repo variables to .env

serialization for the allocatorModel

Author: kokal33

fplus-http-server/src/main.rs

@@ -5,9 +5,6 @@ use actix_web::{App, HttpServer};
 use env_logger;
 use log::info;
 use fplus_database;
-
-use crate::router::allocator;
-
 pub(crate) mod router;
 
 #[tokio::main]
@@ -46,7 +43,6 @@ async fn main() -> std::io::Result<()> {
             .service(router::blockchain::verified_clients)
             .service(router::verifier::verifiers)
             .service(router::allocator::allocators)
-            .service(router::allocator::create_or_update)
             .service(router::allocator::allocator)
             .service(router::allocator::delete)
             .service(router::allocator::create_from_json)

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

@@ -1,6 +1,6 @@
 use actix_web::{get, post, put, delete, web, HttpResponse, Responder};
 use fplus_database::database;
-use fplus_lib::core::{allocator::process_allocator_file, Allocator, AllocatorUpdateInfo, ChangedAllocator};
+use fplus_lib::core::{allocator::process_allocator_file, AllocatorUpdateInfo, ChangedAllocator};
 
 /**
  * Get all allocators
@@ -31,24 +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);
+    log::info!("Starting allocator creation on:  {}", file_name);
 
     match process_allocator_file(file_name).await {
         Ok(model) => {
-            if model.address.is_empty() {
+            if model.multisig_address.is_empty() {
                 return Ok(HttpResponse::BadRequest().body("Missing or invalid multisig_address"));
             }
-            let verifiers_gh_handles = if model.application.github_handles.is_empty() {
+            let verifiers_gh_handles = if model.application.verifiers_gh_handles.is_empty() {
                 None
             } else {
-                Some(model.application.github_handles.join(", ")) // Join verifiers in a string if exists
+                Some(model.application.verifiers_gh_handles.join(", ")) // Join verifiers in a string if exists
             };
 
             match database::create_or_update_allocator(
-                model.organization,
-                model.slug,
-                Some(model.common_ui_install_id as i64), 
-                Some(model.address),      
+                model.owner,
+                model.repo,
+                Some(model.installation_id as i64), 
+                Some(model.multisig_address),      
                 verifiers_gh_handles,
             ).await {
                 Ok(allocator_model) => Ok(HttpResponse::Ok().json(allocator_model)),
@@ -60,39 +60,6 @@ pub async fn create_from_json(file: web::Json<ChangedAllocator>) -> actix_web::R
 }
 
 
-
-
-
-
-
-/**
- * Create a new allocator
- * 
- * # Arguments
- * @param info: web::Json<Allocator> - The allocator information
- * 
- * # Returns
- * @return HttpResponse - The result of the operation
- */
-#[post("/allocator")]
-pub async fn create_or_update(info: web::Json<Allocator>) -> impl Responder {
-    match database::create_or_update_allocator(
-        info.owner.clone(),
-        info.repo.clone(),
-        info.installation_id,
-        info.multisig_address.clone(),
-        info.verifiers_gh_handles.clone(),
-    ).await {
-        Ok(allocator_model) => HttpResponse::Ok().json(allocator_model),
-        Err(e) => {
-            if e.to_string().contains("Allocator already exists") {
-                return HttpResponse::BadRequest().body(e.to_string());
-            }
-            return HttpResponse::InternalServerError().body(e.to_string());
-        }
-    }
-}
-
 /**
  * Update an allocator
  * 

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

@@ -2,14 +2,19 @@ use serde::{Serialize, Deserialize};
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct AllocatorModel {
-    pub slug: String,  
-    pub organization: String,
-    pub address: String,
+    #[serde(rename = "slug")]
+    pub repo: String,  
+    #[serde(rename = "organization")]
+    pub owner: String,
+    #[serde(rename = "address")]
+    pub multisig_address: String,
     pub application: Application,
-    pub common_ui_install_id: u64, 
+    #[serde(rename = "common_ui_install_id")]
+    pub installation_id: u64, 
 }
 
 #[derive(Serialize, Deserialize, Debug)]
 pub struct Application {
-    pub github_handles: Vec<String>
+    #[serde(rename = "github_handles")]
+    pub verifiers_gh_handles: Vec<String>
 }

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

@@ -7,13 +7,19 @@ use self::file::AllocatorModel;
 pub mod file;
 
 pub async fn process_allocator_file(file_name: &str) -> Result<AllocatorModel, LDNError> {
-    let owner = "fidlabs";
-    let repo = "Allocator-Governance-Staging";
+
+    let owner = std::env::var("ALLOCATOR_GOVERNANCE_OWNER").unwrap_or_else(|_| {
+        log::warn!("ALLOCATOR_GOVERNANCE_OWNER not found in .env file");
+        "Allocator-Governance-Staging".to_string()
+    });
+    let repo = std::env::var("ALLOCATOR_GOVERNANCE_REPO").unwrap_or_else(|_| {
+        log::warn!("ALLOCATOR_GOVERNANCE_REPO not found in .env file");
+        "fidlabs".to_string()
+    });
     let branch = "main";
     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()))?;