Fix leaderboard count query

FAForever · Aug 10, 2018 · d9f737d · d9f737d
1 parent 2e3e05b
commit d9f737d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/src/main/java/com/faforever/api/leaderboard/GlobalLeaderboardRepository.java b/src/main/java/com/faforever/api/leaderboard/GlobalLeaderboardRepository.java
@@ -24,8 +24,12 @@ public interface GlobalLeaderboardRepository extends Repository<GlobalLeaderboar
     "     WHERE (expires_at is null or expires_at <= NOW()) AND ban_revoke.ban_id IS NULL" +
     "  ) " +
     "  ORDER BY round(mean - 3 * deviation) DESC LIMIT ?#{#pageable.offset},?#{#pageable.pageSize}",
-    countQuery = "SELECT count(*) FROM ladder1v1_rating WHERE is_active = 1 AND ladder1v1_rating.numGames > 0",
-    nativeQuery = true)
+    countQuery = "SELECT count(*) FROM ladder1v1_rating WHERE is_active = 1 AND ladder1v1_rating.numGames > 0" +
+      "   AND id NOT IN (" +
+      "     SELECT player_id FROM ban" +
+      "     LEFT JOIN ban_revoke on ban.id = ban_revoke.ban_id" +
+      "     WHERE (expires_at is null or expires_at <= NOW()) AND ban_revoke.ban_id IS NULL" +
+      "  ) -- Dummy placeholder for pageable, prevents 'Unknown parameter position': ?,?,?", nativeQuery = true)
   Page<GlobalLeaderboardEntry> getLeaderboardByPage(Pageable pageable);
 
   @Query(value = "SELECT * FROM (SELECT\n" +

diff --git a/src/main/java/com/faforever/api/leaderboard/Ladder1v1LeaderboardRepository.java b/src/main/java/com/faforever/api/leaderboard/Ladder1v1LeaderboardRepository.java
@@ -25,7 +25,12 @@ public interface Ladder1v1LeaderboardRepository extends Repository<Ladder1v1Lead
     "     WHERE (expires_at is null or expires_at > NOW()) AND ban_revoke.ban_id IS NULL" +
     "  ) " +
     "  ORDER BY round(mean - 3 * deviation) DESC LIMIT ?#{#pageable.offset},?#{#pageable.pageSize}",
-    countQuery = "SELECT count(*) FROM ladder1v1_rating WHERE is_active = 1 AND ladder1v1_rating.numGames > 0",
+    countQuery = "SELECT count(*) FROM ladder1v1_rating WHERE is_active = 1 AND ladder1v1_rating.numGames > 0" +
+      "   AND id NOT IN (" +
+      "     SELECT player_id FROM ban" +
+      "     LEFT JOIN ban_revoke on ban.id = ban_revoke.ban_id" +
+      "     WHERE (expires_at is null or expires_at > NOW()) AND ban_revoke.ban_id IS NULL" +
+      "  ) -- Dummy placeholder for pageable, prevents 'Unknown parameter position': ?,?,?",
     nativeQuery = true)
   Page<Ladder1v1LeaderboardEntry> getLeaderboardByPage(Pageable pageable);