Refactoring

Author: enchantinggg4

src/app.module.ts

@@ -13,16 +13,17 @@ import { PlayerController } from 'rest/player.controller';
 import { InfoController } from 'rest/info.controller';
 import { PlayerService } from 'rest/service/player.service';
 import { ScheduleModule } from '@nestjs/schedule';
-import { MetaController } from 'rest/meta.controller';
-import { MetaService } from 'rest/service/meta.service';
+import { MetaController } from 'rest/meta/meta.controller';
+import { MetaService } from 'rest/meta/meta.service';
 import { GetUserInfoQuery } from 'gateway/queries/GetUserInfo/get-user-info.query';
 import { outerQuery } from 'gateway/util/outerQuery';
 import { QueryCache } from 'rcache';
 import { CacheModule } from '@nestjs/cache-manager';
-import { MatchService } from 'rest/service/match.service';
+import { MatchService } from 'rest/match/match.service';
 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';
 
 
 export function qCache<T, B>() {
@@ -71,6 +72,7 @@ export function qCache<T, B>() {
     MatchService,
     PlayerService,
     MatchMapper,
+    MetaMapper,
     Mapper,
     ...GameServerDomain,
     outerQuery(GetUserInfoQuery, 'QueryCore', qCache())

src/gameserver/model/player-crime-log.entity.ts

@@ -12,13 +12,12 @@ export class PlayerCrimeLogEntity {
   @Column()
   crime: BanReason;
 
-  @Column({ default: true })
-  handled: boolean
+  @Column({ default: false })
+  handled: boolean;
 
   @Column({ default: 0 })
   banTime: number;
 
-  @CreateDateColumn()
+  @CreateDateColumn({ type: "timestamptz" })
   created_at: Date;
-
 }

src/rest/match/match-controller.spec.ts

@@ -6,13 +6,13 @@ import FinishedMatchEntity from 'gameserver/model/finished-match.entity';
 import PlayerInMatchEntity from 'gameserver/model/player-in-match.entity';
 import { MatchController } from './match.controller';
 import { createFakeMatch, fillMatch } from '@test/create-fake-match';
-import { MatchService } from 'rest/service/match.service';
 import { MmrChangeLogEntity } from 'gameserver/model/mmr-change-log.entity';
 import { MatchMapper } from 'rest/match/match.mapper';
 import { MatchEntity } from 'gameserver/model/match.entity';
 import { NestApplication } from '@nestjs/core';
 import * as request from 'supertest';
 import { makePage } from 'gateway/util/make-page';
+import { MatchService } from 'rest/match/match.service';
 
 describe("MatchController", () => {
   jest.setTimeout(60000);

src/rest/match/match.controller.ts

@@ -7,7 +7,7 @@ import { MatchmakingMode } from 'gateway/shared-types/matchmaking-mode';
 import { NullableIntPipe } from 'util/pipes';
 import FinishedMatchEntity from 'gameserver/model/finished-match.entity';
 import PlayerInMatchEntity from 'gameserver/model/player-in-match.entity';
-import { MatchService } from 'rest/service/match.service';
+import { MatchService } from './match.service';
 import { MmrChangeLogEntity } from 'gameserver/model/mmr-change-log.entity';
 import { makePage } from 'gateway/util/make-page';
 import { MatchMapper } from 'rest/match/match.mapper';

src/rest/service/match.service.ts src/rest/match/match.service.ts

@@ -0,0 +1,42 @@
+import { Controller, Get, Param } from '@nestjs/common';
+import { ApiTags } from '@nestjs/swagger';
+import { MetaService } from './meta.service';
+import { NullableIntPipe } from 'util/pipes';
+import { HeroItemDto, HeroSummaryDto, ItemDto, ItemHeroDto } from 'rest/dto/meta.dto';
+import { MetaMapper } from 'rest/meta/meta.mapper';
+
+@Controller("meta")
+@ApiTags("meta")
+export class MetaController {
+  constructor(
+    private readonly metaService: MetaService,
+    private readonly mapper: MetaMapper,
+  ) {}
+
+  @Get("heroes")
+  public async heroes(): Promise<HeroSummaryDto[]> {
+    return this.metaService.heroesSummary();
+  }
+
+  @Get("heroes/:hero")
+  public async heroData(@Param("hero") hero: string): Promise<HeroItemDto[]> {
+    return this.metaService.heroMeta(hero);
+  }
+
+  @Get("items")
+  public async items(): Promise<ItemDto[]> {
+    return (await this.metaService.items()).map(this.mapper.mapItem);
+  }
+
+  @Get("items/:item")
+  public async itemData(
+    @Param("item", NullableIntPipe) item: number,
+  ): Promise<ItemHeroDto[]> {
+    return (await this.metaService.itemHeroes(item)).map((it) => ({
+      item: it.item_id,
+      hero: it.hero,
+      wins: it.wins,
+      played: it.played,
+    }));
+  }
+}

src/rest/meta.controller.ts

@@ -0,0 +1,21 @@
+import { Injectable } from '@nestjs/common';
+import { ItemHeroView } from 'gameserver/model/item-hero.view';
+import { ItemDto, ItemHeroDto } from 'rest/dto/meta.dto';
+import { ItemView } from 'gameserver/model/item.view';
+
+@Injectable()
+export class MetaMapper {
+  public mapItemHero = (it: ItemHeroView): ItemHeroDto => ({
+    item: it.item_id,
+    hero: it.hero,
+    wins: it.wins,
+    played: it.played,
+  });
+
+  public mapItem = (it: ItemView): ItemDto => ({
+    item: it.item_id,
+    popularity: it.popularity,
+    games: it.games_played,
+    wins: it.wins,
+  });
+}

src/rest/meta/meta.controller.ts

@@ -1,10 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Connection, In, Repository } from 'typeorm';
+import { Repository } from 'typeorm';
 import { HeroItemDto, HeroSummaryDto } from 'rest/dto/meta.dto';
 import { MatchmakingMode } from 'gateway/shared-types/matchmaking-mode';
-import { Page } from 'rest/dto/page';
-import { cached } from 'util/method-cache';
 import FinishedMatchEntity from 'gameserver/model/finished-match.entity';
 import PlayerInMatchEntity from 'gameserver/model/player-in-match.entity';
 import { ItemHeroView } from 'gameserver/model/item-hero.view';
@@ -17,50 +15,14 @@ export class MetaService {
     private readonly playerInMatchRepository: Repository<PlayerInMatchEntity>,
     @InjectRepository(FinishedMatchEntity)
     private readonly matchRepository: Repository<FinishedMatchEntity>,
-    private readonly connection: Connection,
     @InjectRepository(ItemHeroView)
     private readonly itemHeroViewRepository: Repository<ItemHeroView>,
     @InjectRepository(ItemView)
     private readonly itemViewRepository: Repository<ItemView>,
   ) {}
 
-  @cached(60 * 24, 'meta_heroMatches')
-  public async heroMatches(
-    page: number,
-    perPage: number,
-    hero: string,
-  ): Promise<Page<FinishedMatchEntity>> {
-    const [ids, count] = await this.matchRepository
-      .createQueryBuilder('m')
-      .select(['m.id', 'm.timestamp'])
-      .addOrderBy('m.timestamp', 'DESC')
-      .leftJoin('m.players', 'pims')
-      .where('pims.hero = :hero', { hero })
-      .andWhere('m.matchmaking_mode in (:...modes)', {
-        modes: [MatchmakingMode.RANKED, MatchmakingMode.UNRANKED],
-      })
-      .take(perPage)
-      .skip(perPage * page)
-      .getManyAndCount();
-
-    const mapped = await this.matchRepository.find({
-      where: {
-        id: In(ids.map(t => t.id)),
-      },
-    });
-
-    return {
-      data: mapped,
-      page,
-      perPage: perPage,
-      pages: Math.ceil(count / perPage),
-    };
-  }
-
-  // 24 hours
-  @cached(60 * 24, 'meta_heroesSummary')
   public async heroesSummary(): Promise<HeroSummaryDto[]> {
-    return this.connection.query(
+    return this.playerInMatchRepository.query(
       `with picks as (select count(*) as cnt from player_in_match p)
 SELECT "pim"."hero"                                      AS "hero",
        (count(pim.hero)::float / greatest(1, s.cnt))::float       as pickrate,
@@ -87,7 +49,8 @@ GROUP BY "pim"."hero", s.cnt`,
    * This is a heavy method that should be cached
    * @param hero
    */
-  public async heroMeta(hero: string) {
+
+  public async heroMeta(hero: string): Promise<HeroItemDto[]> {
     // This query finds all unique items bought on hero, games that played on this hero, and then counts winrates
     const query = `with games as (select pim.item0,
                       pim.item1,
@@ -107,7 +70,7 @@ GROUP BY "pim"."hero", s.cnt`,
          group by i.item_id) select w.item, w.wins::int, w.game_count::int, w.winrate::float from winrates w where w.game_count > 10 and w.item != 0 
 order by w.game_count desc`;
 
-    return this.connection.query<HeroItemDto[]>(query, [hero]);
+    return this.playerInMatchRepository.query(query, [hero]);
   }
 
   public async itemHeroes(item: number): Promise<ItemHeroView[]> {

src/rest/meta/meta.mapper.ts

@@ -79,7 +79,7 @@ export const prodDbConfig: TypeOrmModuleOptions = {
   dropSchema: false,
   poolSize: 50,
 
-  // maxQueryExecutionTime: 10,
+  // maxQueryExecutionTime: 100,
 
   ssl: false,
 };