From 2c4db495af373a3efce841fc07ab901d29030ebd Mon Sep 17 00:00:00 2001 From: 1o8ryan <1o8zhouryan@gmail.com> Date: Sun, 8 Nov 2026 20:02:01 -0500 Subject: [PATCH 1/3] oops used wrong branch, update 1048 --- .../leaderboard/LeaderboardController.java | 39 ++++-- .../LeaderboardControllerTest.java | 116 ++++++++++++++++++ 2 files changed, 142 insertions(+), 13 deletions(-) diff --git a/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java b/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java index 3223a4393..412ed6cc8 100644 --- a/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java +++ b/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java @@ -10,6 +10,8 @@ import jakarta.servlet.http.HttpServletRequest; import java.util.List; import java.util.Optional; +import java.util.Set; +import java.util.Set; import org.patinanetwork.codebloom.common.components.LeaderboardManager; import org.patinanetwork.codebloom.common.db.models.leaderboard.Leaderboard; import org.patinanetwork.codebloom.common.db.models.user.UserWithScore; @@ -99,6 +101,8 @@ public ResponseEntity>>> getLeaderbo @Parameter(description = "Discord name", example = "tahmid") @RequestParam(required = false, defaultValue = "") final String query, + @Parameter(description = "Filter for users by institution") @RequestParam(required = false) + final Set filters, @Parameter(description = "Filter for Patina users") @RequestParam(required = false, defaultValue = "false") final boolean patina, @Parameter(description = "Filter for Hunter College users") @@ -133,22 +137,31 @@ public ResponseEntity>>> getLeaderbo final int parsedPageSize = Math.min(pageSize, MAX_LEADERBOARD_PAGE_SIZE); - LeaderboardFilterOptions options = LeaderboardFilterOptions.builder() + final LeaderboardFilterOptions options; + + final Set normalizedFilters = filters == null + ? Set.of() + : filters.stream() + .filter(java.util.Objects::nonNull) + .map(s -> s.trim().toLowerCase()) + .collect(java.util.stream.Collectors.toSet()); + + options = LeaderboardFilterOptions.builder() .page(page) .pageSize(parsedPageSize) .query(query) - .patina(patina) - .hunter(hunter) - .nyu(nyu) - .baruch(baruch) - .rpi(rpi) - .gwc(gwc) - .sbu(sbu) - .ccny(ccny) - .columbia(columbia) - .cornell(cornell) - .bmcc(bmcc) - .mhcplusplus(mhcplusplus) + .patina(patina || normalizedFilters.contains("patina")) + .hunter(hunter || normalizedFilters.contains("hunter")) + .nyu(nyu || normalizedFilters.contains("nyu")) + .baruch(baruch || normalizedFilters.contains("baruch")) + .rpi(rpi || normalizedFilters.contains("rpi")) + .gwc(gwc || normalizedFilters.contains("gwc")) + .sbu(sbu || normalizedFilters.contains("sbu")) + .ccny(ccny || normalizedFilters.contains("ccny")) + .columbia(columbia || normalizedFilters.contains("columbia")) + .cornell(cornell || normalizedFilters.contains("cornell")) + .bmcc(bmcc || normalizedFilters.contains("bmcc")) + .mhcplusplus(mhcplusplus || normalizedFilters.contains("mhcplusplus")) .build(); Page> createdPage = diff --git a/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java b/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java index 678f4a0ed..aa32cc42c 100644 --- a/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java +++ b/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java @@ -1,6 +1,9 @@ package org.patinanetwork.codebloom.api.leaderboard; import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; import java.time.LocalDateTime; @@ -18,6 +21,8 @@ import org.patinanetwork.codebloom.common.db.repos.leaderboard.LeaderboardRepository; import org.patinanetwork.codebloom.common.db.repos.leaderboard.options.LeaderboardFilterOptions; import org.patinanetwork.codebloom.common.db.repos.user.UserRepository; +import java.util.Set; + import org.patinanetwork.codebloom.common.dto.ApiResponder; import org.patinanetwork.codebloom.common.dto.leaderboard.LeaderboardDto; import org.patinanetwork.codebloom.common.dto.user.UserWithScoreDto; @@ -57,6 +62,7 @@ void testGetLeaderboardUsersByIdMhcPlusPlus() { PAGE, PAGE_SIZE, "", + Set.of(), false, false, false, @@ -138,6 +144,7 @@ void capsPageSize() { 1, 999, "", + Set.of(), false, false, false, @@ -167,6 +174,7 @@ void passesAllFilters() { 2, 10, "tahmid", + Set.of(), true /* patina */, true /* hunter */, true /* nyu */, @@ -203,6 +211,114 @@ void passesAllFilters() { assertTrue(opts.isMhcplusplus()); } + @Test + @DisplayName("passes all filter flags through to LeaderboardFilterOptions through set") + void passesAllFiltersThroughSet() { + leaderboardController.getLeaderboardUsersById( + LEADERBOARD_ID, + 2, + 10, + "tahmid", + Set.of( + "patina", + "hunter", + "nyu", + "baruch", + "rpi", + "gwc", + "sbu", + "ccny", + "columbia", + "cornell", + "bmcc", + "mhc++"), + false /* patina */, + false /* hunter */, + false /* nyu */, + false /* baruch */, + false /* rpi */, + false /* gwc */, + false /* sbu */, + false /* ccny */, + false /* columbia */, + false /* cornell */, + false /* bmcc */, + false /* mhc++ */, + true /* globalIndex */, + null); + + ArgumentCaptor captor = ArgumentCaptor.forClass(LeaderboardFilterOptions.class); + verify(leaderboardManager).getLeaderboardUsers(eq(LEADERBOARD_ID), captor.capture(), eq(true)); + + var opts = captor.getValue(); + assertEquals(2, opts.getPage()); + assertEquals(10, opts.getPageSize()); + assertEquals("tahmid", opts.getQuery()); + assertTrue(opts.isPatina()); + assertTrue(opts.isHunter()); + assertTrue(opts.isNyu()); + assertTrue(opts.isBaruch()); + assertTrue(opts.isRpi()); + assertTrue(opts.isGwc()); + assertTrue(opts.isSbu()); + assertTrue(opts.isCcny()); + assertTrue(opts.isColumbia()); + assertTrue(opts.isCornell()); + assertTrue(opts.isBmcc()); + assertTrue(opts.isMhcplusplus()); + } + + @Test + @DisplayName("passes certain filter flags through to LeaderboardFilterOptions through set") + void passesCertainFiltersThroughSet() { + leaderboardController.getLeaderboardUsersById( + LEADERBOARD_ID, + 2, + 10, + "tahmid", + Set.of( + "patina", + "hunter", + "nyu", + "baruch", + "bmcc", + "mhc++"), + false /* patina */, + false /* hunter */, + false /* nyu */, + false /* baruch */, + false /* rpi */, + false /* gwc */, + false /* sbu */, + false /* ccny */, + false /* columbia */, + false /* cornell */, + false /* bmcc */, + false /* mhc++ */, + true /* globalIndex */, + null); + + ArgumentCaptor captor = ArgumentCaptor.forClass(LeaderboardFilterOptions.class); + verify(leaderboardManager).getLeaderboardUsers(eq(LEADERBOARD_ID), captor.capture(), eq(true)); + + var opts = captor.getValue(); + assertEquals(2, opts.getPage()); + assertEquals(10, opts.getPageSize()); + assertEquals("tahmid", opts.getQuery()); + assertTrue(opts.isPatina()); + assertTrue(opts.isHunter()); + assertTrue(opts.isNyu()); + assertTrue(opts.isBaruch()); + assertFalse(opts.isRpi()); + assertFalse(opts.isGwc()); + assertFalse(opts.isSbu()); + assertFalse(opts.isCcny()); + assertFalse(opts.isColumbia()); + assertFalse(opts.isCornell()); + assertTrue(opts.isBmcc()); + assertTrue(opts.isMhcplusplus()); + } + @Test @DisplayName("returns metadata for the most recent leaderboard") void returnsCurrentMetadata() { From d31cf9627d79c592b3cc1e701a89a95fd8c84726 Mon Sep 17 00:00:00 2001 From: 1o8ryan <1o8zhouryan@gmail.com> Date: Sun, 8 Nov 2026 20:05:00 -0500 Subject: [PATCH 2/3] forgot mvn spotless:apply --- .../api/leaderboard/LeaderboardController.java | 1 - .../api/leaderboard/LeaderboardControllerTest.java | 11 ++--------- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java b/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java index 412ed6cc8..584439a74 100644 --- a/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java +++ b/src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java @@ -11,7 +11,6 @@ import java.util.List; import java.util.Optional; import java.util.Set; -import java.util.Set; import org.patinanetwork.codebloom.common.components.LeaderboardManager; import org.patinanetwork.codebloom.common.db.models.leaderboard.Leaderboard; import org.patinanetwork.codebloom.common.db.models.user.UserWithScore; diff --git a/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java b/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java index aa32cc42c..30f9732c1 100644 --- a/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java +++ b/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java @@ -9,6 +9,7 @@ import java.time.LocalDateTime; import java.util.List; import java.util.Optional; +import java.util.Set; import java.util.UUID; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; @@ -21,8 +22,6 @@ import org.patinanetwork.codebloom.common.db.repos.leaderboard.LeaderboardRepository; import org.patinanetwork.codebloom.common.db.repos.leaderboard.options.LeaderboardFilterOptions; import org.patinanetwork.codebloom.common.db.repos.user.UserRepository; -import java.util.Set; - import org.patinanetwork.codebloom.common.dto.ApiResponder; import org.patinanetwork.codebloom.common.dto.leaderboard.LeaderboardDto; import org.patinanetwork.codebloom.common.dto.user.UserWithScoreDto; @@ -276,13 +275,7 @@ void passesCertainFiltersThroughSet() { 2, 10, "tahmid", - Set.of( - "patina", - "hunter", - "nyu", - "baruch", - "bmcc", - "mhc++"), + Set.of("patina", "hunter", "nyu", "baruch", "bmcc", "mhc++"), false /* patina */, false /* hunter */, false /* nyu */, From da10d97ee75ec6c5c64fe62afb56cff53f0a1744 Mon Sep 17 00:00:00 2001 From: 1o8ryan <1o8zhouryan@gmail.com> Date: Sun, 8 Nov 2026 20:17:16 -0500 Subject: [PATCH 3/3] wrong name for mhc --- .../codebloom/api/leaderboard/LeaderboardControllerTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java b/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java index 30f9732c1..a46258d3f 100644 --- a/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java +++ b/src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java @@ -230,7 +230,7 @@ void passesAllFiltersThroughSet() { "columbia", "cornell", "bmcc", - "mhc++"), + "mhcplusplus"), false /* patina */, false /* hunter */, false /* nyu */, @@ -275,7 +275,7 @@ void passesCertainFiltersThroughSet() { 2, 10, "tahmid", - Set.of("patina", "hunter", "nyu", "baruch", "bmcc", "mhc++"), + Set.of("patina", "hunter", "nyu", "baruch", "bmcc", "mhcplusplus"), false /* patina */, false /* hunter */, false /* nyu */,