refactor: 내 다이어리 조회와 캘린더 조회 DTO 분리

Author: jinwon1234

src/main/java/apptive/team5/diary/controller/DiaryController.java

@@ -70,15 +70,15 @@ public ResponseEntity<Page<UserDiaryResponseDto>> getUserDiaries(
     }
 
     @GetMapping("/my/calendar")
-    public ResponseEntity<List<MyDiaryResponseDto>> getMyDiariesByPeriod(
+    public ResponseEntity<List<CalendarDiaryResponseDto>> getMyDiariesByPeriod(
             @AuthenticationPrincipal
             Long userId,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
             LocalDate start,
             @RequestParam @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
             LocalDate end
     ) {
-        List<MyDiaryResponseDto> response = diaryService.getMyDiariesByPeriod(userId, start, end);
+        List<CalendarDiaryResponseDto> response = diaryService.getMyDiariesByPeriod(userId, start, end);
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 

src/main/java/apptive/team5/diary/dto/CalendarDiaryResponseDto.java

@@ -0,0 +1,42 @@
+package apptive.team5.diary.dto;
+
+import apptive.team5.diary.domain.DiaryEntity;
+import apptive.team5.diary.domain.DiaryScope;
+
+import java.time.LocalDateTime;
+
+public record CalendarDiaryResponseDto(
+            Long diaryId,
+            String artist,
+            String musicTitle,
+            String albumImageUrl,
+            String content,
+            String videoUrl,
+            DiaryScope scope,
+            String duration,
+            String totalDuration,
+            String start,
+            String end,
+            LocalDateTime createDate,
+            LocalDateTime updateDate
+    ) implements DiaryResponseDto {
+    public static CalendarDiaryResponseDto from(DiaryEntity diary) {
+        return new CalendarDiaryResponseDto(
+                diary.getId(),
+                diary.getArtist(),
+                diary.getMusicTitle(),
+                diary.getAlbumImageUrl(),
+                diary.getContent(),
+                diary.getVideoUrl(),
+                diary.getScope(),
+                diary.getDuration(),
+                diary.getTotalDuration(),
+                diary.getStart(),
+                diary.getEnd(),
+                diary.getCreateDateTime(),
+                diary.getUpdateDateTime()
+        );
+    }
+
+}
+

src/main/java/apptive/team5/diary/dto/MyDiaryResponseDto.java

@@ -18,9 +18,12 @@ public record MyDiaryResponseDto(
         String start,
         String end,
         LocalDateTime createDate,
-        LocalDateTime updateDate
+        LocalDateTime updateDate,
+        boolean isLiked,
+        Long likeCount,
+        Long userId
 ) implements DiaryResponseDto {
-    public static MyDiaryResponseDto from(DiaryEntity diary) {
+    public static MyDiaryResponseDto from(DiaryEntity diary, boolean isLiked, Long likeCount, Long userId) {
         return new MyDiaryResponseDto(
                 diary.getId(),
                 diary.getArtist(),
@@ -34,7 +37,10 @@ public static MyDiaryResponseDto from(DiaryEntity diary) {
                 diary.getStart(),
                 diary.getEnd(),
                 diary.getCreateDateTime(),
-                diary.getUpdateDateTime()
+                diary.getUpdateDateTime(),
+                isLiked,
+                likeCount,
+                userId
         );
     }
 }

src/main/java/apptive/team5/diary/service/DiaryService.java

@@ -35,8 +35,23 @@ public class DiaryService {
     public Page<MyDiaryResponseDto> getMyDiaries(Long userId, Pageable pageable) {
         UserEntity foundUser = userLowService.getReferenceById(userId);
 
-        return diaryLowService.findDiaryByUser(foundUser, pageable)
-                .map(MyDiaryResponseDto::from);
+        Page<DiaryEntity> diaryPage = diaryLowService.findDiaryByUser(foundUser, pageable);
+
+        List<Long> diaryIds = diaryPage.stream()
+                .map(DiaryEntity::getId)
+                .toList();
+
+
+        Set<Long> likedDiaryIds = diaryLikeLowService.findLikedDiaryIdsByUser(userId, diaryIds);
+        Map<Long, Long> likeCountsMaps = diaryLikeLowService.findLikeCountsByDiaryIds(diaryIds);
+
+        return diaryResponseMapper.mapToResponseDto(
+                diaryPage,
+                likedDiaryIds,
+                likeCountsMaps,
+                userId,
+                MyDiaryResponseDto::from
+        );
     }
 
     @Transactional(readOnly = true)
@@ -96,13 +111,13 @@ public Page<UserDiaryResponseDto> getUserDiaries(Long targetUserId, Long current
     }
 
     @Transactional(readOnly = true)
-    public List<MyDiaryResponseDto> getMyDiariesByPeriod(Long userId, LocalDate startDate, LocalDate endDate) {
+    public List<CalendarDiaryResponseDto> getMyDiariesByPeriod(Long userId, LocalDate startDate, LocalDate endDate) {
         LocalDateTime startDateTime = startDate.atStartOfDay();
         LocalDateTime endDateTime = endDate.atTime(LocalTime.MAX);
 
         return diaryLowService.findByUserIdAndPeriod(userId, startDateTime, endDateTime)
                 .stream()
-                .map(MyDiaryResponseDto::from)
+                .map(CalendarDiaryResponseDto::from)
                 .toList();
     }
 

src/test/java/apptive/team5/diary/controller/DiaryControllerTest.java

@@ -83,6 +83,7 @@ void getMyMusicDiary() throws Exception {
         // given
         DiaryEntity firstDiary = diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
         DiaryEntity secondDiary = diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
+        diaryLikeLowService.saveDiaryLike(new DiaryLikeEntity(testUser, secondDiary)); // 두번째 다이어리에 좋아요
 
         TestSecurityContextHolderInjection.inject(testUser.getId(), testUser.getRoleType());
 
@@ -115,6 +116,10 @@ void getMyMusicDiary() throws Exception {
             softly.assertThat(diaryResponse.totalDuration()).isEqualTo(secondDiary.getTotalDuration());
             softly.assertThat(diaryResponse.start()).isEqualTo(secondDiary.getStart());
             softly.assertThat(diaryResponse.end()).isEqualTo(secondDiary.getEnd());
+            softly.assertThat(diaryResponse.isLiked()).isTrue();
+            softly.assertThat(diaryResponse.likeCount()).isEqualTo(1);
+            softly.assertThat(content.getLast().likeCount()).isEqualTo(0);
+            softly.assertThat(content.getLast().isLiked()).isFalse();
             softly.assertThat(content.getFirst().diaryId() > content.getLast().diaryId()).isTrue();
         });
     }
@@ -196,7 +201,7 @@ void getMyDiariesByPeriod() throws Exception {
                 .getContentAsString();
 
         // then
-        List<MyDiaryResponseDto> content = objectMapper.readValue(response, new TypeReference<>() {});
+        List<CalendarDiaryResponseDto> content = objectMapper.readValue(response, new TypeReference<>() {});
 
         assertSoftly(softly -> {
             softly.assertThat(content.getFirst().diaryId() > content.getLast().diaryId()).isTrue();