From 9e94cfc2982a26171538374dd0e36dab53926219 Mon Sep 17 00:00:00 2001
From: Pierre Hubert <pierre.git@communiquons.org>
Date: Fri, 18 Aug 2023 11:06:57 +0200
Subject: [PATCH] Remove useless check

---
 .../src/controllers/couples_controller.rs      | 17 +++++------------
 .../src/controllers/members_controller.rs      | 18 +++++-------------
 2 files changed, 10 insertions(+), 25 deletions(-)

diff --git a/geneit_backend/src/controllers/couples_controller.rs b/geneit_backend/src/controllers/couples_controller.rs
index c81f7bd..362dd09 100644
--- a/geneit_backend/src/controllers/couples_controller.rs
+++ b/geneit_backend/src/controllers/couples_controller.rs
@@ -37,14 +37,9 @@ pub struct CoupleRequest {
 }
 
 impl CoupleRequest {
-    pub async fn to_couple(
-        self,
-        couple: &mut Couple,
-        check_members_existence: bool,
-    ) -> anyhow::Result<()> {
+    pub async fn to_couple(self, couple: &mut Couple) -> anyhow::Result<()> {
         if let Some(wife) = self.wife {
-            if check_members_existence && !members_service::exists(couple.family_id(), wife).await?
-            {
+            if !members_service::exists(couple.family_id(), wife).await? {
                 return Err(CoupleControllerErr::WifeNotExisting.into());
             }
 
@@ -54,9 +49,7 @@ impl CoupleRequest {
         }
 
         if let Some(husband) = self.husband {
-            if check_members_existence
-                && !members_service::exists(couple.family_id(), husband).await?
-            {
+            if !members_service::exists(couple.family_id(), husband).await? {
                 return Err(CoupleControllerErr::HusbandNotExisting.into());
             }
         }
@@ -109,7 +102,7 @@ impl CoupleAPI {
 pub async fn create(m: FamilyInPath, req: web::Json<CoupleRequest>) -> HttpResult {
     let mut couple = couples_service::create(m.family_id()).await?;
 
-    if let Err(e) = req.0.to_couple(&mut couple, true).await {
+    if let Err(e) = req.0.to_couple(&mut couple).await {
         log::error!("Failed to apply couple information! {e}");
         couples_service::delete(&mut couple).await?;
         return Ok(HttpResponse::BadRequest().body(e.to_string()));
@@ -144,7 +137,7 @@ pub async fn get_single(m: FamilyAndCoupleInPath) -> HttpResult {
 pub async fn update(m: FamilyAndCoupleInPath, req: web::Json<CoupleRequest>) -> HttpResult {
     let mut couple = m.to_couple();
 
-    if let Err(e) = req.0.to_couple(&mut couple, true).await {
+    if let Err(e) = req.0.to_couple(&mut couple).await {
         log::error!("Failed to parse couple information {e}!");
         return Ok(HttpResponse::BadRequest().body(e.to_string()));
     }
diff --git a/geneit_backend/src/controllers/members_controller.rs b/geneit_backend/src/controllers/members_controller.rs
index 165c940..dcb9035 100644
--- a/geneit_backend/src/controllers/members_controller.rs
+++ b/geneit_backend/src/controllers/members_controller.rs
@@ -104,11 +104,7 @@ fn check_opt_str_val(
 }
 
 impl MemberRequest {
-    pub async fn to_member(
-        self,
-        member: &mut Member,
-        check_members_existence: bool, /* TODO: remove this field */
-    ) -> anyhow::Result<()> {
+    pub async fn to_member(self, member: &mut Member) -> anyhow::Result<()> {
         let c = StaticConstraints::default();
         check_opt_str_val(
             &self.first_name,
@@ -195,9 +191,7 @@ impl MemberRequest {
         )?;
 
         if let Some(mother) = self.mother {
-            if check_members_existence
-                && !members_service::exists(member.family_id(), mother).await?
-            {
+            if !members_service::exists(member.family_id(), mother).await? {
                 return Err(MemberControllerErr::MotherNotExisting.into());
             }
 
@@ -207,9 +201,7 @@ impl MemberRequest {
         }
 
         if let Some(father) = self.father {
-            if check_members_existence
-                && !members_service::exists(member.family_id(), father).await?
-            {
+            if !members_service::exists(member.family_id(), father).await? {
                 return Err(MemberControllerErr::FatherNotExisting.into());
             }
         }
@@ -262,7 +254,7 @@ impl MemberAPI {
 pub async fn create(f: FamilyInPath, req: web::Json<MemberRequest>) -> HttpResult {
     let mut member = members_service::create(f.family_id()).await?;
 
-    if let Err(e) = req.0.to_member(&mut member, true).await {
+    if let Err(e) = req.0.to_member(&mut member).await {
         log::error!("Failed to apply member information! {e}");
         members_service::delete(&mut member).await?;
         return Ok(HttpResponse::BadRequest().body(e.to_string()));
@@ -292,7 +284,7 @@ pub async fn get_single(m: FamilyAndMemberInPath) -> HttpResult {
 pub async fn update(m: FamilyAndMemberInPath, req: web::Json<MemberRequest>) -> HttpResult {
     let mut member = m.to_member();
 
-    if let Err(e) = req.0.to_member(&mut member, true).await {
+    if let Err(e) = req.0.to_member(&mut member).await {
         log::error!("Failed to parse member information {e}!");
         return Ok(HttpResponse::BadRequest().body(e.to_string()));
     }