jp.ms.common.modules 1.0.28 → 1.0.30

package/dist/modules/main/main.service.js

@@ -17,16 +17,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MainService = void 0;
 const common_1 = require("@nestjs/common");
-const jp_common_models_1 = require("jp.common.models");
 const dayjs_1 = __importDefault(require("dayjs"));
 const isToday_1 = __importDefault(require("dayjs/plugin/isToday"));
 const jp_db_schemas_1 = require("jp.db.schemas");
+const jp_ms_common_engine_1 = require("jp.ms.common.engine");
+const jp_common_models_1 = require("jp.common.models");
 const dto_1 = require("../../dto");
 const simple_rooms_manager_1 = require("../simple-rooms-manager");
 const players_manager_1 = require("../players-manager");
 const tournament_one_table_rooms_manager_1 = require("../tournament-one-table-rooms-manager");
 const tournament_many_tables_rooms_manager_1 = require("../tournament-many-tables-rooms-manager");
 const events_bus_main_tables_subscribe_service_1 = require("../event-bus/events-bus.main-tables.subscribe.service");
+const exception_1 = require("../../exception");
 const main_constants_1 = require("./main.constants");
 const main_tables_list_screen_view_1 = require("./main-tables-list-screen.view");
 let MainService = class MainService {
@@ -35,22 +37,22 @@ let MainService = class MainService {
     manyTablesRoomsManagerService;
     playersManager;
     eventsBusMainTablesSubscribeService;
-    userRepository;
+    usersRepository;
     activityLogRepository;
     options;
-    constructor(simpleRoomsManager, oneTableRoomsManagerService, manyTablesRoomsManagerService, playersManager, eventsBusMainTablesSubscribeService, userRepository, activityLogRepository, options) {
+    constructor(simpleRoomsManager, oneTableRoomsManagerService, manyTablesRoomsManagerService, playersManager, eventsBusMainTablesSubscribeService, usersRepository, activityLogRepository, options) {
         this.simpleRoomsManager = simpleRoomsManager;
         this.oneTableRoomsManagerService = oneTableRoomsManagerService;
         this.manyTablesRoomsManagerService = manyTablesRoomsManagerService;
         this.playersManager = playersManager;
         this.eventsBusMainTablesSubscribeService = eventsBusMainTablesSubscribeService;
-        this.userRepository = userRepository;
+        this.usersRepository = usersRepository;
         this.activityLogRepository = activityLogRepository;
         this.options = options;
         dayjs_1.default.extend(isToday_1.default);
     }
-    getScreen(lang) {
-        return new dto_1.BaseAppScreenDto(new jp_common_models_1.BaseAppScreen(new main_tables_list_screen_view_1.MainTablesListScreenView(this.options.i18n, lang, this.simpleRoomsManager.getRooms(), this.oneTableRoomsManagerService.getRooms(), this.manyTablesRoomsManagerService.getRooms()).build()));
+    getScreen(lang, clientAuthToken) {
+        return new dto_1.BaseAppScreenDto(new main_tables_list_screen_view_1.MainTablesListScreenView(this.options.i18n, lang, this.simpleRoomsManager.getRooms(), this.oneTableRoomsManagerService.getRooms(), this.manyTablesRoomsManagerService.getRooms(), clientAuthToken).buildBS());
     }
     subscribeOnTablesScreen(clientAuthToken) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
@@ -69,14 +71,22 @@ let MainService = class MainService {
     async playerCheckState(clientAuthToken, game) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
         let redirectUrl = jp_common_models_1.AppScreenRoutesEnum.MENU;
-        const foundUser = await this.userRepository.findById(clientAuthToken);
+        const foundUser = await this.usersRepository.findById(clientAuthToken);
         const isNewbie = await this.activityLogRepository.userIsNewbie(clientAuthToken);
         const last7logins = await this.activityLogRepository.findLast7DaysLogins(game, clientAuthToken);
         if (!foundUser) {
             throw new common_1.InternalServerErrorException();
         }
-        if (player?.isPlayer() && player.tableId) {
-            redirectUrl = jp_common_models_1.router.getRoomPath(player.tableId);
+        if (player && (player.isPlayer() || player.isTableQueuer()) && player.tableId) {
+            if (player.room instanceof jp_ms_common_engine_1.SimpleRoom) {
+                redirectUrl = jp_common_models_1.AppScreenRouter.getSimpleRoomTablePath(player.tableId);
+            }
+            else if (player.room instanceof jp_ms_common_engine_1.OneTableTournamentRoom) {
+                redirectUrl = jp_common_models_1.AppScreenRouter.getOneTableTournamentTablePath(player.tableId);
+            }
+            else if (player.room instanceof jp_ms_common_engine_1.ManyTablesTournamentRoom) {
+                redirectUrl = jp_common_models_1.AppScreenRouter.getManyTablesTournamentTablePath(player.tableId);
+            }
         }
         else if (isNewbie) {
             redirectUrl = jp_common_models_1.AppScreenRoutesEnum.WELCOME;
@@ -89,10 +99,26 @@ let MainService = class MainService {
         }
         return dto_1.PlayerCheckStateDto.fromEntities(redirectUrl, player?.id ?? '');
     }
-    findFreeTable(clientAuthToken) {
+    findFreeTable(clientAuthToken, lang) {
+        const player = this.playersManager.getPlayerById(clientAuthToken);
+        const tableId = this.simpleRoomsManager.getFreeFastGameRoom()?.getId();
+        if (!player || !tableId) {
+            throw new exception_1.NotFoundFreeRoomForFastGameException(new jp_common_models_1.ErrorSnackbarComponent(exception_1.ErrorCodeEnum.NOT_FOUND_FREE_ROOM_FOR_FAST_GAME, this.options.i18n.t('common.server.message.code.4003', { lang })));
+        }
+        return dto_1.FindFreeTableDto.fromEntities(jp_common_models_1.AppScreenRouter.getSimpleRoomTablePath(tableId), player.id);
+    }
+    async manyTablesTournamentbBuyTicket(clientAuthToken, lang, tournamentId) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
-        const tableId = this.simpleRoomsManager.getFreeFastGameRoom()?.getId() ?? '';
-        return dto_1.FindFreeTableDto.fromEntities(tableId ? jp_common_models_1.router.getRoomPath(tableId) : '', player?.id ?? '');
+        const tournament = this.manyTablesRoomsManagerService.getRoomByTableId(tournamentId);
+        const user = await this.usersRepository.findById(player?.id ?? '');
+        if (!player || !tournament || !user) {
+            throw new common_1.InternalServerErrorException();
+        }
+        if (user.balance < tournament.getTicketPrice()) {
+            throw new exception_1.NotEnoughMoneyForPurchaseException(new jp_common_models_1.ErrorSnackbarComponent(exception_1.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);
     }
 };
 exports.MainService = MainService;

package/dist/modules/main/main.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.service.js","sourceRoot":"","sources":["../../../src/modules/main/main.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"main.service.js","sourceRoot":"","sources":["../../../src/modules/main/main.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAAkF;AAClF,kDAA0B;AAC1B,mEAA2C;AAC3C,iDAAuE;AACvE,6DAAmG;AACnG,uDAAgG;AAEhG,mCAAoF;AACpF,kEAAoE;AACpE,wDAA2D;AAC3D,8FAA8F;AAC9F,kGAAkG;AAClG,oHAA4G;AAC5G,+CAA0H;AAG1H,qDAAgD;AAChD,iFAA0E;AAGnE,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEC;IACA;IACA;IACA;IACA;IACA;IACA;IACsB;IAR3C,YACqB,kBAA6C,EAC7C,2BAAkE,EAClE,6BAAsE,EACtE,cAAqC,EACrC,mCAAwE,EACxE,eAAgC,EAChC,qBAA4C,EACtB,OAA2B;QAPjD,uBAAkB,GAAlB,kBAAkB,CAA2B;QAC7C,gCAA2B,GAA3B,2BAA2B,CAAuC;QAClE,kCAA6B,GAA7B,6BAA6B,CAAyC;QACtE,mBAAc,GAAd,cAAc,CAAuB;QACrC,wCAAmC,GAAnC,mCAAmC,CAAqC;QACxE,oBAAe,GAAf,eAAe,CAAiB;QAChC,0BAAqB,GAArB,qBAAqB,CAAuB;QACtB,YAAO,GAAP,OAAO,CAAoB;QAElE,eAAK,CAAC,MAAM,CAAC,iBAAO,CAAC,CAAC;IAC1B,CAAC;IAED,SAAS,CAAE,IAAY,EAAE,eAAuB;QAC5C,OAAO,IAAI,sBAAgB,CACvB,IAAI,uDAAwB,CACxB,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,IAAI,EACJ,IAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,EAClC,IAAI,CAAC,2BAA2B,CAAC,QAAQ,EAAE,EAC3C,IAAI,CAAC,6BAA6B,CAAC,QAAQ,EAAE,EAC7C,eAAe,CAClB,CAAC,OAAO,EAAE,CACd,CAAC;IACN,CAAC;IAED,uBAAuB,CAAE,eAAuB;QAC5C,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAElE,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,mCAAmC,CAAC,mBAAmB,CAAC,MAAM,CAAC,CAAC;QACzE,CAAC;QAED,MAAM,IAAI,qCAA4B,EAAE,CAAC;IAC7C,CAAC;IAED,2BAA2B,CAAE,eAAuB;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAElE,IAAI,MAAM,EAAE,CAAC;YACT,IAAI,CAAC,mCAAmC,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,IAAI,qCAA4B,EAAE,CAAC;IAC7C,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAE,eAAuB,EAAE,IAAY;QACzD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAClE,IAAI,WAAW,GAAW,sCAAmB,CAAC,IAAI,CAAC;QAEnD,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACvE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,YAAY,CAAC,eAAe,CAAC,CAAA;QAC/E,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,qBAAqB,CAAC,mBAAmB,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;QAEhG,IAAI,CAAC,SAAS,EAAE,CAAC;YACb,MAAM,IAAI,qCAA4B,EAAE,CAAC;QAC7C,CAAC;QAED,IAAI,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,IAAI,MAAM,CAAC,aAAa,EAAE,CAAC,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YAC5E,IAAI,MAAM,CAAC,IAAI,YAAY,gCAAU,EAAE,CAAC;gBACpC,WAAW,GAAG,kCAAe,CAAC,sBAAsB,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACzE,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,YAAY,4CAAsB,EAAE,CAAC;gBACvD,WAAW,GAAG,kCAAe,CAAC,8BAA8B,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACjF,CAAC;iBAAM,IAAI,MAAM,CAAC,IAAI,YAAY,8CAAwB,EAAE,CAAC;gBACzD,WAAW,GAAG,kCAAe,CAAC,gCAAgC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACnF,CAAC;QACL,CAAC;aAAM,IAAI,QAAQ,EAAE,CAAC;YAClB,WAAW,GAAG,sCAAmB,CAAC,OAAO,CAAC;QAC9C,CAAC;aAAM,IAAI,IAAA,eAAK,EAAC,WAAW,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,IAAI,WAAW,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,EAAE,CAAC;YAC5E,WAAW,GAAG,sCAAmB,CAAC,WAAW,CAAC;QAClD,CAAC;aAAM,IAAI,IAAA,eAAK,EAAC,SAAS,CAAC,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC;YACnD,WAAW,GAAG,sCAAmB,CAAC,OAAO,CAAC;QAC9C,CAAC;QAED,OAAO,yBAAmB,CAAC,YAAY,CACnC,WAAW,EACX,MAAM,EAAE,EAAE,IAAI,EAAE,CACnB,CAAC;IACN,CAAC;IAED,aAAa,CAAE,eAAuB,EAAE,IAAY;QAChD,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAClE,MAAM,OAAO,GAAG,IAAI,CAAC,kBAAkB,CAAC,mBAAmB,EAAE,EAAE,KAAK,EAAE,CAAC;QAEvE,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;YACtB,MAAM,IAAI,gDAAoC,CAAC,IAAI,yCAAsB,CACrE,yBAAa,CAAC,iCAAiC,EAC/C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAiC,EAAE,EAAE,IAAI,EAAE,CAAC,CACnE,CAAC,CAAC;QACP,CAAC;QAED,OAAO,sBAAgB,CAAC,YAAY,CAChC,kCAAe,CAAC,sBAAsB,CAAC,OAAO,CAAC,EAC/C,MAAM,CAAC,EAAE,CACZ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,8BAA8B,CAAE,eAAuB,EAAE,IAAY,EAAE,YAAoB;QAC7F,MAAM,MAAM,GAAG,IAAI,CAAC,cAAc,CAAC,aAAa,CAAC,eAAe,CAAC,CAAC;QAClE,MAAM,UAAU,GAAG,IAAI,CAAC,6BAA6B,CAAC,gBAAgB,CAAC,YAAY,CAAC,CAAC;QACrF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC;QAEnE,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,EAAE,CAAC;YAClC,MAAM,IAAI,qCAA4B,EAAE,CAAC;QAC7C,CAAC;QAED,IAAI,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,cAAc,EAAE,EAAE,CAAC;YAC7C,MAAM,IAAI,8CAAkC,CAAC,IAAI,yCAAsB,CACnE,yBAAa,CAAC,6BAA6B,EAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,iCAAiC,EAAE,EAAE,IAAI,EAAE,CAAC,CACnE,CAAC,CAAC;QACP,CAAC;QAED,MAAM,IAAI,CAAC,6BAA6B,CAAC,SAAS,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;QAEzE,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC;IACjD,CAAC;CACJ,CAAA;AAtHY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAUJ,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAA;qCAPgB,gDAAyB;QAChB,0EAAqC;QACnC,8EAAuC;QACtD,uCAAqB;QACA,8EAAmC;QACvD,+BAAe;QACT,qCAAqB;GARxD,WAAW,CAsHvB"}

package/dist/modules/many-tables-tournament/many-tables-tournament-status-screen.view.d.ts

@@ -4,4 +4,8 @@ export declare class ManyTablesTournamentStatusScreenView extends UniversalScree
     private readonly tournament;
     constructor(localeService: ILocaleService, lang: string, tournament: ManyTablesTournamentRoom);
     build(): IAppScreen;
+    private getPlayersList;
+    private getStatusHeader;
+    private getStatusIcon;
+    private getStatusDescription;
 }

package/dist/modules/many-tables-tournament/many-tables-tournament-status-screen.view.js

@@ -1,7 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ManyTablesTournamentStatusScreenView = void 0;
+const dayjs_1 = __importDefault(require("dayjs"));
 const jp_common_models_1 = require("jp.common.models");
+const jp_common_utils_1 = require("jp.common.utils");
 class ManyTablesTournamentStatusScreenView extends jp_common_models_1.UniversalScreenView {
     tournament;
     constructor(localeService, lang, tournament) {
@@ -9,10 +14,57 @@ class ManyTablesTournamentStatusScreenView extends jp_common_models_1.UniversalS
         this.tournament = tournament;
     }
     build() {
-        return jp_common_models_1.AppScreen.CreateStatusScreen(jp_common_models_1.AppScreenIdEnum.ROOMS)
-            .addAppBar(jp_common_models_1.AppScreenAppBar.CreateStatusAppBar(this.localeService.t('common.rooms.screen.title', { lang: this.lang }), jp_common_models_1.AppScreenSectionButton.CreateArrowBackButton(this.localeService.t('common.button.back', { lang: this.lang }))))
-            .addSection((jp_common_models_1.AppScreenSection.CreateStatusHeader('status', 'description', jp_common_models_1.AppScreenSectionImage.CreateIconImage(jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS), jp_common_models_1.AppScreenSectionButtons.CreatePrimaryButtonSection(jp_common_models_1.AppScreenSectionButton.CreateTextButton('button')))))
-            .addSection(jp_common_models_1.AppScreenSection.CreateCardListSection('id1', this.tournament.getParticipants().map((item) => jp_common_models_1.AppScreenSectionListItem.CreateCardListItemMini(item.playerId, item.playerName, '', jp_common_models_1.AppScreenSectionImage.CreateUrlImage(item.playerAvatarUrl), true, ''))));
+        return new jp_common_models_1.StandardScreenComponent(jp_common_models_1.AppScreenIdEnum.ROOMS)
+            .addAppBar(new jp_common_models_1.StatusAppBarComponent(this.tournament.getTitle(this.lang), new jp_common_models_1.ArrowBackButtonComponent(this.localeService.t('common.button.back', { lang: this.lang }))))
+            .addSection(this.getStatusHeader())
+            .addSection(new jp_common_models_1.CardListSectionComponent('id1', this.getPlayersList()));
+    }
+    getPlayersList() {
+        if (this.tournament.getRoomMaster().isFinish()) {
+            return this.tournament.getWinners().map((item) => (new jp_common_models_1.MiniCardSectionListItemComponent(item.playerId, item.playerName, this.localeService.t('common.tournaments.status.screen.finish.description', {
+                lang: this.lang,
+                args: {
+                    RANK: item.rank.toString(),
+                    PRIZE: (0, jp_common_utils_1.formatChips)(item.profit, this.lang, true),
+                }
+            }), new jp_common_models_1.UrlImageComponent(item.playerAvatarUrl), true, true, '')));
+        }
+        return this.tournament.getParticipants().map((item) => (new jp_common_models_1.MiniCardSectionListItemComponent(item.playerId, item.playerName, '', new jp_common_models_1.UrlImageComponent(item.playerAvatarUrl), true, true, '')));
+    }
+    getStatusHeader() {
+        return new jp_common_models_1.StatusHeaderSectionComponent('status', this.getStatusDescription(), new jp_common_models_1.IconImageComponent(this.getStatusIcon()));
+    }
+    getStatusIcon() {
+        if (this.tournament.getRoomMaster().isCancelled()) {
+            return jp_common_models_1.AppScreenIconEnum.INFO;
+        }
+        else if (this.tournament.getRoomMaster().isFinish()) {
+            return jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS;
+        }
+        else if (this.tournament.getRoomMaster().isWaiting()) {
+            return jp_common_models_1.AppScreenIconEnum.HOURGLASS_EMPTY;
+        }
+        return '';
+    }
+    getStatusDescription() {
+        if (this.tournament.getRoomMaster().isCancelled()) {
+            return this.localeService.t('common.tournaments.status.4', { lang: this.lang });
+        }
+        else if (this.tournament.getRoomMaster().isFinish()) {
+            return this.localeService.t('common.tournaments.status.3', { lang: this.lang });
+        }
+        else if (this.tournament.getRoomMaster().isInProgress()) {
+            return this.localeService.t('common.tournaments.status.2', { lang: this.lang });
+        }
+        else if (this.tournament.getRoomMaster().isWaiting()) {
+            return (0, jp_common_utils_1.replacePattern)(this.tournament.getSubtitle(this.lang), {
+                DATE: (0, dayjs_1.default)(this.tournament.getScheduleDate()).isToday() ?
+                    this.localeService.t('common.tournaments.status.today', { lang: this.lang }) :
+                    (0, jp_common_utils_1.formatDate)(this.tournament.getScheduleDate() ?? ''),
+                SCHEDULE_DATE: (0, jp_common_utils_1.formatTime)(this.tournament.getScheduleDate() ?? ''),
+            });
+        }
+        return '';
     }
 }
 exports.ManyTablesTournamentStatusScreenView = ManyTablesTournamentStatusScreenView;

package/dist/modules/many-tables-tournament/many-tables-tournament-status-screen.view.js.map

@@ -1 +1 @@
-{"version":3,"file":"many-tables-tournament-status-screen.view.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament-status-screen.view.ts"],"names":[],"mappings":";;;AAAA,uDAa0B;AAG1B,MAAa,oCAAqC,SAAQ,sCAAmB;IACxD,UAAU,CAA2B;IAEtD,YACI,aAA6B,EAC7B,IAAY,EACZ,UAAoC;QAEpC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK;QACD,OAAO,4BAAS,CAAC,kBAAkB,CAAC,kCAAe,CAAC,KAAK,CAAC;aACrD,SAAS,CACN,kCAAe,CAAC,kBAAkB,CAC9B,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EACtE,yCAAsB,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAChH,CACJ;aACA,UAAU,CAAC,CACR,mCAAgB,CAAC,kBAAkB,CAC/B,QAAQ,EACR,aAAa,EACb,wCAAqB,CAAC,eAAe,CAAC,oCAAiB,CAAC,YAAY,CAAC,EACrE,0CAAuB,CAAC,0BAA0B,CAAC,yCAAsB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CACxG,CACJ,CAAC;aACD,UAAU,CACP,mCAAgB,CAAC,qBAAqB,CAClC,KAAK,EACL,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,2CAAwB,CAAC,sBAAsB,CAC3F,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,UAAU,EACf,EAAE,EACF,wCAAqB,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,CAAC,EAC1D,IAAI,EACJ,EAAE,CACL,CAAC,CACL,CACJ,CAAC;IACV,CAAC;CACJ;AA1CD,oFA0CC"}
+{"version":3,"file":"many-tables-tournament-status-screen.view.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament-status-screen.view.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAC1B,uDAc0B;AAC1B,qDAAsF;AAGtF,MAAa,oCAAqC,SAAQ,sCAAmB;IACxD,UAAU,CAA2B;IAEtD,YACI,aAA6B,EAC7B,IAAY,EACZ,UAAoC;QAEpC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK;QACD,OAAO,IAAI,0CAAuB,CAAC,kCAAe,CAAC,KAAK,CAAC;aACpD,SAAS,CACN,IAAI,wCAAqB,CACrB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACnC,IAAI,2CAAwB,CACxB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAClE,CACJ,CACJ;aACA,UAAU,CACP,IAAI,CAAC,eAAe,EAAE,CACzB;aACA,UAAU,CACP,IAAI,2CAAwB,CACxB,KAAK,EACL,IAAI,CAAC,cAAc,EAAE,CACxB,CACJ,CAAC;IACV,CAAC;IAEO,cAAc;QAClB,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;YAC/D,OAAO,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC9C,IAAI,mDAAgC,CAChC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,UAAU,EACf,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,qDAAqD,EAAE;gBACxE,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE;oBACF,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;oBAC1B,KAAK,EAAE,IAAA,6BAAW,EAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC;iBACnD;aACJ,CAAC,EACF,IAAI,oCAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,EAC3C,IAAI,EACJ,IAAI,EACJ,EAAE,CACL,CACJ,CAAC,CAAC;QACP,CAAC;QAED,OAAO,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACnD,IAAI,mDAAgC,CAChC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,UAAU,EACf,EAAE,EACF,IAAI,oCAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,EAC3C,IAAI,EACJ,IAAI,EACJ,EAAE,CACL,CACJ,CAAC,CAAC;IACP,CAAC;IAEO,eAAe;QACnB,OAAO,IAAI,+CAA4B,CACnC,QAAQ,EACR,IAAI,CAAC,oBAAoB,EAAE,EAC3B,IAAI,qCAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,CAC/C,CAAC;IACN,CAAC;IAEO,aAAa;QACjB,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,WAAW,EAAE,EAAE,CAAC;YAClE,OAAO,oCAAiB,CAAC,IAAI,CAAC;QAClC,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACtE,OAAO,oCAAiB,CAAC,YAAY,CAAC;QAC1C,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;YACvE,OAAO,oCAAiB,CAAC,eAAe,CAAC;QAC7C,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,oBAAoB;QACxB,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,WAAW,EAAE,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,YAAY,EAAE,EAAE,CAAC;YAC1E,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;YACvE,OAAO,IAAA,gCAAc,EAAC,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;gBAC1D,IAAI,EAAE,IAAA,eAAK,EAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;oBACtD,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,iCAAiC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;oBAC9E,IAAA,4BAAU,EAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;gBACvD,aAAa,EAAE,IAAA,4BAAU,EAAC,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,IAAI,EAAE,CAAC;aACrE,CAAC,CAAC;QACP,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;CACJ;AAzGD,oFAyGC"}

package/dist/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.js

@@ -9,9 +9,9 @@ class ManyTablesTournamentTablesListScreenView extends jp_common_models_1.Univer
         this.tournament = tournament;
     }
     build() {
-        return jp_common_models_1.AppScreen.CreateStandardScreen(jp_common_models_1.AppScreenIdEnum.ROOMS)
-            .addAppBar(jp_common_models_1.AppScreenAppBar.CreateStandardAppBar(this.localeService.t('common.rooms.screen.title', { lang: this.lang }), jp_common_models_1.AppScreenSectionButton.CreateArrowBackButton(this.localeService.t('common.button.back', { lang: this.lang }))))
-            .addSection(jp_common_models_1.AppScreenSection.CreateCardListSection('id1', this.tournament?.getTables().map((table) => jp_common_models_1.AppScreenSectionListItem.CreateCardListItemMini(table.getId(), table.getTitle(this.lang), table.getSubtitle(this.lang), jp_common_models_1.AppScreenSectionImage.CreateIconImage(jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS), true, jp_common_models_1.router.getRoomPath(table.getId()))) ?? []));
+        return new jp_common_models_1.StandardScreenComponent(jp_common_models_1.AppScreenIdEnum.ROOMS)
+            .addAppBar(new jp_common_models_1.StandardAppBarComponent(this.localeService.t('common.rooms.screen.title', { lang: this.lang }), new jp_common_models_1.ArrowBackButtonComponent(this.localeService.t('common.button.back', { lang: this.lang }))))
+            .addSection(new jp_common_models_1.CardListSectionComponent('id1', this.tournament?.getTables().map((table) => new jp_common_models_1.MiniCardSectionListItemComponent(table.getId(), table.getTitle(this.lang), this.localeService.t('common.tournaments.screen.table.title', { lang: this.lang, args: { NUMBER: table.getNumber().toString() } }), new jp_common_models_1.UrlImageComponent(`${table.getPlayers().length}/${table.getTableSize()}`), true, true, jp_common_models_1.AppScreenRouter.getManyTablesTournamentTablePath(table.getId()))) ?? []));
     }
 }
 exports.ManyTablesTournamentTablesListScreenView = ManyTablesTournamentTablesListScreenView;

package/dist/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.js.map

@@ -1 +1 @@
-{"version":3,"file":"many-tables-tournament-tables-list-screen.view.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.ts"],"names":[],"mappings":";;;AAAA,uDAa0B;AAG1B,MAAa,wCAAyC,SAAQ,sCAAmB;IAC5D,UAAU,CAA2B;IAEtD,YACI,aAA6B,EAC7B,IAAY,EACZ,UAAoC;QAEpC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK;QACD,OAAO,4BAAS,CAAC,oBAAoB,CAAC,kCAAe,CAAC,KAAK,CAAC;aACvD,SAAS,CACN,kCAAe,CAAC,oBAAoB,CAChC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EACtE,yCAAsB,CAAC,qBAAqB,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAChH,CACJ;aACA,UAAU,CACP,mCAAgB,CAAC,qBAAqB,CAClC,KAAK,EACL,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,2CAAwB,CAAC,sBAAsB,CAC3C,KAAK,CAAC,KAAK,EAAE,EACb,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACzB,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAC5B,wCAAqB,CAAC,eAAe,CAAC,oCAAiB,CAAC,YAAY,CAAC,EACrE,IAAI,EACJ,yBAAM,CAAC,WAAW,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CACpC,CACJ,IAAI,EAAE,CACV,CACJ,CAAC;IACV,CAAC;CACJ;AApCD,4FAoCC"}
+{"version":3,"file":"many-tables-tournament-tables-list-screen.view.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.ts"],"names":[],"mappings":";;;AAAA,uDAY0B;AAG1B,MAAa,wCAAyC,SAAQ,sCAAmB;IAC5D,UAAU,CAA2B;IAEtD,YACI,aAA6B,EAC7B,IAAY,EACZ,UAAoC;QAEpC,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IACjC,CAAC;IAED,KAAK;QACD,OAAO,IAAI,0CAAuB,CAAC,kCAAe,CAAC,KAAK,CAAC;aACpD,SAAS,CACN,IAAI,0CAAuB,CACvB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,2BAA2B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EACtE,IAAI,2CAAwB,CACxB,IAAI,CAAC,aAAa,CAAC,CAAC,CAChB,oBAAoB,EACpB,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CACtB,CACJ,CACJ,CACJ;aACA,UAAU,CACP,IAAI,2CAAwB,CACxB,KAAK,EACL,IAAI,CAAC,UAAU,EAAE,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CACvC,IAAI,mDAAgC,CAChC,KAAK,CAAC,KAAK,EAAE,EACb,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACzB,IAAI,CAAC,aAAa,CAAC,CAAC,CAChB,uCAAuC,EACvC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,CAAC,QAAQ,EAAE,EAAE,EAAE,CACtE,EACD,IAAI,oCAAiB,CAAC,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,MAAM,IAAI,KAAK,CAAC,YAAY,EAAE,EAAE,CAAC,EAC7E,IAAI,EACJ,IAAI,EACJ,kCAAe,CAAC,gCAAgC,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAClE,CACJ,IAAI,EAAE,CACV,CACJ,CAAC;IACV,CAAC;CACJ;AA7CD,4FA6CC"}

package/dist/modules/many-tables-tournament/many-tables-tournament.controller.d.ts

@@ -7,14 +7,13 @@ export declare class ManyTablesTournamentController {
     private readonly tournamentService;
     constructor(tournamentService: ManyTablesTournamentService);
     getStatusScreen(tournamentId: string, headers: IAppHeaders): IBaseAppScreen;
-    subscribeOnStatusScreen(tournamentId: string, headers: IAppHeaders): Promise<void>;
-    unsubscribeFromStatusScreen(tournamentId: string, headers: IAppHeaders): Promise<void>;
+    subscribeOnStatusScreen(tournamentId: string, headers: IAppHeaders): void;
+    unsubscribeFromStatusScreen(tournamentId: string, headers: IAppHeaders): void;
     getTableListScreen(tournamentId: string, headers: IAppHeaders): Promise<IBaseAppScreen>;
     watchTheTable(tableId: string, headers: IAppHeaders): IBaseTableGameState;
     moveOnTheTable(tableId: string, baseMoveData: IBaseMoveData, headers: IAppHeaders): IBaseTableGameState;
     joinTournament(tournamentId: string, headers: IAppHeaders): JoinTournamentDto;
-    leaveTournament(tournamentId: string, headers: IAppHeaders): IBaseTableGameState;
-    buyTicket(tournamentId: string, headers: IAppHeaders): Promise<void>;
+    leaveTournament(tournamentId: string, headers: IAppHeaders): void;
     createTournament(headers: IAppHeaders, createTournamentDto: ManyTablesTournamentCreateDto): Promise<void>;
     updateTournament(tournamentId: string, updateTournamentDto: ManyTablesTournamentUpdateDto, headers: IAppHeaders): Promise<void>;
     removeTournament(tournamentId: string, headers: IAppHeaders): Promise<void>;

package/dist/modules/many-tables-tournament/many-tables-tournament.controller.js

@@ -27,10 +27,10 @@ let ManyTablesTournamentController = class ManyTablesTournamentController {
         return this.tournamentService.getStatusScreen(tournamentId, headers.client_language);
     }
     subscribeOnStatusScreen(tournamentId, headers) {
-        return this.tournamentService.subscribeOnStatusScreen(tournamentId, headers.client_language);
+        return this.tournamentService.subscribeOnStatusScreen(tournamentId, headers.client_auth_token);
     }
     unsubscribeFromStatusScreen(tournamentId, headers) {
-        return this.tournamentService.unsubscribeFromStatusScreen(tournamentId, headers.client_language);
+        return this.tournamentService.unsubscribeFromStatusScreen(tournamentId, headers.client_auth_token);
     }
     getTableListScreen(tournamentId, headers) {
         return this.tournamentService.getTableListScreen(tournamentId, headers.client_language);
@@ -47,9 +47,6 @@ let ManyTablesTournamentController = class ManyTablesTournamentController {
     leaveTournament(tournamentId, headers) {
         return this.tournamentService.leaveTournament(tournamentId, headers.client_auth_token);
     }
-    buyTicket(tournamentId, headers) {
-        return this.tournamentService.buyTicket(tournamentId, headers.client_auth_token);
-    }
     createTournament(headers, createTournamentDto) {
         return this.tournamentService.createTournament(createTournamentDto);
     }
@@ -75,7 +72,7 @@ __decorate([
     __param(1, (0, common_1.Headers)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Promise)
+    __metadata("design:returntype", void 0)
 ], ManyTablesTournamentController.prototype, "subscribeOnStatusScreen", null);
 __decorate([
     (0, common_1.Get)('status/unsubscribe/:tournamentId'),
@@ -83,7 +80,7 @@ __decorate([
     __param(1, (0, common_1.Headers)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Promise)
+    __metadata("design:returntype", void 0)
 ], ManyTablesTournamentController.prototype, "unsubscribeFromStatusScreen", null);
 __decorate([
     (0, common_1.Get)('tables/:tournamentId'),
@@ -128,17 +125,8 @@ __decorate([
     __param(1, (0, common_1.Headers)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Object)
+    __metadata("design:returntype", void 0)
 ], ManyTablesTournamentController.prototype, "leaveTournament", null);
-__decorate([
-    (0, common_1.Post)('buy_ticket/:tournamentId'),
-    (0, common_1.HttpCode)(common_1.HttpStatus.OK),
-    __param(0, (0, common_1.Param)('tournamentId')),
-    __param(1, (0, common_1.Headers)()),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", [String, Object]),
-    __metadata("design:returntype", Promise)
-], ManyTablesTournamentController.prototype, "buyTicket", null);
 __decorate([
     (0, common_1.Post)('create'),
     (0, common_1.HttpCode)(common_1.HttpStatus.OK),

package/dist/modules/many-tables-tournament/many-tables-tournament.controller.js.map

@@ -1 +1 @@
-{"version":3,"file":"many-tables-tournament.controller.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.controller.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"many-tables-tournament.controller.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.controller.ts"],"names":[],"mappings":"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"}

package/dist/modules/many-tables-tournament/many-tables-tournament.service.d.ts

@@ -12,14 +12,13 @@ export declare class ManyTablesTournamentService {
     private readonly options;
     constructor(manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService, playersManager: PlayersManagerService, options: ManyTablesTournamentFactoryOptions);
     getStatusScreen(tournamentId: string, lang: string): BaseAppScreenDto;
-    subscribeOnStatusScreen(tournamentId: string, clientAuthToken: string): Promise<void>;
-    unsubscribeFromStatusScreen(tournamentId: string, clientAuthToken: string): Promise<void>;
+    subscribeOnStatusScreen(tournamentId: string, clientAuthToken: string): void;
+    unsubscribeFromStatusScreen(tournamentId: string, clientAuthToken: string): void;
     getTableListScreen(tournamentId: string, lang: string): Promise<BaseAppScreenDto>;
     watchTheTable(tableId: string, clientAuthToken: string): IBaseTableGameState;
     moveOnTheTable(tableId: string, clientAuthToken: string, moveDto: IBaseMoveData): IBaseTableGameState;
     joinTournament(tournamentId: string, clientAuthToken: string): JoinTournamentDto;
-    leaveTournament(tournamentId: string, clientAuthToken: string): IBaseTableGameState;
-    buyTicket(tournamentId: string, clientAuthToken: string): Promise<void>;
+    leaveTournament(tournamentId: string, clientAuthToken: string): void;
     createTournament(createTournamentDto: ManyTablesTournamentCreateDto): Promise<void>;
     updateTournament(tournamentId: string, updateTournamentDto: ManyTablesTournamentUpdateDto): Promise<void>;
     removeTournament(tournamentId: string): Promise<void>;

package/dist/modules/many-tables-tournament/many-tables-tournament.service.js

@@ -36,30 +36,30 @@ let ManyTablesTournamentService = class ManyTablesTournamentService {
         if (!tournament) {
             throw new common_1.InternalServerErrorException();
         }
-        return new dto_1.BaseAppScreenDto(new jp_common_models_1.BaseAppScreen(new many_tables_tournament_status_screen_view_1.ManyTablesTournamentStatusScreenView(this.options.i18n, lang, tournament).build()));
+        return new dto_1.BaseAppScreenDto(new many_tables_tournament_status_screen_view_1.ManyTablesTournamentStatusScreenView(this.options.i18n, lang, tournament).buildBS());
     }
     subscribeOnStatusScreen(tournamentId, clientAuthToken) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
         const tournament = this.manyTablesRoomsManagerService.getRoomById(tournamentId);
-        if (player && tournament) {
-            tournament.addToStatusScreenWatchers(player);
+        if (!player || !tournament) {
+            throw new common_1.InternalServerErrorException();
         }
-        throw new common_1.InternalServerErrorException();
+        tournament.addToStatusScreenWatchers(player);
     }
     unsubscribeFromStatusScreen(tournamentId, clientAuthToken) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
         const tournament = this.manyTablesRoomsManagerService.getRoomById(tournamentId);
-        if (player && tournament) {
-            tournament.removeFromStatusScreenWatchers(player);
+        if (!player || !tournament) {
+            throw new common_1.InternalServerErrorException();
         }
-        throw new common_1.InternalServerErrorException();
+        tournament.removeFromStatusScreenWatchers(player);
     }
     async getTableListScreen(tournamentId, lang) {
         const tournament = this.manyTablesRoomsManagerService.getRoomById(tournamentId);
         if (!tournament) {
             throw new common_1.InternalServerErrorException();
         }
-        return new dto_1.BaseAppScreenDto(new jp_common_models_1.BaseAppScreen(new many_tables_tournament_tables_list_screen_view_1.ManyTablesTournamentTablesListScreenView(this.options.i18n, lang, tournament).build()));
+        return new dto_1.BaseAppScreenDto(new many_tables_tournament_tables_list_screen_view_1.ManyTablesTournamentTablesListScreenView(this.options.i18n, lang, tournament).buildBS());
     }
     watchTheTable(tableId, clientAuthToken) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
@@ -84,19 +84,23 @@ let ManyTablesTournamentService = class ManyTablesTournamentService {
     joinTournament(tournamentId, clientAuthToken) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
         const tournament = this.manyTablesRoomsManagerService.getRoomByTableId(tournamentId);
-        const master = tournament?.getMasterById(tournamentId);
-        if (player && tournament && master) {
+        if (player && tournament) {
             tournament.handleJoinTournament(player);
             if (tournament.getRoomMaster().isInProgress()) {
                 if (player.isPlayer() || player.isTableQueuer()) {
-                    return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.router.getManyTablesTournamentTablePath(player.tableId ?? ''), player.id);
+                    return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.AppScreenRouter.getManyTablesTournamentTablePath(player.tableId ?? ''), player.id);
+                }
+                else if (tournament.isParticipant(player.id)) {
+                    tournament.getRoomMaster()
+                        .onTournamentProcessAlonePlayer(tournament.getRoomMaster(), player);
+                    return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.AppScreenRouter.getManyTablesTournamentTablePath(player.tableId ?? ''), player.id);
                 }
                 else {
-                    return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.router.getManyTablesTournamentTableListPath(), player.id);
+                    return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.AppScreenRouter.getManyTablesTournamentTableListPath(tournamentId), player.id);
                 }
             }
             else {
-                return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.router.getManyTablesTournamentStatusPath(tournament.getId()), player.id);
+                return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.AppScreenRouter.getManyTablesTournamentStatusPath(tournament.getId()), player.id);
             }
         }
         throw new common_1.InternalServerErrorException();
@@ -104,21 +108,10 @@ let ManyTablesTournamentService = class ManyTablesTournamentService {
     leaveTournament(tournamentId, clientAuthToken) {
         const player = this.playersManager.getPlayerById(clientAuthToken);
         const tournament = this.manyTablesRoomsManagerService.getRoomByTableId(tournamentId);
-        const master = tournament?.getMasterById(tournamentId);
-        if (player && tournament && master) {
-            tournament.handleLeaveTournament(player);
-            return master.createGameStateDto(player);
-        }
-        throw new common_1.InternalServerErrorException();
-    }
-    async buyTicket(tournamentId, clientAuthToken) {
-        const player = this.playersManager.getPlayerById(clientAuthToken);
-        const tournament = this.manyTablesRoomsManagerService.getRoomByTableId(tournamentId);
-        const master = tournament?.getMasterById(tournamentId);
-        if (player && tournament && master) {
-            return this.manyTablesRoomsManagerService.buyTicket(tournamentId, player);
+        if (!player || !tournament) {
+            throw new common_1.InternalServerErrorException();
         }
-        throw new common_1.InternalServerErrorException();
+        tournament.handleLeaveTournament(player);
     }
     async createTournament(createTournamentDto) {
         return this.manyTablesRoomsManagerService.createTournament(createTournamentDto);

package/dist/modules/many-tables-tournament/many-tables-tournament.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"many-tables-tournament.service.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"many-tables-tournament.service.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.service.ts"],"names":[],"mappings":"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"}

package/dist/modules/menu/menu.service.js

@@ -15,7 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MenuService = void 0;
 const common_1 = require("@nestjs/common");
 const jp_db_schemas_1 = require("jp.db.schemas");
-const jp_common_models_1 = require("jp.common.models");
 const dto_1 = require("../../dto");
 const menu_constants_1 = require("./menu.constants");
 const menu_screen_view_1 = require("./menu-screen.view");
@@ -31,7 +30,7 @@ let MenuService = class MenuService {
     async getScreen(headers) {
         const menuItems = await this.menuRepository.findMenus('ALL', 'VK') ?? [];
         const enabledBanner = await this.bannersRepository.findEnabledBanner(headers.client_game, headers.client_channel);
-        return new dto_1.BaseAppScreenDto(new jp_common_models_1.BaseAppScreen(new menu_screen_view_1.MenuScreenView(this.options.i18n, headers.client_language, menuItems, enabledBanner).build()));
+        return new dto_1.BaseAppScreenDto(new menu_screen_view_1.MenuScreenView(this.options.i18n, headers.client_language, menuItems, enabledBanner).buildBS());
     }
 };
 exports.MenuService = MenuService;

package/dist/modules/menu/menu.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/modules/menu/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,iDAAkE;AAClE,uDAG0B;AAE1B,mCAA6C;AAE7C,qDAAgD;AAEhD,yDAAoD;AAG7C,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEC;IACA;IACsB;IAH3C,YACqB,cAA8B,EAC9B,iBAAoC,EACd,OAA2B;QAFjD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACd,YAAO,GAAP,OAAO,CAAoB;IAEtE,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,OAAoB;QACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACzE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAElH,OAAO,IAAI,sBAAgB,CACvB,IAAI,gCAAa,CACb,IAAI,iCAAc,CACd,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,OAAO,CAAC,eAAe,EACvB,SAAS,EACT,aAAa,CAChB,CAAC,KAAK,EAAE,CACZ,CACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAvBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKJ,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAA;qCAFY,8BAAc;QACX,iCAAiB;GAHhD,WAAW,CAuBvB"}
+{"version":3,"file":"menu.service.js","sourceRoot":"","sources":["../../../src/modules/menu/menu.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAoD;AACpD,iDAAkE;AAKlE,mCAA6C;AAE7C,qDAAgD;AAEhD,yDAAoD;AAG7C,IAAM,WAAW,GAAjB,MAAM,WAAW;IAEC;IACA;IACsB;IAH3C,YACqB,cAA8B,EAC9B,iBAAoC,EACd,OAA2B;QAFjD,mBAAc,GAAd,cAAc,CAAgB;QAC9B,sBAAiB,GAAjB,iBAAiB,CAAmB;QACd,YAAO,GAAP,OAAO,CAAoB;IAEtE,CAAC;IAED,KAAK,CAAC,SAAS,CAAE,OAAoB;QACjC,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;QACzE,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,OAAO,CAAC,WAAW,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;QAElH,OAAO,IAAI,sBAAgB,CACvB,IAAI,iCAAc,CACd,IAAI,CAAC,OAAO,CAAC,IAAI,EACjB,OAAO,CAAC,eAAe,EACvB,SAAS,EACT,aAAa,CAChB,CAAC,OAAO,EAAE,CACd,CAAC;IACN,CAAC;CACJ,CAAA;AArBY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;IAKJ,WAAA,IAAA,eAAM,EAAC,6BAAY,CAAC,CAAA;qCAFY,8BAAc;QACX,iCAAiB;GAHhD,WAAW,CAqBvB"}

package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.d.ts

@@ -5,6 +5,7 @@ export declare class OneTableTournamentStatusScreenView extends UniversalScreenV
     private readonly playerId;
     constructor(localeService: ILocaleService, lang: string, tournament: OneTableTournamentRoom, playerId: string);
     build(): IAppScreen;
+    private getPlayersList;
     private getStatusHeader;
     private getStatusIcon;
     private getStatusDescription;

package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OneTableTournamentStatusScreenView = void 0;
 const jp_common_models_1 = require("jp.common.models");
+const jp_common_utils_1 = require("jp.common.utils");
 class OneTableTournamentStatusScreenView extends jp_common_models_1.UniversalScreenView {
     tournament;
     playerId;
@@ -14,12 +15,24 @@ class OneTableTournamentStatusScreenView extends jp_common_models_1.UniversalScr
         return new jp_common_models_1.StandardScreenComponent(jp_common_models_1.AppScreenIdEnum.ROOMS)
             .addAppBar(new jp_common_models_1.StatusAppBarComponent(this.tournament.getTitle(this.lang), new jp_common_models_1.ArrowBackButtonComponent(this.localeService.t('common.button.back', { lang: this.lang }))))
             .addSection(this.getStatusHeader())
-            .addSection(new jp_common_models_1.CardListSectionComponent('id1', this.tournament.getParticipants().map((item) => (new jp_common_models_1.MiniCardSectionListItemComponent(item.playerId, item.playerName, '', new jp_common_models_1.UrlImageComponent(item.playerAvatarUrl), true, true, '')))));
+            .addSection(new jp_common_models_1.CardListSectionComponent('id1', this.getPlayersList()));
+    }
+    getPlayersList() {
+        if (this.tournament.getRoomMaster().isFinish()) {
+            return this.tournament.getWinners().map((item) => (new jp_common_models_1.MiniCardSectionListItemComponent(item.playerId, item.playerName, this.localeService.t('common.tournaments.status.screen.finish.description', {
+                lang: this.lang,
+                args: {
+                    RANK: item.rank.toString(),
+                    PRIZE: (0, jp_common_utils_1.formatChips)(item.profit, this.lang, true),
+                }
+            }), new jp_common_models_1.UrlImageComponent(item.playerAvatarUrl), true, true, '')));
+        }
+        return this.tournament.getParticipants().map((item) => (new jp_common_models_1.MiniCardSectionListItemComponent(item.playerId, item.playerName, '', new jp_common_models_1.UrlImageComponent(item.playerAvatarUrl), true, true, '')));
     }
     getStatusHeader() {
-        const foundPlayer = this.tournament.getParticipants().find((item) => item.playerId === this.playerId);
-        return new jp_common_models_1.StatusHeaderSectionComponent('status', this.getStatusDescription(), new jp_common_models_1.IconImageComponent(this.getStatusIcon()), !foundPlayer ?
-            new jp_common_models_1.PrimaryButtonButtonsComponent(new jp_common_models_1.TextButtonComponent('Join tournament')) : undefined);
+        const foundPlayer = this.tournament.getParticipant(this.playerId);
+        return new jp_common_models_1.StatusHeaderSectionComponent('status', this.getStatusDescription(), new jp_common_models_1.IconImageComponent(this.getStatusIcon()), !foundPlayer && this.tournament.getRoomMaster().isWaiting() ?
+            new jp_common_models_1.PrimaryButtonButtonsComponent(new jp_common_models_1.TextButtonComponent(this.localeService.t('common.tournaments.screen.button.join.tournament', { lang: this.lang }))) : undefined);
     }
     getStatusIcon() {
         if (this.tournament.getRoomMaster().isCancelled()) {
@@ -35,7 +48,7 @@ class OneTableTournamentStatusScreenView extends jp_common_models_1.UniversalScr
     }
     getStatusDescription() {
         if (this.tournament.getRoomMaster().isCancelled()) {
-            return this.localeService.t('common.tournaments.status.2', { lang: this.lang });
+            return this.localeService.t('common.tournaments.status.4', { lang: this.lang });
         }
         else if (this.tournament.getRoomMaster().isFinish()) {
             return this.localeService.t('common.tournaments.status.3', { lang: this.lang });

package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js.map

@@ -1 +1 @@
-{"version":3,"file":"one-table-tournament-status-screen.view.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament-status-screen.view.ts"],"names":[],"mappings":";;;AAAA,uDAgB0B;AAG1B,MAAa,kCAAmC,SAAQ,sCAAmB;IACtD,UAAU,CAAyB;IACnC,QAAQ,CAAS;IAElC,YACI,aAA6B,EAC7B,IAAY,EACZ,UAAkC,EAClC,QAAgB;QAEhB,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC7B,CAAC;IAED,KAAK;QACD,OAAO,IAAI,0CAAuB,CAAC,kCAAe,CAAC,KAAK,CAAC;aACpD,SAAS,CACN,IAAI,wCAAqB,CACrB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACnC,IAAI,2CAAwB,CACxB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,oBAAoB,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAClE,CACJ,CACJ;aACA,UAAU,CACP,IAAI,CAAC,eAAe,EAAE,CACzB;aACA,UAAU,CACP,IAAI,2CAAwB,CACxB,KAAK,EACL,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAC5C,IAAI,mDAAgC,CAChC,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,UAAU,EACf,EAAE,EACF,IAAI,oCAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,EAC3C,IAAI,EACJ,IAAI,EACJ,EAAE,CACL,CACJ,CAAC,CACL,CACJ,CAAC;IACV,CAAC;IAEO,eAAe;QAEnB,MAAM,WAAW,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,KAAK,IAAI,CAAC,QAAQ,CAAC,CAAC;QAEtG,OAAO,IAAI,+CAA4B,CACnC,QAAQ,EACR,IAAI,CAAC,oBAAoB,EAAE,EAC3B,IAAI,qCAAkB,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,EAC5C,CAAC,WAAW,CAAC,CAAC;YACV,IAAI,gDAA6B,CAC7B,IAAI,sCAAmB,CAAC,iBAAiB,CAAC,CAC7C,CAAC,CAAC,CAAC,SAAS,CACpB,CAAA;IACL,CAAC;IAEO,aAAa;QACjB,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,WAAW,EAAE,EAAE,CAAC;YAClE,OAAO,oCAAiB,CAAC,IAAI,CAAC;QAClC,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACtE,OAAO,oCAAiB,CAAC,YAAY,CAAC;QAC1C,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;YACvE,OAAO,oCAAiB,CAAC,eAAe,CAAC;QAC7C,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,oBAAoB;QACxB,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,WAAW,EAAE,EAAE,CAAC;YAClE,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,QAAQ,EAAE,EAAE,CAAC;YACtE,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,6BAA6B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACpF,CAAC;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,aAAa,EAAoB,CAAC,SAAS,EAAE,EAAE,CAAC;YACvE,OAAO,IAAI,CAAC,2BAA2B,EAAE,CAAC;QAC9C,CAAC;QAED,OAAO,EAAE,CAAC;IACd,CAAC;IAEO,2BAA2B;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC;QACzD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC;QAElD,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CACvB,wDAAwD,EACxD;gBACI,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE;oBACF,WAAW,EAAE,IAAI,CAAC,UAAU,CAAC,YAAY,EAAE,CAAC,QAAQ,EAAE;iBACzD;aACJ,CACJ,CAAC;QACN,CAAC;QAED,OAAO,IAAI,CAAC,aAAa,CAAC,CAAC,CACvB,6DAA6D,EAC7D;YACI,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,IAAI,EAAE;gBACF,OAAO,EAAE,CAAC,UAAU,GAAG,OAAO,CAAC,CAAC,QAAQ,EAAE;aAC7C;SACJ,CACJ,CAAC;IACN,CAAC;CACJ;AA/GD,gFA+GC"}
+{"version":3,"file":"one-table-tournament-status-screen.view.js","sourceRoot":"","sources":["../../../src/modules/one-table-tournament/one-table-tournament-status-screen.view.ts"],"names":[],"mappings":"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"}