Revamp nest (#12)

.vscode/settings.json

@@ -4,6 +4,7 @@
         "codegen",
         "dotenv",
         "dotenvy",
+        "Iden",
         "nonblocking",
         "oneshot",
         "openapi",

api/src/routers/mod.rs

@@ -9,6 +9,7 @@ use user::create_user_router;
 
 pub fn create_router(state: AppState) -> Router {
     Router::new()
-        .nest("/users", create_user_router(state.clone()))
-        .nest("/", create_root_router(state))
+        .nest("/users", create_user_router())
+        .nest("/", create_root_router())
+        .with_state(state)
 }

api/src/routers/root.rs

@@ -12,7 +12,7 @@ use crate::error::ApiError;
         (status = 200, description = "Hello world", body = String)
     )
 )]
-async fn root(state: State<AppState>) -> Result<String, ApiError> {
+async fn root_get(state: State<AppState>) -> Result<String, ApiError> {
     let result = state
         .conn
         .query_one(Statement::from_string(
@@ -25,6 +25,6 @@ async fn root(state: State<AppState>) -> Result<String, ApiError> {
     result.unwrap().try_get_by(0).map_err(|e| e.into())
 }
 
-pub fn create_root_router(state: AppState) -> Router {
-    Router::new().route("/", get(root)).with_state(state)
+pub fn create_root_router() -> Router<AppState> {
+    Router::new().route("/", get(root_get))
 }

api/src/routers/user.rs

@@ -84,9 +84,8 @@ async fn users_id_get(
         .ok_or_else(|| UserError::NotFound.into())
 }
 
-pub fn create_user_router(state: AppState) -> Router {
+pub fn create_user_router() -> Router<AppState> {
     Router::new()
         .route("/", post(users_post).get(users_get))
         .route("/:id", get(users_id_get))
-        .with_state(state)
 }

doc/src/root.rs

@@ -3,5 +3,5 @@ use utoipa::OpenApi;
 use api::routers::root::*;
 
 #[derive(OpenApi)]
-#[openapi(paths(root))]
+#[openapi(paths(root_get))]
 pub(super) struct RootApi;