Skip to content

change/leaderboards-sorting-632 #658

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
PlayJeri merged 3 commits into from
Sep 7, 2025
Merged

change/leaderboards-sorting-632 #658

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
1a752fb
Remove old comment and change sorting from points to battlePoints
PlayJeri Sep 2, 2025
7c44d7f
fix tests by changing sorting from points to battlePoints
PlayJeri Sep 4, 2025
f106cd0
Fix: Change tests to use battlePoints instead of points.
PlayJeri Sep 5, 2025
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: 4 additions & 4 deletions src/__tests__/leaderboard/LeaderboardService/LeaderboardService.getClanLeaderboard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@ describe('LeaderboardService.getClanLeaderboard() test suite', () => {
const queryBuilder = InterfaceBuilderFactory.getBuilder('IGetAllQuery');

const clanBuilder = ClanBuilderFactory.getBuilder('Clan');
const clan1 = clanBuilder.setName('clan-1').setPoints(100).build();
const clan2 = clanBuilder.setName('clan-2').setPoints(50).build();
const clan3 = clanBuilder.setName('clan-3').setPoints(10).build();
const clan1 = clanBuilder.setName('clan-1').setBattlePoints(100).build();
const clan2 = clanBuilder.setName('clan-2').setBattlePoints(50).build();
const clan3 = clanBuilder.setName('clan-3').setBattlePoints(10).build();
const clanModel = ClanModule.getClanModel();

beforeEach(async () => {
service = await LeaderboardModule.getLeaderboardService();

await clanModel.create(clan1);
await clanModel.create(clan2);
await clanModel.create(clan1);
await clanModel.create(clan3);
});

Expand Down
11 changes: 6 additions & 5 deletions src/__tests__/leaderboard/LeaderboardService/LeaderboardService.getClanPosition.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,20 @@ describe('LeaderboardService.getClanPosition() test suite', () => {
let service: LeaderboardService;

const clanBuilder = ClanBuilderFactory.getBuilder('Clan');
const clan1 = clanBuilder.setName('clan-1').setPoints(100).build();
const clan2 = clanBuilder.setName('clan-2').setPoints(50).build();
const clan3 = clanBuilder.setName('clan-3').setPoints(10).build();
const clan1 = clanBuilder.setName('clan-1').setBattlePoints(100).build();
const clan2 = clanBuilder.setName('clan-2').setBattlePoints(50).build();
const clan3 = clanBuilder.setName('clan-3').setBattlePoints(10).build();
const clanModel = ClanModule.getClanModel();

beforeEach(async () => {
service = await LeaderboardModule.getLeaderboardService();

const createClan2 = await clanModel.create(clan2);
const createClan1 = await clanModel.create(clan1);
const createClan3 = await clanModel.create(clan3);

clan1._id = createClan1._id.toString();
const createClan2 = await clanModel.create(clan2);
clan2._id = createClan2._id.toString();
const createClan3 = await clanModel.create(clan3);
clan3._id = createClan3._id.toString();
});

Expand Down
8 changes: 4 additions & 4 deletions src/__tests__/leaderboard/LeaderboardService/LeaderboardService.getPlayerLeaderboard.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,17 @@ describe('LeaderboardService.getPlayerLeaderboard() test suite', () => {
const player1 = playerBuilder
.setName('player-1')
.setUniqueIdentifier('player-1')
.setPoints(100)
.setBattlePoints(100)
.build();
const player2 = playerBuilder
.setName('player-2')
.setUniqueIdentifier('player-2')
.setPoints(50)
.setBattlePoints(50)
.build();
const player3 = playerBuilder
.setName('player-3')
.setUniqueIdentifier('player-3')
.setPoints(10)
.setBattlePoints(10)
.build();
const playerModel = PlayerModule.getPlayerModel();

Expand All @@ -47,9 +47,9 @@ describe('LeaderboardService.getPlayerLeaderboard() test suite', () => {
player2.clan_id = clan._id;
player3.clan_id = clan._id;

await playerModel.create(player1);
await playerModel.create(player2);
await playerModel.create(player3);
await playerModel.create(player1);
});

it('Should return leading players in valid order', async () => {
Expand Down
3 changes: 1 addition & 2 deletions src/leaderboard/leaderboard.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,11 @@ export class LeaderboardService {
let data: object[] = JSON.parse(dataRaw);

if (!data) {
const fetchedData = await model.find().sort({ points: -1 }).exec();
const fetchedData = await model.find().sort({ battlePoints: -1 }).exec();
if (!fetchedData) throw new ServiceError({ reason: SEReason.NOT_FOUND });

data = await this.processCacheData(model, fetchedData);

// Set the data with 12 hour ttl. The { ttl: number } as any is required to overwrite the default value.
await this.redisService.set(
cacheKey,
JSON.stringify(data),
Expand Down