jp.ms.common.modules 1.0.20 → 1.0.22

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.
Files changed (142) hide show
  1. package/dist/dto/app-screen/app-screen-dialog.dto.d.ts +12 -0
  2. package/dist/dto/app-screen/app-screen-dialog.dto.js +90 -0
  3. package/dist/dto/app-screen/app-screen-dialog.dto.js.map +1 -0
  4. package/dist/dto/app-screen/app-screen-field-list-item.dto.d.ts +7 -0
  5. package/dist/dto/app-screen/app-screen-field-list-item.dto.js +63 -0
  6. package/dist/dto/app-screen/app-screen-field-list-item.dto.js.map +1 -0
  7. package/dist/dto/app-screen/app-screen-field.dto.d.ts +10 -0
  8. package/dist/dto/app-screen/app-screen-field.dto.js +83 -0
  9. package/dist/dto/app-screen/app-screen-field.dto.js.map +1 -0
  10. package/dist/dto/app-screen/app-screen.dto.d.ts +3 -0
  11. package/dist/dto/app-screen/app-screen.dto.js +12 -0
  12. package/dist/dto/app-screen/app-screen.dto.js.map +1 -1
  13. package/dist/dto/common/player-check-state.dto.d.ts +2 -2
  14. package/dist/dto/common/player-check-state.dto.js.map +1 -1
  15. package/dist/modules/base-achievements/base-achievements.module.d.ts +15 -0
  16. package/dist/modules/base-achievements/base-achievements.module.js +138 -0
  17. package/dist/modules/base-achievements/base-achievements.module.js.map +1 -0
  18. package/dist/modules/base-achievements/index.d.ts +1 -0
  19. package/dist/modules/base-achievements/index.js +6 -0
  20. package/dist/modules/base-achievements/index.js.map +1 -0
  21. package/dist/modules/event-bus/events-bus.app.subscribe.service.d.ts +7 -0
  22. package/dist/modules/event-bus/events-bus.app.subscribe.service.js +32 -0
  23. package/dist/modules/event-bus/events-bus.app.subscribe.service.js.map +1 -0
  24. package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.d.ts +11 -0
  25. package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.js +43 -0
  26. package/dist/modules/event-bus/events-bus.main-tables.subscribe.service.js.map +1 -0
  27. package/dist/modules/event-bus/events-bus.many-tables-tournament.subscribe.service.d.ts +3 -0
  28. package/dist/modules/event-bus/events-bus.many-tables-tournament.subscribe.service.js +18 -0
  29. package/dist/modules/event-bus/events-bus.many-tables-tournament.subscribe.service.js.map +1 -0
  30. package/dist/modules/event-bus/events-bus.module.d.ts +2 -0
  31. package/dist/modules/event-bus/events-bus.module.js +35 -0
  32. package/dist/modules/event-bus/events-bus.module.js.map +1 -0
  33. package/dist/modules/event-bus/events-bus.one-table-tournament.subscribe.service.d.ts +3 -0
  34. package/dist/modules/event-bus/events-bus.one-table-tournament.subscribe.service.js +18 -0
  35. package/dist/modules/event-bus/events-bus.one-table-tournament.subscribe.service.js.map +1 -0
  36. package/dist/modules/event-bus/events-bus.tournament.subscribe.service.d.ts +7 -0
  37. package/dist/modules/event-bus/events-bus.tournament.subscribe.service.js +18 -0
  38. package/dist/modules/event-bus/events-bus.tournament.subscribe.service.js.map +1 -0
  39. package/dist/modules/event-bus/index.d.ts +5 -0
  40. package/dist/modules/event-bus/index.js +14 -0
  41. package/dist/modules/event-bus/index.js.map +1 -0
  42. package/dist/modules/index.d.ts +2 -0
  43. package/dist/modules/index.js +6 -1
  44. package/dist/modules/index.js.map +1 -1
  45. package/dist/modules/main/main-tables-list-screen.view.d.ts +9 -0
  46. package/dist/modules/main/main-tables-list-screen.view.js +38 -0
  47. package/dist/modules/main/main-tables-list-screen.view.js.map +1 -0
  48. package/dist/modules/main/main.controller.d.ts +4 -2
  49. package/dist/modules/main/main.controller.js +23 -4
  50. package/dist/modules/main/main.controller.js.map +1 -1
  51. package/dist/modules/main/main.module.d.ts +7 -1
  52. package/dist/modules/main/main.module.js +29 -3
  53. package/dist/modules/main/main.module.js.map +1 -1
  54. package/dist/modules/main/main.service.d.ts +10 -3
  55. package/dist/modules/main/main.service.js +54 -26
  56. package/dist/modules/main/main.service.js.map +1 -1
  57. package/dist/modules/many-tables-tournament/many-tables-tournament-status-screen.view.d.ts +7 -0
  58. package/dist/modules/many-tables-tournament/many-tables-tournament-status-screen.view.js +19 -0
  59. package/dist/modules/many-tables-tournament/many-tables-tournament-status-screen.view.js.map +1 -0
  60. package/dist/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.d.ts +7 -0
  61. package/dist/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.js +18 -0
  62. package/dist/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.js.map +1 -0
  63. package/dist/modules/many-tables-tournament/many-tables-tournament.controller.d.ts +4 -1
  64. package/dist/modules/many-tables-tournament/many-tables-tournament.controller.js +35 -1
  65. package/dist/modules/many-tables-tournament/many-tables-tournament.controller.js.map +1 -1
  66. package/dist/modules/many-tables-tournament/many-tables-tournament.module.d.ts +9 -1
  67. package/dist/modules/many-tables-tournament/many-tables-tournament.module.js +22 -2
  68. package/dist/modules/many-tables-tournament/many-tables-tournament.module.js.map +1 -1
  69. package/dist/modules/many-tables-tournament/many-tables-tournament.service.d.ts +4 -1
  70. package/dist/modules/many-tables-tournament/many-tables-tournament.service.js +34 -10
  71. package/dist/modules/many-tables-tournament/many-tables-tournament.service.js.map +1 -1
  72. package/dist/modules/menu/menu-screen.view.d.ts +7 -0
  73. package/dist/modules/menu/menu-screen.view.js +18 -0
  74. package/dist/modules/menu/menu-screen.view.js.map +1 -0
  75. package/dist/modules/menu/menu.service.d.ts +1 -1
  76. package/dist/modules/menu/menu.service.js +3 -5
  77. package/dist/modules/menu/menu.service.js.map +1 -1
  78. package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.d.ts +7 -0
  79. package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js +19 -0
  80. package/dist/modules/one-table-tournament/one-table-tournament-status-screen.view.js.map +1 -0
  81. package/dist/modules/one-table-tournament/one-table-tournament.controller.d.ts +3 -1
  82. package/dist/modules/one-table-tournament/one-table-tournament.controller.js +23 -1
  83. package/dist/modules/one-table-tournament/one-table-tournament.controller.js.map +1 -1
  84. package/dist/modules/one-table-tournament/one-table-tournament.module.d.ts +9 -1
  85. package/dist/modules/one-table-tournament/one-table-tournament.module.js +22 -2
  86. package/dist/modules/one-table-tournament/one-table-tournament.module.js.map +1 -1
  87. package/dist/modules/one-table-tournament/one-table-tournament.service.d.ts +3 -1
  88. package/dist/modules/one-table-tournament/one-table-tournament.service.js +19 -6
  89. package/dist/modules/one-table-tournament/one-table-tournament.service.js.map +1 -1
  90. package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.d.ts +7 -2
  91. package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js +20 -8
  92. package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js.map +1 -1
  93. package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.d.ts +7 -2
  94. package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.js +24 -5
  95. package/dist/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.js.map +1 -1
  96. package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.d.ts +5 -1
  97. package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.js +17 -5
  98. package/dist/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.js.map +1 -1
  99. package/dist/tsconfig.tsbuildinfo +1 -1
  100. package/dist/views/index.d.ts +1 -0
  101. package/dist/views/index.js +6 -0
  102. package/dist/views/index.js.map +1 -0
  103. package/dist/views/tournament-buy-ticket-dialog.view.d.ts +4 -0
  104. package/dist/views/tournament-buy-ticket-dialog.view.js +11 -0
  105. package/dist/views/tournament-buy-ticket-dialog.view.js.map +1 -0
  106. package/package.json +7 -7
  107. package/src/dto/app-screen/app-screen-dialog.dto.ts +64 -0
  108. package/src/dto/app-screen/app-screen-field-list-item.dto.ts +42 -0
  109. package/src/dto/app-screen/app-screen-field.dto.ts +59 -0
  110. package/src/dto/app-screen/app-screen.dto.ts +12 -1
  111. package/src/dto/common/player-check-state.dto.ts +2 -2
  112. package/src/modules/base-achievements/base-achievements.module.ts +163 -0
  113. package/src/modules/base-achievements/index.ts +1 -0
  114. package/src/modules/event-bus/events-bus.app.subscribe.service.ts +21 -0
  115. package/src/modules/event-bus/events-bus.main-tables.subscribe.service.ts +34 -0
  116. package/src/modules/event-bus/events-bus.many-tables-tournament.subscribe.service.ts +6 -0
  117. package/src/modules/event-bus/events-bus.module.ts +23 -0
  118. package/src/modules/event-bus/events-bus.one-table-tournament.subscribe.service.ts +6 -0
  119. package/src/modules/event-bus/events-bus.tournament.subscribe.service.ts +19 -0
  120. package/src/modules/event-bus/index.ts +5 -0
  121. package/src/modules/index.ts +2 -1
  122. package/src/modules/main/main-tables-list-screen.view.ts +107 -0
  123. package/src/modules/main/main.controller.ts +16 -7
  124. package/src/modules/main/main.module.ts +30 -5
  125. package/src/modules/main/main.service.ts +66 -82
  126. package/src/modules/many-tables-tournament/index.ts +1 -1
  127. package/src/modules/many-tables-tournament/many-tables-tournament-status-screen.view.ts +59 -0
  128. package/src/modules/many-tables-tournament/many-tables-tournament-tables-list-screen.view.ts +53 -0
  129. package/src/modules/many-tables-tournament/many-tables-tournament.controller.ts +36 -11
  130. package/src/modules/many-tables-tournament/many-tables-tournament.module.ts +21 -4
  131. package/src/modules/many-tables-tournament/many-tables-tournament.service.ts +68 -73
  132. package/src/modules/menu/menu-screen.view.ts +48 -0
  133. package/src/modules/menu/menu.service.ts +14 -32
  134. package/src/modules/one-table-tournament/one-table-tournament-status-screen.view.ts +65 -0
  135. package/src/modules/one-table-tournament/one-table-tournament.controller.ts +23 -7
  136. package/src/modules/one-table-tournament/one-table-tournament.module.ts +21 -4
  137. package/src/modules/one-table-tournament/one-table-tournament.service.ts +39 -46
  138. package/src/modules/simple-rooms-manager/simple-rooms-manager.service.ts +30 -17
  139. package/src/modules/tournament-many-tables-rooms-manager/tournament-many-tables-rooms-manager.service.ts +39 -16
  140. package/src/modules/tournament-one-table-rooms-manager/tournament-one-table-rooms-manager.service.ts +48 -35
  141. package/src/views/index.ts +1 -0
  142. package/src/views/tournament-buy-ticket-dialog.view.ts +21 -0
@@ -0,0 +1,107 @@
1
+ import {
2
+ AppScreen,
3
+ AppScreenAppBar,
4
+ AppScreenIconEnum,
5
+ AppScreenIdEnum,
6
+ AppScreenSection,
7
+ AppScreenSectionButton,
8
+ AppScreenSectionImage,
9
+ AppScreenSectionListItem,
10
+ IAppScreen,
11
+ UniversalScreenView,
12
+ ILocaleService,
13
+ router,
14
+ AppScreenSectionButtons,
15
+ } from "jp.common.models";
16
+ import {
17
+ SimpleRoom,
18
+ OneTableTournamentRoom,
19
+ ManyTablesTournamentRoom,
20
+ } from "jp.ms.common.engine";
21
+ import { replacePattern } from "jp.common.utils";
22
+
23
+ import { TournamentBuyTicketDialogView } from "../../views";
24
+
25
+ export class MainTablesListScreenView extends UniversalScreenView {
26
+ private readonly simpleRooms: Array<SimpleRoom>;
27
+ private readonly oneTableTournamentRooms: Array<OneTableTournamentRoom>;
28
+ private readonly manyTablesTournamentRooms: Array<ManyTablesTournamentRoom>;
29
+
30
+ constructor(
31
+ localeService: ILocaleService,
32
+ lang: string,
33
+ simpleRooms: Array<SimpleRoom>,
34
+ oneTableTournamentRooms: Array<OneTableTournamentRoom>,
35
+ manyTablesTournamentRooms: Array<ManyTablesTournamentRoom>,
36
+ ) {
37
+ super(localeService, lang);
38
+ this.simpleRooms = simpleRooms;
39
+ this.oneTableTournamentRooms = oneTableTournamentRooms;
40
+ this.manyTablesTournamentRooms = manyTablesTournamentRooms;
41
+ }
42
+
43
+ build(): IAppScreen {
44
+ const oneTableTournamentsCardList = this.oneTableTournamentRooms.map((room) =>
45
+ AppScreenSectionListItem.CreateCardListItemMini(
46
+ room.getId(),
47
+ room.getTitle(this.lang),
48
+ room.getSubtitle(this.lang),
49
+ AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
50
+ true,
51
+ router.getOneTableTournamentStatusPath(room.getId()),
52
+ ));
53
+
54
+ const manyTablesTournamentsCardList = this.manyTablesTournamentRooms.map((room) =>
55
+ AppScreenSectionListItem.CreateCardListItemExtended(
56
+ room.getId(),
57
+ room.getTitle(this.lang),
58
+ room.getSubtitle(this.lang),
59
+ AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
60
+ true,
61
+ true,
62
+ AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
63
+ room.getDescription(this.lang),
64
+ AppScreenSectionButtons.CreatePrimaryButtonSection(AppScreenSectionButton.CreateTextButton('button')),
65
+ ));
66
+
67
+ const simpleRoomsTableCardList = this.simpleRooms.reduce<Array<AppScreenSectionListItem>>((result, room) => {
68
+ const list = room.getTables().map((table) => AppScreenSectionListItem.CreateCardListItemMini(
69
+ table.getId(),
70
+ replacePattern(table.getTitle(this.lang), { NUMBER: table.getNumber().toString() }),
71
+ replacePattern(table.getSubtitle(this.lang), {
72
+ HALF_BET: table.getHalfBet().toString(),
73
+ BET: table.getBet().toString()
74
+ }),
75
+ AppScreenSectionImage.CreateUrlImage(`${table.getPlayers().length}/${table.getTableSize()}`),
76
+ true,
77
+ router.getRoomPath(table.getId()),
78
+ ));
79
+
80
+ return [...result, ...list];
81
+ }, []);
82
+
83
+ return AppScreen.CreateStandardScreen(AppScreenIdEnum.ROOMS)
84
+ .addAppBar(
85
+ AppScreenAppBar.CreateStandardAppBar(
86
+ this.localeService.t('common.rooms.screen.title', { lang: this.lang }),
87
+ AppScreenSectionButton.CreateArrowBackButton(this.localeService.t('common.button.back', { lang: this.lang })),
88
+ ),
89
+ )
90
+ .addSection(
91
+ AppScreenSection.CreateCardListSection(
92
+ 'id1',
93
+ [
94
+ ...manyTablesTournamentsCardList,
95
+ ...oneTableTournamentsCardList,
96
+ ...simpleRoomsTableCardList
97
+ ]
98
+ ),
99
+ )
100
+ .addDialog(
101
+ new TournamentBuyTicketDialogView(
102
+ this.localeService,
103
+ this.lang,
104
+ ).build(),
105
+ )
106
+ }
107
+ }
@@ -7,23 +7,32 @@ import { MainService } from './main.service';
7
7
 
8
8
  @Controller('main')
9
9
  export class MainController {
10
- constructor (
10
+ constructor(
11
11
  private readonly mainService: MainService,
12
- ) {
13
- }
12
+ ) { }
14
13
 
15
14
  @Get('player/check/state')
16
- checkState (@Headers() headers: IAppHeaders): PlayerCheckStateDto {
17
- return this.mainService.playerCheckState(headers.client_auth_token);
15
+ checkState(@Headers() headers: IAppHeaders): Promise<PlayerCheckStateDto> {
16
+ return this.mainService.playerCheckState(headers.client_auth_token, headers.client_game);
18
17
  }
19
18
 
20
19
  @Get('tables')
21
- getScreen (@Headers() headers: IAppHeaders): Promise<IBaseAppScreen> {
20
+ getScreen(@Headers() headers: IAppHeaders): IBaseAppScreen {
22
21
  return this.mainService.getScreen(headers.client_language);
23
22
  }
24
23
 
24
+ @Get('tables/subscribe')
25
+ subscribeOnTablesScreen(@Headers() headers: IAppHeaders): Promise<void> {
26
+ return this.mainService.subscribeOnTablesScreen(headers.client_language);
27
+ }
28
+
29
+ @Get('tables/unsubscribe')
30
+ unsubscribeFromTablesScreen(@Headers() headers: IAppHeaders): Promise<void> {
31
+ return this.mainService.unsubscribeFromTablesScreen(headers.client_language);
32
+ }
33
+
25
34
  @Get('findFreeTable')
26
- findFreeTable (@Headers() headers: IAppHeaders) {
35
+ findFreeTable(@Headers() headers: IAppHeaders) {
27
36
  return this.mainService.findFreeTable(headers.client_auth_token);
28
37
  }
29
38
  }
@@ -1,4 +1,9 @@
1
1
  import { DynamicModule, Module, Provider } from '@nestjs/common';
2
+ import { MongooseModule } from '@nestjs/mongoose';
3
+ import { GamePlayer, MainTablesUpdateListWsEvent } from 'jp.ms.common.engine';
4
+ import { ActivityLog, ActivityLogRepository, ActivityLogSchema, User, UserSchema, UsersRepository } from 'jp.db.schemas';
5
+
6
+ import { EventsBusMainTablesSubscribeService } from '../event-bus';
2
7
 
3
8
  import { MainController } from './main.controller';
4
9
  import { MainService } from './main.service';
@@ -6,15 +11,24 @@ import { MAIN_OPTIONS } from './main.constants';
6
11
  import { MainModuleOptions } from './main.interfaces';
7
12
 
8
13
  @Module({
14
+ imports: [
15
+ MongooseModule.forFeature([{ name: User.name, schema: UserSchema }]),
16
+ MongooseModule.forFeature([{ name: ActivityLog.name, schema: ActivityLogSchema }]),
17
+ ],
9
18
  controllers: [MainController],
10
- providers: [MainService],
19
+ providers: [
20
+ MainService,
21
+ UsersRepository,
22
+ ActivityLogRepository,
23
+ ]
11
24
  })
12
25
  export class MainModule {
13
- constructor () {
14
-
15
- }
26
+ constructor(
27
+ private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
28
+ private readonly mainService: MainService,
29
+ ) { }
16
30
 
17
- static forRootAsync (options: MainModuleOptions): DynamicModule {
31
+ static forRootAsync(options: MainModuleOptions): DynamicModule {
18
32
  return {
19
33
  module: MainModule,
20
34
  imports: options.imports ?? [],
@@ -27,5 +41,16 @@ export class MainModule {
27
41
  ],
28
42
  };
29
43
  }
44
+
45
+ async onModuleInit() {
46
+ this.eventsBusMainTablesSubscribeService.subscribe(this.onHandleStatusRoomChange);
47
+ }
48
+
49
+ private onHandleStatusRoomChange = () => {
50
+ this.eventsBusMainTablesSubscribeService.getTablesSubscribers().forEach((subscriber: GamePlayer) => {
51
+ const screen = this.mainService.getScreen(subscriber.language);
52
+ subscriber.sendMessage(new MainTablesUpdateListWsEvent(screen.screen));
53
+ });
54
+ }
30
55
  }
31
56
 
@@ -1,111 +1,95 @@
1
- import { Inject, Injectable } from '@nestjs/common';
2
- import {
3
- AppScreen,
4
- AppScreenAppBar,
5
- AppScreenIdEnum,
6
- AppScreenRoutesEnum,
7
- AppScreenSection,
8
- AppScreenSectionButton,
9
- AppScreenSectionImage,
10
- AppScreenSectionListItem,
11
- BaseAppScreen,
12
- router,
13
- AppScreenIconEnum,
14
- AppScreenSectionButtons,
15
- } from 'jp.common.models';
16
- import { replacePattern } from 'jp.common.utils';
1
+ import { Inject, Injectable, InternalServerErrorException } from '@nestjs/common';
2
+ import { AppScreenRoutesEnum, BaseAppScreen, router } from 'jp.common.models';
3
+ import * as dayjs from 'dayjs';
4
+ import * as isToday from 'dayjs/plugin/isToday';
5
+ import { ActivityLogRepository, UsersRepository } from 'jp.db.schemas';
17
6
 
18
7
  import { BaseAppScreenDto, PlayerCheckStateDto } from '../../dto';
19
8
  import { SimpleRoomsManagerService } from '../simple-rooms-manager';
20
9
  import { PlayersManagerService } from '../players-manager';
21
10
  import { TournamentOneTableRoomsManagerService } from '../tournament-one-table-rooms-manager';
22
11
  import { TournamentManyTablesRoomsManagerService } from '../tournament-many-tables-rooms-manager';
12
+ import { EventsBusMainTablesSubscribeService } from '../event-bus/events-bus.main-tables.subscribe.service';
23
13
 
24
14
  import { MainFactoryOptions } from './main.interfaces';
25
15
  import { MAIN_OPTIONS } from './main.constants';
16
+ import { MainTablesListScreenView } from './main-tables-list-screen.view';
26
17
 
27
18
  @Injectable()
28
19
  export class MainService {
29
- constructor (
20
+
21
+ constructor(
30
22
  private readonly simpleRoomsManager: SimpleRoomsManagerService,
31
23
  private readonly oneTableRoomsManagerService: TournamentOneTableRoomsManagerService,
32
24
  private readonly manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService,
33
25
  private readonly playersManager: PlayersManagerService,
26
+ private readonly eventsBusMainTablesSubscribeService: EventsBusMainTablesSubscribeService,
27
+ private readonly userRepository: UsersRepository,
28
+ private readonly activityLogRepository: ActivityLogRepository,
34
29
  @Inject(MAIN_OPTIONS) private readonly options: MainFactoryOptions,
35
30
  ) {
31
+ dayjs.extend(isToday);
36
32
  }
37
33
 
38
- async getScreen (lang: string): Promise<BaseAppScreenDto> {
39
- const oneTableTournamentsCardList = this.oneTableRoomsManagerService.getRooms().map((room) =>
40
- AppScreenSectionListItem.CreateCardListItemMini(
41
- room.getId(),
42
- room.getTitle(lang),
43
- room.getSubtitle(lang),
44
- AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
45
- true,
46
- router.getRoomPath(room.getFirstMaster()?.getId() ?? ''),
47
- ));
48
-
49
- const manyTablesTournamentsCardList = this.manyTablesRoomsManagerService.getRooms().map((room) =>
50
- AppScreenSectionListItem.CreateCardListItemExtended(
51
- room.getId(),
52
- room.getTitle(lang),
53
- room.getSubtitle(lang),
54
- AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
55
- true,
56
- true,
57
- AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
58
- room.getDescription(lang),
59
- AppScreenSectionButtons.CreatePrimaryButtonSection(AppScreenSectionButton.CreateTextButton('button')),
60
- ));
61
-
62
- const simpleRoomsTableCardList = this.simpleRoomsManager.getRooms().reduce<Array<AppScreenSectionListItem>>((result, room) => {
63
- const list = room.getTables().map((table) => AppScreenSectionListItem.CreateCardListItemMini(
64
- table.getId(),
65
- replacePattern(table.getTitle(lang), { NUMBER: table.getNumber().toString() }),
66
- replacePattern(table.getSubtitle(lang), {
67
- HALF_BET: table.getHalfBet().toString(),
68
- BET: table.getBet().toString()
69
- }),
70
- AppScreenSectionImage.CreateUrlImage(`${table.getPlayers().length}/${table.getTableSize()}`),
71
- true,
72
- router.getRoomPath(table.getId()),
73
- ));
74
-
75
- return [...result, ...list];
76
- }, []);
77
-
78
- const screen =
79
- AppScreen.CreateStandardScreen(AppScreenIdEnum.ROOMS)
80
- .addAppBar(
81
- AppScreenAppBar.CreateStandardAppBar(
82
- this.options.i18n.t('common.rooms.screen.title', { lang }),
83
- AppScreenSectionButton.CreateArrowBackButton(this.options.i18n.t('common.button.back', { lang })),
84
- ),
85
- )
86
- .addSection(
87
- AppScreenSection.CreateCardListSection(
88
- 'id1',
89
- [
90
- ...manyTablesTournamentsCardList,
91
- ...oneTableTournamentsCardList,
92
- ...simpleRoomsTableCardList
93
- ]
94
- ),
95
- );
96
-
97
- return new BaseAppScreenDto(new BaseAppScreen(screen));
34
+ getScreen(lang: string): BaseAppScreenDto {
35
+ return new BaseAppScreenDto(
36
+ new BaseAppScreen(
37
+ new MainTablesListScreenView(
38
+ this.options.i18n,
39
+ lang,
40
+ this.simpleRoomsManager.getRooms(),
41
+ this.oneTableRoomsManagerService.getRooms(),
42
+ this.manyTablesRoomsManagerService.getRooms(),
43
+ ).build(),
44
+ )
45
+ );
98
46
  }
99
47
 
100
- playerCheckState (clientAuthToken: string): PlayerCheckStateDto {
48
+ subscribeOnTablesScreen(clientAuthToken: string): Promise<void> {
101
49
  const player = this.playersManager.getPlayerById(clientAuthToken);
102
- if (player && player.isPlayer() && player.tableId) {
103
- return PlayerCheckStateDto.fromEntities(router.getRoomPath(player.tableId), player.id);
50
+
51
+ if (player) {
52
+ this.eventsBusMainTablesSubscribeService.addTablesSubscriber(player);
53
+ }
54
+
55
+ throw new InternalServerErrorException();
56
+ }
57
+
58
+ unsubscribeFromTablesScreen(clientAuthToken: string): Promise<void> {
59
+ const player = this.playersManager.getPlayerById(clientAuthToken);
60
+
61
+ if (player) {
62
+ this.eventsBusMainTablesSubscribeService.removeTablesSubbcriber(player);
63
+ }
64
+
65
+ throw new InternalServerErrorException();
66
+ }
67
+
68
+ async playerCheckState(clientAuthToken: string, game: string): Promise<PlayerCheckStateDto> {
69
+ const player = this.playersManager.getPlayerById(clientAuthToken);
70
+ let redirectUrl: string = AppScreenRoutesEnum.MENU;
71
+
72
+ const foundUser = await this.userRepository.findById(clientAuthToken);
73
+ const isNewbie = await this.activityLogRepository.userIsNewbie(clientAuthToken)
74
+ const last7logins = await this.activityLogRepository.findLast7DaysLogins(game, clientAuthToken);
75
+
76
+ if (!foundUser) {
77
+ throw new InternalServerErrorException();
78
+ }
79
+
80
+ if (player?.isPlayer() && player.tableId) {
81
+ redirectUrl = router.getRoomPath(player.tableId);
82
+ } else if (isNewbie) {
83
+ redirectUrl = AppScreenRoutesEnum.WELCOME;
84
+ } else if (dayjs(last7logins[0].date).isToday() && last7logins[0].count === 1) {
85
+ redirectUrl = AppScreenRoutesEnum.TODAY_BONUS;
86
+ } else if (dayjs(foundUser.premiumExpired).isToday()) {
87
+ redirectUrl = AppScreenRoutesEnum.PREMIUM;
104
88
  }
105
89
 
106
- return PlayerCheckStateDto.fromEntities(AppScreenRoutesEnum.MENU);
90
+ return PlayerCheckStateDto.fromEntities(redirectUrl, player?.id ?? '');
107
91
  }
108
92
 
109
- findFreeTable (clientAuthToken: string) {
93
+ findFreeTable(clientAuthToken: string) {
110
94
  }
111
95
  }
@@ -1 +1 @@
1
- export { ManyTablesTournamentModule } from './many-tables-tournament.module';
1
+ export { ManyTablesTournamentModule } from './many-tables-tournament.module';
@@ -0,0 +1,59 @@
1
+ import {
2
+ AppScreen,
3
+ AppScreenAppBar,
4
+ AppScreenIconEnum,
5
+ AppScreenIdEnum,
6
+ AppScreenSection,
7
+ AppScreenSectionButton,
8
+ AppScreenSectionButtons,
9
+ AppScreenSectionImage,
10
+ AppScreenSectionListItem,
11
+ IAppScreen,
12
+ UniversalScreenView,
13
+ ILocaleService,
14
+ } from "jp.common.models";
15
+ import { ManyTablesTournamentRoom } from "jp.ms.common.engine";
16
+
17
+ export class ManyTablesTournamentStatusScreenView extends UniversalScreenView {
18
+ private readonly tournament: ManyTablesTournamentRoom;
19
+
20
+ constructor(
21
+ localeService: ILocaleService,
22
+ lang: string,
23
+ tournament: ManyTablesTournamentRoom,
24
+ ) {
25
+ super(localeService, lang);
26
+ this.tournament = tournament;
27
+ }
28
+
29
+ build(): IAppScreen {
30
+ return AppScreen.CreateStatusScreen(AppScreenIdEnum.ROOMS)
31
+ .addAppBar(
32
+ AppScreenAppBar.CreateStatusAppBar(
33
+ this.localeService.t('common.rooms.screen.title', { lang: this.lang }),
34
+ AppScreenSectionButton.CreateArrowBackButton(this.localeService.t('common.button.back', { lang: this.lang })),
35
+ ),
36
+ )
37
+ .addSection((
38
+ AppScreenSection.CreateStatusHeader(
39
+ 'status',
40
+ 'description',
41
+ AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
42
+ AppScreenSectionButtons.CreatePrimaryButtonSection(AppScreenSectionButton.CreateTextButton('button')),
43
+ )
44
+ ))
45
+ .addSection(
46
+ AppScreenSection.CreateCardListSection(
47
+ 'id1',
48
+ this.tournament.getParticipants().map((item) => AppScreenSectionListItem.CreateCardListItemMini(
49
+ item.playerId,
50
+ item.playerName,
51
+ '',
52
+ AppScreenSectionImage.CreateUrlImage(item.playerAvatarUrl),
53
+ true,
54
+ '',
55
+ ))
56
+ ),
57
+ );
58
+ }
59
+ }
@@ -0,0 +1,53 @@
1
+ import {
2
+ AppScreen,
3
+ AppScreenAppBar,
4
+ AppScreenIconEnum,
5
+ AppScreenIdEnum,
6
+ AppScreenSection,
7
+ AppScreenSectionButton,
8
+ AppScreenSectionImage,
9
+ AppScreenSectionListItem,
10
+ IAppScreen,
11
+ UniversalScreenView,
12
+ ILocaleService,
13
+ router,
14
+ } from "jp.common.models";
15
+ import { ManyTablesTournamentRoom } from "jp.ms.common.engine";
16
+
17
+ export class ManyTablesTournamentTablesListScreenView extends UniversalScreenView {
18
+ private readonly tournament: ManyTablesTournamentRoom;
19
+
20
+ constructor(
21
+ localeService: ILocaleService,
22
+ lang: string,
23
+ tournament: ManyTablesTournamentRoom,
24
+ ) {
25
+ super(localeService, lang);
26
+ this.tournament = tournament;
27
+ }
28
+
29
+ build(): IAppScreen {
30
+ return AppScreen.CreateStandardScreen(AppScreenIdEnum.ROOMS)
31
+ .addAppBar(
32
+ AppScreenAppBar.CreateStandardAppBar(
33
+ this.localeService.t('common.rooms.screen.title', { lang: this.lang }),
34
+ AppScreenSectionButton.CreateArrowBackButton(this.localeService.t('common.button.back', { lang: this.lang })),
35
+ ),
36
+ )
37
+ .addSection(
38
+ AppScreenSection.CreateCardListSection(
39
+ 'id1',
40
+ this.tournament?.getTables().map((table) =>
41
+ AppScreenSectionListItem.CreateCardListItemMini(
42
+ table.getId(),
43
+ table.getTitle(this.lang),
44
+ table.getSubtitle(this.lang),
45
+ AppScreenSectionImage.CreateIconImage(AppScreenIconEnum.EMOJI_EVENTS),
46
+ true,
47
+ router.getRoomPath(table.getId()),
48
+ )
49
+ ) ?? []
50
+ ),
51
+ );
52
+ }
53
+ }
@@ -8,21 +8,37 @@ import { ManyTablesTournamentUpdateDto } from '../../dto/common/many-tables-tour
8
8
 
9
9
  @Controller('tournament/many_tables')
10
10
  export class ManyTablesTournamentController {
11
- constructor (
11
+ constructor(
12
12
  private readonly tournamentService: ManyTablesTournamentService,
13
13
  ) {
14
14
  }
15
15
 
16
16
  @Get('status/:tournamentId')
17
- getStatusScreen (
17
+ getStatusScreen(
18
18
  @Param('tournamentId') tournamentId: string,
19
19
  @Headers() headers: IAppHeaders,
20
- ): Promise<IBaseAppScreen> {
20
+ ): IBaseAppScreen {
21
21
  return this.tournamentService.getStatusScreen(tournamentId, headers.client_language);
22
22
  }
23
23
 
24
+ @Get('status/subscribe/:tournamentId')
25
+ subscribeOnStatusScreen(
26
+ @Param('tournamentId') tournamentId: string,
27
+ @Headers() headers: IAppHeaders,
28
+ ): Promise<void> {
29
+ return this.tournamentService.subscribeOnStatusScreen(tournamentId, headers.client_language);
30
+ }
31
+
32
+ @Get('status/unsubscribe/:tournamentId')
33
+ unsubscribeFromStatusScreen(
34
+ @Param('tournamentId') tournamentId: string,
35
+ @Headers() headers: IAppHeaders,
36
+ ): Promise<void> {
37
+ return this.tournamentService.unsubscribeFromStatusScreen(tournamentId, headers.client_language);
38
+ }
39
+
24
40
  @Get('tables/:tournamentId')
25
- getTableListScreen (
41
+ getTableListScreen(
26
42
  @Param('tournamentId') tournamentId: string,
27
43
  @Headers() headers: IAppHeaders,
28
44
  ): Promise<IBaseAppScreen> {
@@ -31,7 +47,7 @@ export class ManyTablesTournamentController {
31
47
 
32
48
  @Post('table/watch/:tableId')
33
49
  @HttpCode(HttpStatus.OK)
34
- watchTheTable (
50
+ watchTheTable(
35
51
  @Param('tableId') tableId: string,
36
52
  @Headers() headers: IAppHeaders,
37
53
  ): IBaseTableGameState {
@@ -40,7 +56,7 @@ export class ManyTablesTournamentController {
40
56
 
41
57
  @Post('table/move/:tableId')
42
58
  @HttpCode(HttpStatus.OK)
43
- moveOnTheTable (
59
+ moveOnTheTable(
44
60
  @Param('tableId') tableId: string,
45
61
  @Body() baseMoveData: IBaseMoveData,
46
62
  @Headers() headers: IAppHeaders,
@@ -50,7 +66,7 @@ export class ManyTablesTournamentController {
50
66
 
51
67
  @Post('join/:tournamentId')
52
68
  @HttpCode(HttpStatus.OK)
53
- joinTournament (
69
+ joinTournament(
54
70
  @Param('tournamentId') tournamentId: string,
55
71
  @Headers() headers: IAppHeaders,
56
72
  ): JoinTournamentDto {
@@ -59,16 +75,25 @@ export class ManyTablesTournamentController {
59
75
 
60
76
  @Post('leave/:tournamentId')
61
77
  @HttpCode(HttpStatus.OK)
62
- leaveTournament (
78
+ leaveTournament(
63
79
  @Param('tournamentId') tournamentId: string,
64
80
  @Headers() headers: IAppHeaders,
65
81
  ): IBaseTableGameState {
66
82
  return this.tournamentService.leaveTournament(tournamentId, headers.client_auth_token);
67
83
  }
68
84
 
85
+ @Post('buy_ticket/:tournamentId')
86
+ @HttpCode(HttpStatus.OK)
87
+ buyTicket(
88
+ @Param('tournamentId') tournamentId: string,
89
+ @Headers() headers: IAppHeaders,
90
+ ): Promise<void> {
91
+ return this.tournamentService.buyTicket(tournamentId, headers.client_auth_token);
92
+ }
93
+
69
94
  @Post('create')
70
95
  @HttpCode(HttpStatus.OK)
71
- createTournament (
96
+ createTournament(
72
97
  @Headers() headers: IAppHeaders,
73
98
  @Body() createTournamentDto: ManyTablesTournamentCreateDto,
74
99
  ): Promise<void> {
@@ -77,7 +102,7 @@ export class ManyTablesTournamentController {
77
102
 
78
103
  @Patch('update/:tournamentId')
79
104
  @HttpCode(HttpStatus.OK)
80
- updateTournament (
105
+ updateTournament(
81
106
  @Param('tournamentId') tournamentId: string,
82
107
  @Body() updateTournamentDto: ManyTablesTournamentUpdateDto,
83
108
  @Headers() headers: IAppHeaders,
@@ -87,7 +112,7 @@ export class ManyTablesTournamentController {
87
112
 
88
113
  @Delete('remove/:tournamentId')
89
114
  @HttpCode(HttpStatus.OK)
90
- removeTournament (
115
+ removeTournament(
91
116
  @Param('tournamentId') tournamentId: string,
92
117
  @Headers() headers: IAppHeaders,
93
118
  ): Promise<void> {
@@ -1,6 +1,10 @@
1
1
  import { DynamicModule, Module, Provider } from '@nestjs/common';
2
2
  import { MongooseModule } from '@nestjs/mongoose';
3
3
  import { TournamentManyTablesRoom, TournamentManyTablesRoomSchema, TournamentManyTablesRoomsRepository } from 'jp.db.schemas';
4
+ import { GamePlayer, ManyTablesTournamentUpdateStatusWsEvent, RoomUpdateStateEvent } from 'jp.ms.common.engine';
5
+
6
+ import { TournamentManyTablesRoomsManagerService } from '../tournament-many-tables-rooms-manager';
7
+ import { EventsBusManyTablesTournamentSubscribeService } from '../event-bus';
4
8
 
5
9
  import { ManyTablesTournamentController } from './many-tables-tournament.controller';
6
10
  import { ManyTablesTournamentService } from './many-tables-tournament.service';
@@ -15,11 +19,13 @@ import { ManyTablesTournamentModuleOptions } from './many-tables-tournament.inte
15
19
  providers: [ManyTablesTournamentService, TournamentManyTablesRoomsRepository],
16
20
  })
17
21
  export class ManyTablesTournamentModule {
18
- constructor () {
19
-
20
- }
22
+ constructor(
23
+ private readonly manyTablesRoomsManagerService: TournamentManyTablesRoomsManagerService,
24
+ private readonly eventsBusManyTablesTournamentSubscribeService: EventsBusManyTablesTournamentSubscribeService,
25
+ private readonly manyTablesTournamentService: ManyTablesTournamentService,
26
+ ) { }
21
27
 
22
- static forRootAsync (options: ManyTablesTournamentModuleOptions): DynamicModule {
28
+ static forRootAsync(options: ManyTablesTournamentModuleOptions): DynamicModule {
23
29
  return {
24
30
  module: ManyTablesTournamentModule,
25
31
  imports: options.imports ?? [],
@@ -32,5 +38,16 @@ export class ManyTablesTournamentModule {
32
38
  ],
33
39
  };
34
40
  }
41
+
42
+ async onModuleInit() {
43
+ this.eventsBusManyTablesTournamentSubscribeService.subscribe(this.onHandleStatusRoomChange);
44
+ }
45
+
46
+ private onHandleStatusRoomChange = (event: RoomUpdateStateEvent) => {
47
+ this.manyTablesRoomsManagerService.getRoomById(event.roomId)?.getStatusScreenWatchers().forEach((subscriber: GamePlayer) => {
48
+ const screen = this.manyTablesTournamentService.getStatusScreen(event.roomId, subscriber.language);
49
+ subscriber.sendMessage(new ManyTablesTournamentUpdateStatusWsEvent(screen.screen));
50
+ });
51
+ }
35
52
  }
36
53