Merge pull request #67 from Nexters/dev

Dev

Author: k906506

src/main/java/donmani/donmani_server/webhook/repository/WebHookRepository.java

@@ -6,38 +6,43 @@
 import java.time.LocalDateTime;
 
 public interface WebHookRepository extends JpaRepository<User, Long> {
-	@Query("SELECT COUNT(u) FROM User u WHERE u.createdDate BETWEEN :start AND :end")
-	Integer countNewUsersOnDate(LocalDateTime start, LocalDateTime end);
+	@Query("SELECT COUNT(*) FROM User u WHERE DATE_FORMAT(u.createdDate, '%Y%m%d') = DATE_FORMAT(:date, '%Y%m%d')")
+	Integer countNewUsersOnDate(LocalDateTime date);
 
-	@Query("SELECT COUNT(u) FROM User u WHERE u.createdDate <= :end or u.createdDate is null")
-	Integer countAllUsersBefore(LocalDateTime end);
+	@Query("SELECT COUNT(*) FROM User u WHERE DATE_FORMAT(u.createdDate, '%Y%m%d') <= DATE_FORMAT(:date, '%Y%m%d') or u.createdDate is null")
+	Integer countAllUsersBefore(LocalDateTime date);
 
-	@Query("SELECT COUNT(u) FROM User u WHERE u.lastLoginDate BETWEEN :start AND :end")
-	Integer countLoginUsersOnDate(LocalDateTime start, LocalDateTime end);
+	@Query("SELECT COUNT(*) FROM User u WHERE DATE_FORMAT(u.lastLoginDate, '%Y%m%d') = DATE_FORMAT(:date, '%Y%m%d')")
+	Integer countLoginUsersOnDate(LocalDateTime date);
 
-	@Query("SELECT COUNT(e) FROM Expense e WHERE e.createdDate BETWEEN :start AND :end group by e.userId")
-	Integer countExpenseSubmittersOnDate(LocalDateTime start, LocalDateTime end);
+	@Query(value =
+		  "SELECT COUNT(*)\n"
+		+ "FROM (\n"
+		+ "      SELECT COUNT(*)\n"
+		+ "      FROM Expense e\n"
+		+ "      WHERE DATE_FORMAT(e.created_date, '%Y%m%d') = DATE_FORMAT(:date, '%Y%m%d')\n"
+		+ "      GROUP BY e.user_id\n"
+		+ "      ) a"
+		, nativeQuery = true)
+	Integer countExpenseSubmittersOnDate(LocalDateTime date);
 
 	// @Query("SELECT COUNT(e) FROM User e WHERE e.isNoticeEnable = TRUE")
-	@Query("SELECT COUNT(f) FROM FCMToken f")
+	@Query("SELECT COUNT(*) FROM FCMToken f")
 	Integer countByNoticeEnableTrueUser();
 
 	@Query(value =
-		      "SELECT COUNT(*)\n"
-			+ "FROM (\n"
-			+ "  SELECT user_id\n"
-			+ "  FROM (\n"
-			+ "    SELECT \n"
-			+ "      user_id,\n"
-			+ "      DATE(created_date) AS log_date,\n"
-			+ "      ROW_NUMBER() OVER (PARTITION BY user_id ORDER BY DATE(created_date)) \n"
-			+ "        - DENSE_RANK() OVER (PARTITION BY user_id ORDER BY DATE(created_date)) AS grp\n"
-			+ "    FROM expense\n"
-			+ "    GROUP BY user_id, DATE(created_date)\n"
-			+ "  ) a\n"
-			+ "  GROUP BY user_id, grp\n"
-			+ "  HAVING COUNT(*) >= :day) b\n"
-			+ "GROUP BY user_id",
-		   nativeQuery = true)
-	Integer countUsersWithStreak(int day);
+		  "SELECT COUNT(*)\n"
+		+ "FROM (\n"
+		+ "      SELECT COUNT(*)\n"
+		+ "      FROM (\n"
+		+ "            SELECT e.user_id, e.created_date\n"
+		+ "            FROM Expense e\n"
+		+ "            WHERE DATE_FORMAT(e.created_date, '%Y%m%d') BETWEEN DATE_FORMAT(:date, '%Y%m%d') - INTERVAL :day DAY AND DATE_FORMAT(:date, '%Y%m%d')\n"
+		+ "            GROUP BY e.user_id, e.created_date\n"
+		+ "            ) a\n"
+		+ "      GROUP BY a.user_id\n"
+		+ "      HAVING COUNT(*) = :day + 1\n"
+		+ "      ) b"
+		, nativeQuery = true)
+	Integer countUsersWithStreak(LocalDateTime date, int day);
 }

src/main/java/donmani/donmani_server/webhook/service/WebHookService.java

@@ -29,31 +29,30 @@ public void sendDailyUserStatsReport() {
 		LocalDate today = LocalDate.now(ZoneId.of("Asia/Seoul"));
 
 		LocalDateTime yesterday      = today.atStartOfDay().minusDays(1);
-		LocalDateTime endOfYesterday = today.atStartOfDay().minusNanos(1);
 
 		String formattedToday = today.format(formatter);
 		String formattedYesterday = yesterday.format(formatter);
 
 		// 1. 오늘 앱 설치 수 (신규 가입)
-		Integer todayNewUserCount = webHookRepository.countNewUsersOnDate(yesterday, endOfYesterday);
+		Integer todayNewUserCount = webHookRepository.countNewUsersOnDate(yesterday);
 
 		// 2. 누적 앱 설치 수
 		Integer totalUserCountUntilYesterday = webHookRepository.countAllUsersBefore(yesterday);
 
 		// 3. 오늘 서비스 진입 수
-		Integer todayLoginUserCount = webHookRepository.countLoginUsersOnDate(yesterday, endOfYesterday);
+		Integer todayLoginUserCount = webHookRepository.countLoginUsersOnDate(yesterday);
 
 		// 4. 오늘 기록 완료 수
-		Integer todaySubmittedUserCount = webHookRepository.countExpenseSubmittersOnDate(yesterday, endOfYesterday);
+		Integer todaySubmittedUserCount = webHookRepository.countExpenseSubmittersOnDate(yesterday);
 
 		// 5. 알림 수신 동의 여부 수
 		Integer notificationOptInUserCount = webHookRepository.countByNoticeEnableTrueUser();
 
 		// 6. 2일 연속 기록 작성 수
-		Integer twoDayStreakUserCount = webHookRepository.countUsersWithStreak(2);
+		Integer twoDayStreakUserCount = webHookRepository.countUsersWithStreak(yesterday, 1);
 
 		// 7. 3일 연속 기록 작성 수
-		Integer threeDayStreakUserCount = webHookRepository.countUsersWithStreak(3);
+		Integer threeDayStreakUserCount = webHookRepository.countUsersWithStreak(yesterday, 2);
 
 		sendToDiscord(formattedToday
 			, formattedYesterday