refactor: diaryId로 일기 조회 FeedDiaryResponseDto 사용

Author: jinwon1234

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

@@ -74,13 +74,13 @@ public ResponseEntity<Page<UserDiaryResponseDto>> getUserDiaries(
     }
 
     @GetMapping("/{diaryId}")
-    public ResponseEntity<UserDiaryResponseDto> getDiary(
+    public ResponseEntity<FeedDiaryResponseDto> getDiary(
             @PathVariable
             Long diaryId,
             @AuthenticationPrincipal
             Long userId
     ) {
-        UserDiaryResponseDto response = diaryService.getDiary(diaryId, userId);
+        FeedDiaryResponseDto response = diaryService.getDiary(diaryId, userId);
         return ResponseEntity.status(HttpStatus.OK).body(response);
     }
 

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

@@ -81,9 +81,9 @@ public Page<UserDiaryResponseDto> getUserDiaries(Long targetUserId, Long current
     }
 
     @Transactional(readOnly = true)
-    public UserDiaryResponseDto getDiary(Long diaryId, Long currentUserId) {
+    public FeedDiaryResponseDto getDiary(Long diaryId, Long currentUserId) {
         DiaryEntity foundDiary = diaryLowService.findDiaryById(diaryId);
-        return getDiaryResponseDto(currentUserId, foundDiary, UserDiaryResponseDto::from);
+        return getDiaryResponseDto(currentUserId, foundDiary, FeedDiaryResponseDto::from);
     }
 
     @Transactional(readOnly = true)

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

@@ -216,14 +216,17 @@ void getDiary() throws Exception {
                 .getResponse()
                 .getContentAsString(StandardCharsets.UTF_8);
 
-        UserDiaryResponseDto diaryResponse = objectMapper.readValue(response, UserDiaryResponseDto.class);
+        FeedDiaryResponseDto diaryResponse = objectMapper.readValue(response, FeedDiaryResponseDto.class);
 
         assertSoftly(softly -> {
             softly.assertThat(diaryResponse.diaryId()).isEqualTo(publicDiary.getId());
             softly.assertThat(diaryResponse.content()).isEqualTo(publicDiary.getContent());
             softly.assertThat(diaryResponse.isLiked()).isTrue();
             softly.assertThat(diaryResponse.isStored()).isTrue();
             softly.assertThat(diaryResponse.likeCount()).isEqualTo(2L);
+            softly.assertThat(diaryResponse.userId()).isEqualTo(testUser.getId());
+            softly.assertThat(diaryResponse.username()).isEqualTo(testUser.getUsername());
+            softly.assertThat(diaryResponse.tag()).isEqualTo(testUser.getTag());
         });
     }
 

src/test/java/apptive/team5/diary/service/DiaryServiceTest.java

@@ -234,13 +234,16 @@ void getDiary() {
         given(diaryStoreLowService.findStoredDiaryIdsByUser(viewer.getId(), List.of(publicDiary.getId())))
                 .willReturn(Set.of(publicDiary.getId()));
 
-        UserDiaryResponseDto result = diaryService.getDiary(publicDiary.getId(), viewer.getId());
+        FeedDiaryResponseDto result = diaryService.getDiary(publicDiary.getId(), viewer.getId());
 
         assertThat(result.diaryId()).isEqualTo(publicDiary.getId());
         assertThat(result.content()).isEqualTo(publicDiary.getContent());
         assertThat(result.isLiked()).isTrue();
         assertThat(result.isStored()).isTrue();
         assertThat(result.likeCount()).isEqualTo(3L);
+        assertThat(result.userId()).isEqualTo(owner.getId());
+        assertThat(result.username()).isEqualTo(owner.getUsername());
+        assertThat(result.tag()).isEqualTo(owner.getTag());
 
         verify(diaryLowService).findDiaryById(publicDiary.getId());
         verify(diaryLikeLowService).findLikedDiaryIdsByUser(viewer.getId(), List.of(publicDiary.getId()));