feat: Allow typed errors in category creation form

Author: angrynode

src/extractors/category_request.rs

@@ -7,6 +7,28 @@ use crate::database::content_folder::PathBreadcrumb;
 use crate::filesystem::FileSystemEntry;
 use crate::state::{AppState, error::*};
 
+#[derive(Clone, Debug)]
+pub struct CategoriesRequest {
+    pub children: Vec<FileSystemEntry>,
+}
+
+impl FromRequestParts<AppState> for CategoriesRequest {
+    type Rejection = AppStateError;
+
+    async fn from_request_parts(
+        _parts: &mut Parts,
+        app_state: &AppState,
+    ) -> Result<Self, Self::Rejection> {
+        let categories = CategoryOperator::new(app_state.clone(), None)
+            .list()
+            .await
+            .context(CategorySnafu)?;
+
+        let children = FileSystemEntry::from_categories(&categories);
+        Ok(Self { children })
+    }
+}
+
 #[derive(Clone, Debug)]
 pub struct CategoryRequest {
     pub category: category::Model,

src/routes/category.rs

@@ -7,9 +7,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::database::category;
 use crate::database::content_folder::PathBreadcrumb;
-use crate::extractors::category_request::CategoryRequest;
+use crate::extractors::category_request::{CategoriesRequest, CategoryRequest};
 use crate::filesystem::FileSystemEntry;
 use crate::routes::content_folder::ContentFolderForm;
+use crate::routes::index::IndexTemplate;
 use crate::state::AppStateContext;
 use crate::state::flash_message::{
     FallibleTemplate, FlashRedirect, FlashTemplate, OperationStatus, StatusCookie,
@@ -55,21 +56,27 @@ pub async fn delete(
 
 pub async fn create(
     context: AppStateContext,
+    categories: CategoriesRequest,
     jar: CookieJar,
     Form(form): Form<CategoryForm>,
-) -> FlashRedirect {
-    let status = match context.db.category().create(&form).await {
-        Ok(created) => StatusCookie::success(
-            jar,
-            format!(
-                "The category {} has been successfully created (ID {})",
-                created.name, created.id
-            ),
-        ),
-        Err(error) => StatusCookie::error(jar, error.to_string()),
-    };
-
-    status.redirect("/")
+) -> Result<FlashRedirect, IndexTemplate> {
+    match context.db.category().create(&form).await {
+        Ok(created) => {
+            let status = StatusCookie::success(
+                jar,
+                format!(
+                    "The category {} has been successfully created (ID {})",
+                    created.name, created.id
+                ),
+            );
+            let uri = format!("/folders/{}", created.name);
+            Ok(status.redirect(&uri))
+        }
+        Err(error) => {
+            let status = OperationStatus::error(error);
+            Err(status.with_template(IndexTemplate::new(context, categories)))
+        }
+    }
 }
 
 #[derive(Template, WebTemplate)]

src/routes/index.rs

@@ -1,11 +1,11 @@
 use askama::Template;
 use askama_web::WebTemplate;
-use snafu::prelude::*;
 
 // TUTORIAL: https://github.com/SeaQL/sea-orm/blob/master/examples/axum_example/
+use crate::extractors::category_request::CategoriesRequest;
 use crate::filesystem::FileSystemEntry;
-use crate::state::flash_message::{FallibleTemplate, FlashTemplate, OperationStatus, StatusCookie};
-use crate::state::{AppStateContext, error::*};
+use crate::state::AppStateContext;
+use crate::state::flash_message::{FallibleTemplate, OperationStatus};
 
 #[derive(Template, WebTemplate)]
 #[template(path = "index.html")]
@@ -25,22 +25,15 @@ impl FallibleTemplate for IndexTemplate {
 }
 
 impl IndexTemplate {
-    pub async fn new(context: AppStateContext) -> Result<Self, AppStateError> {
-        let categories = context.db.category().list().await.context(CategorySnafu)?;
-        let children = FileSystemEntry::from_categories(&categories);
-
-        Ok(Self {
+    pub fn new(context: AppStateContext, categories: CategoriesRequest) -> Self {
+        Self {
             state: context,
             flash: None,
-            children,
-        })
+            children: categories.children,
+        }
     }
 }
 
-pub async fn index(
-    context: AppStateContext,
-    status: StatusCookie,
-) -> Result<FlashTemplate<IndexTemplate>, AppStateError> {
-    let template = IndexTemplate::new(context).await?;
-    Ok(status.with_template(template))
+pub async fn index(context: AppStateContext, categories: CategoriesRequest) -> IndexTemplate {
+    IndexTemplate::new(context, categories)
 }