[MERGE] DEVELOP TO MAIN

.gitignore

@@ -8,6 +8,10 @@ target/
 .gradle/
 build/
 
+### Eclipse ###
+bin/
+.metadata
+
 ### STS ###
 .apt_generated
 .classpath

src/main/java/com/divary/DivaryApplication.java

@@ -4,8 +4,10 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
+@EnableScheduling
 public class DivaryApplication {
 
     public static void main(String[] args) {

src/main/java/com/divary/common/response/ApiResponse.java

@@ -30,6 +30,9 @@ public class ApiResponse<T> {
     @Schema(description = "응답 메시지", example = "요청이 성공적으로 처리되었습니다.")
     private String message;
 
+    @Schema(description = "요청 경로", example = "/api/v1/example")
+    private String path;
+
     @Schema(description = "응답 데이터")
     private T data;
 
@@ -62,6 +65,16 @@ public static <T> ApiResponse<T> error(int status, String code, String message)
                 .build();
     }
 
+    public static <T> ApiResponse<T> error(int status, String code, String message, String path) {
+        return ApiResponse.<T>builder()
+                .timestamp(LocalDateTime.now())
+                .status(status)
+                .code(code)
+                .message(message)
+                .path(path)
+                .build();
+    }
+
     public static <T> ApiResponse<T> error(ErrorCode errorCode) {
         return ApiResponse.<T>builder()
                 .timestamp(LocalDateTime.now())
@@ -70,4 +83,14 @@ public static <T> ApiResponse<T> error(ErrorCode errorCode) {
                 .message(errorCode.getMessage())
                 .build();
     }
+
+    public static <T> ApiResponse<T> error(ErrorCode errorCode, String path) {
+        return ApiResponse.<T>builder()
+                .timestamp(LocalDateTime.now())
+                .status(errorCode.getStatus().value())
+                .code(errorCode.getCode())
+                .message(errorCode.getMessage())
+                .path(path)
+                .build();
+    }
 } 

src/main/java/com/divary/domain/chatroom/controller/ChatRoomController.java

@@ -7,15 +7,21 @@
 import com.divary.domain.chatroom.dto.response.ChatRoomMessageResponse;
 import com.divary.domain.chatroom.dto.response.ChatRoomResponse;
 import com.divary.domain.chatroom.service.ChatRoomService;
+import com.divary.global.config.SwaggerConfig.ApiErrorExamples;
 import com.divary.global.config.SwaggerConfig.ApiSuccessResponse;
+import com.divary.global.config.security.CustomUserPrincipal;
+import com.divary.global.exception.ErrorCode;
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.*;
 import java.util.List;
 
+@Slf4j
 @RestController
 @RequestMapping("chatrooms")
 @RequiredArgsConstructor
@@ -27,16 +33,19 @@ public class ChatRoomController {
     @PostMapping(consumes = "multipart/form-data")
     @Operation(summary = "채팅방 메시지 전송", description = "새 채팅방 생성 또는 기존 채팅방에 메시지 전송\n chatRoomId 없으면 새 채팅방 생성\n 보낸 메시지와 AI 응답만 반환")
     @ApiSuccessResponse(dataType = ChatRoomMessageResponse.class)
+    @ApiErrorExamples(value = {ErrorCode.CHAT_ROOM_ACCESS_DENIED, ErrorCode.AUTHENTICATION_REQUIRED})
     public ApiResponse<ChatRoomMessageResponse> sendChatRoomMessage(
-            @Valid @ModelAttribute ChatRoomMessageRequest request) {
+            @Valid @ModelAttribute ChatRoomMessageRequest request,
+            @AuthenticationPrincipal CustomUserPrincipal userPrincipal) {
 
-        ChatRoomMessageResponse response = chatRoomService.sendChatRoomMessage(request);
+        ChatRoomMessageResponse response = chatRoomService.sendChatRoomMessage(request, userPrincipal.getId());
         return ApiResponse.success(response);
     }
 
     @GetMapping("/{chatRoomId}")
     @Operation(summary = "채팅방 상세 조회", description = "채팅방의 상세 정보를 조회합니다.")
     @ApiSuccessResponse(dataType = ChatRoomDetailResponse.class)
+    @ApiErrorExamples(value = {ErrorCode.CHAT_ROOM_NOT_FOUND, ErrorCode.CHAT_ROOM_ACCESS_DENIED, ErrorCode.AUTHENTICATION_REQUIRED})
     public ApiResponse<ChatRoomDetailResponse> getChatRoomDetail(@PathVariable Long chatRoomId) {
         ChatRoomDetailResponse response = chatRoomService.getChatRoomDetail(chatRoomId);
         return ApiResponse.success(response);
@@ -45,10 +54,12 @@ public ApiResponse<ChatRoomDetailResponse> getChatRoomDetail(@PathVariable Long
 
     @GetMapping
     @Operation(summary = "채팅방 목록 조회", description = "사용자의 채팅방 목록을 조회합니다.")
-    public ApiResponse<List<ChatRoomResponse>> getChatRooms() {
-        // 임시로 사용자 ID 하드코딩
-        // TODO: 사용자 ID를 Authorization 헤더에서 가져오도록 수정
-        Long userId = 1L;
+    @ApiSuccessResponse(dataType = ChatRoomResponse.class, isArray = true)
+    @ApiErrorExamples(value = {ErrorCode.AUTHENTICATION_REQUIRED})
+    public ApiResponse<List<ChatRoomResponse>> getChatRooms(
+            @AuthenticationPrincipal CustomUserPrincipal userPrincipal) {
+
+        Long userId = userPrincipal.getId();
 
         List<ChatRoomResponse> responses = chatRoomService.getChatRoomsByUserId(userId);
         return ApiResponse.success(responses);
@@ -57,10 +68,10 @@ public ApiResponse<List<ChatRoomResponse>> getChatRooms() {
     @DeleteMapping("/{chatRoomId}")
     @Operation(summary = "채팅방 삭제", description = "채팅방을 삭제합니다.")
     @ApiSuccessResponse(dataType = Void.class)
-    public ApiResponse<Void> deleteChatRoom(@PathVariable Long chatRoomId) {
-        // 임시로 사용자 ID 하드코딩
-        // TODO: 사용자 ID를 Authorization 헤더에서 가져오도록 수정
-        Long userId = 1L;
+    @ApiErrorExamples(value = {ErrorCode.CHAT_ROOM_NOT_FOUND, ErrorCode.CHAT_ROOM_ACCESS_DENIED, ErrorCode.AUTHENTICATION_REQUIRED})
+    public ApiResponse<Void> deleteChatRoom(@PathVariable Long chatRoomId,
+                                        @AuthenticationPrincipal CustomUserPrincipal userPrincipal) {
+        Long userId = userPrincipal.getId();
 
         chatRoomService.deleteChatRoom(chatRoomId, userId);
         return ApiResponse.success(null);
@@ -69,11 +80,11 @@ public ApiResponse<Void> deleteChatRoom(@PathVariable Long chatRoomId) {
     @PatchMapping("/{chatRoomId}/title")
     @Operation(summary = "채팅방 제목 변경", description = "채팅방의 제목을 변경합니다.")
     @ApiSuccessResponse(dataType = Void.class)
+    @ApiErrorExamples(value = {ErrorCode.CHAT_ROOM_NOT_FOUND, ErrorCode.CHAT_ROOM_ACCESS_DENIED, ErrorCode.AUTHENTICATION_REQUIRED})
     public ApiResponse<Void> updateChatRoomTitle(@PathVariable Long chatRoomId,
-                                                @Valid @RequestBody ChatRoomTitleUpdateRequest request) {
-        // 임시로 사용자 ID 하드코딩
-        // TODO: 사용자 ID를 Authorization 헤더에서 가져오도록 수정
-        Long userId = 1L;
+                                                @Valid @RequestBody ChatRoomTitleUpdateRequest request,
+                                                @AuthenticationPrincipal CustomUserPrincipal userPrincipal) {
+        Long userId = userPrincipal.getId();
 
         chatRoomService.updateChatRoomTitle(chatRoomId, userId, request.getTitle());
         return ApiResponse.success(null);

src/main/java/com/divary/domain/chatroom/service/ChatRoomService.java

@@ -10,13 +10,15 @@
 import com.divary.domain.chatroom.entity.ChatRoom;
 import com.divary.domain.chatroom.repository.ChatRoomRepository;
 import com.divary.domain.image.dto.response.ImageResponse;
-import com.divary.domain.image.entity.ImageType;
+import com.divary.domain.image.enums.ImageType;
 import com.divary.domain.image.service.ImageService;
 import com.divary.global.exception.BusinessException;
 import com.divary.global.exception.ErrorCode;
 import com.divary.common.converter.TypeConverter;
 
 import lombok.RequiredArgsConstructor;
+
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -38,8 +40,7 @@ public class ChatRoomService {
 
     // 채팅방 메시지 전송 (새 채팅방 생성 또는 기존 채팅방에 메시지 추가)
     @Transactional
-    public ChatRoomMessageResponse sendChatRoomMessage(ChatRoomMessageRequest request) {
-        Long userId = getCurrentUserId();
+    public ChatRoomMessageResponse sendChatRoomMessage(ChatRoomMessageRequest request, Long userId) {
         ChatRoom chatRoom;
         List<String> newMessageIds = new java.util.ArrayList<>();
 
@@ -89,7 +90,7 @@ private ChatRoom createNewChatRoom(Long userId, ChatRoomMessageRequest request)
             String firstMessageId = (String) metadata.get("lastMessageId");
             HashMap<String, Object> userMessage = TypeConverter.castToHashMap(messages.get(firstMessageId));
 
-            processImageUpload(userMessage, request.getImage(), userId, savedChatRoom.getId().toString());
+            processImageUpload(userMessage, request.getImage(), userId, savedChatRoom.getId());
 
             messages.put(firstMessageId, userMessage);
             savedChatRoom.updateMessages(messages);
@@ -106,21 +107,21 @@ private ChatRoom addMessageToExistingChatRoom(Long chatRoomId, Long userId, Chat
         validateChatRoomOwnership(chatRoom, userId);
 
         // 새 메시지 추가
-        addUserMessageToChatRoom(chatRoom, request);
+        addUserMessageToChatRoom(chatRoom, request, userId);
 
         return chatRoom;
     }
 
     // 사용자 메시지를 채팅방에 추가
-    private void addUserMessageToChatRoom(ChatRoom chatRoom, ChatRoomMessageRequest request) {
+    private void addUserMessageToChatRoom(ChatRoom chatRoom, ChatRoomMessageRequest request, Long userId) {
         HashMap<String, Object> messages = chatRoom.getMessages();
         String newMessageId = messageFactory.generateNextMessageId(messages);
 
         // 메시지 데이터 생성
         HashMap<String, Object> messageData = messageFactory.createUserMessageData(request.getMessage(), null);
 
         // 이미지 처리
-        processImageUpload(messageData, request.getImage(), getCurrentUserId(), chatRoom.getId().toString());
+        processImageUpload(messageData, request.getImage(), userId, chatRoom.getId());
 
         messages.put(newMessageId, messageData);
 
@@ -157,24 +158,17 @@ private String addAiResponseToMessages(ChatRoom chatRoom, OpenAIResponse aiRespo
 
         return nextMessageId;
     }
-
-    // 현재 사용자 ID 가져오기
-    private Long getCurrentUserId() {
-        // TODO: 사용자 ID를 Authorization 헤더에서 가져오도록 수정
-        return 1L;
-    }
 
     // 채팅방 소유자 권한 확인
     private void validateChatRoomOwnership(ChatRoom chatRoom, Long userId) {
-        // TODO: 채팅방 소유자 확인 로직 - 현재는 하드코딩으로 처리
         if (!chatRoom.getUserId().equals(userId)) {
-            throw new BusinessException(ErrorCode.INTERNAL_SERVER_ERROR);
+            throw new BusinessException(ErrorCode.CHAT_ROOM_ACCESS_DENIED);
         }
     }
 
 
     // 이미지 업로드 처리
-    private void processImageUpload(HashMap<String, Object> messageData, org.springframework.web.multipart.MultipartFile image, Long userId, String chatRoomId) {
+    private void processImageUpload(HashMap<String, Object> messageData, MultipartFile image, Long userId, Long chatRoomId) {
         if (image != null && !image.isEmpty()) {
             ImageResponse imageResponse = imageService.uploadImageByType(
                 ImageType.USER_CHAT,

src/main/java/com/divary/domain/encyclopedia/controller/EncyclopediaCardController.java

@@ -1,21 +1,21 @@
 package com.divary.domain.encyclopedia.controller;
 
 import com.divary.common.response.ApiResponse;
-import com.divary.domain.encyclopedia.dto.AppearanceResponse;
 import com.divary.domain.encyclopedia.dto.EncyclopediaCardResponse;
 import com.divary.domain.encyclopedia.dto.EncyclopediaCardSummaryResponse;
-import com.divary.domain.encyclopedia.dto.PersonalityResponse;
-import com.divary.domain.encyclopedia.dto.SignificantResponse;
 import com.divary.domain.encyclopedia.service.EncyclopediaCardService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/api/v1/cards")
+@RequestMapping("/cards")
 @RequiredArgsConstructor
 public class EncyclopediaCardController {
 

src/main/java/com/divary/domain/encyclopedia/dto/AppearanceResponse.java

@@ -3,11 +3,10 @@
 import com.divary.domain.encyclopedia.embedded.Appearance;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.Arrays;
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
-import java.util.List;
-
 @Getter
 @Builder
 @Schema(description = "도감 생물 외모 응답 DTO")

src/main/java/com/divary/domain/encyclopedia/dto/EncyclopediaCardResponse.java

@@ -1,15 +1,10 @@
 package com.divary.domain.encyclopedia.dto;
 
-import com.divary.domain.encyclopedia.entity.EncyclopediaCard;
-import com.divary.domain.image.entity.Image;
-import com.divary.domain.image.entity.ImageType;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.Optional;
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
-import java.util.List;
-
 @Getter
 @Builder
 @Schema(description = "도감 카드 상세 응답")
@@ -48,31 +43,4 @@ public class EncyclopediaCardResponse {
     @Schema(description = "특이사항 정보")
     private SignificantResponse significant;
 
-    public static EncyclopediaCardResponse from(EncyclopediaCard card) {
-        return EncyclopediaCardResponse.builder()
-                .id(card.getId())
-                .name(card.getName())
-                .type(card.getType().getDescription())
-                .size(card.getSize())
-                .appearPeriod(card.getAppearPeriod())
-                .place(card.getPlace())
-                .imageUrls(
-                        card.getImages().stream()
-                                .filter(img -> img.getType() == ImageType.SYSTEM_DOGAM)
-                                .map(Image::getS3Key)
-                                .toList()
-                )
-                .appearance(Optional.ofNullable(card.getAppearance())
-                        .map(AppearanceResponse::from)
-                        .orElse(null))
-                .personality(Optional.ofNullable(card.getPersonality())
-                        .map(PersonalityResponse::from)
-                        .orElse(null))
-                .significant(Optional.ofNullable(card.getSignificant())
-                        .map(SignificantResponse::from)
-                        .orElse(null))
-                .build();
-    }
-
-
-}
+}

src/main/java/com/divary/domain/encyclopedia/dto/EncyclopediaCardSummaryResponse.java

@@ -1,9 +1,6 @@
 package com.divary.domain.encyclopedia.dto;
 
-import com.divary.domain.encyclopedia.entity.EncyclopediaCard;
 import io.swagger.v3.oas.annotations.media.Schema;
-import java.util.Collections;
-import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 
@@ -21,19 +18,7 @@ public class EncyclopediaCardSummaryResponse {
     @Schema(description = "생물 종류", example = "어류")
     private String type;
 
-    @Schema(description = "썸네일 이미지 URL 목록", example = "[\"https://s3.example.com/card1-thumbnail.jpg\"]")
-    private List<String> imageUrls;
+    @Schema(description = "도감 이모지 프로필 URL", example = "\"https://s3.example.com/card1-thumbnail.jpg\"")
+    private String dogamProfileUrl;
 
-    public static EncyclopediaCardSummaryResponse from(EncyclopediaCard card) {
-        return EncyclopediaCardSummaryResponse.builder()
-                .id(card.getId())
-                .name(card.getName())
-                .type(card.getType().getDescription())
-                .imageUrls(
-                        card.getThumbnail() != null
-                                ? Collections.singletonList(card.getThumbnail().getS3Key())
-                                : Collections.emptyList()
-                )
-                .build();
-    }
 }