Info controller and gamemode mapping

Author: enchantinggg4

src/@test/values.ts

@@ -1,14 +1,20 @@
-import { EventBus } from "@nestjs/cqrs";
-import Mock = jest.Mock;
-import { inspect } from "util";
+import { EventBus } from '@nestjs/cqrs';
+import { inspect } from 'util';
 import { PlayerId } from 'gateway/shared-types/player-id';
+import { MatchmakingMode } from 'gateway/shared-types/matchmaking-mode';
+import { Dota_GameMode } from 'gateway/shared-types/dota-game-mode';
+import { getRepositoryToken } from '@nestjs/typeorm';
+import { MatchmakingModeMappingEntity } from 'gameserver/model/matchmaking-mode-mapping.entity';
+import { Repository } from 'typeorm';
+import { NestApplicationContext } from '@nestjs/core/nest-application-context';
+import Mock = jest.Mock;
 
 export const randomUser = () => {
-  return user(`[U:1:${Math.round(Math.random() * 1000000)}]`);
+  return user(`${Math.round(Math.random() * 1000000)}`);
 };
 
-export const user1 = new PlayerId("[U:1:1062901073]");
-export const user2 = new PlayerId("[U:1:116514945]");
+export const user1 = new PlayerId("1062901073");
+export const user2 = new PlayerId("116514945");
 
 export const user = (id: string) => new PlayerId(id);
 
@@ -20,4 +26,13 @@ export function printCalls(bus: EventBus) {
 
 export function arrayOf(size: number){
   return new Array(size).fill(null)
-}
+}
+
+export function createGameMode(app: NestApplicationContext, lobby: MatchmakingMode, mode: Dota_GameMode, enabled: boolean): Promise<MatchmakingModeMappingEntity> {
+  const rep: Repository<MatchmakingModeMappingEntity> = app.get(getRepositoryToken(MatchmakingModeMappingEntity))
+  return rep.save({
+    lobbyType: lobby,
+    dotaGameMode: mode,
+    enabled
+  })
+}

src/app.module.ts

@@ -10,7 +10,7 @@ import { Entities, prodDbConfig } from 'util/typeorm-config';
 import { QueryController } from 'query.controller';
 import { Mapper } from 'rest/mapper';
 import { PlayerController } from 'rest/player.controller';
-import { InfoController } from 'rest/info.controller';
+import { InfoController } from 'rest/info/info.controller';
 import { PlayerService } from 'rest/service/player.service';
 import { ScheduleModule } from '@nestjs/schedule';
 import { MetaController } from 'rest/meta/meta.controller';
@@ -24,6 +24,8 @@ import { CrimeController } from 'rest/crime.controller';
 import { MatchMapper } from 'rest/match/match.mapper';
 import { MatchController } from 'rest/match/match.controller';
 import { MetaMapper } from 'rest/meta/meta.mapper';
+import { InfoMapper } from 'rest/info/info.mapper';
+import { InfoService } from 'rest/info/info.service';
 
 
 export function qCache<T, B>() {
@@ -73,6 +75,8 @@ export function qCache<T, B>() {
     PlayerService,
     MatchMapper,
     MetaMapper,
+    InfoMapper,
+    InfoService,
     Mapper,
     ...GameServerDomain,
     outerQuery(GetUserInfoQuery, 'QueryCore', qCache())

src/app.service.ts

@@ -6,22 +6,21 @@ import { DiscoveryRequestedEvent } from 'gateway/events/discovery-requested.even
 import { MatchStartedEvent } from 'gateway/events/match-started.event';
 import { MatchCancelledEvent } from 'gateway/events/match-cancelled.event';
 import { MatchFinishedEvent } from 'gateway/events/match-finished.event';
-import { Cron, CronExpression } from '@nestjs/schedule';
-import { GameServerRepository } from 'gameserver/repository/game-server.repository';
+import { Cron } from '@nestjs/schedule';
 import { ServerActualizationRequestedEvent } from 'gateway/events/gs/server-actualization-requested.event';
 import { KillServerRequestedEvent } from 'gateway/events/gs/kill-server-requested.event';
 import { BanSystemEvent } from 'gateway/events/gs/ban-system.event';
-import { LiveMatchUpdateEvent } from 'gateway/events/gs/live-match-update.event';
-import { MoreThan, Repository } from 'typeorm';
-import { construct } from 'gateway/util/construct';
+import { Repository } from 'typeorm';
 import { InjectRepository } from '@nestjs/typeorm';
 import { ReplayEntity } from 'gameserver/model/replay.entity';
+import { GameServerEntity } from 'gameserver/model/game-server.entity';
 
 @Injectable()
 export class AppService {
   constructor(
     private readonly ebus: EventBus,
-    private readonly gsRepository: GameServerRepository,
+    @InjectRepository(GameServerEntity)
+    private readonly gameServerEntityRepository: Repository<GameServerEntity>,
     @InjectRepository(ReplayEntity)
     private readonly replayEntityRepository: Repository<ReplayEntity>,
     @Inject('QueryCore') private readonly redisEventQueue: ClientProxy,
@@ -31,8 +30,7 @@ export class AppService {
   @Cron('*/30 * * * * *')
   async actualizeServers() {
     // for all servers
-    // todo uncomment
-    const all = await this.gsRepository.all();
+    const all = await this.gameServerEntityRepository.find();
 
     await Promise.all(
       all.map(async gs => {

src/gameserver/command/FindGameServer/find-game-server.handler.ts

@@ -1,7 +1,6 @@
 import { CommandHandler, EventBus, ICommandHandler, QueryBus } from '@nestjs/cqrs';
 import { Inject, Logger } from '@nestjs/common';
 import { FindGameServerCommand } from 'gameserver/command/FindGameServer/find-game-server.command';
-import { GameServerRepository } from 'gameserver/repository/game-server.repository';
 import { GameSessionCreatedEvent } from 'gateway/events/game-session-created.event';
 import { GameServerSessionRepository } from 'gameserver/repository/game-server-session.repository';
 import { GameServerSessionEntity } from 'gameserver/model/game-server-session.entity';
@@ -30,6 +29,7 @@ import { GetUserInfoQueryResult } from 'gateway/queries/GetUserInfo/get-user-inf
 import { MatchEntity } from 'gameserver/model/match.entity';
 import { MatchmakingMode } from 'gateway/shared-types/matchmaking-mode';
 import { Dota_GameMode } from 'gateway/shared-types/dota-game-mode';
+import { MatchmakingModeMappingEntity } from 'gameserver/model/matchmaking-mode-mapping.entity';
 
 @CommandHandler(FindGameServerCommand)
 export class FindGameServerHandler
@@ -41,7 +41,6 @@ export class FindGameServerHandler
   >();
 
   constructor(
-    private readonly gsRepository: GameServerRepository,
     private readonly gsSessionRepository: GameServerSessionRepository,
     @InjectRepository(GameServerSessionEntity)
     private readonly gameServerSessionModelRepository: Repository<
@@ -52,6 +51,8 @@ export class FindGameServerHandler
     private readonly matchEntityRepository: Repository<MatchEntity>,
     private readonly qbus: QueryBus,
     @Inject('QueryCore') private readonly redisEventQueue: ClientProxy,
+    @InjectRepository(MatchmakingModeMappingEntity)
+    private readonly matchmakingModeMappingEntityRepository: Repository<MatchmakingModeMappingEntity>,
   ) {
     this.pendingGamesPool
       .pipe(asyncMap(cmd => this.findServer(cmd), 1))
@@ -62,31 +63,18 @@ export class FindGameServerHandler
     this.pendingGamesPool.next(command);
   }
 
-  private getGameModeForMatchMode(mode: MatchmakingMode): Dota_GameMode {
-    switch (mode) {
-      case MatchmakingMode.RANKED:
-        return Dota_GameMode.RANKED_AP;
-      case MatchmakingMode.UNRANKED:
-        return Dota_GameMode.RANKED_AP;
-      case MatchmakingMode.SOLOMID:
-        return Dota_GameMode.SOLOMID;
-      case MatchmakingMode.DIRETIDE:
-        return Dota_GameMode.DIRETIDE;
-      case MatchmakingMode.GREEVILING:
-        return Dota_GameMode.GREEVILING;
-      case MatchmakingMode.ABILITY_DRAFT:
-        return Dota_GameMode.ABILITY_DRAFT;
-      case MatchmakingMode.TOURNAMENT:
-        return Dota_GameMode.CAPTAINS_MODE;
-      case MatchmakingMode.BOTS:
-        return Dota_GameMode.ALLPICK;
-      case MatchmakingMode.HIGHROOM:
-        return Dota_GameMode.RANKED_AP;
-      case MatchmakingMode.TOURNAMENT_SOLOMID:
-        return Dota_GameMode.SOLOMID;
-      case MatchmakingMode.CAPTAINS_MODE:
-        return Dota_GameMode.CAPTAINS_MODE;
+  private async getGameModeForMatchMode(mode: MatchmakingMode): Promise<Dota_GameMode> {
+    const mapping = await this.matchmakingModeMappingEntityRepository.findOne({
+      where: {
+        lobbyType: mode
+      }
+    });
+
+    if(!mapping){
+      this.logger.error(`No mapping found for lobby type ${mode}! Returning all pick`);
+      return Dota_GameMode.ALLPICK;
     }
+    return mapping.dotaGameMode;
   }
 
   private async extendMatchInfo(matchInfo: MatchInfo): Promise<GSMatchInfo> {
@@ -107,7 +95,7 @@ export class FindGameServerHandler
 
     return new GSMatchInfo(
       matchInfo.mode,
-      this.getGameModeForMatchMode(matchInfo.mode),
+      await this.getGameModeForMatchMode(matchInfo.mode),
       matchInfo.roomId,
       players,
       matchInfo.version,

src/gameserver/event-handler/game-server-discovered.event.ts

@@ -1,6 +1,5 @@
 import { EventsHandler, IEventHandler } from '@nestjs/cqrs';
 import { GameServerDiscoveredEvent } from 'gateway/events/game-server-discovered.event';
-import { GameServerRepository } from 'gameserver/repository/game-server.repository';
 import { GameServerEntity } from 'gameserver/model/game-server.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
@@ -9,7 +8,6 @@ import { Repository } from 'typeorm';
 export class GameServerDiscoveredHandler
   implements IEventHandler<GameServerDiscoveredEvent> {
   constructor(
-    private readonly gsRepo: GameServerRepository,
     @InjectRepository(GameServerEntity)
     private readonly gameServerModelRepository: Repository<GameServerEntity>,
   ) {}

src/gameserver/index.ts

@@ -1,4 +1,3 @@
-import { GameServerRepository } from 'gameserver/repository/game-server.repository';
 import { GameserverSaga } from 'gameserver/saga/gameserver.saga';
 import { FindGameServerHandler } from 'gameserver/command/FindGameServer/find-game-server.handler';
 import { GameServerSessionRepository } from 'gameserver/repository/game-server-session.repository';
@@ -68,7 +67,7 @@ const EventHandlers = [
 ];
 
 const QueryHandlers = [GetPlayerInfoHandler, GetSessionByUserHandler, GetReportsAvailableHandler];
-const Repositories = [GameServerRepository, GameServerSessionRepository];
+const Repositories = [GameServerSessionRepository];
 const Services = [GameServerService, AchievementService];
 const Sagas = [GameserverSaga];
 

src/gameserver/model/matchmaking-mode-mapping.entity.ts

@@ -0,0 +1,17 @@
+import { Column, Entity, PrimaryColumn } from 'typeorm';
+import { MatchmakingMode } from 'gateway/shared-types/matchmaking-mode';
+import { Dota_GameMode } from 'gateway/shared-types/dota-game-mode';
+
+@Entity('matchmaking_mode_mapping_entity')
+export class MatchmakingModeMappingEntity {
+
+  @PrimaryColumn({ name: "lobby_type" })
+  public lobbyType: MatchmakingMode
+
+
+  @Column({ name: "enabled"})
+  public enabled: boolean;
+
+  @Column({ name: "dota_game_mode" })
+  public dotaGameMode: Dota_GameMode
+}

src/gameserver/repository/game-server-session.repository.ts

@@ -1,7 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { Dota2Version } from 'gateway/shared-types/dota2version';
 import { GameServerSessionEntity } from 'gameserver/model/game-server-session.entity';
-import { GameServerRepository } from 'gameserver/repository/game-server.repository';
 import { PlayerId } from 'gateway/shared-types/player-id';
 //
 import { Repository } from 'typeorm';
@@ -17,7 +16,6 @@ export class GameServerSessionRepository {
     >,
     @InjectRepository(GameServerEntity)
     private readonly gameServerModelRepository: Repository<GameServerEntity>,
-    private readonly gameServerRepository: GameServerRepository,
   ) {}
 
   async getAllFree(version: Dota2Version): Promise<GameServerEntity[]> {
@@ -29,19 +27,6 @@ export class GameServerSessionRepository {
       having count(gssm) = 0`);
   }
 
-  async findFree(version: Dota2Version) {
-    const compatible = await this.gameServerRepository.find(version);
-    for (let i = 0; i < compatible.length; i++) {
-      const isBusy = await this.gameServerSessionModelRepository.findOne({
-        where: { url: compatible[i].url,}
-      });
-      if (!isBusy) {
-        return compatible[i];
-      }
-    }
-    return false;
-  }
-
   public async findWith(
     playerId: PlayerId,
   ): Promise<GameServerSessionEntity | undefined> {

src/gameserver/repository/game-server.repository.ts

@@ -1,14 +1,13 @@
 import { Dota2Version } from 'gateway/shared-types/dota2version';
-import { MatchInfo } from 'gateway/events/room-ready.event';
 import { MatchmakingMode } from 'gateway/shared-types/matchmaking-mode';
-import { PlayerId } from 'gateway/shared-types/player-id';
+import { Dota_GameMode } from 'gateway/shared-types/dota-game-mode';
+import { ApiProperty } from '@nestjs/swagger';
 
 export class GameServerDto {
   url: string;
   version: Dota2Version;
 }
 
-
 export class MatchInfoDto {
   public readonly mode: MatchmakingMode;
   public readonly roomId: string;
@@ -21,5 +20,21 @@ export class MatchInfoDto {
 export class GameSessionDto {
   url: string;
   matchId: number;
-  info: MatchInfoDto
-}
+  info: MatchInfoDto;
+}
+
+export class MatchmakingModeInfoDto {
+  @ApiProperty({ enum: MatchmakingMode, enumName: "MatchmakingMode" })
+  lobby_type: MatchmakingMode;
+
+  @ApiProperty({ enum: Dota_GameMode, enumName: "Dota_GameMode" })
+  game_mode: Dota_GameMode;
+
+  enabled: boolean;
+}
+
+export class UpdateGamemodeDto {
+  enabled: boolean;
+  @ApiProperty({ enum: Dota_GameMode, enumName: "Dota_GameMode" })
+  game_mode: Dota_GameMode;
+}