allocator parsing model deserialization

Author: kokal33

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

@@ -31,23 +31,24 @@ pub async fn allocators() -> impl Responder {
 #[post("/allocator/create")]
 pub async fn create_from_json(file: web::Json<ChangedAllocator>) -> actix_web::Result<impl Responder> {
     let file_name = &file.file_changed;
+    log::info!("File name:  {}", file_name);
 
     match process_allocator_file(file_name).await {
         Ok(model) => {
-            if model.multisig_address.is_empty() {
+            if model.address.is_empty() {
                 return Ok(HttpResponse::BadRequest().body("Missing or invalid multisig_address"));
             }
-            let verifiers_gh_handles = if model.verifiers.is_empty() {
+            let verifiers_gh_handles = if model.application.github_handles.is_empty() {
                 None
             } else {
-                Some(model.verifiers.join(", ")) // Join verifiers in a string if exists
+                Some(model.application.github_handles.join(", ")) // Join verifiers in a string if exists
             };
 
             match database::create_or_update_allocator(
                 model.organization,
                 model.slug,
-                Some(model.installation_id as i64), 
-                Some(model.multisig_address),      
+                Some(model.common_ui_install_id as i64), 
+                Some(model.address),      
                 verifiers_gh_handles,
             ).await {
                 Ok(allocator_model) => Ok(HttpResponse::Ok().json(allocator_model)),

fplus-lib/src/core/allocator/file.rs

@@ -1,10 +1,15 @@
-use serde::{Deserialize, Serialize};
+use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct AllocatorModel {
-    pub slug: String,
+    pub slug: String,  
     pub organization: String,
-    pub multisig_address: String,
-    pub verifiers: Vec<String>,
-    pub installation_id: u64,
+    pub address: String,
+    pub application: Application,
+    pub common_ui_install_id: u64, 
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct Application {
+    pub github_handles: Vec<String>
 }

fplus-lib/src/core/allocator/mod.rs

@@ -13,7 +13,7 @@ pub async fn process_allocator_file(file_name: &str) -> Result<AllocatorModel, L
     let path = file_name.to_string();
 
     let gh = GithubWrapper::new(owner.to_string(), repo.to_string());
-
+    log::info!("Github is initialized");
     let content_items = gh.get_file(&path, branch).await.map_err(|e| LDNError::Load(e.to_string()))?;
     let model = content_items_to_allocator_model(content_items).map_err(|e| LDNError::Load(e.to_string()))?;
 
@@ -22,13 +22,28 @@ pub async fn process_allocator_file(file_name: &str) -> Result<AllocatorModel, L
 
 
 fn content_items_to_allocator_model(file: ContentItems) -> Result<AllocatorModel, LDNError> {
-    let encoded_content = file.items
-        .get(0)
-        .and_then(|f| f.content.clone())
-        .ok_or(LDNError::Load("Allocator file is corrupted".to_string()))?;
-
-    let allocator_model = decode_allocator_model(&encoded_content.replace("\n", ""))
-        .ok_or(LDNError::Load("Failed to parse allocator model".to_string()))?;
-
-    Ok(allocator_model)
+    let encoded_content = match file.items.get(0).and_then(|f| f.content.clone()) {
+        Some(content) => {
+            log::info!("Fetched content: {:?}", content);
+            content
+        },
+        None => {
+            log::error!("Allocator file is corrupted or empty");
+            return Err(LDNError::Load("Allocator file is corrupted".to_string()));
+        }
+    };
+
+    let cleaned_content = encoded_content.replace("\n", "");
+    log::info!("Cleaned content: {:?}", cleaned_content);
+
+    match decode_allocator_model(&cleaned_content) {
+        Some(model) => {
+            log::info!("Parsed allocator model successfully");
+            Ok(model)
+        },
+        None => {
+            log::error!("Failed to parse allocator model");
+            Err(LDNError::Load("Failed to parse allocator model".to_string()))
+        }
+    }
 }