jp.ms.common.modules 1.0.23 → 1.0.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/adapter/base-table-game-state-adapter.d.ts +3 -1
- package/dist/adapter/base-table-game-state-adapter.js +11 -0
- package/dist/adapter/base-table-game-state-adapter.js.map +1 -1
- package/dist/adapter/card-table-game-state-adapter.d.ts +4 -2
- package/dist/adapter/card-table-game-state-adapter.js +15 -4
- package/dist/adapter/card-table-game-state-adapter.js.map +1 -1
- package/dist/config/cert.js +35 -2
- package/dist/config/cert.js.map +1 -1
- package/dist/config/cors.js +34 -1
- package/dist/config/cors.js.map +1 -1
- package/dist/dto/common/find-free-table.dto.d.ts +3 -0
- package/dist/dto/common/find-free-table.dto.js +8 -0
- package/dist/dto/common/find-free-table.dto.js.map +1 -0
- package/dist/dto/common/index.d.ts +1 -0
- package/dist/dto/common/index.js +3 -1
- package/dist/dto/common/index.js.map +1 -1
- package/dist/dto/table-game/base/base-table-game-state.dto.d.ts +3 -0
- package/dist/dto/table-game/base/base-table-game-state.dto.js +19 -0
- package/dist/dto/table-game/base/base-table-game-state.dto.js.map +1 -1
- package/dist/dto/table-game/cards/cards-panel.dto.d.ts +2 -1
- package/dist/dto/table-game/cards/cards-panel.dto.js +14 -3
- package/dist/dto/table-game/cards/cards-panel.dto.js.map +1 -1
- package/dist/modules/anti-freeze-system/anti-freeze-system.module.js +4 -1
- package/dist/modules/anti-freeze-system/anti-freeze-system.module.js.map +1 -1
- package/dist/modules/anti-freeze-system/anti-freeze-system.service.js +2 -2
- package/dist/modules/anti-freeze-system/anti-freeze-system.service.js.map +1 -1
- package/dist/modules/base-achievements/base-achievements.module.d.ts +5 -3
- package/dist/modules/base-achievements/base-achievements.module.js +34 -25
- package/dist/modules/base-achievements/base-achievements.module.js.map +1 -1
- package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.d.ts +1 -1
- package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.js.map +1 -1
- package/dist/modules/logger/jp-logger.service.js +34 -1
- package/dist/modules/logger/jp-logger.service.js.map +1 -1
- package/dist/modules/main/main-tables-list-screen.view.js +1 -1
- package/dist/modules/main/main-tables-list-screen.view.js.map +1 -1
- package/dist/modules/main/main.controller.d.ts +2 -2
- package/dist/modules/main/main.controller.js +4 -3
- package/dist/modules/main/main.controller.js.map +1 -1
- package/dist/modules/main/main.module.js +2 -2
- package/dist/modules/main/main.module.js.map +1 -1
- package/dist/modules/main/main.service.d.ts +2 -2
- package/dist/modules/main/main.service.js +11 -5
- package/dist/modules/main/main.service.js.map +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.module.js +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.module.js.map +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.service.js +1 -1
- package/dist/modules/many-tables-tournament/many-tables-tournament.service.js.map +1 -1
- package/dist/modules/menu/menu-screen.view.d.ts +5 -3
- package/dist/modules/menu/menu-screen.view.js +10 -2
- package/dist/modules/menu/menu-screen.view.js.map +1 -1
- package/dist/modules/menu/menu.module.js +2 -1
- package/dist/modules/menu/menu.module.js.map +1 -1
- package/dist/modules/menu/menu.service.d.ts +3 -2
- package/dist/modules/menu/menu.service.js +8 -4
- package/dist/modules/menu/menu.service.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.d.ts +6 -1
- package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js +52 -3
- package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament.controller.d.ts +4 -5
- package/dist/modules/one-table-tournament/one-table-tournament.controller.js +8 -9
- package/dist/modules/one-table-tournament/one-table-tournament.controller.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament.module.js +2 -2
- package/dist/modules/one-table-tournament/one-table-tournament.module.js.map +1 -1
- package/dist/modules/one-table-tournament/one-table-tournament.service.d.ts +6 -7
- package/dist/modules/one-table-tournament/one-table-tournament.service.js +10 -17
- package/dist/modules/one-table-tournament/one-table-tournament.service.js.map +1 -1
- package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.d.ts +2 -1
- package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js +30 -5
- package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js.map +1 -1
- package/dist/modules/support/dump.service.js +4 -1
- package/dist/modules/support/dump.service.js.map +1 -1
- package/dist/modules/support/metric.service.js +34 -1
- package/dist/modules/support/metric.service.js.map +1 -1
- package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.js +33 -10
- package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.js.map +1 -1
- package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.js +21 -5
- package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/utils/game-table-result.d.ts +3 -2
- package/dist/utils/game-table-result.js +14 -1
- package/dist/utils/game-table-result.js.map +1 -1
- package/dist/views/index.d.ts +1 -0
- package/dist/views/index.js +3 -1
- package/dist/views/index.js.map +1 -1
- package/dist/views/simple-room-conifrm-exit-dialog.view.d.ts +4 -0
- package/dist/views/simple-room-conifrm-exit-dialog.view.js +11 -0
- package/dist/views/simple-room-conifrm-exit-dialog.view.js.map +1 -0
- package/dist/views/tournament-buy-ticket-dialog.view.d.ts +2 -2
- package/dist/views/tournament-buy-ticket-dialog.view.js +1 -1
- package/dist/views/tournament-buy-ticket-dialog.view.js.map +1 -1
- package/package.json +4 -4
- package/src/adapter/base-table-game-state-adapter.ts +23 -5
- package/src/adapter/card-table-game-state-adapter.ts +28 -4
- package/src/dto/common/find-free-table.dto.ts +3 -0
- package/src/dto/common/index.ts +1 -0
- package/src/dto/table-game/base/base-table-game-state.dto.ts +16 -0
- package/src/dto/table-game/cards/cards-panel.dto.ts +12 -3
- package/src/modules/anti-freeze-system/anti-freeze-system.service.ts +3 -3
- package/src/modules/base-achievements/base-achievements.module.ts +46 -24
- package/src/modules/event-bus/events-bus.main-tables.subscribe.service.ts +1 -1
- package/src/modules/main/main-tables-list-screen.view.ts +2 -2
- package/src/modules/main/main.controller.ts +4 -4
- package/src/modules/main/main.module.ts +5 -5
- package/src/modules/main/main.service.ts +20 -10
- package/src/modules/many-tables-tournament/many-tables-tournament.module.ts +1 -1
- package/src/modules/many-tables-tournament/many-tables-tournament.service.ts +2 -1
- package/src/modules/menu/menu-screen.view.ts +33 -11
- package/src/modules/menu/menu.module.ts +3 -2
- package/src/modules/menu/menu.service.ts +5 -2
- package/src/modules/one-table-tournament/one-table-tournament-status-screen.view.ts +76 -10
- package/src/modules/one-table-tournament/one-table-tournament.controller.ts +8 -8
- package/src/modules/one-table-tournament/one-table-tournament.module.ts +2 -2
- package/src/modules/one-table-tournament/one-table-tournament.service.ts +20 -28
- package/src/modules/simple-rooms-manager/simple-rooms-manager.service.ts +64 -14
- package/src/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.ts +42 -17
- package/src/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.ts +37 -15
- package/src/utils/game-table-result.ts +18 -3
- package/src/views/index.ts +2 -1
- package/src/views/simple-room-conifrm-exit-dialog.view.ts +21 -0
- package/src/views/tournament-buy-ticket-dialog.view.ts +11 -11
|
@@ -23,12 +23,14 @@ let BaseAchievementsModule = class BaseAchievementsModule {
|
|
|
23
23
|
usersRepository;
|
|
24
24
|
activityLogRepository;
|
|
25
25
|
achievementRepository;
|
|
26
|
-
|
|
26
|
+
usersAchievementRepository;
|
|
27
|
+
constructor(eventsBusAppSubscribeService, playersManager, usersRepository, activityLogRepository, achievementRepository, usersAchievementRepository) {
|
|
27
28
|
this.eventsBusAppSubscribeService = eventsBusAppSubscribeService;
|
|
28
29
|
this.playersManager = playersManager;
|
|
29
30
|
this.usersRepository = usersRepository;
|
|
30
31
|
this.activityLogRepository = activityLogRepository;
|
|
31
32
|
this.achievementRepository = achievementRepository;
|
|
33
|
+
this.usersAchievementRepository = usersAchievementRepository;
|
|
32
34
|
}
|
|
33
35
|
async onModuleInit() {
|
|
34
36
|
this.eventsBusAppSubscribeService.subscribe(this.onHandleAppEvent);
|
|
@@ -39,77 +41,81 @@ let BaseAchievementsModule = class BaseAchievementsModule {
|
|
|
39
41
|
const player = this.playersManager.getPlayerById(userId);
|
|
40
42
|
const foundUser = await this.usersRepository.findById(userId);
|
|
41
43
|
const allAchievements = await this.achievementRepository.findAchievements();
|
|
44
|
+
const usersAchievements = await this.usersAchievementRepository.findAchivementsByUserId(userId);
|
|
42
45
|
if (!player || !foundUser) {
|
|
43
46
|
throw new common_1.InternalServerErrorException();
|
|
44
47
|
}
|
|
45
48
|
if (event instanceof jp_ms_common_engine_1.UserGotNewLevelAppEvent) {
|
|
46
|
-
player.sendMessage(new jp_ms_common_engine_1.SnackbarSendToPlayerWsEvent(jp_common_models_1.AppScreenIconEnum.ARROW_UPWARD, 'level up', 'buttonText'));
|
|
47
|
-
if (
|
|
49
|
+
player.sendMessage(new jp_ms_common_engine_1.SnackbarSendToPlayerWsEvent(event.game, jp_common_models_1.AppScreenIconEnum.ARROW_UPWARD, 'level up', 'buttonText'));
|
|
50
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.GotLevel3Achievement.code)) {
|
|
48
51
|
if (new jp_ms_common_engine_1.GotLevel3Achievement(event.newLevel).userGotAchievement()) {
|
|
49
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.GotLevel3Achievement.code,
|
|
52
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.GotLevel3Achievement.code, foundUser, event.game);
|
|
50
53
|
}
|
|
51
54
|
}
|
|
52
|
-
if (
|
|
55
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.GotLevel10Achievement.code)) {
|
|
53
56
|
if (new jp_ms_common_engine_1.GotLevel10Achievement(event.newLevel).userGotAchievement()) {
|
|
54
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.GotLevel10Achievement.code,
|
|
57
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.GotLevel10Achievement.code, foundUser, event.game);
|
|
55
58
|
}
|
|
56
59
|
}
|
|
57
60
|
}
|
|
58
61
|
else if (event instanceof jp_ms_common_engine_1.UserPlayedTheGameAppEvent) {
|
|
59
|
-
if (
|
|
62
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.Playd10GamesAchievement.code)) {
|
|
60
63
|
const playdGamesCount = await this.activityLogRepository.getUserPlayedGamesCount(userId);
|
|
61
64
|
if (new jp_ms_common_engine_1.Playd10GamesAchievement(playdGamesCount).userGotAchievement()) {
|
|
62
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Playd10GamesAchievement.code,
|
|
65
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Playd10GamesAchievement.code, foundUser, event.game);
|
|
63
66
|
}
|
|
64
67
|
}
|
|
65
68
|
}
|
|
66
69
|
else if (event instanceof jp_ms_common_engine_1.UserWonTheGameAppEvent) {
|
|
67
|
-
if (
|
|
70
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.Won3GamesAchievement.code)) {
|
|
68
71
|
const wonGamesCount = await this.activityLogRepository.getUserWonGamesCount(userId);
|
|
69
72
|
if (new jp_ms_common_engine_1.Won3GamesAchievement(wonGamesCount).userGotAchievement()) {
|
|
70
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Won3GamesAchievement.code,
|
|
73
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Won3GamesAchievement.code, foundUser, event.game);
|
|
71
74
|
}
|
|
72
75
|
}
|
|
73
|
-
if (
|
|
76
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.Won3ProfiAchievement.code)) {
|
|
74
77
|
const wonProfiCount = await this.activityLogRepository.getUserWonProfiCount(userId);
|
|
75
78
|
if (new jp_ms_common_engine_1.Won3ProfiAchievement(wonProfiCount).userGotAchievement()) {
|
|
76
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Won3ProfiAchievement.code,
|
|
79
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Won3ProfiAchievement.code, foundUser, event.game);
|
|
77
80
|
}
|
|
78
81
|
}
|
|
79
|
-
if (
|
|
82
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.EarnOneMillionAchievement.code)) {
|
|
80
83
|
if (new jp_ms_common_engine_1.EarnOneMillionAchievement(foundUser.balance).userGotAchievement()) {
|
|
81
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.EarnOneMillionAchievement.code,
|
|
84
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.EarnOneMillionAchievement.code, foundUser, event.game);
|
|
82
85
|
}
|
|
83
86
|
}
|
|
84
87
|
}
|
|
85
88
|
else if (event instanceof jp_ms_common_engine_1.UserWonOneTableTournamentAppEvent) {
|
|
86
|
-
if (
|
|
89
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.WonOneTableTournament3TimesAchievement.code)) {
|
|
87
90
|
const wonFastTournamentCount = await this.activityLogRepository.getUserWonOneTableTournamentCount(userId);
|
|
88
91
|
if (new jp_ms_common_engine_1.WonOneTableTournament3TimesAchievement(wonFastTournamentCount).userGotAchievement()) {
|
|
89
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.WonOneTableTournament3TimesAchievement.code,
|
|
92
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.WonOneTableTournament3TimesAchievement.code, foundUser, event.game);
|
|
90
93
|
}
|
|
91
94
|
}
|
|
92
95
|
}
|
|
93
96
|
else if (event instanceof jp_ms_common_engine_1.UserWonManyTablesTournamentAppEvent) {
|
|
94
|
-
if (
|
|
97
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.Take1PlaceOnManyTablesTournamentAchievement.code)) {
|
|
95
98
|
if (new jp_ms_common_engine_1.Take1PlaceOnManyTablesTournamentAchievement(event.rank)) {
|
|
96
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Take1PlaceOnManyTablesTournamentAchievement.code,
|
|
99
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Take1PlaceOnManyTablesTournamentAchievement.code, foundUser, event.game);
|
|
97
100
|
}
|
|
98
101
|
}
|
|
99
|
-
if (
|
|
102
|
+
if (this.userHasNoAchievement(usersAchievements, jp_ms_common_engine_1.Take2Or3PlaceOnManyTablesTournamentAchievement.code)) {
|
|
100
103
|
if (new jp_ms_common_engine_1.Take2Or3PlaceOnManyTablesTournamentAchievement(event.rank)) {
|
|
101
|
-
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Take2Or3PlaceOnManyTablesTournamentAchievement.code,
|
|
104
|
+
this.giveAchievement(allAchievements, jp_ms_common_engine_1.Take2Or3PlaceOnManyTablesTournamentAchievement.code, foundUser, event.game);
|
|
102
105
|
}
|
|
103
106
|
}
|
|
104
107
|
}
|
|
105
108
|
}
|
|
106
109
|
}
|
|
107
|
-
|
|
110
|
+
userHasNoAchievement(usersAchievements, achievementCode) {
|
|
111
|
+
return !usersAchievements.find((item) => item.achievementCode === achievementCode);
|
|
112
|
+
}
|
|
113
|
+
async giveAchievement(allAchievements, achievementCode, user, game) {
|
|
108
114
|
const foundAchievement = allAchievements.find((item) => item.code === achievementCode);
|
|
109
|
-
const player = this.playersManager.getPlayerById(userId);
|
|
115
|
+
const player = this.playersManager.getPlayerById(user.userId);
|
|
110
116
|
if (foundAchievement && player) {
|
|
111
|
-
await this.
|
|
112
|
-
player.sendMessage(new jp_ms_common_engine_1.SnackbarSendToPlayerWsEvent(jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS, foundAchievement.title, foundAchievement.description));
|
|
117
|
+
await this.usersAchievementRepository.addUsersAchievement(user.userId, user.fullName, foundAchievement.achievementId, foundAchievement.title, foundAchievement.code, foundAchievement.prize, '');
|
|
118
|
+
player.sendMessage(new jp_ms_common_engine_1.SnackbarSendToPlayerWsEvent(game, jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS, foundAchievement.title, foundAchievement.description));
|
|
113
119
|
}
|
|
114
120
|
}
|
|
115
121
|
};
|
|
@@ -121,11 +127,13 @@ exports.BaseAchievementsModule = BaseAchievementsModule = __decorate([
|
|
|
121
127
|
mongoose_1.MongooseModule.forFeature([{ name: jp_db_schemas_1.User.name, schema: jp_db_schemas_1.UserSchema }]),
|
|
122
128
|
mongoose_1.MongooseModule.forFeature([{ name: jp_db_schemas_1.ActivityLog.name, schema: jp_db_schemas_1.ActivityLogSchema }]),
|
|
123
129
|
mongoose_1.MongooseModule.forFeature([{ name: jp_db_schemas_1.Achievement.name, schema: jp_db_schemas_1.AchievementSchema }]),
|
|
130
|
+
mongoose_1.MongooseModule.forFeature([{ name: jp_db_schemas_1.UsersAchievement.name, schema: jp_db_schemas_1.UsersAchievementSchema }]),
|
|
124
131
|
],
|
|
125
132
|
providers: [
|
|
126
133
|
jp_db_schemas_1.UsersRepository,
|
|
127
134
|
jp_db_schemas_1.ActivityLogRepository,
|
|
128
135
|
jp_db_schemas_1.AchievementRepository,
|
|
136
|
+
jp_db_schemas_1.UsersAchievementsRepository,
|
|
129
137
|
events_bus_app_subscribe_service_1.EventsBusAppSubscribeService,
|
|
130
138
|
],
|
|
131
139
|
}),
|
|
@@ -133,6 +141,7 @@ exports.BaseAchievementsModule = BaseAchievementsModule = __decorate([
|
|
|
133
141
|
players_manager_1.PlayersManagerService,
|
|
134
142
|
jp_db_schemas_1.UsersRepository,
|
|
135
143
|
jp_db_schemas_1.ActivityLogRepository,
|
|
136
|
-
jp_db_schemas_1.AchievementRepository
|
|
144
|
+
jp_db_schemas_1.AchievementRepository,
|
|
145
|
+
jp_db_schemas_1.UsersAchievementsRepository])
|
|
137
146
|
], BaseAchievementsModule);
|
|
138
147
|
//# sourceMappingURL=base-achievements.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"base-achievements.module.js","sourceRoot":"","sources":["../../../src/modules/base-achievements/base-achievements.module.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8E;AAC9E,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"base-achievements.module.js","sourceRoot":"","sources":["../../../src/modules/base-achievements/base-achievements.module.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,5 +7,5 @@ export declare class EventsBusMainTablesSubscribeService {
|
|
|
7
7
|
addTablesSubscriber(player: GamePlayer): void;
|
|
8
8
|
removeTablesSubbcriber(player: GamePlayer): void;
|
|
9
9
|
pushNewRoomState(event: RoomUpdateStateEvent): void;
|
|
10
|
-
subscribe(onHandleStatusRoomChange: () => void): void;
|
|
10
|
+
subscribe(onHandleStatusRoomChange: (event: RoomUpdateStateEvent) => void): void;
|
|
11
11
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events-bus.main-tables.subscribe.service.js","sourceRoot":"","sources":["../../../src/modules/event-bus/events-bus.main-tables.subscribe.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,+BAA+B;AAGxB,IAAM,mCAAmC,GAAzC,MAAM,mCAAmC;IAC3B,iBAAiB,CAAgC;IACjD,iBAAiB,CAA0B;IAE5D;QACI,IAAI,CAAC,iBAAiB,GAAG,IAAI,cAAO,EAAwB,CAAC;QAC7D,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;IACvC,CAAC;IAED,oBAAoB;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,mBAAmB,CAAC,MAAkB;QAClC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,MAAkB;QACrC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,KAA2B;QACxC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,SAAS,CAAC,
|
|
1
|
+
{"version":3,"file":"events-bus.main-tables.subscribe.service.js","sourceRoot":"","sources":["../../../src/modules/event-bus/events-bus.main-tables.subscribe.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,+BAA+B;AAGxB,IAAM,mCAAmC,GAAzC,MAAM,mCAAmC;IAC3B,iBAAiB,CAAgC;IACjD,iBAAiB,CAA0B;IAE5D;QACI,IAAI,CAAC,iBAAiB,GAAG,IAAI,cAAO,EAAwB,CAAC;QAC7D,IAAI,CAAC,iBAAiB,GAAG,IAAI,GAAG,EAAE,CAAC;IACvC,CAAC;IAED,oBAAoB;QAChB,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,CAAC,CAAC;IACvD,CAAC;IAED,mBAAmB,CAAC,MAAkB;QAClC,IAAI,CAAC,iBAAiB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;IAClD,CAAC;IAED,sBAAsB,CAAC,MAAkB;QACrC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC7C,CAAC;IAED,gBAAgB,CAAC,KAA2B;QACxC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IACvC,CAAC;IAED,SAAS,CAAC,wBAA+D;QACrE,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,wBAAwB,CAAC,CAAC;IAC/D,CAAC;CACJ,CAAA;AA5BY,kFAAmC;8CAAnC,mCAAmC;IAD/C,IAAA,mBAAU,GAAE;;GACA,mCAAmC,CA4B/C"}
|
|
@@ -1,17 +1,50 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
3
|
+
if (k2 === undefined) k2 = k;
|
|
4
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
5
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
6
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
7
|
+
}
|
|
8
|
+
Object.defineProperty(o, k2, desc);
|
|
9
|
+
}) : (function(o, m, k, k2) {
|
|
10
|
+
if (k2 === undefined) k2 = k;
|
|
11
|
+
o[k2] = m[k];
|
|
12
|
+
}));
|
|
13
|
+
var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
|
|
14
|
+
Object.defineProperty(o, "default", { enumerable: true, value: v });
|
|
15
|
+
}) : function(o, v) {
|
|
16
|
+
o["default"] = v;
|
|
17
|
+
});
|
|
2
18
|
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
19
|
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
20
|
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
21
|
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
22
|
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
23
|
};
|
|
24
|
+
var __importStar = (this && this.__importStar) || (function () {
|
|
25
|
+
var ownKeys = function(o) {
|
|
26
|
+
ownKeys = Object.getOwnPropertyNames || function (o) {
|
|
27
|
+
var ar = [];
|
|
28
|
+
for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
|
|
29
|
+
return ar;
|
|
30
|
+
};
|
|
31
|
+
return ownKeys(o);
|
|
32
|
+
};
|
|
33
|
+
return function (mod) {
|
|
34
|
+
if (mod && mod.__esModule) return mod;
|
|
35
|
+
var result = {};
|
|
36
|
+
if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
|
|
37
|
+
__setModuleDefault(result, mod);
|
|
38
|
+
return result;
|
|
39
|
+
};
|
|
40
|
+
})();
|
|
8
41
|
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
42
|
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
43
|
};
|
|
11
44
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
45
|
exports.JpLoggerService = void 0;
|
|
13
46
|
const common_1 = require("@nestjs/common");
|
|
14
|
-
const process = require("process");
|
|
47
|
+
const process = __importStar(require("process"));
|
|
15
48
|
let JpLoggerService = class JpLoggerService extends common_1.ConsoleLogger {
|
|
16
49
|
constructor() {
|
|
17
50
|
super({ json: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jp-logger.service.js","sourceRoot":"","sources":["../../../src/modules/logger/jp-logger.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"jp-logger.service.js","sourceRoot":"","sources":["../../../src/modules/logger/jp-logger.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4E;AAC5E,iDAAmC;AAG5B,IAAM,eAAe,GAArB,MAAM,eAAgB,SAAQ,sBAAa;IAC9C;QACI,KAAK,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1B,CAAC;IAES,YAAY;QAClB,OAAO,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACpC,CAAC;IAES,WAAW,CAAE,OAAgB,EAAE,OAKxC;QACG,MAAM,SAAS,GAAG;YACd,KAAK,EAAE,OAAO,CAAC,QAAQ;YACvB,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,SAAS,EAAE,IAAI,CAAC,YAAY,EAAE;YAC9B,OAAO;YACP,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS;SACzD,CAAC;QAEF,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAE3E,OAAO,CAAC,OAAO,CAAC,eAAe,IAAI,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,gBAAgB,IAAI,CAAC,CAAC;IAChF,CAAC;CACJ,CAAA;AA3BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,mBAAU,EAAC,EAAE,KAAK,EAAE,cAAK,CAAC,SAAS,EAAE,CAAC;;GAC1B,eAAe,CA2B3B"}
|
|
@@ -18,7 +18,7 @@ class MainTablesListScreenView extends jp_common_models_1.UniversalScreenView {
|
|
|
18
18
|
const oneTableTournamentsCardList = this.oneTableTournamentRooms.map((room) => jp_common_models_1.AppScreenSectionListItem.CreateCardListItemMini(room.getId(), room.getTitle(this.lang), room.getSubtitle(this.lang), jp_common_models_1.AppScreenSectionImage.CreateIconImage(jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS), true, jp_common_models_1.router.getOneTableTournamentStatusPath(room.getId())));
|
|
19
19
|
const manyTablesTournamentsCardList = this.manyTablesTournamentRooms.map((room) => jp_common_models_1.AppScreenSectionListItem.CreateCardListItemExtended(room.getId(), room.getTitle(this.lang), room.getSubtitle(this.lang), jp_common_models_1.AppScreenSectionImage.CreateIconImage(jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS), true, true, jp_common_models_1.AppScreenSectionImage.CreateIconImage(jp_common_models_1.AppScreenIconEnum.EMOJI_EVENTS), room.getDescription(this.lang), jp_common_models_1.AppScreenSectionButtons.CreatePrimaryButtonSection(jp_common_models_1.AppScreenSectionButton.CreateTextButton('button'))));
|
|
20
20
|
const simpleRoomsTableCardList = this.simpleRooms.reduce((result, room) => {
|
|
21
|
-
const list = room.getTables().map((table) => jp_common_models_1.AppScreenSectionListItem.CreateCardListItemMini(table.getId(),
|
|
21
|
+
const list = room.getTables().map((table) => jp_common_models_1.AppScreenSectionListItem.CreateCardListItemMini(table.getId(), table.getTitleWithNumber(this.lang), (0, jp_common_utils_1.replacePattern)(table.getSubtitle(this.lang), {
|
|
22
22
|
HALF_BET: table.getHalfBet().toString(),
|
|
23
23
|
BET: table.getBet().toString()
|
|
24
24
|
}), jp_common_models_1.AppScreenSectionImage.CreateUrlImage(`${table.getPlayers().length}/${table.getTableSize()}`), true, jp_common_models_1.router.getRoomPath(table.getId())));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main-tables-list-screen.view.js","sourceRoot":"","sources":["../../../src/modules/main/main-tables-list-screen.view.ts"],"names":[],"mappings":";;;AAAA,uDAc0B;AAM1B,qDAAiD;AAEjD,uCAA4D;AAE5D,MAAa,wBAAyB,SAAQ,sCAAmB;IAC5C,WAAW,CAAoB;IAC/B,uBAAuB,CAAgC;IACvD,yBAAyB,CAAkC;IAE5E,YACI,aAA6B,EAC7B,IAAY,EACZ,WAA8B,EAC9B,uBAAsD,EACtD,yBAA0D;QAE1D,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,uBAAuB,GAAG,uBAAuB,CAAC;QACvD,IAAI,CAAC,yBAAyB,GAAG,yBAAyB,CAAC;IAC/D,CAAC;IAED,KAAK;QACD,MAAM,2BAA2B,GAAG,IAAI,CAAC,uBAAuB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC1E,2CAAwB,CAAC,sBAAsB,CAC3C,IAAI,CAAC,KAAK,EAAE,EACZ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACxB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAC3B,wCAAqB,CAAC,eAAe,CAAC,oCAAiB,CAAC,YAAY,CAAC,EACrE,IAAI,EACJ,yBAAM,CAAC,+BAA+B,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CACvD,CAAC,CAAC;QAEP,MAAM,6BAA6B,GAAG,IAAI,CAAC,yBAAyB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAC9E,2CAAwB,CAAC,0BAA0B,CAC/C,IAAI,CAAC,KAAK,EAAE,EACZ,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,EACxB,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,EAC3B,wCAAqB,CAAC,eAAe,CAAC,oCAAiB,CAAC,YAAY,CAAC,EACrE,IAAI,EACJ,IAAI,EACJ,wCAAqB,CAAC,eAAe,CAAC,oCAAiB,CAAC,YAAY,CAAC,EACrE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,EAC9B,0CAAuB,CAAC,0BAA0B,CAAC,yCAAsB,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC,CACxG,CAAC,CAAC;QAEP,MAAM,wBAAwB,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,CAAkC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;YACvG,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,EAAE,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,2CAAwB,CAAC,sBAAsB,CACxF,KAAK,CAAC,KAAK,EAAE,EACb,
|
|
1
|
+
{"version":3,"file":"main-tables-list-screen.view.js","sourceRoot":"","sources":["../../../src/modules/main/main-tables-list-screen.view.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { IAppHeaders, IBaseAppScreen } from 'jp.common.models';
|
|
2
|
-
import { PlayerCheckStateDto } from '../../dto';
|
|
2
|
+
import { PlayerCheckStateDto, FindFreeTableDto } from '../../dto';
|
|
3
3
|
import { MainService } from './main.service';
|
|
4
4
|
export declare class MainController {
|
|
5
5
|
private readonly mainService;
|
|
@@ -8,5 +8,5 @@ export declare class MainController {
|
|
|
8
8
|
getScreen(headers: IAppHeaders): IBaseAppScreen;
|
|
9
9
|
subscribeOnTablesScreen(headers: IAppHeaders): Promise<void>;
|
|
10
10
|
unsubscribeFromTablesScreen(headers: IAppHeaders): Promise<void>;
|
|
11
|
-
findFreeTable(headers: IAppHeaders):
|
|
11
|
+
findFreeTable(headers: IAppHeaders): FindFreeTableDto;
|
|
12
12
|
}
|
|
@@ -14,6 +14,7 @@ var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.MainController = void 0;
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
|
+
const dto_1 = require("../../dto");
|
|
17
18
|
const main_service_1 = require("./main.service");
|
|
18
19
|
let MainController = class MainController {
|
|
19
20
|
mainService;
|
|
@@ -38,7 +39,7 @@ let MainController = class MainController {
|
|
|
38
39
|
};
|
|
39
40
|
exports.MainController = MainController;
|
|
40
41
|
__decorate([
|
|
41
|
-
(0, common_1.Get)('
|
|
42
|
+
(0, common_1.Get)('player_check_state'),
|
|
42
43
|
__param(0, (0, common_1.Headers)()),
|
|
43
44
|
__metadata("design:type", Function),
|
|
44
45
|
__metadata("design:paramtypes", [Object]),
|
|
@@ -66,11 +67,11 @@ __decorate([
|
|
|
66
67
|
__metadata("design:returntype", Promise)
|
|
67
68
|
], MainController.prototype, "unsubscribeFromTablesScreen", null);
|
|
68
69
|
__decorate([
|
|
69
|
-
(0, common_1.Get)('
|
|
70
|
+
(0, common_1.Get)('find_free_table'),
|
|
70
71
|
__param(0, (0, common_1.Headers)()),
|
|
71
72
|
__metadata("design:type", Function),
|
|
72
73
|
__metadata("design:paramtypes", [Object]),
|
|
73
|
-
__metadata("design:returntype",
|
|
74
|
+
__metadata("design:returntype", dto_1.FindFreeTableDto)
|
|
74
75
|
], MainController.prototype, "findFreeTable", null);
|
|
75
76
|
exports.MainController = MainController = __decorate([
|
|
76
77
|
(0, common_1.Controller)('main'),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.controller.js","sourceRoot":"","sources":["../../../src/modules/main/main.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0D;
|
|
1
|
+
{"version":3,"file":"main.controller.js","sourceRoot":"","sources":["../../../src/modules/main/main.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA0D;AAG1D,mCAAkE;AAElE,iDAA6C;AAGtC,IAAM,cAAc,GAApB,MAAM,cAAc;IAEF;IADrB,YACqB,WAAwB;QAAxB,gBAAW,GAAX,WAAW,CAAa;IACzC,CAAC;IAGL,UAAU,CAAY,OAAoB;QACtC,OAAO,IAAI,CAAC,WAAW,CAAC,gBAAgB,CAAC,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7F,CAAC;IAGD,SAAS,CAAY,OAAoB;QACrC,OAAO,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC/D,CAAC;IAGD,uBAAuB,CAAY,OAAoB;QACnD,OAAO,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IAC7E,CAAC;IAGD,2BAA2B,CAAY,OAAoB;QACvD,OAAO,IAAI,CAAC,WAAW,CAAC,2BAA2B,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;IACjF,CAAC;IAGD,aAAa,CAAY,OAAoB;QACzC,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACrE,CAAC;CACJ,CAAA;AA7BY,wCAAc;AAMvB;IADC,IAAA,YAAG,EAAC,oBAAoB,CAAC;IACd,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;gDAEpB;AAGD;IADC,IAAA,YAAG,EAAC,QAAQ,CAAC;IACH,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;+CAEnB;AAGD;IADC,IAAA,YAAG,EAAC,kBAAkB,CAAC;IACC,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;6DAEjC;AAGD;IADC,IAAA,YAAG,EAAC,oBAAoB,CAAC;IACG,WAAA,IAAA,gBAAO,GAAE,CAAA;;;;iEAErC;AAGD;IADC,IAAA,YAAG,EAAC,iBAAiB,CAAC;IACR,WAAA,IAAA,gBAAO,GAAE,CAAA;;;oCAAwB,sBAAgB;mDAE/D;yBA5BQ,cAAc;IAD1B,IAAA,mBAAU,EAAC,MAAM,CAAC;qCAGmB,0BAAW;GAFpC,cAAc,CA6B1B"}
|
|
@@ -42,10 +42,10 @@ let MainModule = MainModule_1 = class MainModule {
|
|
|
42
42
|
async onModuleInit() {
|
|
43
43
|
this.eventsBusMainTablesSubscribeService.subscribe(this.onHandleStatusRoomChange);
|
|
44
44
|
}
|
|
45
|
-
onHandleStatusRoomChange = () => {
|
|
45
|
+
onHandleStatusRoomChange = (event) => {
|
|
46
46
|
this.eventsBusMainTablesSubscribeService.getTablesSubscribers().forEach((subscriber) => {
|
|
47
47
|
const screen = this.mainService.getScreen(subscriber.language);
|
|
48
|
-
subscriber.sendMessage(new jp_ms_common_engine_1.MainTablesUpdateListWsEvent(
|
|
48
|
+
subscriber.sendMessage(new jp_ms_common_engine_1.MainTablesUpdateListWsEvent(event.game, screen));
|
|
49
49
|
});
|
|
50
50
|
};
|
|
51
51
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.module.js","sourceRoot":"","sources":["../../../src/modules/main/main.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"main.module.js","sourceRoot":"","sources":["../../../src/modules/main/main.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,6DAAoG;AACpG,iDAAyH;AAEzH,4CAAmE;AAEnE,uDAAmD;AACnD,iDAA6C;AAC7C,qDAAgD;AAezC,IAAM,UAAU,kBAAhB,MAAM,UAAU;IAEE;IACA;IAFrB,YACqB,mCAAwE,EACxE,WAAwB;QADxB,wCAAmC,GAAnC,mCAAmC,CAAqC;QACxE,gBAAW,GAAX,WAAW,CAAa;IACzC,CAAC;IAEL,MAAM,CAAC,YAAY,CAAE,OAA0B;QAC3C,OAAO;YACH,MAAM,EAAE,YAAU;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,6BAAY;oBACrB,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;iBACnB;aAChB;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY;QACd,IAAI,CAAC,mCAAmC,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACtF,CAAC;IAEO,wBAAwB,GAAG,CAAC,KAA2B,EAAE,EAAE;QAC/D,IAAI,CAAC,mCAAmC,CAAC,oBAAoB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YAC/F,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,CAAC,SAAS,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;YAC/D,UAAU,CAAC,WAAW,CAAC,IAAI,iDAA2B,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAChF,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;CACJ,CAAA;AA9BY,gCAAU;qBAAV,UAAU;IAZtB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAI,CAAC,IAAI,EAAE,MAAM,EAAE,0BAAU,EAAE,CAAC,CAAC;YACpE,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,2BAAW,CAAC,IAAI,EAAE,MAAM,EAAE,iCAAiB,EAAE,CAAC,CAAC;SACrF;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE;YACP,0BAAW;YACX,+BAAe;YACf,qCAAqB;SACxB;KACJ,CAAC;qCAG4D,+CAAmC;QAC3D,0BAAW;GAHpC,UAAU,CA8BtB"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ActivityLogRepository, UsersRepository } from 'jp.db.schemas';
|
|
2
|
-
import { BaseAppScreenDto, PlayerCheckStateDto } from '../../dto';
|
|
2
|
+
import { BaseAppScreenDto, PlayerCheckStateDto, FindFreeTableDto } from '../../dto';
|
|
3
3
|
import { SimpleRoomsManagerService } from '../simple-rooms-manager';
|
|
4
4
|
import { PlayersManagerService } from '../players-manager';
|
|
5
5
|
import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager';
|
|
@@ -20,5 +20,5 @@ export declare class MainService {
|
|
|
20
20
|
subscribeOnTablesScreen(clientAuthToken: string): Promise<void>;
|
|
21
21
|
unsubscribeFromTablesScreen(clientAuthToken: string): Promise<void>;
|
|
22
22
|
playerCheckState(clientAuthToken: string, game: string): Promise<PlayerCheckStateDto>;
|
|
23
|
-
findFreeTable(clientAuthToken: string):
|
|
23
|
+
findFreeTable(clientAuthToken: string): FindFreeTableDto;
|
|
24
24
|
}
|
|
@@ -11,12 +11,15 @@ var __metadata = (this && this.__metadata) || function (k, v) {
|
|
|
11
11
|
var __param = (this && this.__param) || function (paramIndex, decorator) {
|
|
12
12
|
return function (target, key) { decorator(target, key, paramIndex); }
|
|
13
13
|
};
|
|
14
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
15
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
16
|
+
};
|
|
14
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
18
|
exports.MainService = void 0;
|
|
16
19
|
const common_1 = require("@nestjs/common");
|
|
17
20
|
const jp_common_models_1 = require("jp.common.models");
|
|
18
|
-
const
|
|
19
|
-
const
|
|
21
|
+
const dayjs_1 = __importDefault(require("dayjs"));
|
|
22
|
+
const isToday_1 = __importDefault(require("dayjs/plugin/isToday"));
|
|
20
23
|
const jp_db_schemas_1 = require("jp.db.schemas");
|
|
21
24
|
const dto_1 = require("../../dto");
|
|
22
25
|
const simple_rooms_manager_1 = require("../simple-rooms-manager");
|
|
@@ -44,7 +47,7 @@ let MainService = class MainService {
|
|
|
44
47
|
this.userRepository = userRepository;
|
|
45
48
|
this.activityLogRepository = activityLogRepository;
|
|
46
49
|
this.options = options;
|
|
47
|
-
|
|
50
|
+
dayjs_1.default.extend(isToday_1.default);
|
|
48
51
|
}
|
|
49
52
|
getScreen(lang) {
|
|
50
53
|
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()));
|
|
@@ -78,15 +81,18 @@ let MainService = class MainService {
|
|
|
78
81
|
else if (isNewbie) {
|
|
79
82
|
redirectUrl = jp_common_models_1.AppScreenRoutesEnum.WELCOME;
|
|
80
83
|
}
|
|
81
|
-
else if (
|
|
84
|
+
else if ((0, dayjs_1.default)(last7logins[0].date).isToday() && last7logins[0].count === 1) {
|
|
82
85
|
redirectUrl = jp_common_models_1.AppScreenRoutesEnum.TODAY_BONUS;
|
|
83
86
|
}
|
|
84
|
-
else if (
|
|
87
|
+
else if ((0, dayjs_1.default)(foundUser.premiumExpired).isToday()) {
|
|
85
88
|
redirectUrl = jp_common_models_1.AppScreenRoutesEnum.PREMIUM;
|
|
86
89
|
}
|
|
87
90
|
return dto_1.PlayerCheckStateDto.fromEntities(redirectUrl, player?.id ?? '');
|
|
88
91
|
}
|
|
89
92
|
findFreeTable(clientAuthToken) {
|
|
93
|
+
const player = this.playersManager.getPlayerById(clientAuthToken);
|
|
94
|
+
const tableId = this.simpleRoomsManager.getFreeFastGameRoom()?.getId() ?? '';
|
|
95
|
+
return dto_1.FindFreeTableDto.fromEntities(tableId ? jp_common_models_1.router.getRoomPath(tableId) : '', player?.id ?? '');
|
|
90
96
|
}
|
|
91
97
|
};
|
|
92
98
|
exports.MainService = MainService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.service.js","sourceRoot":"","sources":["../../../src/modules/main/main.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"main.service.js","sourceRoot":"","sources":["../../../src/modules/main/main.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAAkF;AAClF,uDAA8E;AAC9E,kDAA0B;AAC1B,mEAA2C;AAC3C,iDAAuE;AAEvE,mCAAoF;AACpF,kEAAoE;AACpE,wDAA2D;AAC3D,8FAA8F;AAC9F,kGAAkG;AAClG,oHAA4G;AAG5G,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,cAA+B,EAC/B,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,mBAAc,GAAd,cAAc,CAAiB;QAC/B,0BAAqB,GAArB,qBAAqB,CAAuB;QACtB,YAAO,GAAP,OAAO,CAAoB;QAElE,eAAK,CAAC,MAAM,CAAC,iBAAO,CAAC,CAAC;IAC1B,CAAC;IAED,SAAS,CAAE,IAAY;QACnB,OAAO,IAAI,sBAAgB,CACvB,IAAI,gCAAa,CACb,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,CAChD,CAAC,KAAK,EAAE,CACZ,CACJ,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,cAAc,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;QACtE,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,EAAE,QAAQ,EAAE,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACvC,WAAW,GAAG,yBAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACrD,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;QAClC,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,IAAI,EAAE,CAAC;QAG7E,OAAO,sBAAgB,CAAC,YAAY,CAChC,OAAO,CAAC,CAAC,CAAC,yBAAM,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,EAC1C,MAAM,EAAE,EAAE,IAAI,EAAE,CACnB,CAAC;IACN,CAAC;CACJ,CAAA;AAtFY,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;QACxD,+BAAe;QACR,qCAAqB;GARxD,WAAW,CAsFvB"}
|
|
@@ -48,7 +48,7 @@ let ManyTablesTournamentModule = ManyTablesTournamentModule_1 = class ManyTables
|
|
|
48
48
|
onHandleStatusRoomChange = (event) => {
|
|
49
49
|
this.manyTablesRoomsManagerService.getRoomById(event.roomId)?.getStatusScreenWatchers().forEach((subscriber) => {
|
|
50
50
|
const screen = this.manyTablesTournamentService.getStatusScreen(event.roomId, subscriber.language);
|
|
51
|
-
subscriber.sendMessage(new jp_ms_common_engine_1.ManyTablesTournamentUpdateStatusWsEvent(screen.screen));
|
|
51
|
+
subscriber.sendMessage(new jp_ms_common_engine_1.ManyTablesTournamentUpdateStatusWsEvent(event.game, screen.screen));
|
|
52
52
|
});
|
|
53
53
|
};
|
|
54
54
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"many-tables-tournament.module.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,iDAA8H;AAC9H,6DAAgH;AAEhH,kGAAkG;AAClG,4CAA6E;AAE7E,2FAAqF;AACrF,qFAA+E;AAC/E,yFAAoF;AAU7E,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IAEd;IACA;IACA;IAHrB,YACqB,6BAAsE,EACtE,6CAA4F,EAC5F,2BAAwD;QAFxD,kCAA6B,GAA7B,6BAA6B,CAAyC;QACtE,kDAA6C,GAA7C,6CAA6C,CAA+C;QAC5F,gCAA2B,GAA3B,2BAA2B,CAA6B;IACzE,CAAC;IAEL,MAAM,CAAC,YAAY,CAAC,OAA0C;QAC1D,OAAO;YACH,MAAM,EAAE,4BAA0B;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,iEAA8B;oBACvC,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;iBACnB;aAChB;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY;QACd,IAAI,CAAC,6CAA6C,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAChG,CAAC;IAEO,wBAAwB,GAAG,CAAC,KAA2B,EAAE,EAAE;QAC/D,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YACvH,MAAM,MAAM,GAAG,IAAI,CAAC,2BAA2B,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YACnG,UAAU,CAAC,WAAW,CAAC,IAAI,6DAAuC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"many-tables-tournament.module.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.module.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,iDAA8H;AAC9H,6DAAgH;AAEhH,kGAAkG;AAClG,4CAA6E;AAE7E,2FAAqF;AACrF,qFAA+E;AAC/E,yFAAoF;AAU7E,IAAM,0BAA0B,kCAAhC,MAAM,0BAA0B;IAEd;IACA;IACA;IAHrB,YACqB,6BAAsE,EACtE,6CAA4F,EAC5F,2BAAwD;QAFxD,kCAA6B,GAA7B,6BAA6B,CAAyC;QACtE,kDAA6C,GAA7C,6CAA6C,CAA+C;QAC5F,gCAA2B,GAA3B,2BAA2B,CAA6B;IACzE,CAAC;IAEL,MAAM,CAAC,YAAY,CAAC,OAA0C;QAC1D,OAAO;YACH,MAAM,EAAE,4BAA0B;YAClC,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,iEAA8B;oBACvC,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;iBACnB;aAChB;SACJ,CAAC;IACN,CAAC;IAED,KAAK,CAAC,YAAY;QACd,IAAI,CAAC,6CAA6C,CAAC,SAAS,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IAChG,CAAC;IAEO,wBAAwB,GAAG,CAAC,KAA2B,EAAE,EAAE;QAC/D,IAAI,CAAC,6BAA6B,CAAC,WAAW,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,uBAAuB,EAAE,CAAC,OAAO,CAAC,CAAC,UAAsB,EAAE,EAAE;YACvH,MAAM,MAAM,GAAG,IAAI,CAAC,2BAA2B,CAAC,eAAe,CAAC,KAAK,CAAC,MAAM,EAAE,UAAU,CAAC,QAAQ,CAAC,CAAC;YACnG,UAAU,CAAC,WAAW,CAAC,IAAI,6DAAuC,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACnG,CAAC,CAAC,CAAC;IACP,CAAC,CAAA;CACJ,CAAA;AA/BY,gEAA0B;qCAA1B,0BAA0B;IAPtC,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,wCAAwB,CAAC,IAAI,EAAE,MAAM,EAAE,8CAA8B,EAAE,CAAC,CAAC;SAC/G;QACD,WAAW,EAAE,CAAC,kEAA8B,CAAC;QAC7C,SAAS,EAAE,CAAC,4DAA2B,EAAE,mDAAmC,CAAC;KAChF,CAAC;qCAGsD,8EAAuC;QACvB,yDAA6C;QAC/D,4DAA2B;GAJpE,0BAA0B,CA+BtC"}
|
|
@@ -87,7 +87,7 @@ let ManyTablesTournamentService = class ManyTablesTournamentService {
|
|
|
87
87
|
const master = tournament?.getMasterById(tournamentId);
|
|
88
88
|
if (player && tournament && master) {
|
|
89
89
|
tournament.handleJoinTournament(player);
|
|
90
|
-
if (tournament.
|
|
90
|
+
if (tournament.getRoomMaster().isInProgress()) {
|
|
91
91
|
if (player.isPlayer() || player.isTableQueuer()) {
|
|
92
92
|
return join_tournament_dto_1.JoinTournamentDto.fromEntities(jp_common_models_1.router.getManyTablesTournamentTablePath(player.tableId ?? ''), player.id);
|
|
93
93
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"many-tables-tournament.service.js","sourceRoot":"","sources":["../../../src/modules/many-tables-tournament/many-tables-tournament.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAkF;AAClF,uDAK0B;AAE1B,mCAA6C;AAC7C,uJAA+I;AAC/I,wFAAmF;AACnF,8EAAyE;AAKzE,yFAAoF;AACpF,2GAAmG;AACnG,qHAA4G;
|
|
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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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
|
-
import { IAppScreen, UniversalScreenView, ILocaleService } from "jp.common.models";
|
|
2
|
-
import { Menu } from "jp.db.schemas";
|
|
1
|
+
import { IAppScreen, UniversalScreenView, ILocaleService, BaseSectionComponent } from "jp.common.models";
|
|
2
|
+
import { Banner, Menu } from "jp.db.schemas";
|
|
3
3
|
export declare class MenuScreenView extends UniversalScreenView {
|
|
4
4
|
private readonly menuItems;
|
|
5
|
-
|
|
5
|
+
private readonly banner;
|
|
6
|
+
constructor(localeService: ILocaleService, lang: string, menuItems: Array<Menu>, banner: Banner | null);
|
|
6
7
|
build(): IAppScreen;
|
|
8
|
+
getHeaderSection(): BaseSectionComponent;
|
|
7
9
|
}
|
|
@@ -4,15 +4,23 @@ exports.MenuScreenView = void 0;
|
|
|
4
4
|
const jp_common_models_1 = require("jp.common.models");
|
|
5
5
|
class MenuScreenView extends jp_common_models_1.UniversalScreenView {
|
|
6
6
|
menuItems;
|
|
7
|
-
|
|
7
|
+
banner;
|
|
8
|
+
constructor(localeService, lang, menuItems, banner) {
|
|
8
9
|
super(localeService, lang);
|
|
9
10
|
this.menuItems = menuItems;
|
|
11
|
+
this.banner = banner;
|
|
10
12
|
}
|
|
11
13
|
build() {
|
|
12
14
|
return new jp_common_models_1.StandardScreenComponent(jp_common_models_1.AppScreenIdEnum.MENU)
|
|
13
|
-
.addSection(
|
|
15
|
+
.addSection(this.getHeaderSection())
|
|
14
16
|
.addSection(new jp_common_models_1.MenuListSectionComponent('id1', this.menuItems.map((item) => (new jp_common_models_1.MenuSectionListItemComponent(item.code, this.lang === 'ru' ? item.title : item.titleEn, new jp_common_models_1.IconImageComponent(item.icon), item.url)))));
|
|
15
17
|
}
|
|
18
|
+
getHeaderSection() {
|
|
19
|
+
if (this.banner) {
|
|
20
|
+
return new jp_common_models_1.OneBannerSectionComponent('banner', new jp_common_models_1.BannerSectionListItemComponent(this.banner.bannerId, this.banner.titleRu, this.localeService.t('common.menu.header.title', { lang: this.lang }), new jp_common_models_1.UrlImageComponent(this.banner.image), this.banner.link));
|
|
21
|
+
}
|
|
22
|
+
return new jp_common_models_1.MenuHeaderSectionComponent('header', this.localeService.t('common.menu.header.title', { lang: this.lang }));
|
|
23
|
+
}
|
|
16
24
|
}
|
|
17
25
|
exports.MenuScreenView = MenuScreenView;
|
|
18
26
|
//# sourceMappingURL=menu-screen.view.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-screen.view.js","sourceRoot":"","sources":["../../../src/modules/menu/menu-screen.view.ts"],"names":[],"mappings":";;;AAAA,
|
|
1
|
+
{"version":3,"file":"menu-screen.view.js","sourceRoot":"","sources":["../../../src/modules/menu/menu-screen.view.ts"],"names":[],"mappings":";;;AAAA,uDAc0B;AAG1B,MAAa,cAAe,SAAQ,sCAAmB;IAClC,SAAS,CAAc;IACvB,MAAM,CAAe;IAEtC,YACI,aAA6B,EAC7B,IAAY,EACZ,SAAsB,EACtB,MAAqB;QAErB,KAAK,CAAC,aAAa,EAAE,IAAI,CAAC,CAAC;QAC3B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAC;QAC3B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED,KAAK;QACD,OAAO,IAAI,0CAAuB,CAAC,kCAAe,CAAC,IAAI,CAAC;aACnD,UAAU,CAAC,IAAI,CAAC,gBAAgB,EAAE,CAAC;aACnC,UAAU,CACP,IAAI,2CAAwB,CACxB,KAAK,EACL,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CACzB,IAAI,+CAA4B,CAC5B,IAAI,CAAC,IAAI,EACT,IAAI,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAC9C,IAAI,qCAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,EACjC,IAAI,CAAC,GAAG,CACX,CACJ,CAAC,CACL,CACJ,CAAC;IACV,CAAC;IAED,gBAAgB;QACZ,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YACd,OAAO,IAAI,4CAAyB,CAChC,QAAQ,EACR,IAAI,iDAA8B,CAC9B,IAAI,CAAC,MAAM,CAAC,QAAQ,EACpB,IAAI,CAAC,MAAM,CAAC,OAAO,EACnB,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,EACrE,IAAI,oCAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,EACxC,IAAI,CAAC,MAAM,CAAC,IAAI,CACnB,CACJ,CAAC;QACN,CAAC;QAED,OAAO,IAAI,6CAA0B,CACjC,QAAQ,EACR,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,0BAA0B,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CACxE,CAAC;IACN,CAAC;CACJ;AApDD,wCAoDC"}
|
|
@@ -34,9 +34,10 @@ exports.MenuModule = MenuModule = MenuModule_1 = __decorate([
|
|
|
34
34
|
(0, common_1.Module)({
|
|
35
35
|
imports: [
|
|
36
36
|
mongoose_1.MongooseModule.forFeature([{ name: jp_db_schemas_1.Menu.name, schema: jp_db_schemas_1.MenuSchema }]),
|
|
37
|
+
mongoose_1.MongooseModule.forFeature([{ name: jp_db_schemas_1.Banner.name, schema: jp_db_schemas_1.BannerSchema }]),
|
|
37
38
|
],
|
|
38
39
|
controllers: [menu_controller_1.MenuController],
|
|
39
|
-
providers: [jp_db_schemas_1.MenuRepository, menu_service_1.MenuService],
|
|
40
|
+
providers: [jp_db_schemas_1.MenuRepository, menu_service_1.MenuService, jp_db_schemas_1.BannersRepository],
|
|
40
41
|
})
|
|
41
42
|
], MenuModule);
|
|
42
43
|
//# sourceMappingURL=menu.module.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.module.js","sourceRoot":"","sources":["../../../src/modules/menu/menu.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,
|
|
1
|
+
{"version":3,"file":"menu.module.js","sourceRoot":"","sources":["../../../src/modules/menu/menu.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAiE;AACjE,+CAAkD;AAClD,iDAA0G;AAE1G,uDAAmD;AACnD,iDAA6C;AAC7C,qDAA+C;AAWxC,IAAM,UAAU,kBAAhB,MAAM,UAAU;IACnB,MAAM,CAAC,YAAY,CAAC,OAA0B;QAC1C,OAAO;YACH,MAAM,EAAE,YAAU;YAClB,OAAO,EAAE,OAAO,CAAC,OAAO,IAAI,EAAE;YAC9B,SAAS,EAAE;gBACP;oBACI,OAAO,EAAE,6BAAY;oBACrB,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,EAAE;iBACnB;aAChB;SACJ,CAAC;IACN,CAAC;CACJ,CAAA;AAdY,gCAAU;qBAAV,UAAU;IARtB,IAAA,eAAM,EAAC;QACJ,OAAO,EAAE;YACL,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,oBAAI,CAAC,IAAI,EAAE,MAAM,EAAE,0BAAU,EAAE,CAAC,CAAC;YACpE,yBAAc,CAAC,UAAU,CAAC,CAAC,EAAE,IAAI,EAAE,sBAAM,CAAC,IAAI,EAAE,MAAM,EAAE,4BAAY,EAAE,CAAC,CAAC;SAC3E;QACD,WAAW,EAAE,CAAC,gCAAc,CAAC;QAC7B,SAAS,EAAE,CAAC,8BAAc,EAAE,0BAAW,EAAE,iCAAiB,CAAC;KAC9D,CAAC;GACW,UAAU,CActB"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import { MenuRepository } from 'jp.db.schemas';
|
|
1
|
+
import { BannersRepository, MenuRepository } from 'jp.db.schemas';
|
|
2
2
|
import { IAppHeaders } from 'jp.common.models';
|
|
3
3
|
import { BaseAppScreenDto } from '../../dto';
|
|
4
4
|
import { MenuFactoryOptions } from './menu.interfaces';
|
|
5
5
|
export declare class MenuService {
|
|
6
6
|
private readonly menuRepository;
|
|
7
|
+
private readonly bannersRepository;
|
|
7
8
|
private readonly options;
|
|
8
|
-
constructor(menuRepository: MenuRepository, options: MenuFactoryOptions);
|
|
9
|
+
constructor(menuRepository: MenuRepository, bannersRepository: BannersRepository, options: MenuFactoryOptions);
|
|
9
10
|
getScreen(headers: IAppHeaders): Promise<BaseAppScreenDto>;
|
|
10
11
|
}
|