Skip to content

DINO-1048 added set of strings for filters #1071

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThisRyanZhou wants to merge 3 commits into
base: main
Choose a base branch
from
Open

DINO-1048 added set of strings for filters #1071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2c4db49
oops used wrong branch, update 1048
ThisRyanZhou Nov 9, 2026
d31cf96
forgot mvn spotless:apply
ThisRyanZhou Nov 9, 2026
da10d97
wrong name for mhc
ThisRyanZhou Nov 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 25 additions & 13 deletions src/main/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import jakarta.servlet.http.HttpServletRequest;
import java.util.List;
import java.util.Optional;
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;
Expand Down Expand Up @@ -99,6 +100,8 @@ public ResponseEntity<ApiResponder<Page<Indexed<UserWithScoreDto>>>> 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<String> filters,
@Parameter(description = "Filter for Patina users") @RequestParam(required = false, defaultValue = "false")
final boolean patina,
@Parameter(description = "Filter for Hunter College users")
Expand Down Expand Up @@ -133,22 +136,31 @@ public ResponseEntity<ApiResponder<Page<Indexed<UserWithScoreDto>>>> getLeaderbo

final int parsedPageSize = Math.min(pageSize, MAX_LEADERBOARD_PAGE_SIZE);

LeaderboardFilterOptions options = LeaderboardFilterOptions.builder()
final LeaderboardFilterOptions options;

final Set<String> 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"))
Comment thread
ThisRyanZhou marked this conversation as resolved.
Resolved
.build();

Page<Indexed<UserWithScoreDto>> createdPage =
Expand Down
109 changes: 109 additions & 0 deletions src/test/java/org/patinanetwork/codebloom/api/leaderboard/LeaderboardControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
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;
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;
Expand Down Expand Up @@ -57,6 +61,7 @@ void testGetLeaderboardUsersByIdMhcPlusPlus() {
PAGE,
PAGE_SIZE,
"",
Set.of(),
false,
false,
false,
Expand Down Expand Up @@ -138,6 +143,7 @@ void capsPageSize() {
1,
999,
"",
Set.of(),
false,
false,
false,
Expand Down Expand Up @@ -167,6 +173,7 @@ void passesAllFilters() {
2,
10,
"tahmid",
Set.of(),
true /* patina */,
true /* hunter */,
true /* nyu */,
Expand Down Expand Up @@ -203,6 +210,108 @@ 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",
"mhcplusplus"),
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<LeaderboardFilterOptions> 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", "mhcplusplus"),
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<LeaderboardFilterOptions> 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() {
Expand Down
Loading