Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions infra/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,24 +36,26 @@ WORKDIR /app
COPY mvnw pom.xml ./
COPY .mvn/ .mvn/

RUN ./mvnw dependency:resolve -B
RUN ./mvnw dependency:resolve dependency:resolve-plugins -B

COPY src ./src
COPY --from=frontend-build /js/dist/ src/main/resources/static/
RUN mkdir -p src/main/resources/static/email && rm -f src/main/resources/static/email/*.html
COPY --from=email-build /email/out/*.html src/main/resources/static/email/

ARG COMMIT_SHA
RUN ./mvnw package -DskipTests -Dcommit.sha="${COMMIT_SHA}"
RUN ./mvnw clean package -DskipTests -Dcommit.sha="${COMMIT_SHA}"

FROM eclipse-temurin:25-jre-jammy

WORKDIR /app

ENV PLAYWRIGHT_BROWSERS_PATH=/ms-playwright

COPY mvnw pom.xml ./
COPY .mvn/ .mvn/
RUN ./mvnw -B exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install-deps"
RUN ./mvnw -B exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install firefox"
RUN ./mvnw -B exec:java -e -D exec.mainClass=com.microsoft.playwright.CLI -D exec.args="install"
COPY --from=backend-build /app/target/*.jar app.jar

ARG SERVER_PROFILES=prod
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,10 @@ public void generateAchievementsForAllWinners() {
log.info("on leaderboard for {}", pair.getRight().getResolvedName());
List<Indexed<UserWithScore>> users = leaderboardRepository.getRankedIndexedLeaderboardUsersById(
currentLeaderboard.getId(), pair.getLeft());
List<Indexed<UserWithScore>> winners = users.subList(0, maxWinners(users.size()));
List<Indexed<UserWithScore>> usersWithPoints = users.stream()
.filter(indexed -> indexed.getItem().getTotalScore() > 0)
.toList();
List<Indexed<UserWithScore>> winners = usersWithPoints.subList(0, maxWinners(usersWithPoints.size()));

for (int i = 0; i < winners.size(); i++) {
int place = i + 1;
Expand All @@ -83,7 +86,10 @@ public void generateAchievementsForAllWinners() {
// handle global leaderboard
List<Indexed<UserWithScore>> users = leaderboardRepository.getGlobalRankedIndexedLeaderboardUsersById(
currentLeaderboard.getId(), LeaderboardFilterOptions.DEFAULT);
List<Indexed<UserWithScore>> winners = users.subList(0, maxWinners(users.size()));
List<Indexed<UserWithScore>> usersWithPoints = users.stream()
.filter(indexed -> indexed.getItem().getTotalScore() > 0)
.toList();
List<Indexed<UserWithScore>> winners = usersWithPoints.subList(0, maxWinners(usersWithPoints.size()));

for (int i = 0; i < winners.size(); i++) {
int place = i + 1;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -444,6 +444,71 @@ void testWithAvailableLeaderboardAndThreeWinnersGlobalButFourUsers() {
winners.get(1).getItem().getId());
}

@Test
void testUsersWithZeroPointsAreExcludedFromAchievements() {
var latestLeaderboard = Leaderboard.builder()
.id(UUID.randomUUID().toString())
.name("Test Leaderboard")
.createdAt(StandardizedLocalDateTime.now())
.build();

var users = Indexed.ofDefaultList(List.of(
randomPartialUserWithScore().totalScore(150_000).build(),
randomPartialUserWithScore().totalScore(0).build(),
randomPartialUserWithScore().totalScore(0).build()));

when(leaderboardRepository.getRecentLeaderboardMetadata()).thenReturn(latestLeaderboard);
when(leaderboardRepository.getGlobalRankedIndexedLeaderboardUsersById(eq(latestLeaderboard.getId()), any()))
.thenReturn(users);

leaderboardManager.generateAchievementsForAllWinners();

ArgumentCaptor<Achievement> captor = ArgumentCaptor.forClass(Achievement.class);
verify(achievementRepository, times(1)).createAchievement(captor.capture());

var achievements = captor.getAllValues();
var userOneAchievement = achievements.get(0);
assertAchievement(
userOneAchievement,
null,
AchievementPlaceEnum.ONE,
users.get(0).getItem().getId());
}

@Test
void testUsersWithZeroPointsAreExcludedFromTagAchievements() {
var latestLeaderboard = Leaderboard.builder()
.id(UUID.randomUUID().toString())
.name("Test Leaderboard")
.createdAt(StandardizedLocalDateTime.now())
.build();

var users = Indexed.ofDefaultList(List.of(
randomPartialUserWithScore().totalScore(0).build(),
randomPartialUserWithScore().totalScore(0).build()));

users.forEach(winner -> {
var user = winner.getItem();
user.setTags(List.of(UserTag.builder()
.id(UUID.randomUUID().toString())
.tag(Tag.Sbu)
.userId(user.getId())
.build()));
});

when(leaderboardRepository.getRecentLeaderboardMetadata()).thenReturn(latestLeaderboard);
when(leaderboardRepository.getGlobalRankedIndexedLeaderboardUsersById(eq(latestLeaderboard.getId()), any()))
.thenReturn(users);

when(leaderboardRepository.getRankedIndexedLeaderboardUsersById(
eq(latestLeaderboard.getId()), argThat(opt -> opt.isSbu())))
.thenReturn(users);

leaderboardManager.generateAchievementsForAllWinners();

verify(achievementRepository, times(0)).createAchievement(any());
}

@Test
void testGetLeaderboardMetadata() {
String testId = UUID.randomUUID().toString();
Expand Down