From 1c1f2cc71088dcbb2dc5e598008757394d703ffb Mon Sep 17 00:00:00 2001
From: Pierre Hubert <pierre.git@communiquons.org>
Date: Fri, 25 Aug 2023 15:14:59 +0200
Subject: [PATCH] More properly return import errors

---
 geneit_backend/src/controllers/data_controller.rs    | 7 ++++++-
 geneit_backend/src/controllers/members_controller.rs | 7 +++----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/geneit_backend/src/controllers/data_controller.rs b/geneit_backend/src/controllers/data_controller.rs
index e2b7a9c..6642fc7 100644
--- a/geneit_backend/src/controllers/data_controller.rs
+++ b/geneit_backend/src/controllers/data_controller.rs
@@ -182,7 +182,12 @@ pub async fn import_family(
             req_member_data.mother = members_id_mapping.get(&i).copied();
         }
 
-        req_member_data.to_member(member).await?;
+        if let Err(e) = req_member_data.to_member(member).await {
+            log::error!("Error while processing import (member {:?}) - {e}", req_id);
+            return Ok(
+                HttpResponse::BadRequest().json(format!("Failed to validate member {:?}!", req_id))
+            );
+        }
 
         if let Some(id) = req_member.photo_id {
             photos_to_insert.push(PhotoToProcess {
diff --git a/geneit_backend/src/controllers/members_controller.rs b/geneit_backend/src/controllers/members_controller.rs
index f6edff2..3749706 100644
--- a/geneit_backend/src/controllers/members_controller.rs
+++ b/geneit_backend/src/controllers/members_controller.rs
@@ -5,7 +5,6 @@ use crate::extractors::member_extractor::FamilyAndMemberInPath;
 use crate::models::{Member, MemberID, PhotoID, Sex};
 use crate::services::{members_service, photos_service};
 use crate::utils::countries_utils;
-use crate::utils::encode_utils::base64_enc;
 use actix_multipart::form::tempfile::TempFile;
 use actix_multipart::form::MultipartForm;
 use actix_web::{web, HttpResponse};
@@ -63,8 +62,8 @@ enum MemberControllerErr {
     MalformedBirthLastname,
     #[error("Malformed email address!")]
     MalformedEmailAddress,
-    #[error("Invalid email address (base64={0}) !")]
-    InvalidEmailAddress(String),
+    #[error("Invalid email address!")]
+    InvalidEmailAddress,
     #[error("Malformed phone number!")]
     MalformedPhoneNumber,
     #[error("Malformed address!")]
@@ -133,7 +132,7 @@ impl MemberRequest {
 
         if let Some(mail) = &self.email {
             if !mailchecker::is_valid(mail) {
-                return Err(MemberControllerErr::InvalidEmailAddress(base64_enc(mail)).into());
+                return Err(MemberControllerErr::InvalidEmailAddress.into());
             }
         }