Merge pull request #157 from dnd-side-project/dev

fix(PlaylistDetailResponse): 요구사항에 맞게 좋아요 여부, 제작자 닉네임 추가

Author: gzhan0226

chat-server/src/main/java/com/example/demo/controller/ChatController.java

@@ -1,6 +1,7 @@
 package com.example.demo.controller;
 
 
+import com.example.demo.dto.ChatCountResponse;
 import com.example.demo.dto.ChatHistoryResponseDto;
 import com.example.demo.dto.ChatInbound;
 import com.example.demo.global.redis.ChatRedisCounter;
@@ -35,7 +36,7 @@ public void onMessage(@DestinationVariable String roomId, @Valid @Payload ChatIn
         chatService.handleInbound(roomId, chatInbound);
     }
 
-    @GetMapping("/chat/rooms/{roomId}/count")
+    @GetMapping("/chat/rooms/{roomId}/count/member")
     @Operation(
             summary = "채팅방 참여자 수 조회",
             description = "해당 채팅방의 현재 참여자 수를 1회 반환합니다. (소켓 X)",
@@ -95,4 +96,16 @@ public ResponseEntity<String> deleteChat (@PathVariable String roomId,
         chatService.deleteMessage(roomId,messageId, user.getId());
         return ResponseEntity.ok().body("삭제 성공");
     }
+
+    @GetMapping("/chat/rooms/{roomId}/count/chat")
+    @Operation(
+            summary = "채팅방 총 메시지 수",
+            description = "해당 roomId의 총 메시지 개수를 반환합니다."
+    )
+    public ResponseEntity<ChatCountResponse> count(@PathVariable String roomId) {
+        int total = chatService.countByRoomId(roomId);
+        return ResponseEntity.ok(ChatCountResponse.builder()
+                        .totalCount(total)
+                .build());
+    }
 }

chat-server/src/main/java/com/example/demo/dto/ChatCountResponse.java

@@ -0,0 +1,7 @@
+package com.example.demo.dto;
+
+import lombok.Builder;
+
+@Builder
+public record ChatCountResponse(int totalCount) {
+}

chat-server/src/main/java/com/example/demo/entity/repository/ChatRepository.java

@@ -117,4 +117,27 @@ public boolean deleteByPk(String roomId, String sentAt) {
         Chat deleted = t.deleteItem(r -> r.key(key));
         return deleted != null; // 존재했으면 삭제된 엔티티 반환
     }
+
+    public int countByRoomId(String roomId) {
+        int total = 0;
+        Map<String, AttributeValue> lek = null;
+
+        do {
+            var req = QueryEnhancedRequest.builder()
+                    .queryConditional(QueryConditional.keyEqualTo(
+                            Key.builder().partitionValue(roomId).build()))
+                    .attributesToProject("roomId", "sentAt") // 키만
+                    .limit(1000)                              // 페이지 크기
+                    .exclusiveStartKey(lek)
+                    .build();
+
+            Page<Chat> first = table().query(req).stream().findFirst().orElse(null);
+            if (first == null) break;
+
+            total += first.items().size();
+            lek = first.lastEvaluatedKey();
+        } while (lek != null && !lek.isEmpty());
+
+        return total;
+    }
 }

chat-server/src/main/java/com/example/demo/service/ChatService.java

@@ -104,4 +104,8 @@ public void deleteMessage(String roomId, String messageId, String userId) {
             throw new IllegalStateException("삭제 실패");
         }
     }
+
+    public int countByRoomId(String roomId) {
+        return chatRepository.countByRoomId(roomId);
+    }
 }

main-server/src/main/java/com/example/demo/domain/playlist/controller/PlaylistMyPageController.java

@@ -2,6 +2,7 @@
 
 import com.example.demo.domain.follow.dto.response.FollowedPlaylistsResponse;
 import com.example.demo.domain.playlist.dto.*;
+import com.example.demo.domain.playlist.dto.playlistdto.MainPlaylistDetailResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistDetailResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistResponse;
 import com.example.demo.domain.playlist.service.PlaylistMyPageService;
@@ -110,7 +111,7 @@ public ResponseEntity<List<PlaylistDetailResponse>> getPlaylistsByCreator(
 
     @Operation(
             summary = "내 플레이리스트 상세 조회",
-            description = "플레이리스트 상세 및 곡 목록, 좋아요/조회수 등 메타 정보를 반환합니다."
+            description = "내 플레이리스트 상세 및 곡 목록, 좋아요/조회수 등 메타 정보를 반환합니다."
     )
     @ApiResponse(
             responseCode = "200",
@@ -119,13 +120,13 @@ public ResponseEntity<List<PlaylistDetailResponse>> getPlaylistsByCreator(
     )
     @ApiResponse(responseCode = "404", description = "플레이리스트를 찾을 수 없음")
     @GetMapping("/me/{playlistId}")
-    public ResponseEntity<PlaylistDetailResponse> getPlaylistDetail(
+    public ResponseEntity<MainPlaylistDetailResponse> getMyPlaylistDetail(
             @Parameter(description = "플레이리스트 ID", example = "123")
             @PathVariable Long playlistId,
             @Parameter(hidden = true)
             @AuthenticationPrincipal CustomUserDetails user
     ) {
-        PlaylistDetailResponse response = playlistMyPageService.getPlaylistDetail(user.getId(), playlistId);
+        MainPlaylistDetailResponse response = playlistMyPageService.getMyPlaylistDetail(user.getId(), playlistId);
         return ResponseEntity.ok(response);
     }
 

main-server/src/main/java/com/example/demo/domain/playlist/dto/playlistdto/PlaylistResponse.java

@@ -21,16 +21,20 @@ public record PlaylistResponse(
         @Schema(description = "플레이리스트 공개 여부", example = "true")
         boolean isPublic,
 
+        @Schema(description = "플레이리스트 좋아요 여부", example = "true")
+        boolean isLiked,
+
         @Schema(description = "cd 정보")
         CdResponse cdResponse
 
 ) {
-    public static PlaylistResponse from(Playlist playlist, CdResponse cd) {
+    public static PlaylistResponse from(Playlist playlist, CdResponse cd, boolean isLiked) {
         return PlaylistResponse.builder()
                 .playlistId(playlist.getId())
                 .playlistName(playlist.getName())
                 .creatorNickname(playlist.getUsers().getUsername())
                 .isPublic(playlist.isPublic())
+                .isLiked(isLiked)
                 .cdResponse(cd)
                 .build();
     }

main-server/src/main/java/com/example/demo/domain/playlist/service/PlaylistMyPageService.java

@@ -1,6 +1,7 @@
 package com.example.demo.domain.playlist.service;
 
 import com.example.demo.domain.follow.dto.response.FollowedPlaylistsResponse;
+import com.example.demo.domain.playlist.dto.playlistdto.MainPlaylistDetailResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistDetailResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistResponse;
 import com.example.demo.domain.playlist.dto.PlaylistSortOption;
@@ -12,7 +13,7 @@ public interface PlaylistMyPageService {
 
     List<PlaylistResponse> getLikedPlaylistsSorted(String userId, PlaylistSortOption sortOption);
 
-    PlaylistDetailResponse getPlaylistDetail(String id, Long playlistId);
+    MainPlaylistDetailResponse getMyPlaylistDetail(String id, Long playlistId);
 
     void updateIsPublic(String userId, Long playlistId);
 

main-server/src/main/java/com/example/demo/domain/playlist/service/PlaylistMyPageServiceImpl.java

@@ -11,6 +11,7 @@
 import com.example.demo.domain.like.repository.LikesRepository;
 import com.example.demo.domain.playlist.dto.*;
 import com.example.demo.domain.playlist.dto.SongDto;
+import com.example.demo.domain.playlist.dto.playlistdto.MainPlaylistDetailResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistDetailResponse;
 import com.example.demo.domain.playlist.dto.playlistdto.PlaylistResponse;
 import com.example.demo.domain.playlist.entity.Playlist;
@@ -51,7 +52,9 @@ public List<PlaylistResponse> getMyPlaylistsSorted(String userId, PlaylistSortOp
         };
 
         return all.stream()
-                .map(p -> PlaylistResponse.from(p, cdService.getOnlyCdByPlaylistId(p.getId())))
+                .map(p -> PlaylistResponse.from(p,
+                        cdService.getOnlyCdByPlaylistId(p.getId()),
+                        likesRepository.existsByUsers_IdAndPlaylist_Id(userId, p.getId())))
                 .toList();
     }
 
@@ -61,21 +64,23 @@ public List<PlaylistResponse> getLikedPlaylistsSorted(String userId, PlaylistSor
         List<Playlist> likedPlaylists = likesRepository.findLikedPlaylistsWithMeta(userId, sortOption, DEFAULT_LIMIT);
 
         return likedPlaylists.stream()
-                .map(p -> PlaylistResponse.from(p, cdService.getOnlyCdByPlaylistId(p.getId())))
+                .map(p -> PlaylistResponse.from(p,
+                        cdService.getOnlyCdByPlaylistId(p.getId()),
+                        likesRepository.existsByUsers_IdAndPlaylist_Id(userId, p.getId())))
                 .toList();
     }
 
     @Override
     @Transactional(readOnly = true)
-    public PlaylistDetailResponse getPlaylistDetail(String userId, Long playlistId) {
+    public MainPlaylistDetailResponse getMyPlaylistDetail(String userId, Long playlistId) {
         Playlist playlist = playlistRepository.findByIdAndUsers_Id(playlistId, userId)
                 .orElseThrow(() -> new PlaylistException("플레이리스트가 존재하지 않거나 권한이 없습니다.",
                         PlaylistErrorCode.PLAYLIST_NOT_FOUND));
 
         List<Song> songs = songRepository.findSongsByPlaylistId(playlistId);
         List<SongDto> songDtos = songs.stream().map(SongDto::from).toList();
 
-        return PlaylistDetailResponse.from(playlist, songDtos, cdService.getOnlyCdByPlaylistId(playlistId));
+        return MainPlaylistDetailResponse.from(playlist, songDtos, cdService.getOnlyCdByPlaylistId(playlistId));
     }