Fix: 최신 코드 병합 충돌 제어

Author: loseminho

.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/chat/dm/controller/PrivateChatWebSocketController.java

@@ -0,0 +1,4 @@
+package com.back.domain.chat.dm.controller;
+
+public class PrivateChatWebSocketController {
+}

src/main/java/com/back/domain/chat/dto/ChatMessageDto.java

@@ -1,7 +1,7 @@
-package com.back.domain.chat.controller;
+package com.back.domain.chat.room.controller;
 
-import com.back.domain.chat.dto.ChatPageResponse;
-import com.back.domain.chat.service.ChatService;
+import com.back.domain.chat.room.dto.RoomChatPageResponse;
+import com.back.domain.chat.room.service.RoomChatService;
 import com.back.global.common.dto.RsData;
 import com.back.global.security.CustomUserDetails;
 import io.swagger.v3.oas.annotations.Operation;
@@ -18,22 +18,22 @@
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api")
-@Tag(name = "Chat API", description = "채팅 메시지 조회 관련 API")
-public class ChatApiController {
+@Tag(name = "RoomChat API", description = "스터디룸 채팅 메시지 조회 관련 API")
+public class RoomChatApiController {
 
-    private final ChatService chatService;
+    private final RoomChatService roomChatService;
 
     // 방 채팅 메시지 조회 (페이징, 특정 시간 이전 메시지)
     @GetMapping("/rooms/{roomId}/messages")
-    @Operation(summary = "채팅방 메시지 목록 조회", description = "특정 채팅방의 이전 메시지 기록을 페이징하여 조회합니다.")
-    public ResponseEntity<RsData<ChatPageResponse>> getRoomChatMessages(
+    @Operation(summary = "스터디룸 채팅방 메시지 목록 조회", description = "특정 채팅방의 이전 메시지 기록을 페이징하여 조회합니다.")
+    public ResponseEntity<RsData<RoomChatPageResponse>> getRoomChatMessages(
             @PathVariable Long roomId,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "20") int size,
             @RequestParam(required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime before,
             @AuthenticationPrincipal CustomUserDetails userDetails) {
 
-        ChatPageResponse chatHistory = chatService.getRoomChatHistory(roomId, page, size, before);
+        RoomChatPageResponse chatHistory = roomChatService.getRoomChatHistory(roomId, page, size, before);
 
         return ResponseEntity
                 .status(HttpStatus.OK)

src/main/java/com/back/domain/chat/dto/ChatPageResponse.java

@@ -1,10 +1,10 @@
-package com.back.domain.chat.controller;
+package com.back.domain.chat.room.controller;
 
 import com.back.domain.studyroom.entity.RoomChatMessage;
-import com.back.domain.chat.dto.ChatMessageDto;
+import com.back.domain.chat.room.dto.RoomChatMessageDto;
 import com.back.global.security.CustomUserDetails;
 import com.back.global.websocket.dto.WebSocketErrorResponse;
-import com.back.domain.chat.service.ChatService;
+import com.back.domain.chat.room.service.RoomChatService;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import org.springframework.messaging.handler.annotation.DestinationVariable;
@@ -18,10 +18,10 @@
 
 @Controller
 @RequiredArgsConstructor
-@Tag(name = "Chat WebSocket", description = "STOMP를 이용한 실시간 채팅 WebSocket 컨트롤러 (Swagger에서 직접 테스트 불가)")
-public class ChatWebSocketController {
+@Tag(name = "RoomChat WebSocket", description = "STOMP를 이용한 실시간 채팅 WebSocket 컨트롤러 (Swagger에서 직접 테스트 불가)")
+public class RoomChatWebSocketController {
 
-    private final ChatService chatService;
+    private final RoomChatService roomChatService;
     private final SimpMessagingTemplate messagingTemplate;
 
     /**
@@ -35,7 +35,7 @@ public class ChatWebSocketController {
      */
     @MessageMapping("/chat/room/{roomId}")
     public void handleRoomChat(@DestinationVariable Long roomId,
-                               ChatMessageDto chatMessage,
+                               RoomChatMessageDto chatMessage,
                                SimpMessageHeaderAccessor headerAccessor,
                                Principal principal) {
 
@@ -51,25 +51,26 @@ public void handleRoomChat(@DestinationVariable Long roomId,
             String currentUserNickname = userDetails.getUsername();
 
             // 메시지 정보 보완
-            chatMessage.setRoomId(roomId);
-            chatMessage.setUserId(currentUserId);
-            chatMessage.setNickname(currentUserNickname);
+            RoomChatMessageDto enrichedMessage = chatMessage
+                    .withRoomId(roomId)
+                    .withUserId(currentUserId)
+                    .withNickname(currentUserNickname);
 
             // DB에 메시지 저장
-            RoomChatMessage savedMessage = chatService.saveRoomChatMessage(chatMessage);
+            RoomChatMessage savedMessage = roomChatService.saveRoomChatMessage(enrichedMessage);
 
             // 저장된 메시지 정보로 응답 DTO 생성
-            ChatMessageDto responseMessage = ChatMessageDto.builder()
-                    .messageId(savedMessage.getId())
-                    .roomId(roomId)
-                    .userId(savedMessage.getUser().getId())
-                    .nickname(savedMessage.getUser().getNickname())
-                    .profileImageUrl(savedMessage.getUser().getProfileImageUrl())
-                    .content(savedMessage.getContent())
-                    .messageType(chatMessage.getMessageType())
-                    .attachment(null) // 텍스트 채팅에서는 null
-                    .createdAt(savedMessage.getCreatedAt())
-                    .build();
+            RoomChatMessageDto responseMessage = RoomChatMessageDto.createResponse(
+                    savedMessage.getId(),
+                    roomId,
+                    savedMessage.getUser().getId(),
+                    savedMessage.getUser().getNickname(),
+                    savedMessage.getUser().getProfileImageUrl(),
+                    savedMessage.getContent(),
+                    chatMessage.messageType(),
+                    null, // 텍스트 채팅에서는 null
+                    savedMessage.getCreatedAt()
+            );
 
             // 해당 방의 모든 구독자에게 브로드캐스트
             messagingTemplate.convertAndSend("/topic/room/" + roomId, responseMessage);

src/main/java/com/back/domain/chat/controller/ChatApiController.java renamed to src/main/java/com/back/domain/chat/room/controller/RoomChatApiController.java

@@ -0,0 +1,69 @@
+package com.back.domain.chat.room.dto;
+
+import java.time.LocalDateTime;
+
+public record RoomChatMessageDto(
+    // WebSocket Request
+    String content,
+    String messageType,
+    Long attachmentId,
+    
+    // WebSocket Response
+    Long messageId,
+    Long roomId,
+    Long userId,
+    String nickname,
+    String profileImageUrl,
+    AttachmentDto attachment,
+    LocalDateTime createdAt
+) {
+    
+    // 첨부파일 DTO (나중에 파일 기능 구현 시 사용)
+    public record AttachmentDto(
+        Long id,
+        String originalName,
+        String url,
+        Long size,
+        String mimeType
+    ) {}
+
+    // 텍스트 채팅 요청 생성 헬퍼
+    public static RoomChatMessageDto createRequest(String content, String messageType) {
+        return new RoomChatMessageDto(
+            content,
+            messageType,
+            null, // attachmentId - 텍스트 채팅에서는 null
+            null, // messageId
+            null, // roomId
+            null, // userId
+            null, // nickname
+            null, // profileImageUrl
+            null, // attachment
+            null  // createdAt
+        );
+    }
+    
+    // 필드 업데이트
+    public RoomChatMessageDto withRoomId(Long roomId) {
+        return new RoomChatMessageDto(content, messageType, attachmentId, messageId, roomId, userId, nickname, profileImageUrl, attachment, createdAt);
+    }
+    
+    public RoomChatMessageDto withUserId(Long userId) {
+        return new RoomChatMessageDto(content, messageType, attachmentId, messageId, roomId, userId, nickname, profileImageUrl, attachment, createdAt);
+    }
+    
+    public RoomChatMessageDto withNickname(String nickname) {
+        return new RoomChatMessageDto(content, messageType, attachmentId, messageId, roomId, userId, nickname, profileImageUrl, attachment, createdAt);
+    }
+    
+    // Response용 생성자
+    public static RoomChatMessageDto createResponse(
+            Long messageId, Long roomId, Long userId, String nickname, 
+            String profileImageUrl, String content, String messageType, 
+            AttachmentDto attachment, LocalDateTime createdAt) {
+        return new RoomChatMessageDto(
+            content, messageType, null, // attachmentId는 request용이므로 null
+            messageId, roomId, userId, nickname, profileImageUrl, attachment, createdAt
+        );
+    }
+}