jp.ms.common.modules 1.0.42 → 1.0.43

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 (70) hide show
  1. package/dist/dto/app-table/card.dto.d.ts +1 -0
  2. package/dist/dto/app-table/card.dto.js +11 -0
  3. package/dist/dto/app-table/card.dto.js.map +1 -1
  4. package/dist/dto/app-table/player.dto.d.ts +1 -0
  5. package/dist/dto/app-table/player.dto.js +11 -0
  6. package/dist/dto/app-table/player.dto.js.map +1 -1
  7. package/dist/dto/games/fool/fool-table.dto.d.ts +1 -0
  8. package/dist/dto/games/fool/fool-table.dto.js +10 -0
  9. package/dist/dto/games/fool/fool-table.dto.js.map +1 -1
  10. package/dist/modules/events/events.gateway.js +4 -2
  11. package/dist/modules/events/events.gateway.js.map +1 -1
  12. package/dist/modules/main/main.controller.d.ts +0 -1
  13. package/dist/modules/main/main.controller.js +0 -12
  14. package/dist/modules/main/main.controller.js.map +1 -1
  15. package/dist/modules/main/main.service.d.ts +0 -1
  16. package/dist/modules/main/main.service.js +0 -13
  17. package/dist/modules/main/main.service.js.map +1 -1
  18. package/dist/modules/many-tables-tournament/many-tables-tournament.controller.d.ts +1 -0
  19. package/dist/modules/many-tables-tournament/many-tables-tournament.controller.js +12 -0
  20. package/dist/modules/many-tables-tournament/many-tables-tournament.controller.js.map +1 -1
  21. package/dist/modules/many-tables-tournament/many-tables-tournament.module.js +6 -1
  22. package/dist/modules/many-tables-tournament/many-tables-tournament.module.js.map +1 -1
  23. package/dist/modules/many-tables-tournament/many-tables-tournament.service.d.ts +4 -1
  24. package/dist/modules/many-tables-tournament/many-tables-tournament.service.js +18 -2
  25. package/dist/modules/many-tables-tournament/many-tables-tournament.service.js.map +1 -1
  26. package/dist/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.module.js +2 -0
  27. package/dist/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.module.js.map +1 -1
  28. package/dist/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service.d.ts +3 -2
  29. package/dist/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service.js +9 -6
  30. package/dist/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service.js.map +1 -1
  31. package/dist/modules/menu/menu-screen.view.d.ts +2 -1
  32. package/dist/modules/menu/menu-screen.view.js +9 -3
  33. package/dist/modules/menu/menu-screen.view.js.map +1 -1
  34. package/dist/modules/menu/menu.interfaces.d.ts +1 -0
  35. package/dist/modules/menu/menu.service.js +1 -1
  36. package/dist/modules/menu/menu.service.js.map +1 -1
  37. package/dist/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.module.js +2 -0
  38. package/dist/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.module.js.map +1 -1
  39. package/dist/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service.d.ts +3 -2
  40. package/dist/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service.js +9 -6
  41. package/dist/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service.js.map +1 -1
  42. package/dist/modules/simple-rooms-manager/simple-rooms-manager.module.js +2 -0
  43. package/dist/modules/simple-rooms-manager/simple-rooms-manager.module.js.map +1 -1
  44. package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.d.ts +3 -2
  45. package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js +8 -5
  46. package/dist/modules/simple-rooms-manager/simple-rooms-manager.service.js.map +1 -1
  47. package/dist/tsconfig.tsbuildinfo +1 -1
  48. package/dist/utils/game-table-result.d.ts +4 -3
  49. package/dist/utils/game-table-result.js +54 -4
  50. package/dist/utils/game-table-result.js.map +1 -1
  51. package/package.json +4 -4
  52. package/src/dto/app-table/card.dto.ts +9 -0
  53. package/src/dto/app-table/player.dto.ts +9 -0
  54. package/src/dto/games/fool/fool-table.dto.ts +8 -0
  55. package/src/modules/events/events.gateway.ts +4 -2
  56. package/src/modules/main/main.controller.ts +1 -22
  57. package/src/modules/main/main.service.ts +0 -29
  58. package/src/modules/many-tables-tournament/many-tables-tournament.controller.ts +13 -0
  59. package/src/modules/many-tables-tournament/many-tables-tournament.module.ts +9 -1
  60. package/src/modules/many-tables-tournament/many-tables-tournament.service.ts +33 -0
  61. package/src/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.module.ts +5 -0
  62. package/src/modules/many-tables-tournament-rooms-manager/many-tables-tournament-rooms-manager.service.ts +5 -3
  63. package/src/modules/menu/menu-screen.view.ts +9 -2
  64. package/src/modules/menu/menu.interfaces.ts +1 -0
  65. package/src/modules/menu/menu.service.ts +1 -0
  66. package/src/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.module.ts +5 -0
  67. package/src/modules/one-table-tournament-rooms-manager/one-table-tournament-rooms-manager.service.ts +5 -3
  68. package/src/modules/simple-rooms-manager/simple-rooms-manager.module.ts +5 -0
  69. package/src/modules/simple-rooms-manager/simple-rooms-manager.service.ts +5 -3
  70. package/src/utils/game-table-result.ts +66 -5
@@ -4,6 +4,7 @@ import {
4
4
  OneTableTournamentRoomsRepository,
5
5
  ManyTablesTournamentRoomsRepository,
6
6
  UsersRepository,
7
+ RatingRepository,
7
8
  } from 'jp.db.schemas';
8
9
  import { GameMaster, TournamentMaster } from 'jp.ms.common.engine';
9
10
 
@@ -55,12 +56,12 @@ export function getGameTableResults(master: GameMaster) {
55
56
  };
56
57
  }
57
58
 
58
- export async function saveGameTablesResult(
59
+ export async function saveGameTablesResultForSimpleRoom(
59
60
  master: GameMaster,
60
61
  connection: Connection,
61
62
  gameResultRepository: GameResultRepository,
62
63
  usersRepository: UsersRepository,
63
- saveNewBalance: boolean,
64
+ ratingRepository: RatingRepository,
64
65
  ) {
65
66
  const userGameResult = master
66
67
  .getTable()
@@ -68,7 +69,9 @@ export async function saveGameTablesResult(
68
69
  .map((player) => {
69
70
  return {
70
71
  userId: player.id,
71
- balanceAdding: saveNewBalance ? player.profit : 0,
72
+ userName: player.fullName,
73
+ userAvatarUrl: player.avatarUrl,
74
+ balanceAdding: player.profit,
72
75
  experienceAdding: master.levelHelper.getNewExperienceAmount(player),
73
76
  levelAdding: master.levelHelper.getNewLevelAdding(
74
77
  player.level,
@@ -77,13 +80,60 @@ export async function saveGameTablesResult(
77
80
  };
78
81
  });
79
82
 
83
+ const ratings = userGameResult.map((item) => ({
84
+ userId: item.userId,
85
+ userName: item.userName,
86
+ userAvatarUrl: item.userAvatarUrl,
87
+ profit: item.balanceAdding,
88
+ game: master.getRoom().getGameType(),
89
+ }));
90
+
80
91
  const session = await connection.startSession();
81
92
  session.startTransaction();
82
93
 
83
94
  try {
84
95
  await gameResultRepository.createGameResult(getGameTableResults(master));
85
96
  await usersRepository.saveGameResult(userGameResult);
97
+ await ratingRepository.addBulkPlayerRating(ratings);
98
+
99
+ await session.commitTransaction();
100
+ } catch (error) {
101
+ await session.abortTransaction();
102
+ throw error;
103
+ } finally {
104
+ await session.endSession();
105
+ }
106
+ }
107
+
108
+ export async function saveGameTablesResultForTournamentRoom(
109
+ master: GameMaster,
110
+ connection: Connection,
111
+ gameResultRepository: GameResultRepository,
112
+ usersRepository: UsersRepository,
113
+ ) {
114
+ const userGameResult = master
115
+ .getTable()
116
+ .getPlayers()
117
+ .map((player) => {
118
+ return {
119
+ userId: player.id,
120
+ userName: player.fullName,
121
+ userAvatarUrl: player.avatarUrl,
122
+ balanceAdding: 0,
123
+ experienceAdding: master.levelHelper.getNewExperienceAmount(player),
124
+ levelAdding: master.levelHelper.getNewLevelAdding(
125
+ player.level,
126
+ player.experience,
127
+ ),
128
+ };
129
+ });
130
+
131
+ const session = await connection.startSession();
132
+ session.startTransaction();
86
133
 
134
+ try {
135
+ await gameResultRepository.createGameResult(getGameTableResults(master));
136
+ await usersRepository.saveGameResult(userGameResult);
87
137
  await session.commitTransaction();
88
138
  } catch (error) {
89
139
  await session.abortTransaction();
@@ -97,19 +147,29 @@ export async function saveTournamentResult(
97
147
  master: TournamentMaster,
98
148
  connection: Connection,
99
149
  tournamentRepository:
100
- | OneTableTournamentRoomsRepository
101
- | ManyTablesTournamentRoomsRepository,
150
+ OneTableTournamentRoomsRepository | ManyTablesTournamentRoomsRepository,
102
151
  usersRepository: UsersRepository,
152
+ ratingRepository: RatingRepository,
103
153
  ) {
104
154
  const userTournamentResult = master.getTournamentResult().map((player) => {
105
155
  return {
106
156
  userId: player.playerId,
157
+ userName: player.playerName,
158
+ userAvatarUrl: player.playerAvatarUrl,
107
159
  balanceAdding: player.profit,
108
160
  experienceAdding: 0,
109
161
  levelAdding: 0,
110
162
  };
111
163
  });
112
164
 
165
+ const ratings = userTournamentResult.map((item) => ({
166
+ userId: item.userId,
167
+ userName: item.userName,
168
+ userAvatarUrl: item.userAvatarUrl,
169
+ profit: item.balanceAdding,
170
+ game: master.getRoom().getGameType(),
171
+ }));
172
+
113
173
  const session = await connection.startSession();
114
174
  session.startTransaction();
115
175
 
@@ -119,6 +179,7 @@ export async function saveTournamentResult(
119
179
  master.getTournamentId(),
120
180
  master.getTournamentResult(),
121
181
  );
182
+ await ratingRepository.addBulkPlayerRating(ratings);
122
183
  await session.commitTransaction();
123
184
  } catch (error) {
124
185
  await session.abortTransaction();