Merge remote-tracking branch 'origin/main' into feat/auto-clone-repo

Author: charlykeyko

fplus-database/Cargo.toml

@@ -24,4 +24,3 @@ serde = { version =  "1.0.164", features = ["derive", "std",
 serial_test = "3.0.0"
 sha1 = "0.10.6"
 serde_json = "1.0.96"
-

fplus-database/src/database/allocators.rs

@@ -22,6 +22,7 @@ pub async fn get_allocators() ->Result<Vec<AllocatorModel>, sea_orm::DbErr> {
  * @param installation_id: Option<i64> - The installation ID
  * @param multisig_address: Option<String> - The multisig address
  * @param verifiers_gh_handles: Option<String> - The GitHub handles of the verifiers
+ * @param multisig_threshold: Option<i32> - The multisig threshold
  * 
  * # Returns
  * @return Result<AllocatorModel, sea_orm::DbErr> - The result of the operation
@@ -32,16 +33,30 @@ pub async fn update_allocator(
     installation_id: Option<i64>,
     multisig_address: Option<String>,
     verifiers_gh_handles: Option<String>,
+    multisig_threshold: Option<i32>
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
     let conn = get_database_connection().await?;
 
     let existing_allocator = get_allocator(owner, repo).await?;
     if let Some(allocator_model) = existing_allocator {
         let mut allocator_active_model = allocator_model.into_active_model();
 
-        allocator_active_model.installation_id = Set(installation_id);
-        allocator_active_model.multisig_address = Set(multisig_address);
-        allocator_active_model.verifiers_gh_handles = Set(verifiers_gh_handles);
+        //if fields are not None, update them
+        if Some(installation_id) != None {
+            allocator_active_model.installation_id = Set(installation_id);
+        }
+        
+        if Some(multisig_address.clone()) != None {
+            allocator_active_model.multisig_address = Set(multisig_address);
+        }
+
+        if Some(verifiers_gh_handles.clone()) != None {
+            allocator_active_model.verifiers_gh_handles = Set(verifiers_gh_handles);
+        }
+
+        if Some(multisig_threshold) != None {
+            allocator_active_model.multisig_threshold = Set(multisig_threshold);
+        }
 
         let updated_model = allocator_active_model.update(&conn).await?;
 
@@ -92,6 +107,7 @@ pub async fn create_or_update_allocator(
     installation_id: Option<i64>,
     multisig_address: Option<String>,
     verifiers_gh_handles: Option<String>,
+    multisig_threshold: Option<i32>
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
 
     let existing_allocator = get_allocator(&owner, &repo).await?;
@@ -102,20 +118,34 @@ pub async fn create_or_update_allocator(
         allocator_active_model.installation_id = Set(installation_id);
         allocator_active_model.multisig_address = Set(multisig_address);
         allocator_active_model.verifiers_gh_handles = Set(verifiers_gh_handles);
+        allocator_active_model.multisig_threshold = Set(multisig_threshold);
 
         let updated_model = allocator_active_model.update(&conn).await?;
 
         Ok(updated_model)
     } else {
-        let new_allocator = ActiveModel {
+        let mut new_allocator = ActiveModel {
             owner: Set(owner),
             repo: Set(repo),
-            installation_id: Set(installation_id),
-            multisig_address: Set(multisig_address),
-            verifiers_gh_handles: Set(verifiers_gh_handles),
             ..Default::default()
         };
+
+        if installation_id.is_some() {
+            new_allocator.installation_id = Set(installation_id);
+        }
+
+        if multisig_address.is_some() {
+            new_allocator.multisig_address = Set(multisig_address);
+        }
+
+        if verifiers_gh_handles.is_some() {
+            new_allocator.verifiers_gh_handles = Set(verifiers_gh_handles);
+        }
 
+        if multisig_threshold.is_some() {
+            new_allocator.multisig_threshold = Set(multisig_threshold);
+        }
+
         let conn = get_database_connection().await.expect("Failed to get DB connection");
         new_allocator.insert(&conn).await
     }

fplus-database/src/database/mod.rs

@@ -1,2 +1,2 @@
 pub mod allocators;
-pub mod applications;
+pub mod applications;

fplus-database/src/lib.rs

@@ -103,13 +103,15 @@ mod tests {
         let installation_id = Some(1234);
         let multisig_address = Some("0x1234567890".to_string());
         let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+        let multisig_threshold = Some(2);
 
         let result = database::allocators::create_or_update_allocator(
             owner,
             repo,
             installation_id,
             multisig_address,
             verifiers_gh_handles,
+            multisig_threshold
         ).await;
         assert!(result.is_ok());
     }
@@ -150,13 +152,15 @@ mod tests {
             let multisig_address = Some
             ("0x1234567890".to_string());
             let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+            let multisig_threshold = Some(2);
 
             let result = database::allocators::create_or_update_allocator(
                 owner.clone(),
                 repo.clone(),
                 installation_id,
                 multisig_address,
                 verifiers_gh_handles,
+                multisig_threshold
             ).await;
             assert!(result.is_ok());
         }
@@ -166,13 +170,15 @@ mod tests {
         let installation_id = Some(1234);
         let multisig_address = Some("0x0987654321".to_string());
         let verifiers_gh_handles = Some("test_verifier_3, test_verifier_4".to_string());
+        let multisig_threshold = Some(1);
 
         let result = database::allocators::update_allocator(
             &owner,
             &repo,
             installation_id,
             multisig_address,
             verifiers_gh_handles,
+            multisig_threshold
         ).await;
         assert!(result.is_ok());
     }
@@ -217,13 +223,15 @@ mod tests {
         let installation_id = Some(1234);
         let multisig_address = Some("0x1234567890".to_string());
         let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
+        let multisig_threshold = Some(2);
 
         let result = database::allocators::create_or_update_allocator(
             owner.clone(),
             repo.clone(),
             installation_id,
             multisig_address,
             verifiers_gh_handles,
+            multisig_threshold
         ).await;
 
         assert!(result.is_ok());

fplus-database/src/models/allocators.rs

@@ -14,6 +14,7 @@ pub struct Model {
     pub multisig_address: Option<String>,
     #[sea_orm(column_type = "Text", nullable)]
     pub verifiers_gh_handles: Option<String>,
+    pub multisig_threshold: Option<i32>,
 }
 
 #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]

fplus-http-server/src/main.rs

@@ -58,6 +58,7 @@ async fn main() -> std::io::Result<()> {
             .service(router::allocator::allocator)
             .service(router::allocator::delete)
             .service(router::allocator::create_from_json)
+            .service(router::application::propose)
     })
     .bind(("0.0.0.0", 8080))?
     .run()

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

@@ -50,6 +50,7 @@ pub async fn create_from_json(file: web::Json<ChangedAllocator>) -> actix_web::R
                 Some(model.installation_id as i64), 
                 Some(model.multisig_address),      
                 verifiers_gh_handles,
+                model.multisig_threshold
             ).await {
                 Ok(allocator_model) => allocator_model,
                 Err(e) => return Ok(HttpResponse::BadRequest().body(e.to_string())),
@@ -97,6 +98,7 @@ pub async fn update(
         info.installation_id,
         info.multisig_address.clone(),
         info.verifiers_gh_handles.clone(),
+        info.multisig_threshold
     ).await {
         Ok(allocator_model) => HttpResponse::Ok().json(allocator_model),
         Err(e) => {