♻️ refactoring

Author: codemountains

src/error.rs

@@ -1,3 +1,7 @@
+use axum::http::StatusCode;
+use axum::response::{IntoResponse, Response};
+use axum::Json;
+use serde_json::json;
 use std::fmt;
 
 pub const EXCEPTION_ERROR_MESSAGE: &str = "An unexpected error occurred.";
@@ -34,3 +38,20 @@ impl fmt::Display for MocksError {
         }
     }
 }
+impl IntoResponse for MocksError {
+    fn into_response(self) -> Response {
+        let (status, message) = match self {
+            MocksError::FailedReadFile(err)
+            | MocksError::FailedWriteFile(err)
+            | MocksError::InvalidArgs(err)
+            | MocksError::Exception(err) => (StatusCode::INTERNAL_SERVER_ERROR, err),
+            MocksError::ResourceNotFound | MocksError::ObjectNotFound => {
+                (StatusCode::NOT_FOUND, self.to_string())
+            }
+            MocksError::MethodNotAllowed => (StatusCode::METHOD_NOT_ALLOWED, self.to_string()),
+            MocksError::InvalidRequest => (StatusCode::BAD_REQUEST, self.to_string()),
+        };
+
+        (status, Json(json!({ "error": message }))).into_response()
+    }
+}

src/server.rs

@@ -1,3 +1,4 @@
+mod context;
 mod handler;
 mod hc;
 mod state;
@@ -7,8 +8,6 @@ use crate::server::handler::{delete, get_all, get_one, patch, patch_one, post, p
 use crate::server::hc::hc;
 use crate::server::state::{AppState, SharedState};
 use crate::storage::Storage;
-use axum::http::StatusCode;
-use axum::response::{IntoResponse, Response};
 use axum::routing::get;
 use axum::Router;
 use serde_json::Value;
@@ -37,7 +36,6 @@ impl Server {
             .await
             .map_err(|e| MocksError::Exception(e.to_string()))?;
 
-        println!();
         println!("Endpoints:");
         print_endpoints(url, &storage.data);
 
@@ -70,15 +68,3 @@ fn create_router(state: SharedState) -> Router {
         .nest("/:resource", storage_router)
         .with_state(state)
 }
-
-pub fn response(status_code: StatusCode, body: String) -> Result<impl IntoResponse, StatusCode> {
-    Response::builder()
-        .status(status_code)
-        .header("Content-Type", "application/json")
-        .body(body)
-        .map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)
-}
-
-pub fn format_err(message: &str) -> String {
-    format!("{{\"error\": \"{}\"}}", message)
-}

src/server/context.rs

@@ -0,0 +1,65 @@
+use axum::extract::rejection::JsonRejection;
+use axum::extract::FromRequest;
+use axum::http::StatusCode;
+use axum::{async_trait, Json};
+use serde_json::{json, Value};
+
+const INVALID_JSON_REQUEST: &str = "Invalid JSON format in request body.";
+
+#[derive(Debug, Clone, Default)]
+pub struct Payload(pub Value);
+
+#[async_trait]
+impl<S> FromRequest<S> for Payload
+where
+    S: Send + Sync,
+    Json<Value>: FromRequest<S, Rejection = JsonRejection>,
+{
+    type Rejection = (StatusCode, Json<Value>);
+
+    async fn from_request(req: axum::extract::Request, state: &S) -> Result<Self, Self::Rejection> {
+        let Json(value) = Json::<Value>::from_request(req, state)
+            .await
+            .map_err(|e| to_rejection(&e.to_string()))?;
+
+        if !value.is_object() {
+            return Err(to_rejection(INVALID_JSON_REQUEST));
+        }
+
+        Ok(Payload(value))
+    }
+}
+
+#[derive(Debug, Clone, Default)]
+pub struct PayloadWithId(pub Value);
+
+#[async_trait]
+impl<S> FromRequest<S> for PayloadWithId
+where
+    S: Send + Sync,
+    Json<Value>: FromRequest<S, Rejection = JsonRejection>,
+{
+    type Rejection = (StatusCode, Json<Value>);
+
+    async fn from_request(req: axum::extract::Request, state: &S) -> Result<Self, Self::Rejection> {
+        let Json(value) = Json::<Value>::from_request(req, state)
+            .await
+            .map_err(|e| to_rejection(&e.to_string()))?;
+
+        if !value.is_object() {
+            return Err(to_rejection(INVALID_JSON_REQUEST));
+        }
+
+        // ID is required for updates
+        if value.get("id").is_none() {
+            return Err(to_rejection("ID is required for updates."));
+        }
+
+        Ok(PayloadWithId(value))
+    }
+}
+
+fn to_rejection(message: &str) -> (StatusCode, Json<Value>) {
+    let json = Json::from(json!({"error": message}));
+    (StatusCode::BAD_REQUEST, json)
+}