[BBB-147] Refactor : 인덱스를 타도록 쿼리 변경

Team-BomBomBom · Oct 10, 2024 · ab5bff6 · ab5bff6
1 parent d226e53
commit ab5bff6
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 20 deletions.
diff --git a/...al-api/src/main/java/com/bombombom/devs/external/study/service/AlgorithmStudyService.java b/...al-api/src/main/java/com/bombombom/devs/external/study/service/AlgorithmStudyService.java
@@ -177,8 +177,8 @@ public void feedback(Long userId,
 
         }
 
-        if (!userStudyRepository.existsByUserIdAndStudyId(userId,
-            algorithmStudy.getId())) {
+        if (!userStudyRepository.existsByStudyIdAndUserId(algorithmStudy.getId(),
+            userId)) {
             throw new ForbiddenException(ErrorCode.ONLY_MEMBER_ALLOWED);
         }
 

diff --git a/...xternal-api/src/main/java/com/bombombom/devs/external/study/service/BookStudyService.java b/...xternal-api/src/main/java/com/bombombom/devs/external/study/service/BookStudyService.java
@@ -454,7 +454,7 @@ public AssignmentVoteResult voteAssignment(Long userId, Long studyId,
         final User user = userRepository.findById(userId)
             .orElseThrow(() -> new NotFoundException(ErrorCode.USER_NOT_FOUND));
 
-        if (!userStudyRepository.existsByUserIdAndStudyId(userId, studyId)) {
+        if (!userStudyRepository.existsByStudyIdAndUserId(studyId, userId)) {
             throw new ForbiddenException(ErrorCode.ONLY_MEMBER_ALLOWED);
         }
 
@@ -482,8 +482,8 @@ public AssignmentVoteResult voteAssignment(Long userId, Long studyId,
             second = null;
         }
 
-        AssignmentVote vote = assignmentVoteRepository.findByUserIdAndRound(userId,
-                nextRound)
+        AssignmentVote vote = assignmentVoteRepository.findByRoundAndUserId(nextRound,
+                userId)
             .orElseGet(
                 () -> AssignmentVote.builder()
                     .user(user)

diff --git a/app/external-api/src/main/java/com/bombombom/devs/external/study/service/StudyService.java b/app/external-api/src/main/java/com/bombombom/devs/external/study/service/StudyService.java
@@ -48,7 +48,7 @@ public Page<StudyResult> readStudy(Pageable pageable) {
 
     @Transactional
     public void joinStudy(Long userId, JoinStudyCommand joinStudyCommand) {
-        if (userStudyRepository.existsByUserIdAndStudyId(userId, joinStudyCommand.studyId())) {
+        if (userStudyRepository.existsByStudyIdAndUserId(joinStudyCommand.studyId(), userId)) {
             throw new BusinessRuleException(ErrorCode.ALREADY_JOINED);
         }
         User user = userRepository.findById(userId)

diff --git a/...xternal-api/src/test/java/com/bombombom/devs/external/study/service/StudyServiceTest.java b/...xternal-api/src/test/java/com/bombombom/devs/external/study/service/StudyServiceTest.java
@@ -229,7 +229,7 @@ void user_cannot_join_study_twice() {
             .build();
         JoinStudyCommand joinStudyCommand = JoinStudyCommand.builder().studyId(study.getId())
             .build();
-        when(userStudyRepository.existsByUserIdAndStudyId(testuser.getId(), study.getId()))
+        when(userStudyRepository.existsByStudyIdAndUserId(study.getId(), testuser.getId()))
             .thenReturn(true);
 
         /*
@@ -692,8 +692,8 @@ void apply_feedback_fail_if_user_is_not_a_member() {
                 testuser.getId(), algorithmProblem.getId()
             )).thenReturn(Optional.of(history));
 
-            when(userStudyRepository.existsByUserIdAndStudyId(
-                testuser.getId(), study.getId()
+            when(userStudyRepository.existsByStudyIdAndUserId(
+                study.getId(), testuser.getId()
             )).thenReturn(false);
             /*
              * When & Then
@@ -755,8 +755,8 @@ void apply_feedback_fail_if_user_not_found() {
                 round.getId(),
                 algorithmProblem.getId())).thenReturn(true);
 
-            when(userStudyRepository.existsByUserIdAndStudyId(
-                testuser.getId(), study.getId()
+            when(userStudyRepository.existsByStudyIdAndUserId(
+                study.getId(), testuser.getId()
             )).thenReturn(true);
 
             when(userRepository.findById(
@@ -2321,7 +2321,7 @@ void vote_assignment_fail_if_not_member() {
                 .thenReturn(Optional.of(mock(User.class)));
             when(studyRepository.findById(studyId))
                 .thenReturn(Optional.of(mock(Study.class)));
-            when(userStudyRepository.existsByUserIdAndStudyId(userId, studyId))
+            when(userStudyRepository.existsByStudyIdAndUserId(studyId, userId))
                 .thenReturn(false);
 
 
@@ -2350,7 +2350,7 @@ void vote_assignment_fail_if_no_more_round() {
                 .thenReturn(Optional.of(mock(User.class)));
             when(studyRepository.findById(studyId))
                 .thenReturn(Optional.of(mock(Study.class)));
-            when(userStudyRepository.existsByUserIdAndStudyId(userId, studyId))
+            when(userStudyRepository.existsByStudyIdAndUserId(studyId, userId))
                 .thenReturn(true);
 
             when(roundRepository.findTop1RoundByStudyIdAndStartDateAfterOrderByIdx(eq(studyId), any(
@@ -2384,7 +2384,7 @@ void vote_assignment_fail_if_first_assignment_not_found() {
                 .thenReturn(Optional.of(mock(User.class)));
             when(studyRepository.findById(studyId))
                 .thenReturn(Optional.of(mock(Study.class)));
-            when(userStudyRepository.existsByUserIdAndStudyId(userId, studyId))
+            when(userStudyRepository.existsByStudyIdAndUserId(studyId, userId))
                 .thenReturn(true);
 
             when(roundRepository.findTop1RoundByStudyIdAndStartDateAfterOrderByIdx(eq(studyId), any(
@@ -2419,7 +2419,7 @@ void vote_assignment_fail_if_first_assignment_not_next_round() {
                 .thenReturn(Optional.of(mock(User.class)));
             when(studyRepository.findById(studyId))
                 .thenReturn(Optional.of(mock(Study.class)));
-            when(userStudyRepository.existsByUserIdAndStudyId(userId, studyId))
+            when(userStudyRepository.existsByStudyIdAndUserId(studyId, userId))
                 .thenReturn(true);
 
             when(roundRepository.findTop1RoundByStudyIdAndStartDateAfterOrderByIdx(eq(studyId), any(
@@ -2461,7 +2461,7 @@ void vote_assignment_fail_if_second_assignment_not_found() {
                 .thenReturn(Optional.of(mock(User.class)));
             when(studyRepository.findById(studyId))
                 .thenReturn(Optional.of(mock(Study.class)));
-            when(userStudyRepository.existsByUserIdAndStudyId(userId, studyId))
+            when(userStudyRepository.existsByStudyIdAndUserId(studyId, userId))
                 .thenReturn(true);
 
             when(roundRepository.findTop1RoundByStudyIdAndStartDateAfterOrderByIdx(eq(studyId), any(
@@ -2506,7 +2506,7 @@ void vote_assignment_fail_if_second_assignment_not_next_round() {
                 .thenReturn(Optional.of(mock(User.class)));
             when(studyRepository.findById(studyId))
                 .thenReturn(Optional.of(mock(Study.class)));
-            when(userStudyRepository.existsByUserIdAndStudyId(userId, studyId))
+            when(userStudyRepository.existsByStudyIdAndUserId(studyId, userId))
                 .thenReturn(true);
 
             when(roundRepository.findTop1RoundByStudyIdAndStartDateAfterOrderByIdx(eq(studyId), any(

diff --git a/domain/src/main/java/com/bombombom/devs/study/repository/AssignmentVoteRepository.java b/domain/src/main/java/com/bombombom/devs/study/repository/AssignmentVoteRepository.java
@@ -10,8 +10,8 @@
 public interface AssignmentVoteRepository extends JpaRepository<AssignmentVote, Long> {
 
 
-    @Query("SELECT av FROM AssignmentVote av WHERE av.user.id = :userId AND round = :round")
-    Optional<AssignmentVote> findByUserIdAndRound(Long userId, Round round);
+    @Query("SELECT av FROM AssignmentVote av WHERE round = :round AND av.user.id = :userId ")
+    Optional<AssignmentVote> findByRoundAndUserId(Round round, Long userId);
 
     @Query("SELECT av FROM AssignmentVote av WHERE round = :round")
     List<AssignmentVote> findAllByRound(Round round);

diff --git a/domain/src/main/java/com/bombombom/devs/study/repository/UserStudyRepository.java b/domain/src/main/java/com/bombombom/devs/study/repository/UserStudyRepository.java
@@ -7,7 +7,7 @@
 
 public interface UserStudyRepository extends JpaRepository<UserStudy, Long> {
 
-    boolean existsByUserIdAndStudyId(Long userId, Long studyId);
+    boolean existsByStudyIdAndUserId(Long studyId, Long userId);
 
     @Query("SELECT us FROM UserStudy us JOIN FETCH us.user "
         + "WHERE us.study.id = :studyId")