fixes

Author: enchantinggg4

package.json

@@ -112,7 +112,6 @@
     "@types/web-push": "^3.6.4",
     "bignumber.js": "^9.0.1",
     "jest": "29.7.0",
-    "k6": "^0.0.0",
     "openapi-typescript-codegen": "^0.5.3",
     "prettier": "^3.3.3",
     "supertest": "^7.0.0",

src/generated-api/gameserver/apis/PlayerApi.ts

@@ -53,6 +53,7 @@ export interface PlayerControllerGetHeroPlayersRequest {
 export interface PlayerControllerLeaderboardRequest {
     page: number;
     perPage?: number;
+    seasonId?: number;
 }
 
 export interface PlayerControllerPlayerAchievementsRequest {
@@ -199,6 +200,10 @@ export class PlayerApi extends runtime.BaseAPI {
             queryParameters['per_page'] = requestParameters.perPage;
         }
 
+        if (requestParameters.seasonId !== undefined) {
+            queryParameters['season_id'] = requestParameters.seasonId;
+        }
+
         const headerParameters: runtime.HTTPHeaders = {};
 
         return {
@@ -211,8 +216,8 @@ export class PlayerApi extends runtime.BaseAPI {
 
     /**
      */
-    playerControllerLeaderboard = async (page: number, perPage?: number): Promise<GameserverLeaderboardEntryPageDto> => {
-        const response = await this.playerControllerLeaderboardRaw({ page: page, perPage: perPage });
+    playerControllerLeaderboard = async (page: number, perPage?: number, seasonId?: number): Promise<GameserverLeaderboardEntryPageDto> => {
+        const response = await this.playerControllerLeaderboardRaw({ page: page, perPage: perPage, seasonId: seasonId });
         return await response.value();
     }
 

src/generated-api/gameserver/models/GameserverLeaderboardEntryDto.ts

@@ -35,19 +35,19 @@ export class GameserverLeaderboardEntryDto {
      * @type {number}
      * @memberof GameserverLeaderboardEntryDto
      */
-    mmr: number;
+    seasonId: number;
     /**
      *
      * @type {number}
      * @memberof GameserverLeaderboardEntryDto
      */
-    games: number;
+    mmr: number;
     /**
      *
      * @type {number}
      * @memberof GameserverLeaderboardEntryDto
      */
-    seasonGames: number;
+    games: number;
     /**
      *
      * @type {number}
@@ -92,9 +92,9 @@ export function GameserverLeaderboardEntryDtoFromJSONTyped(json: any, ignoreDisc
 
         'rank': json['rank'],
         'steamId': json['steamId'],
+        'seasonId': json['seasonId'],
         'mmr': json['mmr'],
         'games': json['games'],
-        'seasonGames': json['seasonGames'],
         'wins': json['wins'],
         'kills': json['kills'],
         'deaths': json['deaths'],
@@ -114,9 +114,9 @@ export function GameserverLeaderboardEntryDtoToJSON(value?: GameserverLeaderboar
 
         'rank': value.rank,
         'steamId': value.steamId,
+        'seasonId': value.seasonId,
         'mmr': value.mmr,
         'games': value.games,
-        'seasonGames': value.seasonGames,
         'wins': value.wins,
         'kills': value.kills,
         'deaths': value.deaths,

src/generated-api/gameserver/models/GameserverPlayerSummaryDto.ts

@@ -47,19 +47,19 @@ export class GameserverPlayerSummaryDto {
      * @type {number}
      * @memberof GameserverPlayerSummaryDto
      */
-    mmr: number;
+    seasonId: number;
     /**
      *
      * @type {number}
      * @memberof GameserverPlayerSummaryDto
      */
-    games: number;
+    mmr: number;
     /**
      *
      * @type {number}
      * @memberof GameserverPlayerSummaryDto
      */
-    seasonGames: number;
+    games: number;
     /**
      *
      * @type {number}
@@ -106,9 +106,9 @@ export function GameserverPlayerSummaryDtoFromJSONTyped(json: any, ignoreDiscrim
         'accessLevel': json['accessLevel'],
         'rank': json['rank'],
         'steamId': json['steamId'],
+        'seasonId': json['seasonId'],
         'mmr': json['mmr'],
         'games': json['games'],
-        'seasonGames': json['seasonGames'],
         'wins': json['wins'],
         'kills': json['kills'],
         'deaths': json['deaths'],
@@ -130,9 +130,9 @@ export function GameserverPlayerSummaryDtoToJSON(value?: GameserverPlayerSummary
         'accessLevel': value.accessLevel,
         'rank': value.rank,
         'steamId': value.steamId,
+        'seasonId': value.seasonId,
         'mmr': value.mmr,
         'games': value.games,
-        'seasonGames': value.seasonGames,
         'wins': value.wins,
         'kills': value.kills,
         'deaths': value.deaths,

src/rest/player/player.controller.ts

@@ -10,7 +10,7 @@ import {
   UseInterceptors,
 } from "@nestjs/common";
 import { CacheTTL } from "@nestjs/cache-manager";
-import { ApiBearerAuth, ApiTags } from "@nestjs/swagger";
+import { ApiBearerAuth, ApiQuery, ApiTags } from "@nestjs/swagger";
 import { PlayerApi } from "../../generated-api/gameserver";
 import { PlayerMapper } from "./player.mapper";
 import {
@@ -114,11 +114,20 @@ export class PlayerController {
   @CacheTTL(60 * 30)
   @Get("/leaderboard")
   @WithPagination()
+  @ApiQuery({
+    name: "season_id",
+    required: false,
+  })
   async leaderboard(
     @Query("page") page: number,
     @Query("per_page", NullableIntPipe) perPage: number = 25,
+    @Query("season_id", NullableIntPipe) seasonId?: number,
   ): Promise<LeaderboardEntryPageDto> {
-    const rawPage = await this.ms.playerControllerLeaderboard(page, perPage);
+    const rawPage = await this.ms.playerControllerLeaderboard(
+      page,
+      perPage,
+      seasonId,
+    );
 
     return {
       data: await Promise.all(

src/rest/player/player.mapper.ts

@@ -85,6 +85,7 @@ export class PlayerMapper {
   public mapPlayerSummary = async (
     it: GameserverPlayerSummaryDto,
   ): Promise<PlayerSummaryDto> => {
+    console.log(it)
     return {
       user: await this.userRepository.userDto(it.steamId),
       mmr: it.mmr,

src/rest/stats/dto/stats.dto.ts

@@ -30,3 +30,11 @@ export class PerModePlayersDto {
 
   playerCount: number;
 }
+
+
+export class GameSeasonDto {
+  id: number;
+  startTimestamp: string;
+  isActive: boolean;
+}
+

src/rest/stats/stats.controller.ts

@@ -5,10 +5,10 @@ import {
   InfoApi,
 } from "../../generated-api/gameserver";
 import {
-  CurrentOnlineDto,
+  CurrentOnlineDto, GameSeasonDto,
   MatchmakingInfo,
   PerModePlayersDto,
-} from "./dto/stats.dto";
+} from './dto/stats.dto';
 import { CacheTTL } from "@nestjs/cache-manager";
 import { ReqLoggingInterceptor } from "../../middleware/req-logging.interceptor";
 import { MatchmakingModes } from "../../gateway/shared-types/matchmaking-mode";
@@ -24,6 +24,12 @@ export class StatsController {
     return this.ms.infoControllerGamemodes();
   }
 
+
+  @Get("/seasons")
+  async getGameSeasons(): Promise<GameSeasonDto[]> {
+    return this.ms.infoControllerGetSeasons();
+  }
+
   @Get("/servers")
   public async getServers(): Promise<string[]> {
     const servers = await this.ms.infoControllerGameServers();

yarn.lock

@@ -7101,11 +7101,6 @@ jws@^4.0.0:
     jwa "^2.0.0"
     safe-buffer "^5.0.1"
 
-k6@^0.0.0:
-  version "0.0.0"
-  resolved "https://registry.yarnpkg.com/k6/-/k6-0.0.0.tgz#8c923200be0a68c578e8f5a32be96b1d8065cc3b"
-  integrity sha512-GAQSWayS2+LjbH5bkRi+pMPYyP1JSp7o+4j58ANZ762N/RH/SdlAT3CHHztnn8s/xgg8kYNM24Gd2IPo9b5W+g==
-
 kleur@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/kleur/-/kleur-3.0.3.tgz#a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"