fix: 처음부터 마지막 날일경우 데이터가 오지 않는 버그 수정 (#450)

darass-team · Aug 10, 2021 · b4d848d · b4d848d
1 parent ba60b2b
commit b4d848d
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 11 deletions.
diff --git a/backend/src/main/java/com/darass/darass/comment/repository/CommentCountStrategyByDaily.java b/backend/src/main/java/com/darass/darass/comment/repository/CommentCountStrategyByDaily.java
@@ -52,10 +52,9 @@ private List<CommentStat> getStatByNoneDaily(LocalDateTime startDate, LocalDateT
             }
             noneMonthCommentStats.add(new CommentStat(localDate.toString(), DEFAULT_COMMENT_COUNT));
             localDate = localDate.plusDays(1L);
-
-            if (localDate.equals(end) && !isExistDailyStat(commentStats, localDate)) {
-                noneMonthCommentStats.add(new CommentStat(localDate.toString(), DEFAULT_COMMENT_COUNT));
-            }
+        }
+        if (!isExistDailyStat(commentStats, localDate)) {
+            noneMonthCommentStats.add(new CommentStat(localDate.toString(), DEFAULT_COMMENT_COUNT));
         }
         return noneMonthCommentStats;
     }

diff --git a/...end/src/main/java/com/darass/darass/comment/repository/CommentCountStrategyByMonthly.java b/...end/src/main/java/com/darass/darass/comment/repository/CommentCountStrategyByMonthly.java
@@ -52,12 +52,10 @@ private List<CommentStat> getStatByNoneMonth(LocalDateTime startDate, LocalDateT
             }
             noneMonthCommentStats.add(new CommentStat(yearMonth.toString(), DEFAULT_COMMENT_COUNT));
             yearMonth = yearMonth.plusMonths(1L);
-
-            if (yearMonth.equals(endYearMonth) && !isExistMonthStat(commentStats, yearMonth)) {
-                noneMonthCommentStats.add(new CommentStat(yearMonth.toString(), DEFAULT_COMMENT_COUNT));
-            }
         }
-
+        if (!isExistMonthStat(commentStats, yearMonth)) {
+            noneMonthCommentStats.add(new CommentStat(yearMonth.toString(), DEFAULT_COMMENT_COUNT));
+        }
         return noneMonthCommentStats;
     }
 

diff --git a/backend/src/test/java/com/darass/darass/comment/service/CommentServiceTest.java b/backend/src/test/java/com/darass/darass/comment/service/CommentServiceTest.java
@@ -315,6 +315,17 @@ void stat_daily() {
             .hasSize((int) ChronoUnit.DAYS.between(startDate, endDate) + 1);
     }
 
+    @DisplayName("특정 프로젝트의 일별 댓글 통계를 구한다. (시작 날짜 = 종료 날짜)")
+    @Test
+    void stat_daily_same_date() {
+        LocalDate localDate = LocalDate.now().minusYears(10L);
+        CommentStatRequest request = new CommentStatRequest("DAILY", project.getSecretKey(),
+            localDate, localDate);
+        CommentStatResponse commentStatResponse = commentService.giveStat(request);
+        assertThat(commentStatResponse.getCommentStats())
+            .hasSize(1);
+    }
+
     @DisplayName("특정 프로젝트의 월별 댓글 통계를 구한다.")
     @Test
     void stat_monthly() {
@@ -323,8 +334,17 @@ void stat_monthly() {
         CommentStatRequest request = new CommentStatRequest("MONTHLY", project.getSecretKey(),
             startDate, endDate);
         CommentStatResponse commentStatResponse = commentService.giveStat(request);
-        assertThat(commentStatResponse.getCommentStats())
-            .hasSize((int) ChronoUnit.MONTHS.between(startDate, endDate) + 1);
+        assertThat(commentStatResponse.getCommentStats()).hasSize((int) ChronoUnit.MONTHS.between(startDate, endDate) + 1);
+    }
+
+    @DisplayName("특정 프로젝트의 월별 댓글 통계를 구한다. (시작 날짜 = 종료 날짜)")
+    @Test
+    void stat_monthly_same_date() {
+        LocalDate localDate = LocalDate.now().minusYears(10L);
+        CommentStatRequest request = new CommentStatRequest("MONTHLY", project.getSecretKey(),
+            localDate, localDate);
+        CommentStatResponse commentStatResponse = commentService.giveStat(request);
+        assertThat(commentStatResponse.getCommentStats()).hasSize(1);
     }
 
     @DisplayName("소셜 로그인 유저가 댓글을 수정한다.")