Merge pull request #71 from Nexters/dev

Dev

Author: k906506

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

@@ -18,7 +18,7 @@ public interface WebHookRepository extends JpaRepository<User, Long> {
 	@Query(value =
 		  "SELECT COUNT(*)\n"
 		+ "FROM (\n"
-		+ "      SELECT COUNT(*)\n"
+		+ "      SELECT e.user_id\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"
@@ -33,15 +33,16 @@ public interface WebHookRepository extends JpaRepository<User, Long> {
 	@Query(value =
 		  "SELECT COUNT(*)\n"
 		+ "FROM (\n"
-		+ "      SELECT COUNT(*)\n"
+		+ "      SELECT a.user_id\n"
 		+ "      FROM (\n"
-		+ "            SELECT e.user_id, e.created_date\n"
+		+ "            SELECT e.user_id, DATE_FORMAT(e.created_date, '%Y%m%d')\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"
+		+ "            WHERE DATE_FORMAT(e.created_date, '%Y%m%d') BETWEEN DATE_FORMAT(DATE_SUB(:date, INTERVAL :day DAY), '%Y%m%d') AND DATE_FORMAT(:date, '%Y%m%d')\n"
+		+ "            AND e.created_date IS NOT NULL\n"
+		+ "            GROUP BY e.user_id, DATE_FORMAT(e.created_date, '%Y%m%d')\n"
 		+ "            ) a\n"
 		+ "      GROUP BY a.user_id\n"
-		+ "      HAVING COUNT(*) = :day + 1\n"
+		+ "      HAVING COUNT(*) >= :day + 1\n"
 		+ "      ) b"
 		, nativeQuery = true)
 	Integer countUsersWithStreak(LocalDateTime date, int day);