dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-07-04 10:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat: all application_ids on whoami

Browse source
This commit is contained in:
Sebastian Pravda 2023-01-14 22:58:37 +01:00
parent b0dd796dfe
commit bcb43b622c
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
api/src/routes/candidate.rs
View file

@ -2,6 +2,7 @@ use std::net::{IpAddr, Ipv4Addr, SocketAddr};
use entity::application; use entity::application;
use portfolio_core::Query; use portfolio_core::Query;
use portfolio_core::error::ServiceError;
use portfolio_core::models::auth::AuthenticableTrait; use portfolio_core::models::auth::AuthenticableTrait;
use portfolio_core::models::candidate::{ApplicationDetails, NewCandidateResponse}; use portfolio_core::models::candidate::{ApplicationDetails, NewCandidateResponse};
use portfolio_core::sea_orm::prelude::Uuid; use portfolio_core::sea_orm::prelude::Uuid;
@ -77,9 +78,11 @@ pub async fn whoami(conn: Connection<'_, Db>, session: ApplicationAuth) -> Resul
let private_key = session.get_private_key(); let private_key = session.get_private_key();
let application: entity::application::Model = session.into(); let application: entity::application::Model = session.into();
let candidate = ApplicationService::find_related_candidate(&db, &application).await.map_err(to_custom_error)?; // TODO let candidate = ApplicationService::find_related_candidate(&db, &application)
println!("candidate: {:?}", candidate); .await.map_err(to_custom_error)?; // TODO more compact
let response = NewCandidateResponse::from_encrypted(&private_key, candidate).await 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
.map_err(to_custom_error)?; .map_err(to_custom_error)?;
Ok(Json(response)) Ok(Json(response))

9
core/src/models/candidate.rs
View file

@ -1,5 +1,5 @@
use chrono::NaiveDate; use chrono::NaiveDate;
use entity::candidate; use entity::{candidate, application};
use sea_orm::FromQueryResult; use sea_orm::FromQueryResult;
use serde::{Serialize, Deserialize}; use serde::{Serialize, Deserialize};
@ -11,7 +11,7 @@ use super::candidate_details::EncryptedString;
#[derive(Debug, Serialize, Deserialize)] #[derive(Debug, Serialize, Deserialize)]
#[serde(rename_all = "camelCase")] #[serde(rename_all = "camelCase")]
pub struct NewCandidateResponse { pub struct NewCandidateResponse {
pub application_id: i32, pub applications: Vec<i32>,
pub personal_id_number: String, pub personal_id_number: String,
} }
@ -103,11 +103,12 @@ pub struct Row {
} }
impl NewCandidateResponse { impl NewCandidateResponse {
pub async fn from_encrypted(private_key: &String, c: candidate::Model) -> Result<Self, ServiceError> { pub async fn from_encrypted(applications: Vec<application::Model>, private_key: &String, c: candidate::Model) -> Result<Self, ServiceError> {
let id_number = EncryptedString::from(c.personal_identification_number).decrypt(private_key).await?; let id_number = EncryptedString::from(c.personal_identification_number).decrypt(private_key).await?;
let applications = applications.iter().map(|a| a.id).collect();
Ok( Ok(
Self { Self {
application_id: c.id, applications,
personal_id_number: id_number, personal_id_number: id_number,
} }
) )