Merge pull request #90 from picture-pro/unify-server-errors

Unify server errors

crates/bl/src/fetch.rs

@@ -32,11 +32,7 @@ pub async fn fetch_user_owned_photo_groups(
     Ok(groups)
   }
   .await
-  .map_err(|e: Report| {
-    let error = e.to_string();
-    tracing::error!("Failed to fetch user owned photo groups: {}", error);
-    ServerFnError::new(error)
-  })
+  .map_err(|e: Report| crate::handle_error(e, "fetch user owned photo groups"))
 }
 
 #[server(
@@ -62,11 +58,7 @@ pub async fn fetch_photo_group(
     Ok(group)
   }
   .await
-  .map_err(|e: Report| {
-    let error = e.to_string();
-    tracing::error!("Failed to fetch photo group: {}", error);
-    ServerFnError::new(error)
-  })
+  .map_err(|e: Report| crate::handle_error(e, "fetch photo group"))
 }
 
 #[server(
@@ -91,11 +83,7 @@ pub async fn fetch_user(
       .wrap_err("Failed to fetch user")
   }
   .await
-  .map_err(|e: Report| {
-    let error = e.to_string();
-    tracing::error!("Failed to fetch user: {}", error);
-    ServerFnError::new(error)
-  })
+  .map_err(|e: Report| crate::handle_error(e, "fetch user"))
 }
 
 #[server(
@@ -153,9 +141,5 @@ pub async fn fetch_photo_thumbnail(
     }))
   }
   .await
-  .map_err(|e: Report| {
-    let error = e.to_string();
-    tracing::error!("Failed to fetch photo thumbnail: {}", error);
-    ServerFnError::new(error)
-  })
+  .map_err(|e: Report| crate::handle_error(e, "fetch photo thumbnail"))
 }

crates/bl/src/lib.rs

@@ -1,6 +1,17 @@
+use leptos::ServerFnError;
+
 pub mod fetch;
 #[cfg(feature = "ssr")]
 pub mod model_ext;
 pub mod qr_code;
 pub mod rmp_sfn;
 pub mod upload;
+
+#[cfg(feature = "ssr")]
+pub fn handle_error(
+  error: color_eyre::eyre::Report,
+  failed_action: &'static str,
+) -> ServerFnError {
+  tracing::error!("Failed to {}: {:?}", failed_action, &error);
+  ServerFnError::new(error)
+}

crates/bl/src/qr_code.rs

@@ -27,9 +27,6 @@ pub fn generate_qr_code_inner(data: &str) -> color_eyre::eyre::Result<String> {
 )]
 #[cfg_attr(feature = "ssr", tracing::instrument)]
 pub async fn generate_qr_code(data: String) -> Result<String, ServerFnError> {
-  generate_qr_code_inner(&data).map_err(|e| {
-    let error = e.to_string();
-    tracing::error!("Failed to generate QR code: {}", error);
-    ServerFnError::new(error)
-  })
+  generate_qr_code_inner(&data)
+    .map_err(|e| crate::handle_error(e, "generate qr code"))
 }

crates/site-app/src/components/gallery.rs

@@ -11,7 +11,8 @@ pub fn Gallery() -> impl IntoView {
     .into_view();
   };
 
-  let photo_groups = create_resource(move || user.id, fetch_user_photo_groups);
+  let photo_groups =
+    create_resource(move || user.id, bl::fetch::fetch_user_owned_photo_groups);
 
   view! {
     <Suspense fallback=|| view!{ }>
@@ -57,17 +58,3 @@ fn PhotoGroupList(groups: Vec<core_types::PhotoGroup>) -> impl IntoView {
   }
   .into_view()
 }
-
-#[cfg_attr(feature = "ssr", tracing::instrument)]
-#[server]
-pub async fn fetch_user_photo_groups(
-  user_id: core_types::UserRecordId,
-) -> Result<Vec<core_types::PhotoGroup>, ServerFnError> {
-  bl::fetch::fetch_user_owned_photo_groups(user_id)
-    .await
-    .map_err(|e| {
-      let error = format!("Failed to fetch user photo groups: {:?}", e);
-      tracing::error!("{error}");
-      ServerFnError::new(error)
-    })
-}