Merge pull request #119 from filecoin-project/feat/create-or-update-allocator

modify create -> create or update allocator

Author: clriesco

fplus-database/src/database/mod.rs

@@ -74,7 +74,7 @@ pub async fn get_allocator(
 }
 
 /**
- * Create an allocator in the database
+ * Creates or updates an allocator in the database
  * 
  * # Arguments
  * @param owner: String - The owner of the repository
@@ -86,7 +86,7 @@ pub async fn get_allocator(
  * # Returns
  * @return Result<AllocatorModel, sea_orm::DbErr> - The result of the operation
  */
-pub async fn create_allocator(
+pub async fn create_or_update_allocator(
     owner: String,
     repo: String,
     installation_id: Option<i64>,
@@ -95,21 +95,30 @@ pub async fn create_allocator(
 ) -> Result<AllocatorModel, sea_orm::DbErr> {
 
     let existing_allocator = get_allocator(&owner, &repo).await?;
-    match existing_allocator {
-        Some(_) => return Err(DbErr::Custom(format!("Allocator already exists").into())),
-        None => (),
-    };
-    let 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 let Some(allocator_model) = existing_allocator {
+        let conn = get_database_connection().await?;
+        let mut allocator_active_model = allocator_model.into_active_model();
 
-    let conn = get_database_connection().await.expect("Failed to get DB connection");
-    new_allocator.insert(&conn).await
+        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);
+
+        let updated_model = allocator_active_model.update(&conn).await?;
+
+        Ok(updated_model)
+    } else {
+        let 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()
+        };
+    
+        let conn = get_database_connection().await.expect("Failed to get DB connection");
+        new_allocator.insert(&conn).await
+    }
 }
 
 /**

fplus-database/src/lib.rs

@@ -103,7 +103,7 @@ mod tests {
         let multisig_address = Some("0x1234567890".to_string());
         let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
 
-        let result = database::create_allocator(
+        let result = database::create_or_update_allocator(
             owner,
             repo,
             installation_id,
@@ -150,7 +150,7 @@ mod tests {
             ("0x1234567890".to_string());
             let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
 
-            let result = database::create_allocator(
+            let result = database::create_or_update_allocator(
                 owner.clone(),
                 repo.clone(),
                 installation_id,
@@ -217,7 +217,7 @@ mod tests {
         let multisig_address = Some("0x1234567890".to_string());
         let verifiers_gh_handles = Some("test_verifier_1, test_verifier_2".to_string());
 
-        let result = database::create_allocator(
+        let result = database::create_or_update_allocator(
             owner.clone(),
             repo.clone(),
             installation_id,

fplus-http-server/src/main.rs

@@ -44,8 +44,7 @@ async fn main() -> std::io::Result<()> {
             .service(router::blockchain::verified_clients)
             .service(router::govteam::gov_team_members)
             .service(router::allocator::allocators)
-            .service(router::allocator::create)
-            .service(router::allocator::update)
+            .service(router::allocator::create_or_update)
             .service(router::allocator::allocator)
             .service(router::allocator::delete)
     })

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

@@ -30,8 +30,8 @@ pub async fn allocators() -> impl Responder {
  * @return HttpResponse - The result of the operation
  */
 #[post("/allocator")]
-pub async fn create(info: web::Json<Allocator>) -> impl Responder {
-    match database::create_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,