From 367fc9ffe65bcfb0e3ff4296f4d04db43e9168d0 Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Mon, 26 Dec 2022 15:35:32 +0100
Subject: [PATCH] fix(api): whoami test

---
 api/src/routes/candidate.rs  | 11 +++++++----
 core/src/models/candidate.rs |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/api/src/routes/candidate.rs b/api/src/routes/candidate.rs
index c69dd1a..c2b34a9 100644
--- a/api/src/routes/candidate.rs
+++ b/api/src/routes/candidate.rs
@@ -2,7 +2,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
 
 use portfolio_core::Query;
 use portfolio_core::models::auth::AuthenticableTrait;
-use portfolio_core::models::candidate::{ApplicationDetails, BaseCandidateResponse, NewCandidateResponse};
+use portfolio_core::models::candidate::{ApplicationDetails, NewCandidateResponse};
 use portfolio_core::sea_orm::prelude::Uuid;
 use portfolio_core::services::application_service::ApplicationService;
 use portfolio_core::services::candidate_service::CandidateService;
@@ -258,7 +258,7 @@ pub async fn download_portfolio(session: CandidateAuth) -> Result<Vec<u8>, Custo
 
 #[cfg(test)]
 mod tests {
-    use portfolio_core::{crypto, models::candidate::ApplicationDetails, sea_orm::prelude::Uuid};
+    use portfolio_core::{crypto, models::candidate::{ApplicationDetails, NewCandidateResponse}, sea_orm::prelude::Uuid};
     use rocket::{
         http::{Cookie, Status},
         local::blocking::Client,
@@ -266,7 +266,7 @@ mod tests {
 
     use crate::{
         routes::admin::tests::admin_login,
-        test::tests::{test_client, APPLICATION_ID, CANDIDATE_PASSWORD},
+        test::tests::{test_client, APPLICATION_ID, CANDIDATE_PASSWORD, PERSONAL_ID_NUMBER},
     };
 
     fn candidate_login(client: &Client) -> (Cookie, Cookie) {
@@ -328,7 +328,10 @@ mod tests {
             .dispatch();
 
         assert_eq!(response.status(), Status::Ok);
-        assert_eq!(response.into_string().unwrap(), APPLICATION_ID.to_string());
+
+        let candidate = response.into_json::<NewCandidateResponse>().unwrap();
+        assert_eq!(candidate.application_id, APPLICATION_ID);
+        assert_eq!(candidate.personal_id_number, PERSONAL_ID_NUMBER);
     }
 
     #[test]
diff --git a/core/src/models/candidate.rs b/core/src/models/candidate.rs
index dc51299..60d1022 100644
--- a/core/src/models/candidate.rs
+++ b/core/src/models/candidate.rs
@@ -8,7 +8,7 @@ use crate::{error::ServiceError, database::query::candidate::CandidateResult, se
 use super::candidate_details::decrypt_if_exists;
 
 /// Minimal candidate response containing database only not null fields
-#[derive(Debug, Serialize)]
+#[derive(Debug, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase")]
 pub struct NewCandidateResponse {
     pub application_id: i32,