From 95dc6bc3d94ca52530ffde643e8e9c94d273f527 Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Sun, 8 Jan 2023 14:31:55 +0100 Subject: [PATCH] refactor: update_candidate_details method name --- core/src/database/mutation/candidate.rs | 9 +++++---- core/src/services/candidate_service.rs | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core/src/database/mutation/candidate.rs b/core/src/database/mutation/candidate.rs index e0b37d9..d5d853e 100644 --- a/core/src/database/mutation/candidate.rs +++ b/core/src/database/mutation/candidate.rs @@ -26,7 +26,7 @@ impl Mutation { .insert(db) .await?; - info!("CANDIDATE CREATED"); + info!("CANDIDATE {} CREATED", application_id); Ok(insert) } @@ -60,11 +60,12 @@ impl Mutation { Ok(update) } - pub async fn add_candidate_details( + pub async fn update_candidate_details( db: &DbConn, user: candidate::Model, enc_candidate: EncryptedCandidateDetails, ) -> Result { + let application = user.application; let mut user: candidate::ActiveModel = user.into(); user.name = Set(enc_candidate.name.map(|e| e.into())); user.surname = Set(enc_candidate.surname.map(|e| e.into())); @@ -82,7 +83,7 @@ impl Mutation { let update = user.update(db).await?; - info!("CANDIDATE DETAILS ADDED"); + info!("CANDIDATE {} DETAILS UPDATED", application); Ok(update) } @@ -140,7 +141,7 @@ mod tests { vec!["age1u889gp407hsz309wn09kxx9anl6uns30m27lfwnctfyq9tq4qpus8tzmq5".to_string()], ).await.unwrap(); - Mutation::add_candidate_details(&db, candidate, encrypted_details.candidate).await.unwrap(); + Mutation::update_candidate_details(&db, candidate, encrypted_details.candidate).await.unwrap(); let candidate = Query::find_candidate_by_id(&db, APPLICATION_ID) .await diff --git a/core/src/services/candidate_service.rs b/core/src/services/candidate_service.rs index 0ca5e75..3156868 100644 --- a/core/src/services/candidate_service.rs +++ b/core/src/services/candidate_service.rs @@ -109,7 +109,7 @@ impl CandidateService { .decrypt(admin_private_key).await?; let enc_details = EncryptedApplicationDetails::new(&dec_details, recipients).await?; - Mutation::add_candidate_details(db, candidate, enc_details.candidate).await?; + Mutation::update_candidate_details(db, candidate, enc_details.candidate).await?; for i in 0..enc_details.parents.len() { Mutation::add_parent_details(db, parents[i].clone(), enc_details.parents[i].clone()).await?; } @@ -137,7 +137,7 @@ impl CandidateService { recipients: &Vec, ) -> Result { let enc_details = EncryptedCandidateDetails::new(&details, recipients).await?; - let model = Mutation::add_candidate_details(db, candidate, enc_details).await?; + let model = Mutation::update_candidate_details(db, candidate, enc_details).await?; Ok(model) }