Merge branch 'master' into jxl9/achievements-tracking

server/src/challenge/challenge.service.ts

@@ -101,7 +101,7 @@ export class ChallengeService {
     const eventTracker: EventTracker =
       await this.eventService.getCurrentEventTrackerForUser(user);
 
-    // const achievementTracker : AchievementTracker = 
+    // const achievementTracker : AchievementTracker =
     //   await this.achievementService.getAchievementsByIdsForAbility(user.ability, [eventTracker.id]);
 
     const alreadyDone =
@@ -159,18 +159,30 @@ export class ChallengeService {
     );
 
     // check if the challenge is part of a journey
-    const isJourney = (await this.prisma.prevChallenge.count({
-      where: {
-        userId: user.id,
-        challengeId: eventTracker.curChallengeId,
-        trackerId: eventTracker.id,
-      },
-    })) === (await this.prisma.eventTracker.count({
-      where: { id: eventTracker.id }, // CHECK
-    }));      
+    const isJourney =
+      (await this.prisma.prevChallenge.count({
+        where: {
+          userId: user.id,
+          challengeId: eventTracker.curChallengeId,
+          trackerId: eventTracker.id,
+        },
+      })) ===
+      (await this.prisma.eventTracker.count({
+        where: { id: eventTracker.id }, // CHECK
+      }));
 
-    await this.achievementService.checkAchievementProgress(user, challengeId, isJourney);
-
+    await this.achievementService.checkAchievementProgress(
+      user,
+      challengeId,
+      isJourney,
+    );
+
+    await this.eventService.emitUpdateLeaderPosition({
+      playerId: newUser.id,
+      newTotalScore: newUser.score,
+      newEventScore: newEvTracker.score,
+      eventId: newEvTracker.eventId,
+    });
 
     return true;
   }