pierre/GeneIT
1
0
Fork 0
Code Issues Pull Requests 3 Packages Projects Releases Wiki Activity

Remove useless check

Browse Source
This commit is contained in:
Pierre HUBERT
2023-08-18 11:06:57 +02:00
parent 57d919ee63
commit 9e94cfc298
2 changed files with 10 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
geneit_backend/src/controllers/couples_controller.rs
View File

@ -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()));
}