Axum and SeaORM Rewrite (#26)

.github/workflows/rust.yml

@@ -3,6 +3,8 @@ name: Rust
 on:
   push:
     branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
 
 env:
   CARGO_TERM_COLOR: always

Cargo.toml

@@ -16,7 +16,7 @@ dotenvy_macro = "0.15.7"
 serde = { version = "1.0.195", features = ["derive"] }
 serde_json = "1.0.111"
 uuid = { version = "1", features = ["v4", "serde"] }
-env_logger = "0.10"
+env_logger = "0.11.0"
 log = "0.4"
 strum_macros = "0.25.3"
 strum = { version = "0.25.0", features = ["derive"] }

README.md

@@ -25,4 +25,3 @@ Built with Axum and SeaORM
 **Update Entity**
 
 ``sea-orm-cli generate entity -u postgres://jijobose:password@localhost/loco_app -o src/database/``
-

src/api/house.rs

@@ -1,111 +1,95 @@
 use std::sync::Arc;
 
-use crate::{database::house::Entity as HouseEntity, AppState};
 use crate::database::house;
+use crate::{database::house::Entity as HouseEntity, AppState};
 use axum::extract::State;
-use axum::response::IntoResponse;
-use axum::{
-  http::StatusCode,
-  Json, Extension, extract::Path,
-};
-use serde_json::json;
-use sea_orm::{DatabaseConnection, EntityTrait, Set, ActiveModelTrait};
+use axum::{extract::Path, http::StatusCode, Extension, Json};
+use sea_orm::{ActiveModelTrait, DatabaseConnection, EntityTrait, Set};
 use uuid::Uuid;
 
-use crate::models::house::{House, CreateHouse};
-
+use crate::models::house::{CreateHouse, House};
 
 pub async fn all_houses(
-  State(database): State<Arc<AppState>>,
+    State(database): State<Arc<AppState>>,
 ) -> Result<Json<Vec<House>>, StatusCode> {
-
     let list_houses = HouseEntity::find()
         .all(&database.db)
         .await
         .map_err(|_error| StatusCode::INTERNAL_SERVER_ERROR)?
         .into_iter()
         .map(|db_house| House {
-          id: db_house.id.to_string(),
-          title: db_house.title,
-          body: db_house.body,
+            id: db_house.id.to_string(),
+            title: db_house.title,
+            body: db_house.body,
         })
         .collect();
 
     Ok(Json(list_houses))
 }
 
 pub async fn create_house(
-  State(database): State<Arc<AppState>>,
-  Json(house_params): Json<CreateHouse>,
-) -> Result<impl IntoResponse, (StatusCode, Json<serde_json::Value>)> {
-
-  let new_house = house::ActiveModel {
-    id: Set(Uuid::new_v4().to_string()),
-    title: Set(house_params.title),
-    body: Set(house_params.body),
-    ..Default::default()
-  };
-
-  let result = new_house
-    .save(&database.db)
-    .await;
-
-  match result {
-    Ok(_) => {
-      let house_response = json!({ "status": "success" });
-
-      return Ok((StatusCode::CREATED, Json(house_response)));
+    State(database): State<Arc<AppState>>,
+    Json(house_params): Json<CreateHouse>,
+) -> Result<Json<House>, StatusCode> {
+    let new_house = house::ActiveModel {
+        id: Set(Uuid::new_v4().to_string()),
+        title: Set(house_params.title),
+        body: Set(house_params.body),
+        ..Default::default()
+    };
+
+    match new_house.insert(&database.db).await {
+        Ok(inserted_house) => {
+            let response_json = Json(House {
+                id: inserted_house.id,
+                title: inserted_house.title,
+                body: inserted_house.body,
+            });
+
+            Ok(response_json)
+        }
+        Err(db_err) => {
+            let status_code = match db_err {
+                _ => StatusCode::INTERNAL_SERVER_ERROR,
+            };
+            Err(status_code)
+        }
     }
-    Err(e) => {
-      if e.to_string()
-          .contains("duplicate key value violates unique constraint")
-      {
-          let error_response = serde_json::json!({
-              "status": "fail",
-              "message": "Note with that title already exists",
-          });
-          return Err((StatusCode::CONFLICT, Json(error_response)));
-      }
-      return Err((
-          StatusCode::INTERNAL_SERVER_ERROR,
-          Json(json!({"status": "error","message": format!("{:?}", e)})),
-      ));
-  }
-
-  }
 }
 
+// Todo - Database implementation required
 pub async fn find_house(
-  Extension(database): Extension<DatabaseConnection>,
-  Path(house_id): Path<Uuid>
+    Extension(database): Extension<DatabaseConnection>,
+    Path(house_id): Path<Uuid>,
 ) -> Result<Json<House>, StatusCode> {
-  let house_id = house_id.to_owned();
-
-  let house = HouseEntity::find_by_id(house_id)
-    .one(&database)
-    .await
-    .unwrap();
+    let house_id = house_id.to_owned();
 
-  if let Some(house) = house {
-    Ok(Json(House {
-      id: house.id.to_string(),
-      title: house.title,
-      body: house.body
-    }))
-  } else {
-    Err(StatusCode::NOT_FOUND)
-  }
+    let house = HouseEntity::find_by_id(house_id)
+        .one(&database)
+        .await
+        .unwrap();
+
+    if let Some(house) = house {
+        Ok(Json(House {
+            id: house.id.to_string(),
+            title: house.title,
+            body: house.body,
+        }))
+    } else {
+        Err(StatusCode::NOT_FOUND)
+    }
 }
 
+// Todo - Database implementation required
 pub async fn delete_house(
-  Extension(database): Extension<DatabaseConnection>,
-  Path(house_id): Path<Uuid>
+    Extension(database): Extension<DatabaseConnection>,
+    Path(house_id): Path<Uuid>,
 ) -> Result<(), StatusCode> {
-  let house_id = house_id.to_owned();
-  HouseEntity::delete_by_id(house_id)
-    .exec(&database)
-    .await
-    .map_err(|_error| StatusCode::INTERNAL_SERVER_ERROR)?;
+    let house_id = house_id.to_owned();
+    HouseEntity::delete_by_id(house_id)
+        .exec(&database)
+        .await
+        .map_err(|_error| StatusCode::INTERNAL_SERVER_ERROR)?;
 
-  Ok(())
+    Ok(())
 }

src/main.rs

@@ -3,7 +3,6 @@ use anyhow::Ok;
 use axum::serve;
 use sea_orm::{Database, DatabaseConnection};
 use tokio::net::TcpListener;
-use dotenvy_macro::dotenv;
 
 pub mod routes;
 pub mod api;
@@ -16,8 +15,8 @@ pub struct AppState {
 
 #[tokio::main]
 async fn start() -> anyhow::Result<()> {
-    dotenvy::dotenv().ok();
-    let database_uri = dotenv!("DATABASE_URL");
+    dotenv::dotenv()?;
+    let database_uri = dotenvy::var("DATABASE_URL")?;
     let db_connection = Database::connect(database_uri)
       .await
       .expect("Database connection failed");
@@ -27,8 +26,8 @@ async fn start() -> anyhow::Result<()> {
 
     let app = routes::create_routes(Arc::new(AppState { db: db_connection.clone() }));
 
-    let listner = TcpListener::bind(&"0.0.0.0:3000").await.unwrap();
-    serve(listner, app).await?;
+    let listener = TcpListener::bind(&"0.0.0.0:3000").await.unwrap();
+    serve(listener, app).await?;
 
     Ok(())
 }

src/models/house.rs

@@ -28,7 +28,7 @@ impl CreateHouse {
           return Err("Name is empty".to_string());
       }
       if self.body.trim().is_empty() {
-          return Err("Desciption is empty".to_string());
+          return Err("Description is empty".to_string());
       }
       Ok(())
   }