fix all_applications

Author: charlykeyko

fplus-http-server/src/router/application.rs

@@ -122,7 +122,12 @@ pub async fn all_applications() -> impl Responder {
                 Err(e) => HttpResponse::InternalServerError().body(format!("Failed to serialize applications: {}", e)),
             }
         },
-        Err(e) => HttpResponse::BadRequest().body(e.to_string()),
+        Err(errors) => {
+            match serde_json::to_string_pretty(&errors) {
+                Ok(json) => HttpResponse::BadRequest().content_type("application/json").body(json),
+                Err(e) => HttpResponse::InternalServerError().body(format!("Failed to serialize errors: {}", e)),
+            }
+        },
     }
 }
 

fplus-lib/src/core/mod.rs

@@ -239,8 +239,10 @@ impl LDNApplication {
     }
 
     pub async fn all_applications() -> Result<Vec<(ApplicationFile, String, String)>, Vec<LDNError>> {
-        let allocators = database::get_allocators().await.map_err(|_| LDNError::New("Failed to get allocators from the database"))?;
-        let mut all_apps: Vec<(ApplicationFile, String, String)> = Vec::new();
+        let allocators = match database::get_allocators().await {
+            Ok(allocs) => allocs,
+            Err(e) => return Err(vec![LDNError::Load(format!("Failed to retrieve allocators: {}", e))]),
+        };        let mut all_apps: Vec<(ApplicationFile, String, String)> = Vec::new();
         let mut errors: Vec<LDNError> = Vec::new();
 
         for allocator in allocators {

fplus-lib/src/error.rs

@@ -8,8 +8,9 @@ use actix_web::{
     body::{BodySize, MessageBody},
     web::Bytes,
 };
+use serde::{Deserialize, Serialize};
 
-#[derive(Debug)]
+#[derive(Debug, Serialize, Deserialize)]
 pub enum LDNError {
     New(String),
     Load(String),