[OING-335] �fix: 가족구성원 랭킹 API의 생존신고 수가 미션 수를 포함하는 현상 해결 (#257)

* fix: Fix wrongly written post counting query that count survival and mission post both * refactor: Refactor the query to compare createdAt of Post by eqauals with year and month to between for index
depromeet · May 30, 2024 · a968906 · a968906
1 parent 42f75c3
commit a968906
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/gateway/src/main/java/com/oing/repository/PostRepositoryCustomImpl.java b/gateway/src/main/java/com/oing/repository/PostRepositoryCustomImpl.java
@@ -105,23 +105,32 @@ public QueryResults<Post> searchPosts(int page, int size, LocalDate date, String
 
     @Override
     public long countMonthlyPostByFamilyId(int year, int month, String familyId) {
+        LocalDateTime from = LocalDateTime.of(year, month, 1, 0, 0);
+        LocalDateTime to = from.plusMonths(1).minusDays(1);
+
         return queryFactory
                 .select(post.count())
                 .from(post)
-                .where(post.familyId.eq(familyId),
-                        post.createdAt.year().eq(year),
-                        post.createdAt.month().eq(month))
+                .where(
+                        post.familyId.eq(familyId),
+                        post.createdAt.between(from, to)
+                )
                 .fetchFirst();
     }
 
     @Override
-    public long countMonthlyPostByMemberId(int year, int month, String memberId) {
+    public long countMonthlySurvivalPostByMemberId(int year, int month, String memberId) {
+        LocalDateTime from = LocalDateTime.of(year, month, 1, 0, 0);
+        LocalDateTime to = from.plusMonths(1).minusDays(1);
+
         return queryFactory
                 .select(post.count())
                 .from(post)
-                .where(post.memberId.eq(memberId),
-                        post.createdAt.year().eq(year),
-                        post.createdAt.month().eq(month))
+                .where(
+                        post.type.eq(SURVIVAL),
+                        post.memberId.eq(memberId),
+                        post.createdAt.between(from, to)
+                )
                 .fetchFirst();
     }
 

diff --git a/post/src/main/java/com/oing/controller/PostController.java b/post/src/main/java/com/oing/controller/PostController.java
@@ -142,7 +142,7 @@ public ArrayResponse<PostRankerResponse> getFamilyMembersMonthlySurvivalRanking(
 
         List<PostRankerResponse> postRankerResponses = familyMembersIds.stream().map(familyMemberId -> new PostRankerDTO(
                         familyMemberId,
-                        postService.countMonthlyPostByMemberId(dateTime, familyMemberId),
+                        postService.countMonthlySurvivalPostByMemberId(dateTime, familyMemberId),
                         commentService.countMonthlyCommentByMemberId(dateTime, familyMemberId),
                         reactionService.countMonthlyReactionByMemberId(dateTime, familyMemberId)
 

diff --git a/post/src/main/java/com/oing/repository/PostRepositoryCustom.java b/post/src/main/java/com/oing/repository/PostRepositoryCustom.java
@@ -22,7 +22,7 @@ QueryResults<Post> searchPosts(int page, int size, LocalDate date, String member
 
     long countMonthlyPostByFamilyId(int year, int month, String familyId);
 
-    long countMonthlyPostByMemberId(int year, int month, String memberId);
+    long countMonthlySurvivalPostByMemberId(int year, int month, String memberId);
 
     boolean existsByFamilyIdAndCreatedAt(String familyId, LocalDate postDate);
 

diff --git a/post/src/main/java/com/oing/service/PostService.java b/post/src/main/java/com/oing/service/PostService.java
@@ -184,11 +184,11 @@ public int calculateRemainingSurvivalPostCountUntilMissionUnlocked(String family
         return Math.max(requiredSurvivalPostCount - todaySurvivalPostCount, 0);
     }
 
-    public long countMonthlyPostByMemberId(LocalDate date, String memberId) {
+    public long countMonthlySurvivalPostByMemberId(LocalDate date, String memberId) {
         int year = date.getYear();
         int month = date.getMonthValue();
 
-        return postRepository.countMonthlyPostByMemberId(year, month, memberId);
+        return postRepository.countMonthlySurvivalPostByMemberId(year, month, memberId);
     }
 
     public boolean isCreatedSurvivalPostToday(String memberId, String familyId) {