From af3271d3d6ed61bb00678ac5082689bda01c0232 Mon Sep 17 00:00:00 2001
From: Sebastian Pravda <sebastian.pravda@gmail.com>
Date: Sun, 15 Jan 2023 20:10:12 +0100
Subject: [PATCH] refactor: stop using find_parent_by_id

---
 core/src/database/mutation/parent.rs | 13 ++++++-------
 core/src/database/query/parent.rs    | 11 -----------
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/core/src/database/mutation/parent.rs b/core/src/database/mutation/parent.rs
index 3dcc2f8..6959cb6 100644
--- a/core/src/database/mutation/parent.rs
+++ b/core/src/database/mutation/parent.rs
@@ -56,10 +56,10 @@ mod tests {
         .await
         .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();
-        assert!(parent.is_some());
+        let parents = Query::find_candidate_parents(&db, &candidate).await.unwrap();
+        assert!(parents.get(0).is_some());
     }
 
     #[tokio::test]
@@ -82,15 +82,14 @@ mod tests {
         .await
         .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
             .unwrap();
 
-        let parent = Query::find_parent_by_id(&db, parent.id)
+        let parents = Query::find_candidate_parents(&db, &candidate)
             .await
-            .unwrap()
             .unwrap();
 
-        assert!(parent.surname.is_some());
+        assert!(parents[0].surname.is_some());
     }
 }
diff --git a/core/src/database/query/parent.rs b/core/src/database/query/parent.rs
index e463d98..b512b4b 100644
--- a/core/src/database/query/parent.rs
+++ b/core/src/database/query/parent.rs
@@ -2,23 +2,12 @@
 use entity::candidate;
 use entity::parent;
 use entity::parent::Model;
-use entity::parent::Entity;
 use sea_orm::ModelTrait;
 use sea_orm::{DbConn, DbErr};
-use sea_orm::EntityTrait;
 
 use crate::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(
         db: &DbConn,
         candidate: &candidate::Model,