refactor/chatroom-lastchat-1: 마지막 채팅을 객체 자체를 return 하도록 수정

src/main/java/com/dife/api/controller/BookmarkController.java

@@ -23,12 +23,6 @@ public class BookmarkController implements SwaggerBookmarkController {
 
 	private final BookmarkService bookmarkService;
 
-	@GetMapping
-	public ResponseEntity<List<BookmarkResponseDto>> getAllBookmarks(Authentication authentication) {
-		List<BookmarkResponseDto> bookmarks = bookmarkService.getAllBookmarks(authentication.getName());
-		return ResponseEntity.ok(bookmarks);
-	}
-
 	@PostMapping
 	public ResponseEntity<BookmarkResponseDto> createBookmark(
 			@RequestBody BookmarkCreateRequestDto requestDto, Authentication auth) {

src/main/java/com/dife/api/controller/SwaggerBookmarkController.java

@@ -16,17 +16,6 @@
 @Tag(name = "Bookmark API", description = "북마크 서비스 API")
 public interface SwaggerBookmarkController {
 
-	@Operation(summary = "모든 북마크 조회 API", description = "사용자가 생성한 모든 (채팅/게시글) 북마크를 조회해주는 API입니다.")
-	@ApiResponse(
-			responseCode = "200",
-			description = "단일 북마크 조회 예시",
-			content = {
-				@Content(
-						mediaType = "application/json",
-						schema = @Schema(implementation = BookmarkResponseDto.class))
-			})
-	ResponseEntity<List<BookmarkResponseDto>> getAllBookmarks(Authentication authentication);
-
 	@Operation(
 			summary = "북마크 생성 API",
 			description = "사용자가 DTO를 작성해 채팅/게시글 북마크를 생성하는 API입니다. 북마크 타입 : CHAT, POST, COMMENT")

src/main/java/com/dife/api/model/dto/ChatroomResponseDto.java

@@ -15,5 +15,5 @@ public interface ChatroomResponseDto {
 
 	Set<MemberRestrictedResponseDto> getMembers();
 
-	String getLastChat();
+	ChatResponseDto getLastChat();
 }

src/main/java/com/dife/api/model/dto/GroupChatroomResponseDto.java

@@ -51,5 +51,5 @@ public class GroupChatroomResponseDto implements ChatroomResponseDto {
 
 	private Boolean isEntered;
 
-	private String lastChat;
+	private ChatResponseDto lastChat;
 }

src/main/java/com/dife/api/model/dto/SingleChatroomResponseDto.java

@@ -27,5 +27,5 @@ public class SingleChatroomResponseDto implements ChatroomResponseDto {
 
 	private Long unreadChatsCount = 0L;
 
-	private String lastChat;
+	private ChatResponseDto lastChat;
 }

src/main/java/com/dife/api/service/BookmarkService.java

@@ -75,8 +75,10 @@ public List<BookmarkResponseDto> getChatroomBookmarks(
 			bookmarks = bookmarkRepository.findBookmarksByMemberAndChatroom(member, chatroomId);
 			bookmarks.sort(Comparator.comparing(Bookmark::getCreated).reversed());
 
-		} else {
+		} else if (boardType != null) {
 			bookmarks = bookmarkRepository.findBookmarkByMemberAndPost_BoardCategory(member, boardType);
+		} else {
+			return getAllBookmarks(memberEmail);
 		}
 
 		return bookmarks.stream()

src/main/java/com/dife/api/service/ChatroomService.java

@@ -410,7 +410,8 @@ public SingleChatroomResponseDto getSingleChatroom(Long id, String memberEmail)
 				chatroomModelMapper.map(chatroom, SingleChatroomResponseDto.class);
 
 		changeChatroomMemberToMemberSet(chatroom, responseDto);
-		responseDto.setLastChat(getLastChat(chatroom, member));
+		Chat chat = getLastChat(chatroom, member);
+		responseDto.setLastChat(modelMapper.map(chat, ChatResponseDto.class));
 		responseDto.setUnreadChatsCount(getChatCounts(chatroomMember));
 		return responseDto;
 	}
@@ -459,7 +460,7 @@ public void chatroomReEnter(Long chatroomId, String memberEmail) {
 		throw new ChatroomReEnterException("채팅방 재입장에 실패했습니다");
 	}
 
-	private String getLastChat(Chatroom chatroom, Member member) {
+	private Chat getLastChat(Chatroom chatroom, Member member) {
 
 		ChatroomMember chatroomMember =
 				chatroomMemberRepository
@@ -472,7 +473,7 @@ private String getLastChat(Chatroom chatroom, Member member) {
 						.filter(chat -> chat.getCreated().isAfter(last_joined_at))
 						.sorted(Comparator.comparing(Chat::getCreated).reversed())
 						.toList();
-		return chats.isEmpty() ? "" : chats.get(0).getMessage();
+		return chats.isEmpty() ? null : chats.get(0);
 	}
 
 	public GroupChatroomResponseDto getGroupChatroom(Long id, String memberEmail) {

src/main/resources/application.yml

@@ -37,6 +37,9 @@ spring:
         redis:
             host: ${REDIS_HOST}
             port: ${REDIS_PORT}
+
+    jackson:
+        time-zone: Asia/Seoul
 translation:
     api-key: ${DEEPL_TRANSLATE_API_KEY}