add score result when quiz solved

ambrosus · Feb 27, 2024 · 9732fd9 · 9732fd9
1 parent 5683584
commit 9732fd9
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/gov-portal-db/src/quiz.rs b/gov-portal-db/src/quiz.rs
@@ -175,7 +175,10 @@ impl Quiz {
                     .cloned()
                     .unwrap_or_default()
         {
-            QuizResult::Solved
+            QuizResult::Solved(
+                total_valid_answers,
+                self.config.minimum_total_valid_answers_required,
+            )
         } else {
             QuizResult::Failed(
                 total_valid_answers,
@@ -381,7 +384,7 @@ mod tests {
         {
             match serde_json::from_str::<Vec<QuizAnswer>>(input) {
                 Ok(answers) => assert_eq!(
-                    quiz.verify_answers(answers) == QuizResult::Solved,
+                    matches!(quiz.verify_answers(answers), QuizResult::Solved(..)),
                     expected,
                     "Test case #{i} '{title}' failed!"
                 ),

diff --git a/gov-portal-db/src/server.rs b/gov-portal-db/src/server.rs
@@ -254,7 +254,7 @@ async fn verify_quiz_route(
                 }
                 | UserProfileStatus::Complete(_),
             ..
-        }) => Ok(QuizResult::Solved),
+        }) => Ok(QuizResult::AlreadySolved),
         // Do not allow to solve quiz if temporarily blocked
         Ok(UserProfile {
             status: UserProfileStatus::Blocked { blocked_until },

diff --git a/gov-portal-db/src/users_manager/mod.rs b/gov-portal-db/src/users_manager/mod.rs
@@ -89,8 +89,9 @@ impl Default for UserProfileAttributes {
 
 #[derive(Debug, PartialEq)]
 pub enum QuizResult {
-    Solved,
+    Solved(u64, u64),
     Failed(u64, u64, DateTime<Utc>),
+    AlreadySolved,
 }
 
 impl Serialize for QuizResult {
@@ -99,14 +100,20 @@ impl Serialize for QuizResult {
         S: Serializer,
     {
         match self {
-            Self::Solved => serializer.serialize_none(),
+            Self::Solved(valid_answers, required_answers) => {
+                let mut seq = serializer.serialize_seq(Some(2))?;
+                seq.serialize_element(valid_answers)?;
+                seq.serialize_element(required_answers)?;
+                seq.end()
+            }
             Self::Failed(valid_answers, required_answers, blocked_until) => {
                 let mut seq = serializer.serialize_seq(Some(3))?;
                 seq.serialize_element(valid_answers)?;
                 seq.serialize_element(required_answers)?;
                 seq.serialize_element(&blocked_until.timestamp_millis())?;
                 seq.end()
             }
+            Self::AlreadySolved => serializer.serialize_none(),
         }
     }
 }
@@ -225,12 +232,8 @@ impl UsersManager {
         wallet: Address,
         quiz_result: &QuizResult,
     ) -> Result<(), error::Error> {
-        let query = doc! {
-            "wallet": bson::to_bson(&wallet)?,
-        };
-
         let update = match quiz_result {
-            QuizResult::Solved => {
+            QuizResult::Solved(..) => {
                 doc! {
                     "$set": bson::to_bson(&RawUserProfile {
                         quiz_solved: Some(true),
@@ -268,6 +271,11 @@ impl UsersManager {
                     })?
                 }
             }
+            QuizResult::AlreadySolved => return Ok(()),
+        };
+
+        let query = doc! {
+            "wallet": bson::to_bson(&wallet)?,
         };
 
         let options = UpdateOptions::builder().upsert(false).build();
@@ -449,8 +457,8 @@ mod tests {
     #[test]
     fn test_ser_quiz_result() {
         assert_matches!(
-            serde_json::to_string(&QuizResult::Solved).as_deref(),
-            Ok("null")
+            serde_json::to_string(&QuizResult::Solved(4, 5)).as_deref(),
+            Ok("[4,5]")
         );
 
         assert_matches!(
@@ -462,7 +470,12 @@ mod tests {
                 )
             ))
             .as_deref(),
-            Ok(r#"[3,5,1708997209002]"#)
+            Ok("[3,5,1708997209002]")
+        );
+
+        assert_matches!(
+            serde_json::to_string(&QuizResult::AlreadySolved).as_deref(),
+            Ok("null")
         );
     }
 

diff --git a/gov-portal-db/tests/test_db.rs b/gov-portal-db/tests/test_db.rs
@@ -164,7 +164,7 @@ async fn test_complete_profile() -> Result<(), anyhow::Error> {
         .unwrap(),
     ]);
 
-    assert_matches!(quiz_result, QuizResult::Solved);
+    assert_matches!(quiz_result, QuizResult::Solved(2, 2));
 
     let addr_1 = Address::from_low_u64_le(0);