jp.ms.common.modules 1.0.22 → 1.0.24

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "jp.ms.common.modules",
-  "version": "1.0.22",
+  "version": "1.0.24",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@nestjs/common": "11.1.0",
-    "@nestjs/config": "4.0.2",
+    "@nestjs/common": "^11.1.19",
+    "@nestjs/config": "^4.0.4",
     "@nestjs/core": "11.1.0",
     "@nestjs/mongoose": "11.0.4",
     "@nestjs/websockets": "11.1.9",
     "dayjs": "1.11.18",
-    "jp.common.models": "1.1.1",
-    "jp.common.utils": "1.0.2",
-    "jp.db.schemas": "2.1.10",
+    "jp.common.models": "1.1.6",
+    "jp.common.utils": "1.0.4",
+    "jp.db.schemas": "2.2.2",
     "jp.ms.common.engine": "3.0.8",
     "mongoose": "9.1.5",
     "nestjs-i18n": "10.5.1",
@@ -26,7 +26,7 @@
     "socket.io": "4.8.1"
   },
   "devDependencies": {
-    "@nestjs/swagger": "11.2.3",
+    "@nestjs/swagger": "^11.4.1",
     "@types/express": "^5.0.6",
     "@types/node": "22.15.3",
     "@types/node-schedule": "2.1.8",
@@ -43,4 +43,4 @@
     "src",
     "dist"
   ]
-}
+}

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

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