From ea669d63bfcebc4550efacee9aaba2a7d561ed5c Mon Sep 17 00:00:00 2001
From: Hugo <hnouts.dev@gmail.com>
Date: Mon, 20 Sep 2021 19:37:04 +0200
Subject: [PATCH] fix (quiz.service & challenge.service): watch progress
 doesn't get over 5

---
 src/services/challenge.service.ts |  3 +++
 src/services/quiz.service.ts      | 10 +++-------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/services/challenge.service.ts b/src/services/challenge.service.ts
index b0cddf3fd..d6db95472 100644
--- a/src/services/challenge.service.ts
+++ b/src/services/challenge.service.ts
@@ -622,6 +622,9 @@ export default class ChallengeService {
         if (userChallenge.quiz.result > userChallenge.progress.quizProgress) {
           userChallenge.progress.quizProgress = userChallenge.quiz.result
         }
+        if (userChallenge.progress.quizProgress > 5) {
+          userChallenge.progress.quizProgress = 5
+        }
         updatedQuiz = await quizService.endUserQuiz(userChallenge.quiz)
         updatedUserChallenge = {
           ...userChallenge,
diff --git a/src/services/quiz.service.ts b/src/services/quiz.service.ts
index e0f6a635d..8624f3d0f 100644
--- a/src/services/quiz.service.ts
+++ b/src/services/quiz.service.ts
@@ -257,15 +257,11 @@ export default class QuizService {
       }
       userQuiz.customQuestion = updatedQuestion
     }
-    let quizLimit
-    if (userQuiz.result + 1 > 5) {
-      quizLimit = 5
-    } else {
-      quizLimit = userQuiz.result + 1
-    }
+    let quizScoreLimit = userQuiz.result
+    quizScoreLimit = quizScoreLimit + 1 > 5 ? 5 : quizScoreLimit + 1
     const updatedUserQuiz: UserQuiz = {
       ...userQuiz,
-      result: questionResult ? quizLimit : userQuiz.result,
+      result: questionResult ? quizScoreLimit : userQuiz.result,
     }
     return updatedUserQuiz
   }
-- 
GitLab