Skip to content

TAN-1052: added leaderboardID due to it being required now #996

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

Merged
angelayu0530 merged 1 commit into from
Oct 7, 2026
Merged

TAN-1052: added leaderboardID due to it being required now #996

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions src/main/java/org/patinanetwork/codebloom/common/components/LeaderboardManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ public void generateAchievementsForAllWinners() {
String placeString = calculatePlaceString(place);
Achievement achievement = Achievement.builder()
.userId(user.getId())
.leaderboardId(currentLeaderboard.get().getId())
.place(AchievementPlaceEnum.fromInteger(place))
.leaderboard(pair.getRight())
.title(String.format(
Expand Down Expand Up @@ -118,6 +119,7 @@ public void generateAchievementsForAllWinners() {
UserWithScore user = winners.get(i);
Achievement achievement = Achievement.builder()
.userId(user.getId())
.leaderboardId(currentLeaderboard.get().getId())
.place(AchievementPlaceEnum.fromInteger(place))
.leaderboard(null)
.title(String.format(
Expand Down
110 changes: 74 additions & 36 deletions src/test/java/org/patinanetwork/codebloom/common/components/LeaderboardManagerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,12 @@ private void assertAchievement(
final Achievement achievement,
final Tag leaderboard,
final AchievementPlaceEnum placeEnum,
final String userId) {
final String userId,
final String leaderboardId) {
assertEquals(leaderboard, achievement.getLeaderboard());
assertEquals(placeEnum, achievement.getPlace());
assertEquals(userId, achievement.getUserId());
assertEquals(leaderboardId, achievement.getLeaderboardId());
}

private static Stream<Arguments> tagGenerator() {
Expand Down Expand Up @@ -173,12 +175,14 @@ void testWithAvailableLeaderboardAndTwoWinnersGlobal() {
userOneAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -225,24 +229,28 @@ void testWithAvailableLeaderboardAndTwoWinnersGlobalWithOneValidTag() {
userOneSbuAchievement,
Tag.Sbu,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoSbuAchievement,
Tag.Sbu,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGlobalAchievement = achievements.get(2);
var userTwoGlobalAchievement = achievements.get(3);
assertAchievement(
userOneGlobalAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGlobalAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -300,36 +308,42 @@ void testWithAvailableLeaderboardAndTwoWinnersGlobalWithTwoValidTags() {
userOneSbuAchievement,
Tag.Sbu,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoSbuAchievement,
Tag.Sbu,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOnePatinaAchievement = achievements.get(2);
var userTwoPatinaAchievement = achievements.get(3);
assertAchievement(
userOnePatinaAchievement,
Tag.Patina,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoPatinaAchievement,
Tag.Patina,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGlobalAchievement = achievements.get(4);
var userTwoGlobalAchievement = achievements.get(5);
assertAchievement(
userOneGlobalAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGlobalAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -387,36 +401,42 @@ void testWithAvailableLeaderboardAndTwoWinnersGlobalWithOneValidOneInvalidTag()
userOneSbuAchievement,
Tag.Sbu,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoSbuAchievement,
Tag.Sbu,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGwcAchievement = achievements.get(2);
var userTwoGwcAchievement = achievements.get(3);
assertAchievement(
userOneGwcAchievement,
Tag.Gwc,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGwcAchievement,
Tag.Gwc,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGlobalAchievement = achievements.get(4);
var userTwoGlobalAchievement = achievements.get(5);
assertAchievement(
userOneGlobalAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGlobalAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -463,24 +483,28 @@ void testWithAvailableLeaderboardAndTwoWinnersWithOnlyGwcTag() {
userOneGwcAchievement,
Tag.Gwc,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGwcAchievement,
Tag.Gwc,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGlobalAchievement = achievements.get(2);
var userTwoGlobalAchievement = achievements.get(3);
assertAchievement(
userOneGlobalAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGlobalAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -538,36 +562,42 @@ void testWithAvailableLeaderboardAndTwoWinnersWithGwcAndMhcPlusPlusTags() {
userOneMhcPlusPlusAchievement,
Tag.MHCPlusPlus,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoMhcPlusPlusAchievement,
Tag.MHCPlusPlus,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGwcAchievement = achievements.get(2);
var userTwoGwcAchievement = achievements.get(3);
assertAchievement(
userOneGwcAchievement,
Tag.Gwc,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGwcAchievement,
Tag.Gwc,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGlobalAchievement = achievements.get(4);
var userTwoGlobalAchievement = achievements.get(5);
assertAchievement(
userOneGlobalAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGlobalAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -638,12 +668,14 @@ void testWithAvailableLeaderboardAndThreeWinnersGlobalButFourUsers() {
userOneAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -674,7 +706,8 @@ void testUsersWithZeroPointsAreExcludedFromAchievements() {
userOneAchievement,
null,
AchievementPlaceEnum.ONE,
users.get(0).getItem().getId());
users.get(0).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down Expand Up @@ -735,6 +768,7 @@ void testWinnersWithNullTagsAreSkippedInTagLeaderboards() {
var achievements = captor.getAllValues();
for (var achievement : achievements) {
assertNull(achievement.getLeaderboard());
assertEquals(latestLeaderboard.getId(), achievement.getLeaderboardId());
}
}

Expand Down Expand Up @@ -779,24 +813,28 @@ void testWinnersWithNonMatchingTagsAreSkippedInTagLeaderboards() {
userOnePatinaAchievement,
Tag.Patina,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoPatinaAchievement,
Tag.Patina,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
var userOneGlobalAchievement = achievements.get(2);
var userTwoGlobalAchievement = achievements.get(3);
assertAchievement(
userOneGlobalAchievement,
null,
AchievementPlaceEnum.ONE,
winners.get(0).getItem().getId());
winners.get(0).getItem().getId(),
latestLeaderboard.getId());
assertAchievement(
userTwoGlobalAchievement,
null,
AchievementPlaceEnum.TWO,
winners.get(1).getItem().getId());
winners.get(1).getItem().getId(),
latestLeaderboard.getId());
}

@Test
Expand Down
Loading