Merge branch 'dev' into Feat/89

Author: jueunk617

.github/workflows/deploy.yml renamed to .github/workflows/backend-cd.yml

@@ -1,4 +1,4 @@
-name: deploy
+name: backend-cd
 on:
   push:
     paths:
@@ -61,7 +61,7 @@ jobs:
       - name: set lower case owner name
         run: |
           echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
-          
+
 
       - name: 빌드 앤 푸시
         uses: docker/build-push-action@v3
@@ -71,12 +71,18 @@ jobs:
           tags: |
             ghcr.io/${{ env.OWNER_LC }}/${{ env.DOCKER_IMAGE_NAME }}:${{ needs.makeTagAndRelease.outputs.tag_name }},
             ghcr.io/${{ env.OWNER_LC }}/${{ env.DOCKER_IMAGE_NAME }}:latest
-            
-            
+  
+
   deploy:
     runs-on: ubuntu-latest
     needs: [ buildImageAndPush ]
+    env:
+      OWNER: ${{ github.repository_owner }}
     steps:
+      - name: set lower case owner name
+        run: |
+          echo "OWNER_LC=${OWNER,,}" >> ${GITHUB_ENV}
+
       - name: AWS SSM Send-Command
         uses: peterkimzz/aws-ssm-send-command@master
         id: ssm
@@ -88,7 +94,18 @@ jobs:
           working-directory: /
           comment: Deploy
           command: |
+            # 0. env 변수 확인
+            echo "OWNER_LC = ${{ env.OWNER_LC }}"
+            
+            # 1. 최신 이미지 pull
             docker pull ghcr.io/${{ env.OWNER_LC }}/catfe-backend:latest
+            
+            # 2. 기존 컨테이너 종료 및 제거
             docker stop catfe-backend 2>/dev/null
             docker rm catfe-backend 2>/dev/null
-            docker run -d --name catfe-backend -p 8080:8080 ghcr.io/${{ env.OWNER_LC }}/catfe-backend:latest
+            
+            # 3. 새로운 컨테이너 실행
+            docker run -d --name catfe-backend -p 8080:8080 ghcr.io/${{ env.OWNER_LC }}/catfe-backend:latest
+            
+            # 4. dangling 이미지 삭제
+            docker rmi $(docker images -f "dangling=true" -q)

.gitignore

@@ -40,6 +40,7 @@ out/
 db_dev.mv.db
 db_dev.trace.db
 .env
+.env.*
 
 ### Terraform ###
 /infra/terraform/.terraform

Dockerfile

@@ -8,16 +8,14 @@ WORKDIR /app
 COPY build.gradle.kts .
 COPY settings.gradle.kts .
 
+# 종속성 설치
 RUN gradle dependencies --no-daemon
 
 # 소스코드 복사
 COPY src src
 
-# .env 복사
-COPY .env .env
-
 # 애플리케이션 빌드
-RUN gradle build --no-daemon
+RUN gradle build --no-daemon -x test
 
 # 두 번째 스테이지 : 실행 스테이지
 FROM container-registry.oracle.com/graalvm/jdk:21
@@ -26,7 +24,9 @@ WORKDIR /app
 
 # 첫 번째 스테이지에서 빌드된 JAR 파일 복사
 COPY --from=builder /app/build/libs/*.jar app.jar
-COPY --from=builder /app/.env .env
+
+# 빌드 컨텍스트의 .env(backend-cd 작업에서 빌드된 .env)를 컨테이너 안으로 복사
+COPY .env .env
 
 # 실행할 JAR 파일 지정
 ENTRYPOINT ["java", "-Dspring.profiles.active=prod", "-jar", "app.jar"]

src/main/java/com/back/domain/user/controller/AuthController.java

@@ -4,7 +4,7 @@
 import com.back.domain.user.dto.LoginResponse;
 import com.back.domain.user.dto.UserRegisterRequest;
 import com.back.domain.user.dto.UserResponse;
-import com.back.domain.user.service.UserService;
+import com.back.domain.user.service.AuthService;
 import com.back.global.common.dto.RsData;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -23,14 +23,14 @@
 @RequestMapping("/api/auth")
 @RequiredArgsConstructor
 public class AuthController implements AuthControllerDocs {
-    private final UserService userService;
+    private final AuthService authService;
 
     // 회원가입
     @PostMapping("/register")
     public ResponseEntity<RsData<UserResponse>> register(
             @Valid @RequestBody UserRegisterRequest request
     ) {
-        UserResponse response = userService.register(request);
+        UserResponse response = authService.register(request);
         return ResponseEntity
                 .status(HttpStatus.CREATED)
                 .body(RsData.success(
@@ -45,7 +45,7 @@ public ResponseEntity<RsData<LoginResponse>> login(
             @Valid @RequestBody LoginRequest request,
             HttpServletResponse response
     ) {
-        LoginResponse loginResponse = userService.login(request, response);
+        LoginResponse loginResponse = authService.login(request, response);
         return ResponseEntity
                 .ok(RsData.success(
                         "로그인에 성공했습니다.",
@@ -59,7 +59,7 @@ public ResponseEntity<RsData<Void>> logout(
             HttpServletRequest request,
             HttpServletResponse response
     ) {
-        userService.logout(request, response);
+        authService.logout(request, response);
         return ResponseEntity
                 .ok(RsData.success(
                         "로그아웃 되었습니다.",
@@ -73,7 +73,7 @@ public ResponseEntity<RsData<Map<String, String>>> refreshToken(
             HttpServletRequest request,
             HttpServletResponse response
     ) {
-        String newAccessToken = userService.refreshToken(request, response);
+        String newAccessToken = authService.refreshToken(request, response);
         return ResponseEntity.ok(RsData.success(
                 "토큰이 재발급되었습니다.",
                 Map.of("accessToken", newAccessToken)

src/main/java/com/back/domain/user/controller/AuthControllerDocs.java

@@ -131,7 +131,8 @@ ResponseEntity<RsData<UserResponse>> register(
 
     @Operation(
             summary = "로그인",
-            description = "username + password로 로그인합니다. "
+            description = "username + password로 로그인합니다. " +
+                    "로그인 성공 시 Access Token을 응답 본문에, Refresh Token을 HttpOnly 쿠키에 담아 반환합니다. "
     )
     @ApiResponses({
             @ApiResponse(
@@ -311,7 +312,7 @@ ResponseEntity<RsData<Void>> logout(
     @Operation(
             summary = "토큰 재발급",
             description = "만료된 Access Token 대신 Refresh Token을 이용해 새로운 Access Token을 발급받습니다. " +
-                    "Refresh Token은 HttpOnly 쿠키에서 추출하며, 재발급 성공 시 응답 헤더와 본문에 새로운 Access Token을 담습니다."
+                    "Refresh Token은 HttpOnly 쿠키에서 추출하며, 재발급 성공 시 본문에 새로운 Access Token을 담습니다."
     )
     @ApiResponses({
             @ApiResponse(

src/main/java/com/back/domain/user/controller/UserController.java

@@ -0,0 +1,45 @@
+package com.back.domain.user.controller;
+
+import com.back.domain.user.dto.UpdateUserProfileRequest;
+import com.back.domain.user.dto.UserDetailResponse;
+import com.back.domain.user.service.UserService;
+import com.back.global.common.dto.RsData;
+import com.back.global.security.CustomUserDetails;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/users")
+@RequiredArgsConstructor
+public class UserController implements UserControllerDocs {
+    private final UserService userService;
+
+    @GetMapping("/me")
+    public ResponseEntity<RsData<UserDetailResponse>> getMyInfo (
+            @AuthenticationPrincipal CustomUserDetails user
+    ) {
+        UserDetailResponse userDetail = userService.getUserInfo(user.getUserId());
+        return ResponseEntity
+                .ok(RsData.success(
+                        "회원 정보를 조회했습니다.",
+                        userDetail
+                ));
+    }
+
+    @PatchMapping("/me")
+    public ResponseEntity<RsData<UserDetailResponse>> updateMyProfile(
+            @AuthenticationPrincipal CustomUserDetails user,
+            @Valid @RequestBody UpdateUserProfileRequest request
+    ) {
+        UserDetailResponse updated = userService.updateUserProfile(user.getUserId(), request);
+        return ResponseEntity
+                .ok(RsData.success(
+                        "회원 정보를 수정했습니다.",
+                        updated
+                )
+        );
+    }
+}