move find_all to entity_api

refactor-group · Nov 16, 2023 · 4e25708 · 4e25708
1 parent 3ca3c9d
commit 4e25708
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/entity_api/src/organization.rs b/entity_api/src/organization.rs
@@ -1,7 +1,12 @@
 use entity::organization;
+use organization::{Entity, Model};
 use sea_orm::{entity::prelude::*, ActiveValue, DatabaseConnection};
 use serde_json::json;
 
+pub async fn find_all(db: &DatabaseConnection) -> Vec<Model> {
+  Entity::find().all(db).await.unwrap_or(vec![])
+}
+
 pub(crate) async fn seed_database(db: &DatabaseConnection) {
     let organization_names = [
         "Jim Hodapp Coaching",

diff --git a/web/Cargo.toml b/web/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 
 [dependencies]
 entity = { path = "../entity" }
+entity_api = { path = "../entity_api" }
 service = { path = "../service" }
 
 axum = "0.6.20"

diff --git a/web/src/controller/organization_controller.rs b/web/src/controller/organization_controller.rs
@@ -9,6 +9,7 @@ use sea_orm::ActiveModelTrait;
 use sea_orm::ActiveValue::{NotSet, Set};
 use sea_orm::DeleteResult;
 use serde_json::json;
+use entity_api::organization as OrganizationApi;
 
 extern crate log;
 use log::*;
@@ -21,10 +22,7 @@ impl OrganizationController {
     /// --request GET \
     /// http://localhost:3000/organizations
     pub async fn index(State(app_state): State<AppState>) -> impl IntoResponse {
-        let organizations = organization::Entity::find()
-            .all(&app_state.database_connection.unwrap())
-            .await
-            .unwrap_or(vec![]);
+        let organizations = OrganizationApi::find_all(&app_state.database_connection.unwrap()).await;
 
         Json(organizations)
     }