fix qr_code generator

Author: robatipoor

api/src/bin/main.rs

@@ -1,7 +1,7 @@
 use api::{
   configure::env::get_env_source,
   constant::ENV_PREFIX,
-  error::ApiResult,
+  error::result::ApiResult,
   server::{worker::GarbageCollectorTask, ApiServer},
   util::{self, tracing::INIT_SUBSCRIBER},
 };

api/src/database/file_path.rs

@@ -1,4 +1,4 @@
-use crate::error::{ApiError, ApiResult};
+use crate::error::{result::ApiResult, ApiError};
 use sdk::dto::FileUrlPath;
 use serde::{Deserialize, Serialize};
 use sled::IVec;

api/src/database/meta_data_file.rs

@@ -1,5 +1,5 @@
 use crate::{
-  error::{ApiError, ApiResult},
+  error::{result::ApiResult, ApiError},
   util::secret::SecretHash,
 };
 use chrono::{DateTime, Utc};

api/src/database/mod.rs

@@ -1,6 +1,6 @@
 use crate::{
   configure::DatabaseConfig,
-  error::{ApiError, ApiResult},
+  error::{result::ApiResult, ApiError},
 };
 use chrono::{DateTime, Utc};
 use sled::IVec;

api/src/error/mod.rs

@@ -1,11 +1,8 @@
-use axum::{
-  http::StatusCode,
-  response::{IntoResponse, Response},
-  Json,
-};
+use axum::http::StatusCode;
 use sdk::dto::response::BodyResponseError;
 
-pub type ApiResult<T = ()> = std::result::Result<T, ApiError>;
+pub mod response;
+pub mod result;
 
 #[derive(Debug, thiserror::Error)]
 pub enum ApiError {
@@ -53,6 +50,8 @@ pub enum ApiError {
   MultipartError(#[from] axum::extract::multipart::MultipartError),
   #[error(transparent)]
   UrlError(#[from] url::ParseError),
+  #[error(transparent)]
+  ImageError(#[from] image::ImageError),
   #[error("lock error: {0}")]
   LockError(String),
   #[error("duration out of range error: {0}")]
@@ -155,6 +154,11 @@ impl ApiError {
         err.to_string(),
         StatusCode::INTERNAL_SERVER_ERROR,
       ),
+      ImageError(err) => (
+        "IMAGE_ERROR",
+        err.to_string(),
+        StatusCode::INTERNAL_SERVER_ERROR,
+      ),
       UnknownError(err) => (
         "UNKNOWN_ERROR",
         err.to_string(),
@@ -178,25 +182,8 @@ impl ApiError {
   }
 }
 
-impl IntoResponse for ApiError {
-  fn into_response(self) -> Response {
-    let (body, status_code) = self.response();
-    (status_code, Json(body)).into_response()
-  }
-}
-
 pub fn invalid_input_error(field: &'static str, message: &'static str) -> ApiError {
   let mut report = garde::Report::new();
   report.append(garde::Path::new(field), garde::Error::new(message));
   ApiError::InvalidInputError(report)
 }
-
-pub trait ToApiResult<T> {
-  fn to_result(self) -> ApiResult<T>;
-}
-
-impl<T> ToApiResult<T> for Option<T> {
-  fn to_result(self) -> ApiResult<T> {
-    self.ok_or_else(|| ApiError::NotFoundError(format!("{} not found", std::any::type_name::<T>())))
-  }
-}

api/src/error/response.rs

@@ -0,0 +1,13 @@
+use axum::{
+  response::{IntoResponse, Response},
+  Json,
+};
+
+use super::ApiError;
+
+impl IntoResponse for ApiError {
+  fn into_response(self) -> Response {
+    let (body, status_code) = self.response();
+    (status_code, Json(body)).into_response()
+  }
+}

api/src/error/result.rs

@@ -0,0 +1,13 @@
+use super::ApiError;
+
+pub type ApiResult<T = ()> = std::result::Result<T, ApiError>;
+
+pub trait ToApiResult<T> {
+  fn to_result(self) -> ApiResult<T>;
+}
+
+impl<T> ToApiResult<T> for Option<T> {
+  fn to_result(self) -> ApiResult<T> {
+    self.ok_or_else(|| ApiError::NotFoundError(format!("{} not found", std::any::type_name::<T>())))
+  }
+}

api/src/handler/file.rs

@@ -15,7 +15,7 @@ use tower::ServiceExt;
 use tower_http::services::fs::ServeFileSystemResponseBody;
 
 use crate::{
-  error::ApiResult,
+  error::result::ApiResult,
   server::ApiState,
   service::{self},
 };

api/src/server/mod.rs

@@ -3,7 +3,7 @@ pub mod worker;
 
 use crate::configure::{ApiConfig, UrlSchema};
 use crate::database::Database;
-use crate::error::ApiResult;
+use crate::error::result::ApiResult;
 use crate::router::get_router;
 use std::sync::Arc;
 

api/src/server/worker.rs

@@ -1,4 +1,4 @@
-use crate::error::ApiResult;
+use crate::error::result::ApiResult;
 
 use super::ApiState;