add randomization to quiz, add difficulty levels, udpate quiz configu…

…ration, add a check for user profile completion token, add tests
ambrosus · Feb 16, 2024 · f7116dd · f7116dd
1 parent 7036725
commit f7116dd
Show file tree

Hide file tree

Showing 14 changed files with 916 additions and 145 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/config/default.json b/config/default.json
@@ -1,8 +1,6 @@
 {
     "listenAddress": "0.0.0.0:10000",
-    "userDb": {
-        "secret": null
-    },
+    "usersManagerSecret": null,
     "signer": {
         "signingKey": null,
         "requestLifetime": 60000,

diff --git a/gov-portal-db/Cargo.toml b/gov-portal-db/Cargo.toml
@@ -54,6 +54,7 @@ hex = { workspace = true }
 base64 = { workspace = true }
 anyhow = { workspace = true }
 dotenv = { workspace = true }
+rand = { workspace = true }
 
 [dev-dependencies]
 assert_matches = { workspace = true }

diff --git a/gov-portal-db/config/default.json b/gov-portal-db/config/default.json
@@ -4,7 +4,7 @@
         "secret": null,
         "lifetime": 86400
     },
-    "registration": {
+    "usersManager": {
         "secret": null,
         "lifetime": 600,
         "userProfileAttributes": {
@@ -24,8 +24,17 @@
         "requestTimeout": 10
     },
     "quiz": {
+        "secret": null,
+        "timeToSolve": 300,
         "failedQuizBlockDuration": 172800,
-        "minimumValidAnswersRequired": null,
+        "numberOfQuizQuestionsShown": {
+            "easy": null,
+            "moderate": null
+        },
+        "minimumValidAnswersRequired": {
+            "easy": null,
+            "moderate": null
+        },
         "questions": null
     }
 }
diff --git a/gov-portal-db/src/config.rs b/gov-portal-db/src/config.rs
@@ -3,7 +3,7 @@ use serde::Deserialize;
 use crate::{
     quiz::QuizConfig,
     session_token::SessionConfig,
-    users_manager::{mongo_client::MongoConfig, UserRegistrationConfig},
+    users_manager::{mongo_client::MongoConfig, UsersManagerConfig},
 };
 
 #[derive(Deserialize, Debug, Clone)]
@@ -14,7 +14,7 @@ pub struct AppConfig {
     /// Session tokens configuration to allow access to database
     pub session: SessionConfig,
     /// User registration configuration
-    pub registration: UserRegistrationConfig,
+    pub users_manager: UsersManagerConfig,
     /// MongoDB client configuration
     pub mongo: MongoConfig,
     /// Quiz configuration

diff --git a/gov-portal-db/src/main.rs b/gov-portal-db/src/main.rs
@@ -21,7 +21,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
     let config = utils::load_config::<config::AppConfig>("./gov-portal-db").await?;
 
     let users_manager =
-        Arc::new(UsersManager::new(&config.mongo, config.registration.clone()).await?);
+        Arc::new(UsersManager::new(&config.mongo, config.users_manager.clone()).await?);
 
     server::start(config, users_manager.clone()).await?;