Fixed per-point achievements

cornell-dti · May 3, 2024 · 678b681 · 678b681
1 parent f833c46
commit 678b681
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 16 deletions.
diff --git a/server/src/achievement/achievement.service.ts b/server/src/achievement/achievement.service.ts
@@ -290,6 +290,7 @@ export class AchievementService {
     user: User,
     evTracker: EventTracker,
     pointsAdded: number,
+    journeyComplete: boolean,
   ) {
     const ability = this.abilityFactory.createForUser(user);
 
@@ -326,15 +327,20 @@ export class AchievementService {
             // must either be both challenge + journey achievement
             // total points achievement
             // or journey/challenge achievement depending on what was completed
-            OR: [
-              { achievementType: AchievementType.TOTAL_CHALLENGES_OR_JOURNEYS },
-              { achievementType: AchievementType.TOTAL_POINTS },
-              {
-                achievementType: isJourney
-                  ? AchievementType.TOTAL_JOURNEYS
-                  : AchievementType.TOTAL_CHALLENGES,
-              },
-            ],
+            OR: journeyComplete
+              ? [
+                  {
+                    achievementType:
+                      AchievementType.TOTAL_CHALLENGES_OR_JOURNEYS,
+                  },
+                  { achievementType: AchievementType.TOTAL_POINTS },
+                  {
+                    achievementType: isJourney
+                      ? AchievementType.TOTAL_JOURNEYS
+                      : AchievementType.TOTAL_CHALLENGES,
+                  },
+                ]
+              : [{ achievementType: AchievementType.TOTAL_POINTS }],
           },
           {
             // Only find non-completed achievements

diff --git a/server/src/challenge/challenge.service.ts b/server/src/challenge/challenge.service.ts
@@ -170,13 +170,12 @@ export class ChallengeService {
         },
       })) === 0;
 
-    if (isJourneyCompleted) {
-      await this.achievementService.checkAchievementProgress(
-        user,
-        eventTracker,
-        deltaScore,
-      );
-    }
+    await this.achievementService.checkAchievementProgress(
+      user,
+      eventTracker,
+      deltaScore,
+      isJourneyCompleted,
+    );
 
     await this.eventService.emitUpdateLeaderPosition({
       playerId: newUser.id,