Feat/subscription

.github/workflows/ci-cd.yml

@@ -1,3 +1,14 @@
+<<<<<<< HEAD
+name: Deploy to EC2 (Self-contained)
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  build-and-deploy:
+=======
 name: Deploy to EKS
 
 on:
@@ -14,6 +25,7 @@ env:
 jobs:
   deploy:
     name: Build and Deploy
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
@@ -31,6 +43,34 @@ jobs:
       - name: Build with Gradle
         run: ./gradlew build -x test
 
+<<<<<<< HEAD
+      - name: Transfer JAR to EC2
+        uses: appleboy/scp-action@v0.1.4
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          source: "build/libs/*.jar"
+          target: "/home/${{ secrets.SSH_USER }}/app"
+          strip_components: 2
+
+      - name: Deploy on EC2
+        uses: appleboy/ssh-action@v0.1.10
+        with:
+          host: ${{ secrets.SSH_HOST }}
+          username: ${{ secrets.SSH_USER }}
+          key: ${{ secrets.SSH_KEY }}
+          script: |
+            APP_DIR="/home/${{ secrets.SSH_USER }}/app"
+            LOG_DIR="${APP_DIR}/logs"
+            DEPLOY_SCRIPT="$APP_DIR/deploy.sh"
+
+            mkdir -p $LOG_DIR
+
+            echo "> 배포 스크립트 실행"
+            chmod +x $DEPLOY_SCRIPT
+            $DEPLOY_SCRIPT
+=======
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v2
         with:
@@ -74,4 +114,5 @@ jobs:
           kubectl apply -f .
 
           # 배포 확인
-          kubectl rollout status deployment/joycrew-backend-deployment
+          kubectl rollout status deployment/joycrew-backend-deployment
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7

build.gradle

@@ -38,6 +38,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-mail'
 
+    // Added from merged branch
     implementation 'org.springframework.boot:spring-boot-starter-actuator'
     implementation 'io.micrometer:micrometer-registry-prometheus'
 
@@ -52,14 +53,14 @@ dependencies {
     // AWS SDK for S3 and Secrets Manager Integration
     implementation platform('io.awspring.cloud:spring-cloud-aws-dependencies:3.1.1')
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-secrets-manager'
-    implementation(platform("software.amazon.awssdk:bom:2.21.46"))
+    implementation platform("software.amazon.awssdk:bom:2.21.46")
     implementation 'software.amazon.awssdk:s3'
 
     implementation 'org.springframework.cloud:spring-cloud-starter-bootstrap'
 
     // Database Drivers
-    runtimeOnly 'com.mysql:mysql-connector-j' // For production
-    runtimeOnly 'com.h2database:h2'           // For development
+    runtimeOnly 'com.mysql:mysql-connector-j'
+    runtimeOnly 'com.h2database:h2'
 
     // Developer Tools
     compileOnly 'org.projectlombok:lombok'
@@ -76,7 +77,7 @@ bootJar {
     enabled = true
 }
 
-// Disables the plain JAR generation as the bootJar is sufficient.
+// Disables the plain JAR generation.
 jar {
     enabled = false
 }

infra/eks/cluster.yml

@@ -1,3 +1,10 @@
+<<<<<<< HEAD
+# ===================================================================
+# EKS Cluster Configuration for JoyCrew Backend
+# This version is configured to use your EXISTING VPC and subnets.
+# ===================================================================
+=======
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
 apiVersion: eksctl.io/v1alpha5
 kind: ClusterConfig
 
@@ -6,6 +13,24 @@ metadata:
   region: ap-northeast-2
   version: "1.29"
 
+<<<<<<< HEAD
+# Enable IAM Roles for Service Accounts (IRSA)
+iam:
+  withOIDC: true
+
+vpc:
+  id: "vpc-067968d8c7f0de694"
+  subnets:
+    # The worker nodes will be placed in the private subnets.
+    private:
+      ap-northeast-2b: { id: "subnet-0b1c4ed704fe8809c" }
+      ap-northeast-2d: { id: "subnet-00394d1c845cc1187" }
+    public:
+      ap-northeast-2a: { id: "subnet-03e9e38db1457d819" }
+      ap-northeast-2c: { id: "subnet-0283caa043409b846" }
+
+# Configuration for managed node groups
+=======
 vpc:
   id: "vpc-028bab1adc7ebda69"
   subnets:
@@ -29,15 +54,59 @@ iam:
       wellKnownPolicies:
         awsLoadBalancerController: true
 
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
 managedNodeGroups:
   - name: app-workers
     instanceType: t3.small
     desiredCapacity: 2
     minSize: 1
+<<<<<<< HEAD
+    maxSize: 4
+    # 'privateNetworking' is not needed when subnets are specified above.
+    # eksctl will automatically use the private subnets for the nodes.
+=======
     maxSize: 3
     privateNetworking: false  # Public 서브넷 사용
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
     ssh:
       allow: true
       publicKeyName: joycrew-deploy-key
     labels:
       role: application
+<<<<<<< HEAD
+      environment: production
+    volumeSize: 20
+    volumeType: gp3
+    iam:
+      attachPolicyARNs:
+        - arn:aws:iam::aws:policy/AmazonEKSWorkerNodePolicy
+        - arn:aws:iam::aws:policy/AmazonEKS_CNI_Policy
+        - arn:aws:iam::aws:policy/AmazonEC2ContainerRegistryReadOnly
+        - arn:aws:iam::aws:policy/CloudWatchAgentServerPolicy
+
+# Manage essential EKS add-ons
+addons:
+  - name: vpc-cni
+    version: latest
+    configurationValues: |-
+      enableNetworkPolicy: "true"
+  - name: coredns
+    version: latest
+  - name: kube-proxy
+    version: latest
+  - name: aws-ebs-csi-driver
+    version: latest
+    wellKnownPolicies:
+      ebsCSIController: true
+
+# CloudWatch logging configuration
+cloudWatch:
+  clusterLogging:
+    enableTypes:
+      - api
+      - audit
+      - authenticator
+      - controllerManager
+      - scheduler
+=======
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7

k8s/deployment.yml

@@ -1,10 +1,18 @@
+<<<<<<< HEAD
+# Defines the desired state for the application pods.
+=======
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
 apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: joycrew-backend-deployment
   labels:
     app: joycrew-backend
 spec:
+<<<<<<< HEAD
+  # Runs 2 replicas of the pod for high availability.
+=======
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
   replicas: 2
   selector:
     matchLabels:
@@ -14,6 +22,30 @@ spec:
       labels:
         app: joycrew-backend
     spec:
+<<<<<<< HEAD
+      # Use a dedicated service account for the application pods.
+      # This is crucial for securely granting AWS permissions via IRSA.
+      serviceAccountName: joycrew-service-account
+      containers:
+        - name: backend-container
+          image: "566105751077.dkr.ecr.ap-northeast-2.amazonaws.com/joycrew-backend:a761bbb-1754808557"
+          ports:
+            - containerPort: 8082
+          env:
+            - name: SPRING_DATASOURCE_HIKARI_CONNECTION_TIMEOUT
+              value: "20000" # 20 seconds
+            - name: SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE
+              value: "5"
+          # Define resource requests and limits for better scheduling and stability.
+          resources:
+            requests:
+              memory: "128Mi"
+              cpu: "150m"
+            limits:
+              memory: "1Gi"
+              cpu: "500m"
+          # Readiness probe checks if the container is ready to accept traffic.
+=======
       # cluster.yml에서 생성한 서비스 계정 이름과 일치해야 함
       serviceAccountName: joycrew-service-account
       containers:
@@ -43,15 +75,27 @@ spec:
               memory: "1Gi"
               cpu: "1000m"
 
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
           readinessProbe:
             httpGet:
               path: /
               port: 8082
+<<<<<<< HEAD
+            initialDelaySeconds: 30
+            periodSeconds: 10
+          # Liveness probe checks if the container is still running correctly.
+          # If it fails, Kubernetes will restart the container.
+=======
             initialDelaySeconds: 40
             periodSeconds: 10
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
           livenessProbe:
             httpGet:
               path: /
               port: 8082
+<<<<<<< HEAD
+            initialDelaySeconds: 60
+=======
             initialDelaySeconds: 90
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
             periodSeconds: 20

k8s/ingress.yml

@@ -1,14 +1,35 @@
+<<<<<<< HEAD
+# /k8s/ingress.yml
+# Defines how external traffic reaches the service inside the cluster.
+# This configuration uses the AWS Load Balancer Controller to provision an ALB.
+=======
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: joycrew-backend-ingress
   annotations:
+<<<<<<< HEAD
+    # Creates an internet-facing load balancer.
     alb.ingress.kubernetes.io/scheme: internet-facing
+    # Routes traffic directly to Pod IPs for better performance.
     alb.ingress.kubernetes.io/target-type: ip
+    # Specifies the ARN of the ACM certificate for HTTPS.
     alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-northeast-2:566105751077:certificate/d5930928-10dc-4f4d-9cc4-67770a94522b
+    # Configures the ALB to listen on port 443 (HTTPS).
     alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
+    # Redirects HTTP traffic to HTTPS.
     alb.ingress.kubernetes.io/ssl-redirect: '443'
 spec:
+  # Specifies that the 'alb' ingress controller should handle this Ingress. (Modern way)
+=======
+    alb.ingress.kubernetes.io/scheme: internet-facing
+    alb.ingress.kubernetes.io/target-type: ip
+    alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-northeast-2:566105751077:certificate/d5930928-10dc-4f4d-9cc4-67770a94522b
+    alb.ingress.kubernetes.io/listen-ports: '[{"HTTPS":443}]'
+    alb.ingress.kubernetes.io/ssl-redirect: '443'
+spec:
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
   ingressClassName: alb
   rules:
     - host: api.joycrew.co.kr
@@ -18,6 +39,13 @@ spec:
             pathType: Prefix
             backend:
               service:
+<<<<<<< HEAD
+                # Forwards traffic to the 'joycrew-backend-service'.
+                name: joycrew-backend-service
+                port:
+                  # Forwards to the service's port 80.
+=======
                 name: joycrew-backend-service
                 port:
+>>>>>>> 12d0498008b5251ba390633e46e4cbf9f1235fd7
                   number: 80

k8s/serviceaccount.yml

@@ -0,0 +1,9 @@
+# Defines a dedicated identity for the application pods within the cluster.
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: joycrew-service-account
+  # Annotations for IAM Roles for Service Accounts (IRSA).
+  # This links the Kubernetes service account to an AWS IAM role.
+  annotations:
+    eks.amazonaws.com/role-arn: "arn:aws:iam::566105751077:role/eksctl-joycrew-cluster-addon-iamserviceaccoun-Role1-65tzCzsgly5T"

src/main/java/com/joycrew/backend/controller/AccountLookupController.java

@@ -5,15 +5,15 @@
 import com.joycrew.backend.service.KycTokenService;
 import com.joycrew.backend.util.EmailMasker;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j; // 로그 확인용 추가
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.stream.Stream;
 
-@Slf4j // 로그를 찍어보시려면 추가하세요
+@Slf4j
 @RestController
 @RequestMapping("/accounts/emails")
 @RequiredArgsConstructor
@@ -29,12 +29,13 @@ public ResponseEntity<EmailsByPhoneResponse> emailsByPhone(
         // 1. 토큰에서 폰번호 추출 (하이픈이 있을 수도 있음)
         String rawPhone = kycTokenService.validateAndExtractPhone(kycToken);
 
-        // 🚨 [수정 핵심] 숫자 이외의 문자(하이픈 등) 제거 -> "01044907174"
+        // 숫자 이외의 문자(하이픈 등) 제거 -> "01044907174" 형태로 정규화
         String cleanPhone = rawPhone.replaceAll("\\D", "");
 
         log.info("Email Lookup Request - Raw: {}, Clean: {}", rawPhone, cleanPhone);
 
         // 2. 정제된 번호(cleanPhone)로 DB 조회
+        // EmployeeRepository.findByPhoneNumber(cleanPhone) 가 List<Employee> 라고 가정
         List<String> emails = employeeRepo.findByPhoneNumber(cleanPhone).stream()
                 .flatMap(e -> Stream.of(e.getEmail(), e.getPersonalEmail()))
                 .filter(Objects::nonNull)
@@ -52,4 +53,4 @@ public ResponseEntity<EmailsByPhoneResponse> emailsByPhone(
                 message
         ));
     }
-}
+}