From 670c790f0f7b4bb3ddae15c34e410402548e426e Mon Sep 17 00:00:00 2001 From: Sebastian Pravda Date: Sun, 15 Jan 2023 16:15:52 +0100 Subject: [PATCH] refactor: remove duplicate public keys --- core/src/services/application_service.rs | 3 +-- core/src/services/portfolio_service.rs | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/src/services/application_service.rs b/core/src/services/application_service.rs index 503354c..c271c8f 100644 --- a/core/src/services/application_service.rs +++ b/core/src/services/application_service.rs @@ -195,8 +195,7 @@ impl ApplicationService { candidate: candidate::Model, form: &ApplicationDetails, ) -> Result<(candidate::Model, Vec), ServiceError> { - - let mut recipients = get_recipients(db, &application.public_key).await?; + let mut recipients = Query::get_all_admin_public_keys(db).await?; let applications = Query::find_applications_by_candidate_id(db, candidate.id).await?; recipients.append(&mut applications.iter().map(|a| a.public_key.to_owned()).collect()); diff --git a/core/src/services/portfolio_service.rs b/core/src/services/portfolio_service.rs index 56d12b4..ac6c3dd 100644 --- a/core/src/services/portfolio_service.rs +++ b/core/src/services/portfolio_service.rs @@ -297,12 +297,13 @@ impl PortfolioService { archive.shutdown().await?; let applications_pubkeys: Vec = Query::find_applications_by_candidate_id(db, candidate_id) - .await?.iter().map(|a| a.public_key.to_owned()).collect(); + .await? + .iter() + .map(|a| a.public_key.to_owned()).collect(); let admin_public_keys = Query::get_all_admin_public_keys(db).await?; - let mut admin_public_keys_refrence: Vec<&str> = admin_public_keys.iter().map(|s| &**s).collect(); let mut recipients = vec![]; - recipients.append(&mut admin_public_keys_refrence); + recipients.append(&mut admin_public_keys.iter().map(|s| &**s).collect()); recipients.append(&mut applications_pubkeys.iter().map(|s| &**s).collect()); let final_path = path.join(FileType::PortfolioZip.as_str());