Refactor leaderboard responses

src/controllers/leaderboard.controller.ts

@@ -3,6 +3,7 @@ import { ApiBearerAuth, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { AuthGuard } from '../services/guards';
 import { IAuthorizedRequest } from '../interfaces';
 import { LeaderboardService } from '../services';
+import { GlobalLeaderboardResponseDto } from '../dtos/leaderboard/responses';
 
 @ApiBearerAuth()
 @Controller('/api/leaderboard')
@@ -24,7 +25,7 @@ export class LeaderboardController {
     description: 'Internal server error, contact with backend team.',
   })
   @Get('/global')
-  public async getGlobalLeaderboard(): Promise<any> {
+  public async getGlobalLeaderboard(): Promise<GlobalLeaderboardResponseDto[]> {
     return await this.leaderboardService.getGlobalLeaderboard();
   }
 

src/dtos/leaderboard/responses/country-leaderboard-response.dto.ts

@@ -0,0 +1,11 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
+
+export class CountryLeaderboardResponseDto {
+  @ApiProperty()
+  @Expose()
+  username: string;
+  @ApiProperty()
+  @Expose()
+  levelNum: string;
+}

src/dtos/leaderboard/responses/global-leaderboard-response.dto.ts

@@ -0,0 +1,11 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { Expose } from 'class-transformer';
+
+export class GlobalLeaderboardResponseDto {
+  @ApiProperty()
+  @Expose()
+  username: string;
+  @ApiProperty()
+  @Expose()
+  levelNum: string;
+}

src/dtos/leaderboard/responses/index.ts

@@ -0,0 +1,2 @@
+export * from './global-leaderboard-response.dto';
+export * from './country-leaderboard-response.dto';

src/repositories/user.repository.ts

@@ -17,6 +17,7 @@ import {
 import { ConfigService } from '@nestjs/config';
 import { User } from '../entities';
 import { TournamentGroupRepository } from '.';
+import { GlobalLeaderboardResponseDto, CountryLeaderboardResponseDto } from '../dtos/leaderboard/responses';
 
 @Injectable()
 export class UserRepository {
@@ -141,21 +142,25 @@ export class UserRepository {
     }
   }
 
-  public async getGlobalLeaderboard(): Promise<any> {
+  public async getGlobalLeaderboard(): Promise<GlobalLeaderboardResponseDto[]> {
     const queryCommand = new QueryCommand({
       TableName: 'Users',
       IndexName: 'LevelGSI',
       KeyConditionExpression: 'dummyPartitionKey = :dpk',
       ExpressionAttributeValues: {
         ':dpk': { S: '_' },
       },
+      ProjectionExpression: 'username, levelNum',
       Limit: 1000,
       ScanIndexForward: false,
     });
 
     try {
       const response = await this.client.send(queryCommand);
-      return response.Items;
+      return response.Items.map((item) => ({
+        levelNum: item.levelNum.N,
+        username: item.username.S,
+      }));
     } catch (error) {
       console.error('Error in get global leaderboard request:', error);
       throw new InternalServerErrorException(
@@ -164,21 +169,25 @@ export class UserRepository {
     }
   }
 
-  public async getCountryLeaderboard(countryCode: string): Promise<any> {
+  public async getCountryLeaderboard(countryCode: string): Promise<CountryLeaderboardResponseDto[]> {
     const queryCommand = new QueryCommand({
       TableName: 'Users',
       IndexName: 'CountryCodeGSI',
       KeyConditionExpression: 'countryCode = :val',
       ExpressionAttributeValues: {
         ':val': { S: countryCode },
       },
+      ProjectionExpression: 'username, levelNum',
       Limit: 1000,
       ScanIndexForward: false,
     });
 
     try {
       const response = await this.client.send(queryCommand);
-      return response.Items;
+      return response.Items.map((item) => ({
+        levelNum: item.levelNum.N,
+        username: item.username.S,
+      }));
     } catch (error) {
       console.error('Error in get global leaderboard request:', error);
       throw new InternalServerErrorException(

src/services/leaderboard.service.ts

@@ -2,6 +2,7 @@ import { BadRequestException, Injectable } from '@nestjs/common';
 import { TournamentGroupRepository, UserRepository } from '../repositories';
 import { SortOption } from '../enums';
 import { IUser } from '../interfaces';
+import { GlobalLeaderboardResponseDto } from '../dtos/leaderboard/responses';
 
 @Injectable()
 export class LeaderboardService {
@@ -10,7 +11,7 @@ export class LeaderboardService {
     public readonly userRepository: UserRepository,
   ) {}
 
-  public async getGlobalLeaderboard() {
+  public async getGlobalLeaderboard(): Promise<GlobalLeaderboardResponseDto[]>{
     const users = await this.userRepository.getGlobalLeaderboard();
 
     return users;