feat: adjusted allocator model for new allocator json file changes

Author: AlexMCon

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

@@ -37,20 +37,24 @@ pub async fn create_from_json(file: web::Json<ChangedAllocator>) -> actix_web::R
 
     match process_allocator_file(file_name).await {
         Ok(model) => {
-            if model.multisig_address.is_empty() {
+            if model.pathway_addresses.msig.is_empty() {
                 return Ok(HttpResponse::BadRequest().body("Missing or invalid multisig_address"));
             }
             let verifiers_gh_handles = if model.application.verifiers_gh_handles.is_empty() {
                 None
             } else {
                 Some(model.application.verifiers_gh_handles.join(", ")) // Join verifiers in a string if exists
             };
-            
+
+            let owner_repo_parts: Vec<&str> = model.application.allocation_bookkeeping.split('/').collect();
+            let owner = parts[3];
+            let repo = parts[4];
+
             let allocator_model = match allocators_db::create_or_update_allocator(
-                model.owner.clone(),
-                model.repo.clone(),
+                owner.to_string(),
+                owner.to_string(),
                 None,
-                Some(model.multisig_address),      
+                Some(model.pathway_addresses.msig),      
                 verifiers_gh_handles,
                 model.multisig_threshold
             ).await {

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

@@ -2,21 +2,22 @@ use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct AllocatorModel {
-    #[serde(rename = "slug")]
-    pub repo: String,  
-    #[serde(rename = "organization")]
-    pub owner: String,
-    #[serde(rename = "address")]
-    pub multisig_address: String,
     pub application: Application,
     #[serde(rename = "multisig_threshold")]
     pub multisig_threshold: Option<i32>,
+    pub pathway_addresses: AllocatorModelPathwayAddresses
+}
+
+#[derive(Serialize, Deserialize, Debug)]
+pub struct AllocatorModelPathwayAddresses {
+    pub msig: String,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Application {
     #[serde(rename = "github_handles")]
-    pub verifiers_gh_handles: Vec<String>
+    pub verifiers_gh_handles: Vec<String>,
+    pub allocation_bookkeeping: String,
 }
 
 #[derive(Debug, Serialize, Deserialize)]