dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-07-06 19:40:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: remove duplicate public keys

Browse source
This commit is contained in:
Sebastian Pravda 2023-01-15 16:15:52 +01:00
parent fd08bef4db
commit 670c790f0f
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/services/application_service.rs
View file

@ -195,8 +195,7 @@ impl ApplicationService {
candidate: candidate::Model, candidate: candidate::Model,
form: &ApplicationDetails, form: &ApplicationDetails,
) -> Result<(candidate::Model, Vec<parent::Model>), ServiceError> { ) -> Result<(candidate::Model, Vec<parent::Model>), ServiceError> {
let mut recipients = Query::get_all_admin_public_keys(db).await?;
let mut recipients = get_recipients(db, &application.public_key).await?;
let applications = Query::find_applications_by_candidate_id(db, candidate.id).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()); recipients.append(&mut applications.iter().map(|a| a.public_key.to_owned()).collect());

7
core/src/services/portfolio_service.rs
View file

@ -297,12 +297,13 @@ impl PortfolioService {
archive.shutdown().await?; archive.shutdown().await?;
let applications_pubkeys: Vec<String> = Query::find_applications_by_candidate_id(db, candidate_id) let applications_pubkeys: Vec<String> = 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 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![]; 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()); recipients.append(&mut applications_pubkeys.iter().map(|s| &**s).collect());
let final_path = path.join(FileType::PortfolioZip.as_str()); let final_path = path.join(FileType::PortfolioZip.as_str());