jp.ms.common.modules 1.0.23 → 1.0.25

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

@@ -1,6 +1,6 @@
-import { GameMaster, TournamentMaster } from 'jp.ms.common.engine';
-import { GameResultRepository, TournamentManyTablesRoomsRepository, TournamentOneTableRoomsRepository, UsersRepository } from 'jp.db.schemas';
 import { Connection } from 'mongoose';
+import { BaseGameEvent, GameMaster, GameTournamentPlayerLeavedTheTournamentEvent, TournamentMaster } from 'jp.ms.common.engine';
+import { GameResultRepository, TournamentManyTablesRoomsRepository, TournamentOneTableRoomsRepository, UsersRepository } from 'jp.db.schemas';
 export declare function getGameTableResults(master: GameMaster): {
     gameType: string;
     gameId: string;
@@ -37,3 +37,4 @@ 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: TournamentManyTablesRoomsRepository | TournamentOneTableRoomsRepository, usersRepository: UsersRepository): Promise<void>;
+export declare function isUpdateTounrmanentRoomEvent(event: BaseGameEvent): GameTournamentPlayerLeavedTheTournamentEvent | null;

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getGameTableResults = getGameTableResults;
 exports.saveGameTablesResult = saveGameTablesResult;
 exports.saveTournamentResult = saveTournamentResult;
+exports.isUpdateTounrmanentRoomEvent = isUpdateTounrmanentRoomEvent;
+const jp_ms_common_engine_1 = require("jp.ms.common.engine");
 function getGameTableResults(master) {
     return {
         gameType: master.getRoom().getGameType(),
@@ -72,7 +74,7 @@ async function saveTournamentResult(master, connection, tournamentRepository, us
             levelAdding: 0,
         };
     });
-    const session = await this.connection.startSession();
+    const session = await connection.startSession();
     session.startTransaction();
     try {
         await usersRepository.saveGameResult(userTournamentResult);
@@ -87,4 +89,15 @@ async function saveTournamentResult(master, connection, tournamentRepository, us
         await session.endSession();
     }
 }
+function isUpdateTounrmanentRoomEvent(event) {
+    if (event instanceof jp_ms_common_engine_1.GameTournamentPlayerJoinedTheTournamentEvent &&
+        event instanceof jp_ms_common_engine_1.GameTournamentPlayerLeavedTheTournamentEvent &&
+        event instanceof jp_ms_common_engine_1.GameTournamentCancelledEvent &&
+        event instanceof jp_ms_common_engine_1.GameTournamentWaitedEvent &&
+        event instanceof jp_ms_common_engine_1.GameTournamentStartedEvent &&
+        event instanceof jp_ms_common_engine_1.GameTournamentFinishedEvent) {
+        return event;
+    }
+    return null;
+}
 //# sourceMappingURL=game-table-result.js.map

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":"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"}

package/dist/views/index.d.ts

@@ -1 +1,2 @@
 export { TournamentBuyTicketDialogView } from './tournament-buy-ticket-dialog.view';
+export { SimpleRoomConfirmExitDialogView } from './simple-room-conifrm-exit-dialog.view';

package/dist/views/index.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TournamentBuyTicketDialogView = void 0;
+exports.SimpleRoomConfirmExitDialogView = exports.TournamentBuyTicketDialogView = void 0;
 var tournament_buy_ticket_dialog_view_1 = require("./tournament-buy-ticket-dialog.view");
 Object.defineProperty(exports, "TournamentBuyTicketDialogView", { enumerable: true, get: function () { return tournament_buy_ticket_dialog_view_1.TournamentBuyTicketDialogView; } });
+var simple_room_conifrm_exit_dialog_view_1 = require("./simple-room-conifrm-exit-dialog.view");
+Object.defineProperty(exports, "SimpleRoomConfirmExitDialogView", { enumerable: true, get: function () { return simple_room_conifrm_exit_dialog_view_1.SimpleRoomConfirmExitDialogView; } });
 //# sourceMappingURL=index.js.map

package/dist/views/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AAA3E,kJAAA,6BAA6B,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/views/index.ts"],"names":[],"mappings":";;;AAAA,yFAAoF;AAA3E,kJAAA,6BAA6B,OAAA;AACtC,+FAAyF;AAAhF,uJAAA,+BAA+B,OAAA"}

package/dist/views/simple-room-conifrm-exit-dialog.view.d.ts

@@ -0,0 +1,4 @@
+import { UniversalScreenDialogView, StandardDialogComponent } from "jp.common.models";
+export declare class SimpleRoomConfirmExitDialogView extends UniversalScreenDialogView {
+    build(): StandardDialogComponent;
+}

package/dist/views/simple-room-conifrm-exit-dialog.view.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SimpleRoomConfirmExitDialogView = void 0;
+const jp_common_models_1 = require("jp.common.models");
+class SimpleRoomConfirmExitDialogView extends jp_common_models_1.UniversalScreenDialogView {
+    build() {
+        return new jp_common_models_1.StandardDialogComponent(jp_common_models_1.AppScreenDialogIdEnum.DIALOG_SIMPLE_ROOM_CONFIRM_EXIT, this.localeService.t('common.room.screen.dialog.confirm.exit.game.title', { lang: this.lang }), this.localeService.t('common.room.screen.dialog.confirm.exit.game.message', { lang: this.lang }), new jp_common_models_1.FullButtonsButtonsComponent(new jp_common_models_1.TextButtonComponent(this.localeService.t('common.room.screen.dialog.confirm.exit.game.ok', { lang: this.lang })), new jp_common_models_1.TextButtonComponent(this.localeService.t('common.room.screen.dialog.confirm.exit.game.cancel', { lang: this.lang }))));
+    }
+}
+exports.SimpleRoomConfirmExitDialogView = SimpleRoomConfirmExitDialogView;
+//# sourceMappingURL=simple-room-conifrm-exit-dialog.view.js.map

package/dist/views/simple-room-conifrm-exit-dialog.view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simple-room-conifrm-exit-dialog.view.js","sourceRoot":"","sources":["../../src/views/simple-room-conifrm-exit-dialog.view.ts"],"names":[],"mappings":";;;AAAA,uDAM0B;AAE1B,MAAa,+BAAgC,SAAQ,4CAAyB;IAC1E,KAAK;QACD,OAAO,IAAI,0CAAuB,CAC9B,wCAAqB,CAAC,+BAA+B,EACrD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,mDAAmD,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAC9F,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,qDAAqD,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAChG,IAAI,8CAA2B,CAC3B,IAAI,sCAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,gDAAgD,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EACpH,IAAI,sCAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,oDAAoD,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAC3H,CACJ,CAAC;IACN,CAAC;CACJ;AAZD,0EAYC"}

package/dist/views/tournament-buy-ticket-dialog.view.d.ts

@@ -1,4 +1,4 @@
-import { UniversalScreenDialogView, AppScreenDialog } from "jp.common.models";
+import { UniversalScreenDialogView, StandardDialogComponent } from "jp.common.models";
 export declare class TournamentBuyTicketDialogView extends UniversalScreenDialogView {
-    build(): AppScreenDialog;
+    build(): StandardDialogComponent;
 }

package/dist/views/tournament-buy-ticket-dialog.view.js

@@ -4,7 +4,7 @@ exports.TournamentBuyTicketDialogView = void 0;
 const jp_common_models_1 = require("jp.common.models");
 class TournamentBuyTicketDialogView extends jp_common_models_1.UniversalScreenDialogView {
     build() {
-        return jp_common_models_1.AppScreenDialog.CreateStandardDialog(jp_common_models_1.AppScreenDialogIdEnum.DIALOG_TOURNAMENT_BUY_TICKET, this.localeService.t('common.rooms.screen.buyTicket.title', { lang: this.lang }), this.localeService.t('common.rooms.screen.buyTicket.description', { lang: this.lang }), jp_common_models_1.AppScreenSectionButtons.CreateFullButtonSection(jp_common_models_1.AppScreenSectionButton.CreateTextButton('Ok'), jp_common_models_1.AppScreenSectionButton.CreateTextButton('Cancel')));
+        return new jp_common_models_1.StandardDialogComponent(jp_common_models_1.AppScreenDialogIdEnum.DIALOG_TOURNAMENT_BUY_TICKET, this.localeService.t('common.rooms.screen.buyTicket.title', { lang: this.lang }), this.localeService.t('common.rooms.screen.buyTicket.description', { lang: this.lang }), new jp_common_models_1.FullButtonsButtonsComponent(new jp_common_models_1.TextButtonComponent(this.localeService.t('common.rooms.screen.buyTicket.button.ok', { lang: this.lang })), new jp_common_models_1.TextButtonComponent(this.localeService.t('common.rooms.screen.buyTicket.button.cancel', { lang: this.lang }))));
     }
 }
 exports.TournamentBuyTicketDialogView = TournamentBuyTicketDialogView;

package/dist/views/tournament-buy-ticket-dialog.view.js.map

@@ -1 +1 @@
-{"version":3,"file":"tournament-buy-ticket-dialog.view.js","sourceRoot":"","sources":["../../src/views/tournament-buy-ticket-dialog.view.ts"],"names":[],"mappings":";;;AAAA,uDAM2B;AAE3B,MAAa,6BAA8B,SAAQ,4CAAyB;IACxE,KAAK;QACD,OAAO,kCAAe,CAAC,oBAAoB,CACvC,wCAAqB,CAAC,4BAA4B,EAClD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAChF,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,2CAA2C,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EACtF,0CAAuB,CAAC,uBAAuB,CAC3C,yCAAsB,CAAC,gBAAgB,CAAC,IAAI,CAAC,EAC7C,yCAAsB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CACpD,CACJ,CAAC;IACN,CAAC;CACJ;AAZD,sEAYC"}
+{"version":3,"file":"tournament-buy-ticket-dialog.view.js","sourceRoot":"","sources":["../../src/views/tournament-buy-ticket-dialog.view.ts"],"names":[],"mappings":";;;AAAA,uDAM0B;AAE1B,MAAa,6BAA8B,SAAQ,4CAAyB;IACxE,KAAK;QACD,OAAO,IAAI,0CAAuB,CAC9B,wCAAqB,CAAC,4BAA4B,EAClD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,qCAAqC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EAChF,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,2CAA2C,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EACtF,IAAI,8CAA2B,CAC3B,IAAI,sCAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,yCAAyC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAC7G,IAAI,sCAAmB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,6CAA6C,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CACpH,CACJ,CAAC;IACN,CAAC;CACJ;AAZD,sEAYC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jp.ms.common.modules",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "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.6",
+    "jp.common.models": "file:../jp.common.models",
     "jp.common.utils": "1.0.4",
-    "jp.db.schemas": "2.2.2",
-    "jp.ms.common.engine": "3.0.8",
+    "jp.db.schemas": "file:../jp.ms.common.schemas",
+    "jp.ms.common.engine": "file:../jp.ms.common.engine",
     "mongoose": "9.1.5",
     "nestjs-i18n": "10.5.1",
     "node-schedule": "2.1.1",

package/src/adapter/base-table-game-state-adapter.ts

@@ -12,15 +12,18 @@ import {
     BaseTableGameStateSummary,
     BaseTableGameSummaryItem,
     BaseTableGameStateMovesPanel,
+    IAppScreenDialog,
 } from 'jp.common.models';
 import { GameMaster, GamePlayer } from 'jp.ms.common.engine';
-import { formatChips, getPropsFromObject } from 'jp.common.utils';
+import { formatChips, getPropsFromObject, replacePattern } from 'jp.common.utils';
+
+import { SimpleRoomConfirmExitDialogView } from '../views'
 
 export abstract class BaseTableGameStateAdapter {
     private readonly _master: GameMaster;
     private readonly _currentPlayer: GamePlayer;
 
-    constructor (master: GameMaster, currentPlayer: GamePlayer) {
+    constructor(master: GameMaster, currentPlayer: GamePlayer) {
         this._master = master;
         this._currentPlayer = currentPlayer;
     }
@@ -53,6 +56,10 @@ export abstract class BaseTableGameStateAdapter {
         return this._master.getRoom().getId();
     }
 
+    getTableTitle (): string {
+        return this._master.getTable().getTitleWithNumber(this.lang);
+    }
+
     getTableId (): string {
         return this._master.getTable().getId();
     }
@@ -199,9 +206,9 @@ export abstract class BaseTableGameStateAdapter {
         summary.list.push(BaseTableGameSummaryItem.newTitleMdItem(
             'pot',
             this.t('room.screen.summary.pot', {
-                    lang: this.lang,
-                    args: { POT: formatChips(this.getMaster()?.getGameRound()?.getPot() ?? 0, this.lang, true) },
-                },
+                lang: this.lang,
+                args: { POT: formatChips(this.getMaster()?.getGameRound()?.getPot() ?? 0, this.lang, true) },
+            },
             ),
         ));
 
@@ -237,6 +244,15 @@ export abstract class BaseTableGameStateAdapter {
         return summary;
     }
 
+    getConfirmExitDialog (): IAppScreenDialog | undefined {
+        if (this._currentPlayer.isPlayer()) {
+            return new SimpleRoomConfirmExitDialogView(
+                this._master.getRoom().getLocaleService(),
+                this.lang
+            ).build();
+        }
+    }
+
     getState (): IBaseTableGameState {
         return {
             roomId: this.getRoomId(),
@@ -249,6 +265,8 @@ export abstract class BaseTableGameStateAdapter {
             summary: this.getSummary(),
             movesPanel: this.getMovesPanel(),
             extraButtons: this.getExtraButtons(),
+            tableTitle: this.getTableTitle(),
+            confirmExitDialog: this.getConfirmExitDialog(),
         }
     }
 }

package/src/adapter/card-table-game-state-adapter.ts

@@ -3,6 +3,8 @@ import {
     ICardPlayerState,
     CardsPanelState,
     ICardsPanelState,
+    ICardPairSlotState,
+    CardPairSlotState,
 } from 'jp.common.models';
 import { CardsGameMaster, CardsPlayer } from 'jp.ms.common.engine';
 
@@ -28,8 +30,16 @@ export abstract class CardTableGameStateAdapter extends BaseTableGameStateAdapte
         return false;
     }
 
-    getCardsPanelBackdropVisible (): boolean {
-        return false;
+    getCardsPanelEnableDragging (): boolean {
+        return this.getCurrentPlayer().isActivePlayer();
+    }
+
+    getCardsPanelDescription (): string {
+        if (this.getCurrentPlayer().isActivePlayer()) {
+            return this.t('room.screen.yours.player.turn.timeout', { lang: this.lang });
+        }
+
+        return '';
     }
 
     getCardsPanel (): ICardsPanelState {
@@ -37,17 +47,31 @@ export abstract class CardTableGameStateAdapter extends BaseTableGameStateAdapte
             this.getCardsPanelIsOpen(),
             this.getPlayerActions(),
             this.getPlayerCards(),
-            this.getCardsPanelBackdropVisible(),
+            this.getCardsPanelEnableDragging(),
+            this.getCardsPanelDescription(),
         );
     }
 
+    getSlots (): Array<ICardPairSlotState> {
+        const slots = this.getMaster<CardsGameMaster>().getGameCardPairSlots().getSlots()
+            .map((item) => new CardPairSlotState(
+                item.id,
+                item.bottom,
+                item.top,
+                item.activated,
+                this.getCurrentPlayer().isActivePlayer() ? item.disabled : true,
+            ));
+
+        return slots;
+    }
+
     getState (): ICardTableGameState {
         return {
             ...super.getState(),
             players: this.getPlayers(),
             baseCard: this.getMaster<CardsGameMaster>().getGameBaseCard(),
             gameCards: this.getMaster<CardsGameMaster>().getGameCards(),
-            gameCardsPair: this.getMaster<CardsGameMaster>().getGameCardPairSlots().getSlots(),
+            gameCardsPair: this.getSlots(),
             cardsPanel: this.getCardsPanel(),
         };
     }

package/src/dto/common/find-free-table.dto.ts

@@ -0,0 +1,3 @@
+import { PlayerCheckStateDto } from './player-check-state.dto';
+
+export class FindFreeTableDto extends PlayerCheckStateDto { }

package/src/dto/common/index.ts

@@ -1 +1,2 @@
 export { PlayerCheckStateDto } from './player-check-state.dto';
+export { FindFreeTableDto } from './find-free-table.dto';

package/src/dto/table-game/base/base-table-game-state.dto.ts

@@ -3,6 +3,8 @@ import { IsNumber, IsString, ValidateNested } from 'class-validator';
 import { IBaseTableGameState } from 'jp.common.models';
 import { ApiProperty } from '@nestjs/swagger';
 
+import { AppScreenDialogDto } from '../../app-screen/app-screen-dialog.dto';
+
 import { BaseTableSummaryDto } from './base-table-summary.dto';
 import { BaseTableMovesPanelDto } from './base-table-moves-panel.dto';
 
@@ -76,4 +78,18 @@ export class BaseTableGameStateDto implements IBaseTableGameState {
   @Type(() => BaseTableMovesPanelDto)
   @Expose()
   movesPanel: BaseTableMovesPanelDto;
+
+  @ApiProperty({
+    description: 'Table title',
+    required: true,
+    type: String,
+  })
+  @Expose()
+  @IsString()
+  tableTitle: string;
+
+  @ValidateNested()
+  @Type(() => AppScreenDialogDto)
+  @Expose()
+  confirmExitDialog?: AppScreenDialogDto;
 }

package/src/dto/table-game/cards/cards-panel.dto.ts

@@ -1,5 +1,5 @@
 import { Expose, Type } from 'class-transformer';
-import { IsArray, IsBoolean, ValidateNested } from 'class-validator';
+import { IsArray, IsBoolean, IsString, ValidateNested } from 'class-validator';
 import { ICardsPanelState } from 'jp.common.models';
 import { ApiProperty } from '@nestjs/swagger';
 
@@ -18,13 +18,13 @@ export class CardsPanelDto implements ICardsPanelState {
   isOpen: boolean;
 
   @ApiProperty({
-    description: 'backdropVisible',
+    description: 'enableDragging',
     required: true,
     type: Boolean,
   })
   @Expose()
   @IsBoolean()
-  backdropVisible: boolean;
+  enableDragging: boolean;
 
   @IsArray()
   @ValidateNested({ each: true })
@@ -37,4 +37,13 @@ export class CardsPanelDto implements ICardsPanelState {
   @Type(() => CardDto)
   @Expose()
   cards: Array<CardDto>;
+
+  @ApiProperty({
+    description: 'description',
+    required: true,
+    type: String,
+  })
+  @Expose()
+  @IsString()
+  description: string;
 }

package/src/modules/anti-freeze-system/anti-freeze-system.service.ts

@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { GameRoom, ManyTablesTournamentRoom, OneTableTournamentRoom } from 'jp.ms.common.engine';
+import { GameRoom, ManyTablesTournamentRoom, OneTableTournamentRoom, TournamentMaster } from 'jp.ms.common.engine';
 
 import { SimpleRoomsManagerService } from '../simple-rooms-manager/simple-rooms-manager.service';
 import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service';
@@ -79,10 +79,10 @@ export class AntiFreezeSystemService {
             if (item.count === checkCount) {
                 if (item.room instanceof OneTableTournamentRoom) {
                     const room = this.oneTableRoomsManagerService.getRoomByTableId(item.tableId);
-                    room?.getTournamentMaster().cancelTournament();
+                    room?.getRoomMaster<TournamentMaster>().cancelTournament();
                 } else if (item.room instanceof ManyTablesTournamentRoom) {
                     const room = this.manyTablesRoomsManagerService.getRoomByTableId(item.tableId)
-                    room?.getTournamentMaster().cancelTournament();
+                    room?.getRoomMaster<TournamentMaster>().cancelTournament();
                 } else {
                     this.simpleRoomsManagerService.getRoomByTableId(item.tableId)?.restartTable(item.tableId);
                 }

package/src/modules/base-achievements/base-achievements.module.ts

@@ -9,7 +9,10 @@ import {
   UsersRepository,
   AchievementRepository,
   Achievement,
-  AchievementSchema
+  AchievementSchema,
+  UsersAchievement,
+  UsersAchievementSchema,
+  UsersAchievementsRepository,
 } from 'jp.db.schemas';
 import {
   BaseAppEvent,
@@ -41,11 +44,13 @@ import { PlayersManagerService } from '../players-manager';
     MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
     MongooseModule.forFeature([{ name: ActivityLog.name, schema: ActivityLogSchema }]),
     MongooseModule.forFeature([{ name: Achievement.name, schema: AchievementSchema }]),
+    MongooseModule.forFeature([{ name: UsersAchievement.name, schema: UsersAchievementSchema }]),
   ],
   providers: [
     UsersRepository,
     ActivityLogRepository,
     AchievementRepository,
+    UsersAchievementsRepository,
     EventsBusAppSubscribeService,
   ],
 })
@@ -56,19 +61,21 @@ export abstract class BaseAchievementsModule {
     protected readonly usersRepository: UsersRepository,
     protected readonly activityLogRepository: ActivityLogRepository,
     protected readonly achievementRepository: AchievementRepository,
+    protected readonly usersAchievementRepository: UsersAchievementsRepository,
   ) {
   }
 
-  async onModuleInit() {
+  async onModuleInit () {
     this.eventsBusAppSubscribeService.subscribe(this.onHandleAppEvent);
   }
 
-  protected async onHandleAppEvent(event: BaseAppEvent) {
+  protected async onHandleAppEvent (event: BaseAppEvent) {
     if (event instanceof BaseUserAppEvent) {
       const userId = event.userId;
       const player = this.playersManager.getPlayerById(userId);
       const foundUser = await this.usersRepository.findById(userId);
       const allAchievements: Array<Achievement> = await this.achievementRepository.findAchievements();
+      const usersAchievements: Array<UsersAchievement> = await this.usersAchievementRepository.findAchivementsByUserId(userId);
 
       if (!player || !foundUser) {
         throw new InternalServerErrorException();
@@ -77,83 +84,98 @@ export abstract class BaseAchievementsModule {
       if (event instanceof UserGotNewLevelAppEvent) {
         // TODO подумать куда перенести LEVEL UP 
         player.sendMessage(new SnackbarSendToPlayerWsEvent(
+          event.game,
           AppScreenIconEnum.ARROW_UPWARD,
           'level up',
           'buttonText'
         ));
 
-        if (foundUser.hasNoAchievement(GotLevel3Achievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, GotLevel3Achievement.code)) {
           if (new GotLevel3Achievement(event.newLevel).userGotAchievement()) {
-            this.giveAchievement(allAchievements, GotLevel3Achievement.code, userId);
+            this.giveAchievement(allAchievements, GotLevel3Achievement.code, foundUser, event.game);
           }
         }
 
-        if (foundUser.hasNoAchievement(GotLevel10Achievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, GotLevel10Achievement.code)) {
           if (new GotLevel10Achievement(event.newLevel).userGotAchievement()) {
-            this.giveAchievement(allAchievements, GotLevel10Achievement.code, userId);
+            this.giveAchievement(allAchievements, GotLevel10Achievement.code, foundUser, event.game);
           }
         }
 
       } else if (event instanceof UserPlayedTheGameAppEvent) {
-        if (foundUser.hasNoAchievement(Playd10GamesAchievement.code)) {
+
+        if (this.userHasNoAchievement(usersAchievements, Playd10GamesAchievement.code)) {
           const playdGamesCount = await this.activityLogRepository.getUserPlayedGamesCount(userId);
 
           if (new Playd10GamesAchievement(playdGamesCount).userGotAchievement()) {
-            this.giveAchievement(allAchievements, Playd10GamesAchievement.code, userId);
+            this.giveAchievement(allAchievements, Playd10GamesAchievement.code, foundUser, event.game);
           }
         }
       } else if (event instanceof UserWonTheGameAppEvent) {
-        if (foundUser.hasNoAchievement(Won3GamesAchievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, Won3GamesAchievement.code)) {
           const wonGamesCount = await this.activityLogRepository.getUserWonGamesCount(userId);
 
           if (new Won3GamesAchievement(wonGamesCount).userGotAchievement()) {
-            this.giveAchievement(allAchievements, Won3GamesAchievement.code, userId);
+            this.giveAchievement(allAchievements, Won3GamesAchievement.code, foundUser, event.game);
           }
         }
 
-        if (foundUser.hasNoAchievement(Won3ProfiAchievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, Won3ProfiAchievement.code)) {
           const wonProfiCount = await this.activityLogRepository.getUserWonProfiCount(userId);
           if (new Won3ProfiAchievement(wonProfiCount).userGotAchievement()) {
-            this.giveAchievement(allAchievements, Won3ProfiAchievement.code, userId);
+            this.giveAchievement(allAchievements, Won3ProfiAchievement.code, foundUser, event.game);
           }
         }
 
-        if (foundUser.hasNoAchievement(EarnOneMillionAchievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, EarnOneMillionAchievement.code)) {
           if (new EarnOneMillionAchievement(foundUser.balance).userGotAchievement()) {
-            this.giveAchievement(allAchievements, EarnOneMillionAchievement.code, userId);
+            this.giveAchievement(allAchievements, EarnOneMillionAchievement.code, foundUser, event.game);
           }
         }
       } else if (event instanceof UserWonOneTableTournamentAppEvent) {
-        if (foundUser.hasNoAchievement(WonOneTableTournament3TimesAchievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, WonOneTableTournament3TimesAchievement.code)) {
           const wonFastTournamentCount = await this.activityLogRepository.getUserWonOneTableTournamentCount(userId);
           if (new WonOneTableTournament3TimesAchievement(wonFastTournamentCount).userGotAchievement()) {
-            this.giveAchievement(allAchievements, WonOneTableTournament3TimesAchievement.code, userId);
+            this.giveAchievement(allAchievements, WonOneTableTournament3TimesAchievement.code, foundUser, event.game);
           }
         }
       } else if (event instanceof UserWonManyTablesTournamentAppEvent) {
-        if (foundUser.hasNoAchievement(Take1PlaceOnManyTablesTournamentAchievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, Take1PlaceOnManyTablesTournamentAchievement.code)) {
           if (new Take1PlaceOnManyTablesTournamentAchievement(event.rank)) {
-            this.giveAchievement(allAchievements, Take1PlaceOnManyTablesTournamentAchievement.code, userId);
+            this.giveAchievement(allAchievements, Take1PlaceOnManyTablesTournamentAchievement.code, foundUser, event.game);
           }
         }
 
-        if (foundUser.hasNoAchievement(Take2Or3PlaceOnManyTablesTournamentAchievement.code)) {
+        if (this.userHasNoAchievement(usersAchievements, Take2Or3PlaceOnManyTablesTournamentAchievement.code)) {
           if (new Take2Or3PlaceOnManyTablesTournamentAchievement(event.rank)) {
-            this.giveAchievement(allAchievements, Take2Or3PlaceOnManyTablesTournamentAchievement.code, userId);
+            this.giveAchievement(allAchievements, Take2Or3PlaceOnManyTablesTournamentAchievement.code, foundUser, event.game);
           }
         }
       }
     }
   }
 
-  protected async giveAchievement(allAchievements: Array<Achievement>, achievementCode: string, userId: string) {
+  protected userHasNoAchievement (usersAchievements: Array<UsersAchievement>, achievementCode: string) {
+    return !usersAchievements.find((item) => item.achievementCode === achievementCode);
+  }
+
+  protected async giveAchievement (allAchievements: Array<Achievement>, achievementCode: string, user: User, game: string) {
     const foundAchievement = allAchievements.find((item) => item.code === achievementCode);
-    const player = this.playersManager.getPlayerById(userId);
+    const player = this.playersManager.getPlayerById(user.userId);
 
     if (foundAchievement && player) {
-      await this.usersRepository.addAchievement(userId, achievementCode);
+      await this.usersAchievementRepository.addUsersAchievement(
+        user.userId,
+        user.fullName,
+        foundAchievement.achievementId,
+        foundAchievement.title,
+        foundAchievement.code,
+        foundAchievement.prize,
+        '',
+      );
 
       player.sendMessage(new SnackbarSendToPlayerWsEvent(
+        game,
         AppScreenIconEnum.EMOJI_EVENTS,
         foundAchievement.title,
         foundAchievement.description

package/src/modules/event-bus/events-bus.main-tables.subscribe.service.ts

@@ -28,7 +28,7 @@ export class EventsBusMainTablesSubscribeService {
         this.roomStatesSubject.next(event);
     }
 
-    subscribe(onHandleStatusRoomChange: () => void) {
+    subscribe(onHandleStatusRoomChange: (event: RoomUpdateStateEvent) => void) {
         this.roomStatesSubject.subscribe(onHandleStatusRoomChange);
     }
 }

package/src/modules/main/main-tables-list-screen.view.ts

@@ -40,7 +40,7 @@ export class MainTablesListScreenView extends UniversalScreenView {
         this.manyTablesTournamentRooms = manyTablesTournamentRooms;
     }
 
-    build(): IAppScreen {
+    build (): IAppScreen {
         const oneTableTournamentsCardList = this.oneTableTournamentRooms.map((room) =>
             AppScreenSectionListItem.CreateCardListItemMini(
                 room.getId(),
@@ -67,7 +67,7 @@ export class MainTablesListScreenView extends UniversalScreenView {
         const simpleRoomsTableCardList = this.simpleRooms.reduce<Array<AppScreenSectionListItem>>((result, room) => {
             const list = room.getTables().map((table) => AppScreenSectionListItem.CreateCardListItemMini(
                 table.getId(),
-                replacePattern(table.getTitle(this.lang), { NUMBER: table.getNumber().toString() }),
+                table.getTitleWithNumber(this.lang),
                 replacePattern(table.getSubtitle(this.lang), {
                     HALF_BET: table.getHalfBet().toString(),
                     BET: table.getBet().toString()

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

@@ -1,7 +1,7 @@
 import { Controller, Get, Headers } from '@nestjs/common';
 import { IAppHeaders, IBaseAppScreen } from 'jp.common.models';
 
-import { PlayerCheckStateDto } from '../../dto';
+import { PlayerCheckStateDto, FindFreeTableDto } from '../../dto';
 
 import { MainService } from './main.service';
 
@@ -11,7 +11,7 @@ export class MainController {
         private readonly mainService: MainService,
     ) { }
 
-    @Get('player/check/state')
+    @Get('player_check_state')
     checkState(@Headers() headers: IAppHeaders): Promise<PlayerCheckStateDto> {
         return this.mainService.playerCheckState(headers.client_auth_token, headers.client_game);
     }
@@ -31,8 +31,8 @@ export class MainController {
         return this.mainService.unsubscribeFromTablesScreen(headers.client_language);
     }
 
-    @Get('findFreeTable')
-    findFreeTable(@Headers() headers: IAppHeaders) {
+    @Get('find_free_table')
+    findFreeTable(@Headers() headers: IAppHeaders): FindFreeTableDto {
         return this.mainService.findFreeTable(headers.client_auth_token);
     }
 }