Merge branch 'main' of github.com:filecoin-project/filplus-backend

Author: lukasz-wal

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "fplus-database"
 authors = ["clriesco", "kokal33", "alexmcon"]
-version = "2.2.17"
+version = "2.2.18"
 edition = "2021"
 description = "FPlus main database module"
 license = "MIT OR Apache-2.0"

fplus-database/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fplus-http-server"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "2.2.17"
+version = "2.2.18"
 description = "FPlus main http module"
 license = "MIT OR Apache-2.0"
 edition = "2021"
@@ -22,8 +22,8 @@ actix-cors = "0.6.4"
 reqwest = { version = "0.11.18", features = ["json"] }
 futures = "0.3.28"
 dotenv = "0.15.0"
-fplus-lib = { path = "../fplus-lib", version = "2.2.17" }
-fplus-database = { path = "../fplus-database", version = "2.2.17" }
+fplus-lib = { path = "../fplus-lib", version = "2.2.18" }
+fplus-database = { path = "../fplus-database", version = "2.2.18" }
 anyhow = "1.0.75"
 async-trait = "0.1.73"
 uuidv4 = "1.0.0"

fplus-http-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fplus-lib"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "2.2.17"
+version = "2.2.18"
 edition = "2021"
 description = "FPlus library/helper files"
 license = "MIT OR Apache-2.0"
@@ -30,7 +30,7 @@ uuidv4 = "1.0.0"
 rayon = "1.8.0" 
 log = "0.4.20"
 once_cell = "1.19.0"
-fplus-database = { path = "../fplus-database", version = "2.2.17" }
+fplus-database = { path = "../fplus-database", version = "2.2.18" }
 pem = "1.0"
 anyhow = "1.0"
 regex = "1.0"

fplus-lib/Cargo.toml

@@ -1681,7 +1681,7 @@ impl LDNApplication {
         let clompleted_application = app_file.reached_total_datacap();
         let parsed_app_file = serde_json::to_string_pretty(&clompleted_application)
             .map_err(|e| LDNError::Load(format!("Failed to pare into string: {}", e)))?;
-        LDNPullRequest::create_pr_for_existing_application(
+        let pr_number = LDNPullRequest::create_pr_for_existing_application(
             clompleted_application.id.clone(),
             parsed_app_file,
             self.file_name.clone(),
@@ -1694,6 +1694,28 @@ impl LDNApplication {
             format!("Total Datacap reached for {}", clompleted_application.id),
         )
         .await?;
+
+        let gh = github_async_new(self.github.owner.clone(), self.github.repo.clone()).await?;
+
+        gh.merge_pull_request(pr_number).await.map_err(|e| {
+            LDNError::Load(format!(
+                "Failed to merge pull request {}. Reason: {}",
+                pr_number, e
+            ))
+        })?;
+
+        database::applications::merge_application_by_pr_number(
+            self.github.owner.clone(),
+            self.github.repo.clone(),
+            pr_number,
+        )
+        .await
+        .map_err(|e| {
+            LDNError::Load(format!(
+                "Failed to update application in database. Reason: {}",
+                e
+            ))
+        })?;
         Self::add_comment_to_issue(
             application_model.issue_number.to_string().clone(),
             application_model.owner.clone(),
@@ -1980,9 +2002,7 @@ impl LDNApplication {
 
             Self::merge_application(pr_number, owner, repo).await?;
             return Ok(true);
-        } else if application.lifecycle.get_state() == AppState::Declined
-            || application.lifecycle.get_state() == AppState::TotalDatacapReached
-        {
+        } else if application.lifecycle.get_state() == AppState::Declined {
             Self::merge_application(pr_number, owner, repo).await?;
             return Ok(true);
         }