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

refactor: stop using find_parent_by_id

Browse source
This commit is contained in:
Sebastian Pravda 2023-01-15 20:10:12 +01:00
parent 56acf36f92
commit af3271d3d6
No known key found for this signature in database
GPG key ID: F3BC84F08EFA3F57
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
core/src/database/mutation/parent.rs
View file

@ -56,10 +56,10 @@ mod tests {
.await .await
.unwrap(); .unwrap();
let new_parent = Mutation::create_parent(&db, candidate.id).await.unwrap(); Mutation::create_parent(&db, candidate.id).await.unwrap();
let parent = Query::find_parent_by_id(&db, new_parent.id).await.unwrap(); let parents = Query::find_candidate_parents(&db, &candidate).await.unwrap();
assert!(parent.is_some()); assert!(parents.get(0).is_some());
} }
#[tokio::test] #[tokio::test]
@ -82,15 +82,14 @@ mod tests {
.await .await
.unwrap(); .unwrap();
let parent = Mutation::add_parent_details(&db, parent, encrypted_details.parents[0].clone()) Mutation::add_parent_details(&db, parent, encrypted_details.parents[0].clone())
.await .await
.unwrap(); .unwrap();
let parent = Query::find_parent_by_id(&db, parent.id) let parents = Query::find_candidate_parents(&db, &candidate)
.await .await
.unwrap()
.unwrap(); .unwrap();
assert!(parent.surname.is_some()); assert!(parents[0].surname.is_some());
} }
} }

11
core/src/database/query/parent.rs
View file

@ -2,23 +2,12 @@
use entity::candidate; use entity::candidate;
use entity::parent; use entity::parent;
use entity::parent::Model; use entity::parent::Model;
use entity::parent::Entity;
use sea_orm::ModelTrait; use sea_orm::ModelTrait;
use sea_orm::{DbConn, DbErr}; use sea_orm::{DbConn, DbErr};
use sea_orm::EntityTrait;
use crate::Query; use crate::Query;
impl Query { impl Query {
#[deprecated(note = "Use find_candidate_parents instead")]
pub async fn find_parent_by_id(
db: &DbConn,
id: i32,
) -> Result<Option<Model>, DbErr> {
Entity::find_by_id(id).one(db).await
}
pub async fn find_candidate_parents( pub async fn find_candidate_parents(
db: &DbConn, db: &DbConn,
candidate: &candidate::Model, candidate: &candidate::Model,