apply change in find_by_id pattern to other entities

refactor-group · Feb 24, 2025 · d774660 · d774660
1 parent 2df1bd3
commit d774660
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 105 deletions.
diff --git a/entity_api/src/action.rs b/entity_api/src/action.rs
@@ -106,43 +106,16 @@ pub async fn update_status(
 pub async fn delete_by_id(db: &DatabaseConnection, id: Id) -> Result<(), Error> {
     let result = find_by_id(db, id).await?;
 
-    match result {
-        Some(action_model) => {
-            debug!("Existing Action model to be deleted: {:?}", action_model);
+    result.delete(db).await?;
 
-            action_model.delete(db).await?;
-            Ok(())
-        }
-        None => Err(Error {
-            source: None,
-            error_kind: EntityApiErrorKind::RecordNotFound,
-        }),
-    }
+    Ok(())
 }
 
-pub async fn find_by_id(db: &DatabaseConnection, id: Id) -> Result<Option<Model>, Error> {
-    match Entity::find_by_id(id).one(db).await {
-        Ok(Some(action)) => {
-            debug!("Action found: {:?}", action);
-
-            Ok(Some(action))
-        }
-        Ok(None) => {
-            error!("Action with id {} not found", id);
-
-            Err(Error {
-                source: None,
-                error_kind: EntityApiErrorKind::RecordNotFound,
-            })
-        }
-        Err(err) => {
-            error!("Action with id {} not found and returned error {}", id, err);
-            Err(Error {
-                source: None,
-                error_kind: EntityApiErrorKind::RecordNotFound,
-            })
-        }
-    }
+pub async fn find_by_id(db: &DatabaseConnection, id: Id) -> Result<Model, Error> {
+    Entity::find_by_id(id).one(db).await?.ok_or_else(|| Error {
+        source: None,
+        error_kind: EntityApiErrorKind::RecordNotFound,
+    })
 }
 
 pub async fn find_by(

diff --git a/entity_api/src/agreement.rs b/entity_api/src/agreement.rs
@@ -63,47 +63,15 @@ pub async fn update(db: &DatabaseConnection, id: Id, model: Model) -> Result<Mod
 pub async fn delete_by_id(db: &DatabaseConnection, id: Id) -> Result<(), Error> {
     let result = find_by_id(db, id).await?;
 
-    match result {
-        Some(agreement_model) => {
-            debug!(
-                "Existing Agreement model to be deleted: {:?}",
-                agreement_model
-            );
-
-            agreement_model.delete(db).await?;
-            Ok(())
-        }
-        None => Err(Error {
-            source: None,
-            error_kind: EntityApiErrorKind::RecordNotFound,
-        }),
-    }
+    result.delete(db).await?;
+    Ok(())
 }
 
-pub async fn find_by_id(db: &DatabaseConnection, id: Id) -> Result<Option<Model>, Error> {
-    match Entity::find_by_id(id).one(db).await {
-        Ok(Some(agreement)) => {
-            debug!("Agreement found: {:?}", agreement);
-
-            Ok(Some(agreement))
-        }
-        Ok(None) => {
-            error!("Agreement with id {} not found", id);
-
-            Err(Error {
-                source: None,
-                error_kind: EntityApiErrorKind::RecordNotFound,
-            })
-        }
-        Err(err) => {
-            error!("Error finding Agreement with id {}: {:?}", id, err);
-
-            Err(Error {
-                source: Some(err),
-                error_kind: EntityApiErrorKind::RecordNotFound,
-            })
-        }
-    }
+pub async fn find_by_id(db: &DatabaseConnection, id: Id) -> Result<Model, Error> {
+    Entity::find_by_id(id).one(db).await?.ok_or_else(|| Error {
+        source: None,
+        error_kind: EntityApiErrorKind::RecordNotFound,
+    })
 }
 
 pub async fn find_by(

diff --git a/entity_api/src/overarching_goal.rs b/entity_api/src/overarching_goal.rs
@@ -129,32 +129,11 @@ pub async fn update_status(
     }
 }
 
-pub async fn find_by_id(db: &DatabaseConnection, id: Id) -> Result<Option<Model>, Error> {
-    match Entity::find_by_id(id).one(db).await {
-        Ok(Some(overarching_goal)) => {
-            debug!("Overarching Goal found: {:?}", overarching_goal);
-
-            Ok(Some(overarching_goal))
-        }
-        Ok(None) => {
-            error!("Overarching Goal with id {} not found", id);
-
-            Err(Error {
-                source: None,
-                error_kind: EntityApiErrorKind::RecordNotFound,
-            })
-        }
-        Err(err) => {
-            error!(
-                "Overarching Goal with id {} not found and returned error {}",
-                id, err
-            );
-            Err(Error {
-                source: None,
-                error_kind: EntityApiErrorKind::RecordNotFound,
-            })
-        }
-    }
+pub async fn find_by_id(db: &DatabaseConnection, id: Id) -> Result<Model, Error> {
+    Entity::find_by_id(id).one(db).await?.ok_or_else(|| Error {
+        source: None,
+        error_kind: EntityApiErrorKind::RecordNotFound,
+    })
 }
 
 pub async fn find_by(

diff --git a/web/src/controller/action_controller.rs b/web/src/controller/action_controller.rs
@@ -71,9 +71,9 @@ pub async fn read(
 ) -> Result<impl IntoResponse, Error> {
     debug!("GET Action by id: {}", id);
 
-    let note: Option<Model> = ActionApi::find_by_id(app_state.db_conn_ref(), id).await?;
+    let action = ActionApi::find_by_id(app_state.db_conn_ref(), id).await?;
 
-    Ok(Json(ApiResponse::new(StatusCode::OK.into(), note)))
+    Ok(Json(ApiResponse::new(StatusCode::OK.into(), action)))
 }
 
 #[utoipa::path(

diff --git a/web/src/controller/agreement_controller.rs b/web/src/controller/agreement_controller.rs
@@ -77,9 +77,9 @@ pub async fn read(
 ) -> Result<impl IntoResponse, Error> {
     debug!("GET Agreement by id: {}", id);
 
-    let note: Option<Model> = AgreementApi::find_by_id(app_state.db_conn_ref(), id).await?;
+    let agreement = AgreementApi::find_by_id(app_state.db_conn_ref(), id).await?;
 
-    Ok(Json(ApiResponse::new(StatusCode::OK.into(), note)))
+    Ok(Json(ApiResponse::new(StatusCode::OK.into(), agreement)))
 }
 
 #[utoipa::path(

diff --git a/web/src/controller/overarching_goal_controller.rs b/web/src/controller/overarching_goal_controller.rs
@@ -80,9 +80,12 @@ pub async fn read(
 ) -> Result<impl IntoResponse, Error> {
     debug!("GET Overarching Goal by id: {}", id);
 
-    let note: Option<Model> = OverarchingGoalApi::find_by_id(app_state.db_conn_ref(), id).await?;
+    let overarching_goal = OverarchingGoalApi::find_by_id(app_state.db_conn_ref(), id).await?;
 
-    Ok(Json(ApiResponse::new(StatusCode::OK.into(), note)))
+    Ok(Json(ApiResponse::new(
+        StatusCode::OK.into(),
+        overarching_goal,
+    )))
 }
 
 #[utoipa::path(