Some slight improvements

Author: enchantinggg4

src/gameserver/command/ProcessRankedMatch/process-ranked-match.handler.ts

@@ -25,6 +25,8 @@ export class ProcessRankedMatchHandler
 {
   private static readonly Slogger = new Logger(ProcessRankedMatchHandler.name);
 
+  public static TOTAL_CALIBRATION_GAMES = 10;
+
   private readonly logger = ProcessRankedMatchHandler.Slogger;
 
   public static readonly AVERAGE_DIFF_CAP = 300;
@@ -232,7 +234,7 @@ export class ProcessRankedMatchHandler
         cb,
         winner,
         mmrDiff,
-        10, // CB GAMES = 0 for now
+        ProcessRankedMatchHandler.TOTAL_CALIBRATION_GAMES, // CB GAMES = 0 for now
         25,
         0,
       ),

src/gameserver/model/leaderboard.view.ts

@@ -20,7 +20,7 @@ select p.steam_id,
        avg(pim.deaths)::float                                                       as deaths,
        avg(pim.assists)::float                                                      as assists,
        sum(m.duration)::int                                                         as play_time,
-       sum((m.matchmaking_mode = 0)::int)                                           as ranked_games,
+       sum((m.matchmaking_mode in (0, 1))::int)                                     as ranked_games,
        (row_number() over ( order by p.mmr desc))::int                              as rank
 from cte p
          inner join player_in_match pim on pim."playerId" = p.steam_id

src/rest/dto/player.dto.ts

@@ -29,6 +29,7 @@ export class LeaderboardEntryPageDto extends Page<LeaderboardEntryDto> {
 export class PlayerSummaryDto extends LeaderboardEntryDto {
   newbieUnrankedGamesLeft: number;
   playedAnyGame: boolean;
+  calibrationGamesLeft: number;
 }
 
 export class BanStatusDto {

src/rest/player.controller.ts

@@ -33,6 +33,7 @@ import { AchievementDto } from 'rest/dto/achievement.dto';
 import PlayerInMatchEntity from 'gameserver/model/player-in-match.entity';
 import FinishedMatchEntity from 'gameserver/model/finished-match.entity';
 import { makePage } from 'gateway/util/make-page';
+import { ProcessRankedMatchHandler } from 'gameserver/command/ProcessRankedMatch/process-ranked-match.handler';
 
 @Controller('player')
 @ApiTags('player')
@@ -185,6 +186,8 @@ offset $2 limit $3`,
           lb.ranked_games > 0
             ? 0
             : Math.max(0, UNRANKED_GAMES_REQUIRED_FOR_RANKED - lb.games),
+
+        calibrationGamesLeft: Math.max(ProcessRankedMatchHandler.TOTAL_CALIBRATION_GAMES - lb.ranked_games, 0)
       };
     }
 
@@ -194,6 +197,8 @@ offset $2 limit $3`,
 
     const rank = await this.playerService.getRank(version, steam_id);
 
+    console.log(summary.ranked_games)
+
     return {
       rank: rank,
       mmr: summary?.mmr,
@@ -217,6 +222,8 @@ offset $2 limit $3`,
               UNRANKED_GAMES_REQUIRED_FOR_RANKED -
                 (summary?.unranked_games || 0),
             ),
+
+      calibrationGamesLeft: Math.max(ProcessRankedMatchHandler.TOTAL_CALIBRATION_GAMES - (summary?.ranked_games || 0), 0)
     };
   }
 

src/rest/service/player.service.ts

@@ -12,10 +12,10 @@ import { VersionPlayerEntity } from 'gameserver/model/version-player.entity';
 
 export type Summary =
   | undefined
-  | (Omit<PlayerSummaryDto, 'rank' | 'newbieUnrankedGamesLeft'> & {
+  | (Omit<PlayerSummaryDto, "rank" | "newbieUnrankedGamesLeft"> & {
       ranked_games: number;
       unranked_games: number;
-    any_games: number;
+      any_games: number;
     });
 
 // TODO: we probably need to orm this shit up
@@ -30,7 +30,7 @@ export class PlayerService {
     private readonly connection: Connection,
   ) {}
 
-  @cached(100, 'getRank')
+  @cached(100, "getRank")
   public async getRank(
     version: Dota2Version,
     steam_id: string,
@@ -77,7 +77,7 @@ where p.mmr > $3
     return rank2[0].count + 1;
   }
 
-  @cached(100, 'heroStats')
+  @cached(100, "heroStats")
   async heroStats(
     version: Dota2Version,
     steam_id: string,
@@ -103,7 +103,7 @@ group by pim.hero, pim."playerId"
     );
   }
 
-  @cached(100, 'winrateLastRankedGames')
+  @cached(100, "winrateLastRankedGames")
   async winrateLastRankedGames(steam_id: string): Promise<number> {
     const some: { is_win: boolean }[] = await this.playerInMatchRepository
       .query(`
@@ -178,13 +178,13 @@ select p.steam_id,
        avg(pim.deaths)::float                                                       as deaths,
        avg(pim.assists)::float                                                      as assists,
        sum(m.duration)::int                                                         as play_time,
-       sum((m.matchmaking_mode = 0)::int)                                           as ranked_games,
+       sum((m.matchmaking_mode in ($2, $3))::int)                                   as ranked_games,
        -1                             as rank
 from cte p
          inner join player_in_match pim on pim."playerId" = p.steam_id
          inner join finished_match m on pim."matchId" = m.id
 group by p.steam_id, p.recent_ranked_games, p.mmr, p.games, p.wins, p.any_games`,
-      [steam_id],
+      [steam_id, MatchmakingMode.RANKED, MatchmakingMode.UNRANKED],
     );
 
     return some[0];