refactor: 다이어리 아이디 기준 내림차순 정렬 및 테스트 로그인 임시 주석 처리

# 변경점 👍
close: #29 

다이어리 아이디 기준 내림차순 정렬 및 테스트 로그인 임시 주석 처리를 진행했습니다.
추가로 정렬이 잘되는지 확인하기 위해 테스트를 보완했습니다.
 
# 비고 ✏
정렬 기준을 추가하려니 JPA 네이밍 메서드를 사용하면 메서드명이 너무 길어져서 JPQL을 사용했습니다!

Author: jinwon1234

src/main/java/apptive/team5/diary/repository/DiaryRepository.java

@@ -14,12 +14,16 @@
 import java.util.Set;
 
 public interface DiaryRepository extends JpaRepository<DiaryEntity, Long> {
+
+    @Query("select d from DiaryEntity d where d.user = :user order by d.id desc")
     Page<DiaryEntity> findByUser(UserEntity user, Pageable pageable);
 
     List<DiaryEntity> findByUserId(Long userId);
 
+    @Query("select d from DiaryEntity d where d.user.id = :userId and d.scope in :scopes order by d.id desc")
     Page<DiaryEntity> findByUserIdAndScopeIn(Long userId, List<DiaryScope> scopes, Pageable pageable);
 
+    @Query("select d from DiaryEntity d where d.user.id = :userId and d.createDateTime between :start and :end order by d.id desc")
     List<DiaryEntity> findByUserIdAndCreateDateTimeBetween(Long userId, LocalDateTime start, LocalDateTime end);
 
     @Query("select count(d) from DiaryEntity d where d.user.id = :userId")
@@ -29,9 +33,6 @@ public interface DiaryRepository extends JpaRepository<DiaryEntity, Long> {
     @Modifying(clearAutomatically = true)
     void deleteByUserId(Long userId);
 
-    @Query("select d from DiaryEntity d where d.user.id in :userIds")
-    Page<DiaryEntity> findByUserIdsPage(Set<Long> userIds, Pageable pageable);
-
-    @Query("select d from DiaryEntity d join fetch d.user where d.user.id in :userIds and d.scope in :scopes")
+    @Query("select d from DiaryEntity d join fetch d.user where d.user.id in :userIds and d.scope in :scopes order by d.id desc")
     Page<DiaryEntity> findByUserIdsAndScopseWithUserPage(Set<Long> userIds, List<DiaryScope> scopes, Pageable pageable);
 }

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

@@ -70,9 +70,6 @@ public void deleteByUserId(Long userId) {
         diaryRepository.deleteByUserId(userId);
     }
 
-    public Page<DiaryEntity> findByUserIds(Set<Long> userIds, Pageable pageable) {
-        return diaryRepository.findByUserIdsPage(userIds, pageable);
-    }
 
     public Page<DiaryEntity> findByUserIdsAndScopseWithUserPage(Set<Long> userIds, List<DiaryScope> scopes, Pageable pageable) {
         return diaryRepository.findByUserIdsAndScopseWithUserPage(userIds, scopes, pageable);

src/main/java/apptive/team5/oauth2/controller/OAuth2Controller.java

@@ -35,11 +35,11 @@ public ResponseEntity<TokenResponse> googleLogin(@RequestBody GoogleLoginRequest
         return  ResponseEntity.ok(tokenResponse);
     }
 
-    @GetMapping("/test")
-    public ResponseEntity<TokenResponse> testLogin() {
-
-        TokenResponse tokenResponse = testLoginService.testLogin();
-
-        return ResponseEntity.ok(tokenResponse);
-    }
+//    @GetMapping("/test")
+//    public ResponseEntity<TokenResponse> testLogin() {
+//
+//        TokenResponse tokenResponse = testLoginService.testLogin();
+//
+//        return ResponseEntity.ok(tokenResponse);
+//    }
 }

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

@@ -81,7 +81,8 @@ void setUp() {
     @DisplayName("내 다이어리 목록 조회")
     void getMyMusicDiary() throws Exception {
         // given
-        DiaryEntity diary = diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
+        DiaryEntity firstDiary = diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
+        DiaryEntity secondDiary = diaryRepository.save(TestUtil.makeDiaryEntity(testUser));
 
         TestSecurityContextHolderInjection.inject(testUser.getId(), testUser.getRoleType());
 
@@ -106,13 +107,15 @@ void getMyMusicDiary() throws Exception {
         MyDiaryResponseDto diaryResponse = content.getFirst();
 
         assertSoftly(softly-> {
-            softly.assertThat(content).hasSize(1);
-            softly.assertThat(diaryResponse.musicTitle()).isEqualTo(diary.getMusicTitle());
-            softly.assertThat(diaryResponse.artist()).isEqualTo(diary.getArtist());
-            softly.assertThat(diaryResponse.duration()).isEqualTo(diary.getDuration());
-            softly.assertThat(diaryResponse.totalDuration()).isEqualTo(diary.getTotalDuration());
-            softly.assertThat(diaryResponse.start()).isEqualTo(diary.getStart());
-            softly.assertThat(diaryResponse.end()).isEqualTo(diary.getEnd());
+            softly.assertThat(content).hasSize(2);
+            softly.assertThat(diaryResponse.diaryId()).isEqualTo(secondDiary.getId());
+            softly.assertThat(diaryResponse.musicTitle()).isEqualTo(secondDiary.getMusicTitle());
+            softly.assertThat(diaryResponse.artist()).isEqualTo(secondDiary.getArtist());
+            softly.assertThat(diaryResponse.duration()).isEqualTo(secondDiary.getDuration());
+            softly.assertThat(diaryResponse.totalDuration()).isEqualTo(secondDiary.getTotalDuration());
+            softly.assertThat(diaryResponse.start()).isEqualTo(secondDiary.getStart());
+            softly.assertThat(diaryResponse.end()).isEqualTo(secondDiary.getEnd());
+            softly.assertThat(content.getFirst().diaryId() > content.getLast().diaryId()).isTrue();
         });
     }
 
@@ -151,6 +154,7 @@ void getUserDiariesByViewer() throws Exception {
         assertSoftly(softly -> {
             softly.assertThat(content).hasSize(2);
             softly.assertThat(responseMap.containsKey(privateDiary.getId())).isFalse();
+            softly.assertThat(content.getFirst().diaryId() > content.getLast().diaryId()).isTrue();
 
             // PUBLIC
             UserDiaryResponseDto publicResponse = responseMap.get(publicDiary.getId());
@@ -195,6 +199,7 @@ void getMyDiariesByPeriod() throws Exception {
         List<MyDiaryResponseDto> content = objectMapper.readValue(response, new TypeReference<>() {});
 
         assertSoftly(softly -> {
+            softly.assertThat(content.getFirst().diaryId() > content.getLast().diaryId()).isTrue();
             softly.assertThat(content).hasSize(2);
         });
     }
@@ -209,9 +214,11 @@ void getMyDiariesFeeds() throws Exception {
         Subscribe subscribe = new Subscribe(testUser, subscribedToUser);
         subscribeRepository.save(subscribe);
 
+        DiaryEntity otherFeedDiary = diaryRepository.save(TestUtil.makeDiaryEntity(subscribedToUser));
+        // 좋아요 누를 다이어를 두 번째로 저장
+        DiaryEntity likedFeedDiary = diaryRepository.save(TestUtil.makeDiaryEntity(subscribedToUser));
         // 좋아요 누르기
-        DiaryEntity feedDiary = diaryRepository.save(TestUtil.makeDiaryEntity(subscribedToUser));
-        DiaryLikeEntity diaryLikeEntity = diaryLikeLowService.saveDiaryLike(new DiaryLikeEntity(testUser, feedDiary));
+        DiaryLikeEntity diaryLikeEntity = diaryLikeLowService.saveDiaryLike(new DiaryLikeEntity(testUser, likedFeedDiary));
 
         // 구독하지 않은 회원
         UserEntity otherUser = userRepository.save(TestUtil.makeDifferentUserEntity(subscribedToUser));
@@ -237,11 +244,12 @@ void getMyDiariesFeeds() throws Exception {
         FeedDiaryResponseDto feedDiaryResponseDto = content.getFirst();
 
         assertSoftly(softly -> {
-            softly.assertThat(content).hasSize(1);
-            softly.assertThat(feedDiaryResponseDto.diaryId()).isEqualTo(feedDiary.getId());
+            softly.assertThat(content).hasSize(2);
+            softly.assertThat(feedDiaryResponseDto.diaryId()).isEqualTo(likedFeedDiary.getId());
             softly.assertThat(feedDiaryResponseDto.isLiked()).isTrue();
             softly.assertThat(feedDiaryResponseDto.likeCount()).isEqualTo(1L);
             softly.assertThat(feedDiaryResponseDto.userId()).isEqualTo(subscribedToUser.getId());
+            softly.assertThat(content.getFirst().diaryId() > content.getLast().diaryId()).isTrue();
         });
     }