feat: more data in BaseCandidate response

api/src/routes/candidate.rs

@@ -82,7 +82,12 @@ pub async fn whoami(conn: Connection<'_, Db>, session: ApplicationAuth) -> Resul
         .await.map_err(to_custom_error)?; // TODO more compact
     let applications = Query::find_applications_by_candidate_id(&db, candidate.id)
         .await.map_err(|e| to_custom_error(ServiceError::DbError(e)))?; 
-    let response = NewCandidateResponse::from_encrypted(applications, &private_key, candidate).await
+    let response = NewCandidateResponse::from_encrypted(
+        application.id,
+        applications,
+        &private_key,
+        candidate
+    ).await
         .map_err(to_custom_error)?;
 
     Ok(Json(response))

core/src/models/candidate.rs

@@ -1,18 +1,24 @@
 use chrono::NaiveDate;
-use entity::{candidate, application};
+use entity::{application, candidate};
 use sea_orm::FromQueryResult;
-use serde::{Serialize, Deserialize};
+use serde::{Deserialize, Serialize};
 
-use crate::{error::ServiceError, database::query::candidate::CandidateResult, services::portfolio_service::SubmissionProgress};
+use crate::{
+    database::query::candidate::CandidateResult, error::ServiceError,
+    services::portfolio_service::SubmissionProgress,
+};
 
-use super::candidate_details::EncryptedString;
+use super::candidate_details::{EncryptedString, EncryptedCandidateDetails};
 
 /// Minimal candidate response containing database only not null fields
 #[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NewCandidateResponse {
+    pub current_application: i32,
     pub applications: Vec<i32>,
     pub personal_id_number: String,
+    pub details_filled: bool,
+    pub encrypted_by: Option<i32>,
 }
 
 /// Create candidate (admin endpoint)
@@ -103,15 +109,25 @@ pub struct Row {
 }
 
 impl NewCandidateResponse {
-    pub async fn from_encrypted(applications: Vec<application::Model>, private_key: &String, c: candidate::Model) -> Result<Self, ServiceError> {
+    pub async fn from_encrypted(
-        let id_number = EncryptedString::from(c.personal_identification_number).decrypt(private_key).await?;
+        current_application: i32,
+        applications: Vec<application::Model>,
+        private_key: &String,
+        c: candidate::Model,
+    ) -> Result<Self, ServiceError> {
+        let id_number = EncryptedString::from(c.personal_identification_number.to_owned())
+            .decrypt(private_key)
+            .await?;
         let applications = applications.iter().map(|a| a.id).collect();
-        Ok(
+        let encrypted_details = EncryptedCandidateDetails::from(&c);
-            Self {
+
-                applications,
+        Ok(Self {
-                personal_id_number: id_number,
+            current_application,
-            }
+            applications,
-        )
+            personal_id_number: id_number,
+            details_filled: encrypted_details.is_filled(),
+            encrypted_by: c.encrypted_by_id,
+        })
     }
 }
 
@@ -121,21 +137,31 @@ impl BaseCandidateResponse {
         c: CandidateResult,
         progress: Option<SubmissionProgress>,
     ) -> Result<Self, ServiceError> {
-        let name = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.name).ok(), private_key).await?;
+        let name =
-        let surname = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.surname).ok(), private_key).await?;
+            EncryptedString::decrypt_option(&EncryptedString::try_from(&c.name).ok(), private_key)
-        let email = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.email).ok(), private_key).await?;
+                .await?;
-        let telephone = EncryptedString::decrypt_option(&EncryptedString::try_from(&c.telephone).ok(), private_key).await?;
+        let surname = EncryptedString::decrypt_option(
-
+            &EncryptedString::try_from(&c.surname).ok(),
-        Ok(
+            private_key,
-            Self {
-                application_id: c.application,
-                name: name.unwrap_or_default(),
-                surname: surname.unwrap_or_default(),
-                email: email.unwrap_or_default(),
-                telephone:  telephone.unwrap_or_default(),
-                study: c.study.unwrap_or_default(),
-                progress: progress.unwrap_or(SubmissionProgress::NoneInCache),
-            }
         )
+        .await?;
+        let email =
+            EncryptedString::decrypt_option(&EncryptedString::try_from(&c.email).ok(), private_key)
+                .await?;
+        let telephone = EncryptedString::decrypt_option(
+            &EncryptedString::try_from(&c.telephone).ok(),
+            private_key,
+        )
+        .await?;
+
+        Ok(Self {
+            application_id: c.application,
+            name: name.unwrap_or_default(),
+            surname: surname.unwrap_or_default(),
+            email: email.unwrap_or_default(),
+            telephone: telephone.unwrap_or_default(),
+            study: c.study.unwrap_or_default(),
+            progress: progress.unwrap_or(SubmissionProgress::NoneInCache),
+        })
     }
-}
+}