Merge pull request #145 from Central-MakeUs/dev

[fix] 수정본 반영

Author: HamJina

.github/workflows/deploy.yml

@@ -1,4 +1,4 @@
-name: Deploy To EC2 (Blue-Green via Bastion)
+name: Deploy To EC2 (Blue-Green Public)
 
 on:
   push:
@@ -8,13 +8,13 @@ permissions:
   contents: read
 
 jobs:
-  # 1️⃣ BUILD JOB
+  # 1️⃣ BUILD JOB: 빌드 및 ECR 이미지 업로드
   build:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
 
-      - uses: actions/setup-java@v4
+      - uses: images/setup-java@v4
         with:
           distribution: temurin
           java-version: 17
@@ -27,7 +27,8 @@ jobs:
           chmod +x ./gradlew
           ./gradlew clean build -x test
 
-      - uses: aws-actions/configure-aws-credentials@v4
+      - name: Configure AWS Credentials
+        uses: aws-actions/configure-aws-credentials@v4
         with:
           aws-region: ap-northeast-2
           aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
@@ -44,45 +45,39 @@ jobs:
           docker tag forday:latest 839983937363.dkr.ecr.ap-northeast-2.amazonaws.com/forday:latest
           docker push 839983937363.dkr.ecr.ap-northeast-2.amazonaws.com/forday:latest
 
-  # 2️⃣ DEPLOY JOB
+  # 2️⃣ DEPLOY JOB: Public EC2에 직접 접속하여 배포
   deploy:
     needs: build
     runs-on: ubuntu-latest
     steps:
-      - name: Configure SSH (Bastion → Private)
+      - name: Configure SSH
         run: |
           mkdir -p ~/.ssh
           echo "${{ secrets.SSH_PRIVATE_KEY }}" > ~/.ssh/id_rsa
           chmod 600 ~/.ssh/id_rsa
-
+          
+          # 별칭(Alias)을 'ec2-server'로 설정하여 접속 간소화
           cat <<EOF >> ~/.ssh/config
-          Host bastion
-            HostName ${{ secrets.BASTION_HOST }}
+          Host ec2-server
+            HostName ${{ secrets.EC2_PUBLIC_IP }}
             User ubuntu
             IdentityFile ~/.ssh/id_rsa
             StrictHostKeyChecking no
-
-          Host private
-            HostName ${{ secrets.EC2_PRIVATE_HOST }}
-            User ubuntu
-            IdentityFile ~/.ssh/id_rsa
-            ProxyJump bastion
-            StrictHostKeyChecking no
           EOF
 
-      - name: Blue-Green Deploy
+      - name: Blue-Green Deploy via SSH
         run: |
-          ssh private << 'EOF'
+          ssh ec2-server << 'EOF'
             set -e
           
-            echo "▶ Detect current upstream from nginx env file"
+            echo "▶ Nginx 환경 설정 확인"
             if [ -f /etc/nginx/conf.d/service-env.inc ]; then
               CURRENT_VAL=$(grep -oP '(?<=set \$service_url ).*(?=;)' /etc/nginx/conf.d/service-env.inc || echo "blue")
             else
               CURRENT_VAL="blue"
             fi
           
-            echo "현재 서비스 상태: $CURRENT_VAL"
+            echo "현재 서비스 위치: $CURRENT_VAL"
           
             if [ "$CURRENT_VAL" = "blue" ]; then
               TARGET="green"
@@ -94,20 +89,19 @@ jobs:
               OLD_TARGET="green"
             fi
           
-            echo "▶ Deploy target: $TARGET (port: $TARGET_PORT)"
-            echo "▶ Old container: $OLD_TARGET"
+            echo "▶ 배포 대상: $TARGET (포트: $TARGET_PORT)"
           
-            # ECR 로그인
+            # EC2 내부에서 ECR 로그인
             aws ecr get-login-password --region ap-northeast-2 | docker login --username AWS --password-stdin 839983937363.dkr.ecr.ap-northeast-2.amazonaws.com
           
-            echo "▶ Pull image"
+            echo "▶ 최신 이미지 Pull"
             docker pull 839983937363.dkr.ecr.ap-northeast-2.amazonaws.com/forday:latest
           
-            echo "▶ Stop & remove current $TARGET (if exists)"
+            echo "▶ $TARGET 컨테이너 초기화"
             docker stop $TARGET || true
             docker rm $TARGET || true
           
-            echo "▶ Run new $TARGET"
+            echo "▶ $TARGET 컨테이너 실행"
             docker run -d \
               --name $TARGET \
               --restart=always \
@@ -117,32 +111,33 @@ jobs:
               -e SPRING_DATA_REDIS_PORT=6379 \
               839983937363.dkr.ecr.ap-northeast-2.amazonaws.com/forday:latest
           
-            echo "▶ Health Check"
+            echo "▶ 헬스 체크 시작 (http://localhost:$TARGET_PORT/health_check)"
+            HEALTH_OK=false
             for i in {1..20}; do
               if curl -sf http://localhost:$TARGET_PORT/health_check; then
-                echo "Health OK"
+                echo "✅ 헬스 체크 성공!"
                 HEALTH_OK=true
                 break
               fi
-              echo "Waiting... ($i/20)"
+              echo "대기 중... ($i/20)"
               sleep 5
             done
           
             if [ "$HEALTH_OK" != "true" ]; then
-              echo "❌ Health check failed. Rollback."
+              echo "❌ 헬스 체크 실패. 배포를 중단합니다."
               docker logs $TARGET
               exit 1
             fi
           
-            echo "▶ Switching Nginx upstream to $TARGET"
+            echo "▶ Nginx 스위칭: $TARGET"
             echo "set \$service_url $TARGET;" | sudo tee /etc/nginx/conf.d/service-env.inc
           
             sudo nginx -t
             sudo nginx -s reload
           
-            echo "▶ Stopping OLD container: $OLD_TARGET"
+            echo "▶ 이전 컨테이너($OLD_TARGET) 정리"
             docker stop $OLD_TARGET || true
             docker rm $OLD_TARGET || true
           
-            echo "✅ Deployment complete. Now running: $TARGET"
-          EOF
+            echo "🚀 배포 완료! 현재 실행 중: $TARGET"
+          EOF

src/main/java/com/example/ForDay/domain/activity/dto/FastAPIHobbyCardReqDto.java

@@ -0,0 +1,14 @@
+package com.example.ForDay.domain.activity.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+public class FastAPIHobbyCardReqDto {
+    private Long userHobbyId;
+}

src/main/java/com/example/ForDay/domain/activity/dto/response/FastAPIHobbyCardResDto.java

@@ -0,0 +1,14 @@
+package com.example.ForDay.domain.activity.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class FastAPIHobbyCardResDto {
+    @JsonProperty("content")
+    private String content;
+}

src/main/java/com/example/ForDay/domain/activity/entity/Activity.java

@@ -29,7 +29,7 @@ public class Activity extends BaseTimeEntity {
     @JoinColumn(name = "user_hobby_id", nullable = false)
     private Hobby hobby;
 
-    @Column(nullable = false, length = 100)
+    @Column(nullable = false, length = 25)
     private String content;
 
     private boolean aiRecommended;

src/main/java/com/example/ForDay/domain/activity/repository/ActivityRepository.java

@@ -2,6 +2,7 @@
 
 
 import com.example.ForDay.domain.activity.entity.Activity;
+import com.example.ForDay.domain.record.entity.ActivityRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
@@ -11,4 +12,5 @@
 public interface ActivityRepository extends JpaRepository<Activity, Long>, ActivityRepositoryCustom{
     @Query("SELECT a FROM Activity a WHERE a.id = :activityId AND a.user.id = :userId")
     Optional<Activity> findByIdAndUserId(@Param("activityId") Long activityId,@Param("userId") String userId);
+
 }