Merge branch 'dev' into Test/202

Author: jueunk617

.github/workflows/backend-cd.yml

@@ -41,7 +41,7 @@ jobs:
     runs-on: ubuntu-latest
     env:
       DOCKER_IMAGE_NAME: catfe-backend
-      DOT_ENV: ${{ secrets.DOT_ENV }}
+      DOT_ENV: ${{ secrets.DOT_ENV_PROD }}
       OWNER: ${{ github.repository_owner }}
     steps:
       - uses: actions/checkout@v4
@@ -77,7 +77,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [ makeTagAndRelease, buildImageAndPush ]
     env:
-      IMAGE_REPOSITORY: catfe_backend # 도커 이미지 명
+      IMAGE_REPOSITORY: catfe-backend # 도커 이미지 명
       CONTAINER_1_NAME: catfe_1 # 슬롯 1
       CONTAINER_2_NAME: catfe_2 # 슬롯 2
       CONTAINER_PORT: 8080 # 컨테이너 내부 포트
@@ -112,9 +112,6 @@ jobs:
           command: |
             set -Eeuo pipefail
             
-            # 1. EC2 인스턴스 아이디 확인
-            echo "INSTANCE_ID=${INSTANCE_ID}"
-            
             # 3. 실행 로그(라인 타임스탬프 부착)
             LOG="/tmp/ssm-$(date +%Y%m%d_%H%M%S).log"
             exec > >(awk '{ fflush(); print strftime("[%Y-%m-%d %H:%M:%S]"), $0 }' | tee -a "$LOG")
@@ -140,18 +137,18 @@ jobs:
             TOKEN=$(curl -s -X POST http://127.0.0.1:81/api/tokens \
               -H "Content-Type: application/json" \
               -d "{\"identity\": \"[email protected]\", \"secret\": \"${PASSWORD:-}\"}" | jq -r '.token')
-              
+            
               # 조회한 토큰과 도메인 검증
             [[ -n "${TOKEN}" && "${TOKEN}" != "null" ]] || { echo "NPM token issue failed"; exit 1; }
             [[ -n "${DOMAIN:-}" ]] || { echo "DOMAIN is empty"; exit 1; }
             
             # 6. 대상 프록시 호스트 ID 조회(도메인 매칭)
             PROXY_ID=$(curl -s -X GET "http://127.0.0.1:81/api/nginx/proxy-hosts" \
               -H "Authorization: Bearer ${TOKEN}" \
-              | jq ".[] | select(.domain_names[]==\"${APP_1_DOMAIN}\") | .id")
-              
+              | jq ".[] | select(.domain_names[]==\"${DOMAIN}\") | .id")
+            
               # 조회한 프록시 호스트 ID 검증
-            [[ -n "${PROXY_ID}" && "${PROXY_ID}" != "null" ]] || { echo "Proxy host not found for ${APP_1_DOMAIN}"; exit 1; }
+            [[ -n "${PROXY_ID}" && "${PROXY_ID}" != "null" ]] || { echo "Proxy host not found for ${DOMAIN}"; exit 1; }
             
             # 현재 프록시가 바라보는 업스트림(컨테이너명) 조회
             CURRENT_HOST=$(curl -s -X GET "http://127.0.0.1:81/api/nginx/proxy-hosts/${PROXY_ID}" \
@@ -179,9 +176,9 @@ jobs:
             echo "🎨 role -> blue(now): ${BLUE}, green(next): ${GREEN}"
             
             # 8. Green 역할 컨테이너 
-            docker rm -f "${Green}" > /dev/null 2>&1 || true
-            echo "run new container -> ${Green}"
-            docker run -d --name "${Green}" \
+            docker rm -f "${GREEN}" > /dev/null 2>&1 || true
+            echo "run new container -> ${GREEN}"
+            docker run -d --name "${GREEN}" \
               --restart unless-stopped \
               --network "${NET}" \
               -e TZ=Asia/Seoul \
@@ -234,4 +231,3 @@ jobs:
             
             
             
-            

build.gradle.kts

@@ -74,6 +74,9 @@ dependencies {
     // Redis
     implementation("org.springframework.boot:spring-boot-starter-data-redis")
     implementation("com.github.codemonstur:embedded-redis:1.4.3")
+
+    // AWS S3
+    implementation ("org.springframework.cloud:spring-cloud-starter-aws:2.2.6.RELEASE")
 }
 
 tasks.withType<Test> {

infra/terraform/main.tf

@@ -198,7 +198,8 @@ sudo sh -c 'echo "/swapfile swap swap defaults 0 0" >> /etc/fstab'
 echo "PASSWORD=${var.password_1}" >> /etc/environment
 echo "DOMAIN=${var.catfe_domain_1}" >> /etc/environment
 echo "GITHUB_ACCESS_TOKEN_OWNER=${var.github_access_token_1_owner}" >> /etc/environment
-ehco "GITHUB_ACCESS_TOKEN=${var.github_access_token_1}" >> /etc/environment
+echo "GITHUB_ACCESS_TOKEN=${var.github_access_token_1}" >> /etc/environment
+
 # EC2 환경변수 등록
 source /etc/environment
 
@@ -340,4 +341,30 @@ resource "aws_db_instance" "mysql" {
     Value = "devcos-team05"
     Name  = "team5-mysql"
   }
+}
+
+# EC2 역할에 AmazonS3FullAccess 정책을 부착
+resource "aws_iam_role_policy_attachment" "s3_full_access" {
+  role = aws_iam_role.ec2_role_1.name
+  policy_arn = "arn:aws:iam::aws:policy/AmazonS3FullAccess"
+}
+
+# S3 접근 권한 추가
+resource "aws_s3_bucket_public_access_block" "public-access" {
+  bucket = aws_s3_bucket.s3_1.id
+
+  block_public_acls = false
+  block_public_policy = false
+  ignore_public_acls = false
+  restrict_public_buckets = false
+}
+
+# S3 인스턴스 생성
+resource "aws_s3_bucket" "s3_1" {
+  bucket = "team5-s3-1"
+  tags = {
+    Key = "TEAM"
+    Value = "devcos-team05"
+    Name = "team5-s3-1"
+  }
 }

infra/terraform/variables.tf

@@ -1,3 +1,4 @@
 variable "catfe_domain_1" {
-  description = "api.catfe.site"
+  description = "domain_1"
+  default = "api.catfe.site"
 }

src/main/java/com/back/domain/board/comment/controller/CommentLikeController.java

@@ -0,0 +1,47 @@
+package com.back.domain.board.comment.controller;
+
+import com.back.domain.board.comment.dto.CommentLikeResponse;
+import com.back.domain.board.comment.service.CommentLikeService;
+import com.back.global.common.dto.RsData;
+import com.back.global.security.user.CustomUserDetails;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/posts/{postId}/comments/{commentId}/like")
+@RequiredArgsConstructor
+public class CommentLikeController implements CommentLikeControllerDocs {
+    private final CommentLikeService commentLikeService;
+
+    // 댓글 좋아요
+    @PostMapping
+    public ResponseEntity<RsData<CommentLikeResponse>> likeComment(
+            @PathVariable Long postId,
+            @PathVariable Long commentId,
+            @AuthenticationPrincipal CustomUserDetails user
+    ) {
+        CommentLikeResponse response = commentLikeService.likeComment(commentId, user.getUserId());
+        return ResponseEntity
+                .ok(RsData.success(
+                "댓글 좋아요가 등록되었습니다.",
+                        response
+                ));
+    }
+
+    // 댓글 좋아요 취소
+    @DeleteMapping
+    public ResponseEntity<RsData<CommentLikeResponse>> cancelLikeComment(
+            @PathVariable Long postId,
+            @PathVariable Long commentId,
+            @AuthenticationPrincipal CustomUserDetails user
+    ) {
+        CommentLikeResponse response = commentLikeService.cancelLikeComment(commentId, user.getUserId());
+        return ResponseEntity
+                .ok(RsData.success(
+                        "댓글 좋아요가 취소되었습니다.",
+                        response
+                ));
+    }
+}