update utoipa

Cargo.toml

@@ -70,8 +70,9 @@ tracing-subscriber = { version = "0.3.19", features = [
   "env-filter",
 ] }
 url = "2.5.2"
-utoipa = { version = "4.2.3", features = ["axum_extras", "uuid", "chrono"] }
-utoipa-swagger-ui = { version = "7.1.0", features = ["axum"] }
+utoipa = { version = "5.2.0", features = ["axum_extras", "uuid", "chrono"] }
+utoipa-swagger-ui = { version = "8.0.3", features = ["axum"] }
+utoipa-axum = "0.1.2"
 uuid = { version = "1.11.0", features = ["v4", "serde"] }
 tokio-tungstenite = "0.24.0"
 garde = { version = "0.20.0", features = ["full"] }

src/entity/message.rs

@@ -3,7 +3,6 @@ use fake::Dummy;
 use sea_orm::entity::prelude::*;
 use serde::{Deserialize, Serialize};
 use strum::Display;
-use utoipa::ToSchema;
 
 use crate::error::ResourceType;
 
@@ -53,7 +52,6 @@ impl ActiveModelBehavior for ActiveModel {}
   Ord,
   Deserialize,
   Serialize,
-  ToSchema,
   Dummy,
   Clone,
   Copy,
@@ -81,7 +79,6 @@ pub enum MessageKind {
   Ord,
   Deserialize,
   Serialize,
-  ToSchema,
   Dummy,
   Clone,
   Copy,

src/error/mod.rs

@@ -6,13 +6,12 @@ use axum::{
 use serde::Deserialize;
 use serde::Serialize;
 use strum::EnumString;
-use utoipa::ToSchema;
 
 use crate::entity;
 
 pub type AppResult<T = ()> = std::result::Result<T, AppError>;
 
-#[derive(Debug, thiserror::Error, ToSchema)]
+#[derive(Debug, thiserror::Error)]
 pub enum AppError {
   #[error("{0} not found")]
   NotFoundError(Resource),

src/handler/admin/user.rs

@@ -2,7 +2,7 @@ use axum::extract::{Query, State};
 use axum::Json;
 use tracing::info;
 
-use crate::error::AppResult;
+use crate::error::{AppResponseError, AppResult};
 use crate::server::state::AppState;
 use crate::util::claim::UserClaims;
 use crate::{dto::*, service};

src/handler/openapi.rs

@@ -1,14 +1,14 @@
 use utoipa::{
   openapi::security::{Http, HttpAuthScheme, SecurityScheme},
-  Modify, OpenApi,
+  Modify,
 };
 
 use crate::dto::*;
 use crate::entity::role::RoleUser;
-use crate::error::{AppError, AppResponseError};
+use crate::error::AppResponseError;
 use crate::util::claim::UserClaims;
 
-#[derive(OpenApi)]
+#[derive(utoipa::OpenApi)]
 #[openapi(
     info(
         version = "v0.1.0",
@@ -45,7 +45,7 @@ use crate::util::claim::UserClaims;
             LoginResponse,
             LoginRequest,
             AppResponseError,
-            AppError,
+            // AppError,
             MessageResponse,
             TokenInfoRequest,
             UserClaims,

src/handler/server.rs

@@ -1,6 +1,6 @@
 use crate::client::redis::RedisClientExt;
 use crate::dto::{MessageResponse, ServiceStatusResponse};
-use crate::error::AppResult;
+use crate::error::{AppResponseError, AppResult};
 use crate::server::state::AppState;
 use axum::extract::State;
 use axum::Json;

src/handler/token.rs

@@ -3,7 +3,7 @@ use axum::Json;
 use garde::Validate;
 use tracing::{info, warn};
 
-use crate::error::AppResult;
+use crate::error::{AppResponseError, AppResult};
 use crate::server::state::AppState;
 use crate::util::claim::UserClaims;
 use crate::{dto::*, service};

src/handler/user.rs

@@ -3,7 +3,7 @@ use axum::Json;
 use garde::Validate;
 use tracing::{info, warn};
 
-use crate::error::AppResult;
+use crate::error::{AppResponseError, AppResult};
 use crate::server::state::AppState;
 use crate::util::claim::UserClaims;
 use crate::{dto::*, service};