create allocator from json functionality

Author: kokal33

fplus-http-server/src/main.rs

@@ -6,6 +6,8 @@ use env_logger;
 use log::info;
 use fplus_database;
 
+use crate::router::allocator;
+
 pub(crate) mod router;
 
 #[tokio::main]
@@ -47,6 +49,7 @@ async fn main() -> std::io::Result<()> {
             .service(router::allocator::create_or_update)
             .service(router::allocator::allocator)
             .service(router::allocator::delete)
+            .service(router::allocator::create_from_json)
     })
     .bind(("0.0.0.0", 8080))?
     .run()

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::{extract_owner_repo, process_allocator_file}, Allocator, AllocatorUpdateInfo, ChangedAllocator};
+use fplus_lib::core::{allocator::process_allocator_file, Allocator, AllocatorUpdateInfo, ChangedAllocator};
 
 /**
  * Get all allocators
@@ -29,18 +29,10 @@ pub async fn allocators() -> impl Responder {
  * @return HttpResponse - The result of the operation
  */
 #[post("/allocator/create")]
-pub async fn notify_changed_json(file: web::Json<ChangedAllocator>) -> actix_web::Result<impl Responder> {
+pub async fn create_from_json(file: web::Json<ChangedAllocator>) -> actix_web::Result<impl Responder> {
     let file_name = &file.file_changed;
-    
-    let (extracted_owner, extracted_repo) = match extract_owner_repo(file_name) {
-        Ok((owner, repo)) => (owner, repo.trim_end_matches(".json")),
-        Err(_) => return Ok(HttpResponse::BadRequest().body(format!("Invalid file name format: {}", file_name))),
-    };
 
-    let branch = "main";
-    let path = format!("active/{}/{}.json", extracted_owner, extracted_repo);
-
-    match process_allocator_file(extracted_owner, extracted_repo, branch, &path).await {
+    match process_allocator_file(file_name).await {
         Ok(model) => {
             if model.multisig_address.is_empty() {
                 return Ok(HttpResponse::BadRequest().body("Missing or invalid multisig_address"));
@@ -50,10 +42,10 @@ pub async fn notify_changed_json(file: web::Json<ChangedAllocator>) -> actix_web
             } else {
                 Some(model.verifiers.join(", ")) // Join verifiers in a string if exists
             };
-
+            
             match database::create_or_update_allocator(
-                extracted_owner.to_string(),
-                extracted_repo.to_string(),
+                model.organization,
+                model.slug,
                 Some(model.installation_id as i64), 
                 Some(model.multisig_address),      
                 verifiers_gh_handles,

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

@@ -6,10 +6,15 @@ use self::file::AllocatorModel;
 
 pub mod file;
 
-pub async fn process_allocator_file(owner: &str, repo: &str, branch: &str, path: &str) -> Result<AllocatorModel, LDNError> {
+pub async fn process_allocator_file(file_name: &str) -> Result<AllocatorModel, LDNError> {
+    let owner = "fidlabs";
+    let repo = "Allocator-Governance-Staging";
+    let branch = "main";
+    let path = file_name.to_string();
+
     let gh = GithubWrapper::new(owner.to_string(), repo.to_string());
 
-    let content_items = gh.get_file(path, branch).await.map_err(|e| LDNError::Load(e.to_string()))?;
+    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()))?;
 
     Ok(model)
@@ -26,12 +31,4 @@ fn content_items_to_allocator_model(file: ContentItems) -> Result<AllocatorModel
         .ok_or(LDNError::Load("Failed to parse allocator model".to_string()))?;
 
     Ok(allocator_model)
-}
-
-pub fn extract_owner_repo(file_name: &str) -> Result<(&str, &str), &'static str> {
-    let parts: Vec<&str> = file_name.splitn(2, '_').collect();
-    if parts.len() != 2 {
-        return Err("Invalid file name format");
-    }
-    Ok((parts[0], parts[1]))
 }

fplus-lib/src/core/mod.rs

@@ -103,7 +103,7 @@ pub struct Allocator {
 }
 #[derive(Deserialize)]
 pub struct ChangedAllocator {
-    pub file_changed: String,
+    pub file_changed: String
 }
 
 #[derive(Deserialize)]

fplus-lib/src/external_services/github.rs

@@ -88,13 +88,13 @@ struct Author {
 
 impl GithubWrapper {
     pub fn new(owner: String, repo: String) -> Self {
-        let app_id = get_env_var_or_default("GITHUB_APP_ID", "826129")
+        let app_id = get_env_var_or_default("GITHUB_APP_ID", "373258")
             .parse::<u64>()
             .unwrap_or_else(|_| {
                 log::error!("Failed to parse GITHUB_APP_ID, using default");
                 826129
             });
-        let installation_id = get_env_var_or_default("GITHUB_INSTALLATION_ID", "47207972")
+        let installation_id = get_env_var_or_default("GITHUB_INSTALLATION_ID", "40514592")
             .parse::<u64>()
             .unwrap_or_else(|_| {
                 log::error!("Failed to parse GITHUB_INSTALLATION_ID, using default");