jp.ms.common.modules 1.0.42 → 1.0.43

package/dist/utils/game-table-result.d.ts

@@ -1,5 +1,5 @@
 import { Connection } from 'mongoose';
-import { GameResultRepository, OneTableTournamentRoomsRepository, ManyTablesTournamentRoomsRepository, UsersRepository } from 'jp.db.schemas';
+import { GameResultRepository, OneTableTournamentRoomsRepository, ManyTablesTournamentRoomsRepository, UsersRepository, RatingRepository } from 'jp.db.schemas';
 import { GameMaster, TournamentMaster } from 'jp.ms.common.engine';
 export declare function getGameTableResults(master: GameMaster): {
     gameType: string;
@@ -35,5 +35,6 @@ export declare function getGameTableResults(master: GameMaster): {
         }[];
     }[];
 };
-export declare function saveGameTablesResult(master: GameMaster, connection: Connection, gameResultRepository: GameResultRepository, usersRepository: UsersRepository, saveNewBalance: boolean): Promise<void>;
-export declare function saveTournamentResult(master: TournamentMaster, connection: Connection, tournamentRepository: OneTableTournamentRoomsRepository | ManyTablesTournamentRoomsRepository, usersRepository: UsersRepository): Promise<void>;
+export declare function saveGameTablesResultForSimpleRoom(master: GameMaster, connection: Connection, gameResultRepository: GameResultRepository, usersRepository: UsersRepository, ratingRepository: RatingRepository): Promise<void>;
+export declare function saveGameTablesResultForTournamentRoom(master: GameMaster, connection: Connection, gameResultRepository: GameResultRepository, usersRepository: UsersRepository): Promise<void>;
+export declare function saveTournamentResult(master: TournamentMaster, connection: Connection, tournamentRepository: OneTableTournamentRoomsRepository | ManyTablesTournamentRoomsRepository, usersRepository: UsersRepository, ratingRepository: RatingRepository): Promise<void>;

package/dist/utils/game-table-result.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGameTableResults = getGameTableResults;
-exports.saveGameTablesResult = saveGameTablesResult;
+exports.saveGameTablesResultForSimpleRoom = saveGameTablesResultForSimpleRoom;
+exports.saveGameTablesResultForTournamentRoom = saveGameTablesResultForTournamentRoom;
 exports.saveTournamentResult = saveTournamentResult;
 function getGameTableResults(master) {
     return {
@@ -48,14 +49,53 @@ function getGameTableResults(master) {
         })) ?? [],
     };
 }
-async function saveGameTablesResult(master, connection, gameResultRepository, usersRepository, saveNewBalance) {
+async function saveGameTablesResultForSimpleRoom(master, connection, gameResultRepository, usersRepository, ratingRepository) {
     const userGameResult = master
         .getTable()
         .getPlayers()
         .map((player) => {
         return {
             userId: player.id,
-            balanceAdding: saveNewBalance ? player.profit : 0,
+            userName: player.fullName,
+            userAvatarUrl: player.avatarUrl,
+            balanceAdding: player.profit,
+            experienceAdding: master.levelHelper.getNewExperienceAmount(player),
+            levelAdding: master.levelHelper.getNewLevelAdding(player.level, player.experience),
+        };
+    });
+    const ratings = userGameResult.map((item) => ({
+        userId: item.userId,
+        userName: item.userName,
+        userAvatarUrl: item.userAvatarUrl,
+        profit: item.balanceAdding,
+        game: master.getRoom().getGameType(),
+    }));
+    const session = await connection.startSession();
+    session.startTransaction();
+    try {
+        await gameResultRepository.createGameResult(getGameTableResults(master));
+        await usersRepository.saveGameResult(userGameResult);
+        await ratingRepository.addBulkPlayerRating(ratings);
+        await session.commitTransaction();
+    }
+    catch (error) {
+        await session.abortTransaction();
+        throw error;
+    }
+    finally {
+        await session.endSession();
+    }
+}
+async function saveGameTablesResultForTournamentRoom(master, connection, gameResultRepository, usersRepository) {
+    const userGameResult = master
+        .getTable()
+        .getPlayers()
+        .map((player) => {
+        return {
+            userId: player.id,
+            userName: player.fullName,
+            userAvatarUrl: player.avatarUrl,
+            balanceAdding: 0,
             experienceAdding: master.levelHelper.getNewExperienceAmount(player),
             levelAdding: master.levelHelper.getNewLevelAdding(player.level, player.experience),
         };
@@ -75,20 +115,30 @@ async function saveGameTablesResult(master, connection, gameResultRepository, us
         await session.endSession();
     }
 }
-async function saveTournamentResult(master, connection, tournamentRepository, usersRepository) {
+async function saveTournamentResult(master, connection, tournamentRepository, usersRepository, ratingRepository) {
     const userTournamentResult = master.getTournamentResult().map((player) => {
         return {
             userId: player.playerId,
+            userName: player.playerName,
+            userAvatarUrl: player.playerAvatarUrl,
             balanceAdding: player.profit,
             experienceAdding: 0,
             levelAdding: 0,
         };
     });
+    const ratings = userTournamentResult.map((item) => ({
+        userId: item.userId,
+        userName: item.userName,
+        userAvatarUrl: item.userAvatarUrl,
+        profit: item.balanceAdding,
+        game: master.getRoom().getGameType(),
+    }));
     const session = await connection.startSession();
     session.startTransaction();
     try {
         await usersRepository.saveGameResult(userTournamentResult);
         await tournamentRepository.finishTournament(master.getTournamentId(), master.getTournamentResult());
+        await ratingRepository.addBulkPlayerRating(ratings);
         await session.commitTransaction();
     }
     catch (error) {

package/dist/utils/game-table-result.js.map

@@ -1 +1 @@
-{"version":3,"file":"game-table-result.js","sourceRoot":"","sources":["../../src/utils/game-table-result.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"game-table-result.js","sourceRoot":"","sources":["../../src/utils/game-table-result.ts"],"names":[],"mappings":";;AAUA,kDA8CC;AAED,8EA+CC;AAED,sFAoCC;AAED,oDA4CC;AAnLD,SAAgB,mBAAmB,CAAC,MAAkB;IACpD,OAAO;QACL,QAAQ,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE;QACxC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE;QAC5C,MAAM,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE;QAChC,IAAI,EAAE,IAAI,IAAI,EAAE;QAChB,GAAG,EAAE,MAAM,CAAC,YAAY,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC;QACzC,OAAO,EAAE,MAAM;aACZ,QAAQ,EAAE;aACV,UAAU,EAAE;aACZ,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACL,OAAO,EAAE,MAAM;aACZ,mBAAmB,EAAE;aACrB,UAAU,EAAE;aACZ,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,MAAM,EAAE,IAAI,CAAC,EAAE;YACf,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,EAAE;SACZ,CAAC,CAAC;QACL,OAAO,EACL,MAAM;aACH,YAAY,EAAE;YACf,EAAE,UAAU,EAAE;aACb,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACd,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,IAAI,EAAE,MAAM;YAC7B,QAAQ,EAAE,IAAI,CAAC,IAAI,IAAI,SAAS;YAChC,OAAO,EACL,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;gBAC3B,QAAQ,EAAE,IAAI,CAAC,EAAE;gBACjB,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,IAAI,CAAC,OAAO,EAAE;aACrB,CAAC,CAAC,IAAI,EAAE;SACZ,CAAC,CAAC,IAAI,EAAE;KACd,CAAC;AACJ,CAAC;AAEM,KAAK,UAAU,iCAAiC,CACrD,MAAkB,EAClB,UAAsB,EACtB,oBAA0C,EAC1C,eAAgC,EAChC,gBAAkC;IAElC,MAAM,cAAc,GAAG,MAAM;SAC1B,QAAQ,EAAE;SACV,UAAU,EAAE;SACZ,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,EAAE;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE,MAAM,CAAC,SAAS;YAC/B,aAAa,EAAE,MAAM,CAAC,MAAM;YAC5B,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,MAAM,CAAC;YACnE,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAC/C,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,UAAU,CAClB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAC5C,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,MAAM,EAAE,IAAI,CAAC,aAAa;QAC1B,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE;KACrC,CAAC,CAAC,CAAC;IAEJ,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;IAChD,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,MAAM,eAAe,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QAEpD,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACjC,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,qCAAqC,CACzD,MAAkB,EAClB,UAAsB,EACtB,oBAA0C,EAC1C,eAAgC;IAEhC,MAAM,cAAc,GAAG,MAAM;SAC1B,QAAQ,EAAE;SACV,UAAU,EAAE;SACZ,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,EAAE;YACjB,QAAQ,EAAE,MAAM,CAAC,QAAQ;YACzB,aAAa,EAAE,MAAM,CAAC,SAAS;YAC/B,aAAa,EAAE,CAAC;YAChB,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC,MAAM,CAAC;YACnE,WAAW,EAAE,MAAM,CAAC,WAAW,CAAC,iBAAiB,CAC/C,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,UAAU,CAClB;SACF,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;IAChD,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,oBAAoB,CAAC,gBAAgB,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC,CAAC;QACzE,MAAM,eAAe,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QACrD,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACjC,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;AACH,CAAC;AAEM,KAAK,UAAU,oBAAoB,CACxC,MAAwB,EACxB,UAAsB,EACtB,oBACyE,EACzE,eAAgC,EAChC,gBAAkC;IAElC,MAAM,oBAAoB,GAAG,MAAM,CAAC,mBAAmB,EAAE,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACvE,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,QAAQ;YACvB,QAAQ,EAAE,MAAM,CAAC,UAAU;YAC3B,aAAa,EAAE,MAAM,CAAC,eAAe;YACrC,aAAa,EAAE,MAAM,CAAC,MAAM;YAC5B,gBAAgB,EAAE,CAAC;YACnB,WAAW,EAAE,CAAC;SACf,CAAC;IACJ,CAAC,CAAC,CAAC;IAEH,MAAM,OAAO,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QAClD,MAAM,EAAE,IAAI,CAAC,MAAM;QACnB,QAAQ,EAAE,IAAI,CAAC,QAAQ;QACvB,aAAa,EAAE,IAAI,CAAC,aAAa;QACjC,MAAM,EAAE,IAAI,CAAC,aAAa;QAC1B,IAAI,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,WAAW,EAAE;KACrC,CAAC,CAAC,CAAC;IAEJ,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,YAAY,EAAE,CAAC;IAChD,OAAO,CAAC,gBAAgB,EAAE,CAAC;IAE3B,IAAI,CAAC;QACH,MAAM,eAAe,CAAC,cAAc,CAAC,oBAAoB,CAAC,CAAC;QAC3D,MAAM,oBAAoB,CAAC,gBAAgB,CACzC,MAAM,CAAC,eAAe,EAAE,EACxB,MAAM,CAAC,mBAAmB,EAAE,CAC7B,CAAC;QACF,MAAM,gBAAgB,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,OAAO,CAAC,iBAAiB,EAAE,CAAC;IACpC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,MAAM,OAAO,CAAC,gBAAgB,EAAE,CAAC;QACjC,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IAC7B,CAAC;AACH,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.ms.common.modules",
-  "version": "1.0.42",
+  "version": "1.0.43",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,10 +13,10 @@
     "@nestjs/mongoose": "11.0.4",
     "@nestjs/websockets": "11.1.9",
     "dayjs": "1.11.18",
-    "jp.common.models": "1.1.45",
+    "jp.common.models": "1.1.50",
     "jp.common.utils": "1.0.6",
-    "jp.db.schemas": "2.2.14",
-    "jp.ms.common.engine": "3.0.25",
+    "jp.db.schemas": "2.2.16",
+    "jp.ms.common.engine": "3.0.26",
     "mongoose": "9.1.5",
     "nestjs-i18n": "10.5.1",
     "node-schedule": "2.1.1",

package/src/dto/app-table/card.dto.ts

@@ -51,4 +51,13 @@ export class CardDto implements IAppTableCard {
   @Type(() => Number)
   @Expose()
   targets: Array<number>;
+
+  @ApiProperty({
+    description: 'skin',
+    required: true,
+    type: String,
+  })
+  @Expose()
+  @IsString()
+  skin: string;
 }

package/src/dto/app-table/player.dto.ts

@@ -31,6 +31,15 @@ export class PlayerDto implements IAppTablePlayer {
   @IsString()
   avatarUrl: string;
 
+  @ApiProperty({
+    description: 'avatar frame',
+    required: true,
+    type: String,
+  })
+  @Expose()
+  @IsString()
+  avatarFrame: string;
+
   @ApiProperty({
     description: 'stack',
     required: true,

package/src/dto/games/fool/fool-table.dto.ts

@@ -47,6 +47,14 @@ export class FoolTableDto implements IFoolTable {
   @Expose()
   tableSize: number;
 
+  @ApiProperty({
+    description: 'Table cards skin',
+    type: Number,
+  })
+  @IsNumber()
+  @Expose()
+  tableCardsSkin: string;
+
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => FoolPlayerDto)

package/src/modules/events/events.gateway.ts

@@ -40,12 +40,14 @@ export class EventsGateway
       if (user) {
         const player = this.options.createPlayer({
           id: user.userId,
-          fullName: user.fullName,
-          avatarUrl: user.avatarUrl,
+          fullName: user.publicFullName,
+          avatarUrl: user.publicAvatarUrl,
+          avatarFrame: user.avatarFrame,
           balance: user.balance,
           experience: user.experience,
           level: user.level,
           language: user.normalizedLang,
+          cardsSkin: user.cardSkin,
           onSendWsMessage: this.handleSendWsMessage,
           onGotWsMessageClientResponse: this.handleGotWsMessageClientResponse,
         });

package/src/modules/main/main.controller.ts

@@ -1,12 +1,4 @@
-import {
-  Controller,
-  Get,
-  Headers,
-  HttpCode,
-  HttpStatus,
-  Param,
-  Post,
-} from '@nestjs/common';
+import { Controller, Get, Headers } from '@nestjs/common';
 import { IAppHeaders } from 'jp.common.models';
 
 import {
@@ -56,17 +48,4 @@ export class MainController {
       headers.client_language,
     );
   }
-
-  @Post('many_tables_tournament/buy_ticket/:tournamentId')
-  @HttpCode(HttpStatus.OK)
-  buyTicket(
-    @Param('tournamentId') tournamentId: string,
-    @Headers() headers: IAppHeaders,
-  ): Promise<BaseAppScreenDto> {
-    return this.mainService.manyTablesTournamentbBuyTicket(
-      headers.client_auth_token,
-      headers.client_language,
-      tournamentId,
-    );
-  }
 }

package/src/modules/main/main.service.ts

@@ -29,7 +29,6 @@ import { ManyTablesTournamentRoomsManagerService } from '../many-tables-tourname
 import { EventsBusMainTablesSubscribeService } from '../event-bus/events-bus.main-tables.subscribe.service';
 import {
   ErrorCodeEnum,
-  NotEnoughMoneyForPurchaseException,
   NotFoundFreeRoomForFastGameException,
 } from '../../exception';
 
@@ -152,32 +151,4 @@ export class MainService {
       player.id,
     );
   }
-
-  async manyTablesTournamentbBuyTicket(
-    clientAuthToken: string,
-    lang: string,
-    tournamentId: string,
-  ): Promise<BaseAppScreenDto> {
-    const player = this.playersManager.getPlayerById(clientAuthToken);
-    const tournament =
-      this.manyTablesRoomsManagerService.getRoomByTableId(tournamentId);
-    const user = await this.usersRepository.findById(player?.id ?? '');
-
-    if (!player || !tournament || !user) {
-      throw new InternalServerErrorException();
-    }
-
-    if (user.balance < tournament.getTicketPrice()) {
-      throw new NotEnoughMoneyForPurchaseException(
-        new ErrorSnackbarComponent(
-          ErrorCodeEnum.NOT_ENOUGH_MONEY_FOR_PURCHASE,
-          this.options.i18n.t('common.server.message.code.4004', { lang }),
-        ),
-      );
-    }
-
-    await this.manyTablesRoomsManagerService.buyTicket(tournamentId, player);
-
-    return this.getScreen(lang, clientAuthToken);
-  }
 }

package/src/modules/many-tables-tournament/many-tables-tournament.controller.ts

@@ -148,4 +148,17 @@ export class ManyTablesTournamentController {
   removeTournament(@Param('tournamentId') tournamentId: string): Promise<void> {
     return this.tournamentService.removeTournament(tournamentId);
   }
+
+  @Post('many_tables_tournament/buy_ticket/:tournamentId')
+  @HttpCode(HttpStatus.OK)
+  buyTicket(
+    @Param('tournamentId') tournamentId: string,
+    @Headers() headers: IAppHeaders,
+  ): Promise<void> {
+    return this.tournamentService.manyTablesTournamentbBuyTicket(
+      headers.client_auth_token,
+      headers.client_language,
+      tournamentId,
+    );
+  }
 }

package/src/modules/many-tables-tournament/many-tables-tournament.module.ts

@@ -4,6 +4,9 @@ import {
   ManyTablesTournamentRoom,
   ManyTablesTournamentRoomSchema,
   ManyTablesTournamentRoomsRepository,
+  User,
+  UserSchema,
+  UsersRepository,
 } from 'jp.db.schemas';
 import {
   GamePlayer,
@@ -27,9 +30,14 @@ import { ManyTablesTournamentModuleOptions } from './many-tables-tournament.inte
         schema: ManyTablesTournamentRoomSchema,
       },
     ]),
+    MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
   ],
   controllers: [ManyTablesTournamentController],
-  providers: [ManyTablesTournamentService, ManyTablesTournamentRoomsRepository],
+  providers: [
+    ManyTablesTournamentService,
+    ManyTablesTournamentRoomsRepository,
+    UsersRepository,
+  ],
 })
 export class ManyTablesTournamentModule {
   constructor(

package/src/modules/many-tables-tournament/many-tables-tournament.service.ts

@@ -7,11 +7,13 @@ import {
   IBaseMoveData,
   IAppTableState,
   AppScreenRouter,
+  ErrorSnackbarComponent,
 } from 'jp.common.models';
 import {
   ManyTablesTournamentMaster,
   TournamentMaster,
 } from 'jp.ms.common.engine';
+import { UsersRepository } from 'jp.db.schemas';
 
 import { BaseAppScreenDto } from '../../dto';
 import { ManyTablesTournamentRoomsManagerService } from '../many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service';
@@ -19,6 +21,10 @@ import { PlayersManagerService } from '../players-manager/players-manager.servic
 import { JoinTournamentDto } from '../../dto/common/join-tournament.dto';
 import { ManyTablesTournamentCreateDto } from '../../dto/common/many-tables-tournament-create.dto';
 import { ManyTablesTournamentUpdateDto } from '../../dto/common/many-tables-tournament-update.dto';
+import {
+  NotEnoughMoneyForPurchaseException,
+  ErrorCodeEnum,
+} from '../../exception';
 
 import { ManyTablesTournamentFactoryOptions } from './many-tables-tournament.interfaces';
 import { MANY_TABLES_TOURNAMENT_OPTIONS } from './many-tables-tournament.constants';
@@ -32,6 +38,7 @@ export class ManyTablesTournamentService {
     private readonly playersManager: PlayersManagerService,
     @Inject(MANY_TABLES_TOURNAMENT_OPTIONS)
     private readonly options: ManyTablesTournamentFactoryOptions,
+    private readonly usersRepository: UsersRepository,
   ) {}
 
   getStatusScreen(tournamentId: string, lang: string): BaseAppScreenDto {
@@ -205,4 +212,30 @@ export class ManyTablesTournamentService {
   async removeTournament(tournamentId: string) {
     return this.manyTablesRoomsManagerService.removeTournament(tournamentId);
   }
+
+  async manyTablesTournamentbBuyTicket(
+    clientAuthToken: string,
+    lang: string,
+    tournamentId: string,
+  ): Promise<void> {
+    const player = this.playersManager.getPlayerById(clientAuthToken);
+    const tournament =
+      this.manyTablesRoomsManagerService.getRoomByTableId(tournamentId);
+    const user = await this.usersRepository.findById(player?.id ?? '');
+
+    if (!player || !tournament || !user) {
+      throw new InternalServerErrorException();
+    }
+
+    if (user.balance < tournament.getTicketPrice()) {
+      throw new NotEnoughMoneyForPurchaseException(
+        new ErrorSnackbarComponent(
+          ErrorCodeEnum.NOT_ENOUGH_MONEY_FOR_PURCHASE,
+          this.options.i18n.t('common.server.message.code.4004', { lang }),
+        ),
+      );
+    }
+
+    await this.manyTablesRoomsManagerService.buyTicket(tournamentId, player);
+  }
 }

package/src/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.module.ts

@@ -19,6 +19,9 @@ import {
   Purchase,
   PurchaseSchema,
   PurchaseRepository,
+  Rating,
+  RatingSchema,
+  RatingRepository,
 } from 'jp.db.schemas';
 
 import { ManyTablesTournamentRoomsManagerService } from './many-tables-tournament-rooms-manager.service';
@@ -42,6 +45,7 @@ import { ManyTablesTournamentRoomsFactoryOptions } from './many-tables-tournamen
     MongooseModule.forFeature([
       { name: GameResult.name, schema: GameResultSchema },
     ]),
+    MongooseModule.forFeature([{ name: Rating.name, schema: RatingSchema }]),
   ],
   providers: [
     ManyTablesTournamentRoomsRepository,
@@ -49,6 +53,7 @@ import { ManyTablesTournamentRoomsFactoryOptions } from './many-tables-tournamen
     ManyTablesTournamentRoomsManagerService,
     GameResultRepository,
     PurchaseRepository,
+    RatingRepository,
   ],
   exports: [ManyTablesTournamentRoomsManagerService],
 })

package/src/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service.ts

@@ -31,10 +31,11 @@ import {
   ManyTablesTournamentRoomDocument,
   ManyTablesTournamentRoomsRepository,
   UsersRepository,
+  RatingRepository,
 } from 'jp.db.schemas';
 
 import {
-  saveGameTablesResult,
+  saveGameTablesResultForTournamentRoom,
   saveTournamentResult,
 } from '../../utils/game-table-result';
 import { JpLoggerService } from '../logger';
@@ -59,6 +60,7 @@ export class ManyTablesTournamentRoomsManagerService {
     private readonly usersRepository: UsersRepository,
     private readonly gameResultRepository: GameResultRepository,
     private readonly purchaseRepository: PurchaseRepository,
+    private readonly ratingRepository: RatingRepository,
     private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
     private readonly eventsBusManyTablesTournamentSubscribeService: EventsBusManyTablesTournamentSubscribeService,
     @Inject(MANY_TABLES_TOURNAMENT_ROOMS_MANAGER_OPTIONS)
@@ -259,12 +261,11 @@ export class ManyTablesTournamentRoomsManagerService {
   };
 
   private handleRoomTableGameFinished = async (master: GameMaster) => {
-    await saveGameTablesResult(
+    await saveGameTablesResultForTournamentRoom(
       master,
       this.connection,
       this.gameResultRepository,
       this.usersRepository,
-      false,
     );
   };
 
@@ -282,6 +283,7 @@ export class ManyTablesTournamentRoomsManagerService {
       this.connection,
       this.tournamentRepository,
       this.usersRepository,
+      this.ratingRepository,
     );
   };
 

package/src/modules/menu/menu-screen.view.ts

@@ -18,16 +18,19 @@ import { Banner, Menu } from 'jp.db.schemas';
 export class MenuScreenView extends UniversalScreenView {
   private readonly menuItems: Array<Menu>;
   private readonly banner: Banner | null;
+  private gameType: string;
 
   constructor(
     localeService: ILocaleService,
     lang: string,
+    gameType: string,
     menuItems: Array<Menu>,
     banner: Banner | null,
   ) {
     super(localeService, lang);
     this.menuItems = menuItems;
     this.banner = banner;
+    this.gameType = gameType;
   }
 
   build(): IAppScreen {
@@ -56,7 +59,9 @@ export class MenuScreenView extends UniversalScreenView {
         new BannerSectionListItemComponent(
           this.banner.bannerId,
           this.getDbResource(this.banner.title),
-          this.localeService.t('common.menu.header.title', { lang: this.lang }),
+          this.localeService.t(`${this.gameType}.menu.header.title`, {
+            lang: this.lang,
+          }),
           new UrlImageComponent(this.banner.image),
           this.banner.link,
         ),
@@ -65,7 +70,9 @@ export class MenuScreenView extends UniversalScreenView {
 
     return new MenuHeaderSectionComponent(
       'header',
-      this.localeService.t('common.menu.header.title', { lang: this.lang }),
+      this.localeService.t(`${this.gameType}.menu.header.title`, {
+        lang: this.lang,
+      }),
     );
   }
 }

package/src/modules/menu/menu.interfaces.ts

@@ -14,4 +14,5 @@ export interface MenuModuleOptions extends Pick<ModuleMetadata, 'imports'> {
 
 export interface MenuFactoryOptions {
   i18n: I18nService;
+  gameType: string;
 }

package/src/modules/menu/menu.service.ts

@@ -31,6 +31,7 @@ export class MenuService {
       new MenuScreenView(
         this.options.i18n,
         headers.client_language,
+        this.options.gameType,
         menuItems,
         enabledBanner,
       ).buildBS(),

package/src/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.module.ts

@@ -10,6 +10,9 @@ import {
   GameResult,
   GameResultSchema,
   GameResultRepository,
+  Rating,
+  RatingSchema,
+  RatingRepository,
 } from 'jp.db.schemas';
 
 import { OneTableTournamentRoomsManagerService } from './one-table-tournament-rooms-manager.service';
@@ -29,12 +32,14 @@ import { ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS } from './one-table-tourname
     MongooseModule.forFeature([
       { name: GameResult.name, schema: GameResultSchema },
     ]),
+    MongooseModule.forFeature([{ name: Rating.name, schema: RatingSchema }]),
   ],
   providers: [
     OneTableTournamentRoomsRepository,
     UsersRepository,
     OneTableTournamentRoomsManagerService,
     GameResultRepository,
+    RatingRepository,
   ],
   exports: [OneTableTournamentRoomsManagerService],
 })

package/src/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service.ts

@@ -20,6 +20,7 @@ import {
   GameResultRepository,
   OneTableTournamentRoomDocument,
   OneTableTournamentRoomsRepository,
+  RatingRepository,
   UsersRepository,
 } from 'jp.db.schemas';
 import { InjectConnection } from '@nestjs/mongoose';
@@ -27,7 +28,7 @@ import { Connection } from 'mongoose';
 
 import { JpLoggerService } from '../logger/jp-logger.service';
 import {
-  saveGameTablesResult,
+  saveGameTablesResultForTournamentRoom,
   saveTournamentResult,
 } from '../../utils/game-table-result';
 import {
@@ -46,6 +47,7 @@ export class OneTableTournamentRoomsManagerService {
     private readonly tournamentRepository: OneTableTournamentRoomsRepository,
     private readonly usersRepository: UsersRepository,
     private readonly gameResultRepository: GameResultRepository,
+    private readonly ratingRepository: RatingRepository,
     private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
     private readonly eventsBusOneTableTournamentSubscribeService: EventsBusOneTableTournamentSubscribeService,
     @Inject(ONE_TABLE_TOURNAMENT_ROOMS_MANAGER_OPTIONS)
@@ -163,12 +165,11 @@ export class OneTableTournamentRoomsManagerService {
   };
 
   private handleRoomTableGameFinished = async (master: GameMaster) => {
-    await saveGameTablesResult(
+    await saveGameTablesResultForTournamentRoom(
       master,
       this.connection,
       this.gameResultRepository,
       this.usersRepository,
-      false,
     );
   };
 
@@ -210,6 +211,7 @@ export class OneTableTournamentRoomsManagerService {
       this.connection,
       this.tournamentRepository,
       this.usersRepository,
+      this.ratingRepository,
     );
   };
 

package/src/modules/simple-rooms-manager/simple-rooms-manager.module.ts

@@ -10,6 +10,9 @@ import {
   GameResult,
   GameResultSchema,
   GameResultRepository,
+  Rating,
+  RatingSchema,
+  RatingRepository,
 } from 'jp.db.schemas';
 
 import { SimpleRoomsManagerService } from './simple-rooms-manager.service';
@@ -26,11 +29,13 @@ import { SIMPLE_ROOMS_MANAGER_OPTIONS } from './simple-rooms-manager.constants';
     MongooseModule.forFeature([
       { name: GameResult.name, schema: GameResultSchema },
     ]),
+    MongooseModule.forFeature([{ name: Rating.name, schema: RatingSchema }]),
   ],
   providers: [
     SimpleRoomsRepository,
     UsersRepository,
     GameResultRepository,
+    RatingRepository,
     SimpleRoomsManagerService,
   ],
   exports: [SimpleRoomsManagerService],

package/src/modules/simple-rooms-manager/simple-rooms-manager.service.ts

@@ -16,13 +16,14 @@ import {
 } from 'jp.ms.common.engine';
 import {
   GameResultRepository,
+  RatingRepository,
   SimpleRoomDocument,
   SimpleRoomsRepository,
   UsersRepository,
 } from 'jp.db.schemas';
 
 import { JpLoggerService } from '../logger/jp-logger.service';
-import { saveGameTablesResult } from '../../utils/game-table-result';
+import { saveGameTablesResultForSimpleRoom } from '../../utils/game-table-result';
 import { EventsBusMainTablesSubscribeService } from '../event-bus/events-bus.main-tables.subscribe.service';
 import { EventsBusAppSubscribeService } from '../event-bus/events-bus.app.subscribe.service';
 
@@ -37,6 +38,7 @@ export class SimpleRoomsManagerService {
     private readonly roomsRepository: SimpleRoomsRepository,
     private readonly usersRepository: UsersRepository,
     private readonly gameResultRepository: GameResultRepository,
+    private readonly ratingRepository: RatingRepository,
     private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
     private readonly eventsBusAppSubscribeService: EventsBusAppSubscribeService,
     @Inject(SIMPLE_ROOMS_MANAGER_OPTIONS)
@@ -170,12 +172,12 @@ export class SimpleRoomsManagerService {
   };
 
   private handleRoomTableGameFinished = async (master: GameMaster) => {
-    await saveGameTablesResult(
+    await saveGameTablesResultForSimpleRoom(
       master,
       this.connection,
       this.gameResultRepository,
       this.usersRepository,
-      true,
+      this.ratingRepository,
     );
 
     // TODO: записать разные события для достижений