dan/Portfolio
1
0
Fork 0
mirror of https://github.com/danbulant/Portfolio synced 2026-05-22 05:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: remove duplicate pubkeys, code cleanup

Browse source
This commit is contained in:
Sebastian Pravda 2023-01-15 15:55:43 +01:00
parent e6cd7d3cb5
commit 603e5cc698
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
2 changed files with 58 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/src/error.rs
View file

@ -22,6 +22,10 @@ pub enum ServiceError {
Locked,
#[error("Too many applications")]
TooManyApplications,
#[error("Too many fields for one person")]
TooManyFieldsForOnePerson,
#[error("Internal server error")]
InternalServerError,
#[error("Parrent not found")]
ParentNotFound,
#[error("Database error")]
@ -84,8 +88,10 @@ impl ServiceError {
ServiceError::IncompletePortfolio => 406,
ServiceError::UserAlreadyExists => 409,
ServiceError::Locked => 423,
ServiceError::TooManyFieldsForOnePerson => 409,
ServiceError::TooManyApplications => 409,
// 500
ServiceError::InternalServerError => 500,
ServiceError::ParentNotFound => 500,
ServiceError::DbError(_) => 500,
ServiceError::UserNotFoundBySessionId => 500,

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

@ -64,7 +64,13 @@ impl ApplicationService {
encrypted_priv_key,
).await?;
// PortfolioService::create_user_dir(application.id).await?;
let applications = Query::find_applications_by_candidate_id(db, candidate.id).await?;
if applications.len() >= 3 {
for application in applications {
ApplicationService::delete(db, application).await?;
}
return Err(ServiceError::InternalServerError);
}
Ok(application)
}
@ -93,42 +99,18 @@ impl ApplicationService {
.iter()
.filter(|(_, id)| id == &personal_id_number)
.collect();
let mut recipients = get_recipients(db, pubkey).await?;
if found_ids.iter().any(|(_, personal_id)| personal_id == &personal_id_number) {
let candidate = Query::find_candidate_by_id(db, found_ids[0].0)
.await?
.ok_or(ServiceError::CandidateNotFound)?;
let mut linked_applications_pubkeys: Vec<String> = Query::find_applications_by_candidate_id(db, candidate.id)
.await?
.iter()
.filter(|a| a.id.to_string()[0..3] != application_id.to_string()[0..3])
.map(|a| a.public_key.to_owned())
.collect();
if linked_applications_pubkeys.is_empty() {
return Err(ServiceError::InvalidApplicationId);
}
if linked_applications_pubkeys.len() > 1 {
return Err(ServiceError::TooManyApplications);
}
recipients.append(&mut linked_applications_pubkeys);
let enc_personal_id_number = EncryptedString::new(
&personal_id_number,
&recipients,
).await?;
let candidate = Mutation::update_personal_id(db, candidate, &enc_personal_id_number.to_owned().to_string()).await?;
println!("Candidates linked!");
Ok(
(candidate, enc_personal_id_number.to_string())
Self::find_linkable_candidate(db,
application_id,
found_ids[0].0,
personal_id_number
).await?
)
} else {
let recipients = get_recipients(db, pubkey).await?;
let enc_personal_id_number = EncryptedString::new(
&personal_id_number,
&recipients,
@ -142,6 +124,44 @@ impl ApplicationService {
}
}
async fn find_linkable_candidate(
db: &DbConn,
new_application_id: i32,
candidate_id: i32,
personal_id_number: String,
) -> Result<(candidate::Model, String), ServiceError> {
let candidate = Query::find_candidate_by_id(db, candidate_id)
.await?
.ok_or(ServiceError::CandidateNotFound)?;
let linked_applications = Query::find_applications_by_candidate_id(db, candidate.id).await?;
if linked_applications.len() > 1 {
return Err(ServiceError::TooManyApplications);
}
let linked_application = linked_applications.first().ok_or(ServiceError::CandidateNotFound)?;//TODO
if linked_application.id.to_string()[0..3] == new_application_id.to_string()[0..3] {
return Err(ServiceError::TooManyFieldsForOnePerson);
}
let mut recipients = Query::get_all_admin_public_keys(db).await?;
recipients.append(&mut vec![linked_application.public_key.to_owned()]);
let enc_personal_id_number = EncryptedString::new(
&personal_id_number,
&recipients,
).await?;
let candidate = Mutation::update_personal_id(db, candidate, &enc_personal_id_number.to_owned().to_string()).await?;
println!("APPLICATIONS {} AND {} ARE LINKED (CANDIDATE {})", new_application_id, linked_application.id, candidate.id);
Ok(
(candidate, enc_personal_id_number.to_string())
)
}
pub async fn delete(db: &DbConn, application: application::Model) -> Result<(), ServiceError> {
Mutation::delete_application(db, application).await?;
Ok(())