[FIL-758] Allow to close ane reopen application (#269)

* Allow to close ane reopen application

Author: Filip-L

fplus-http-server/src/main.rs

@@ -84,14 +84,15 @@ async fn main() -> std::io::Result<()> {
                     .service(router::application::approve_changes)
                     .service(router::application::propose)
                     .service(router::application::approve)
-                    .service(router::application::decline)
                     .service(router::application::additional_info_required)
                     .service(router::application::trigger_ssa)
                     .service(router::application::request_kyc)
                     .service(router::application::remove_pending_allocation)
                     .service(router::application::propose_storage_providers)
                     .service(router::application::approve_storage_providers)
-                    .service(router::application::allocation_failed),
+                    .service(router::application::allocation_failed)
+                    .service(router::application::decline)
+                    .service(router::application::reopen_declined_application),
             )
             .service(router::application::merged)
             .service(router::application::active)

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

@@ -278,6 +278,22 @@ pub async fn decline(
     Ok(HttpResponse::Ok().body(()))
 }
 
+#[post("/application/reopen_declined_application")]
+pub async fn reopen_declined_application(
+    query: web::Query<VerifierActionsQueryParams>,
+) -> actix_web::Result<impl Responder> {
+    LDNApplication::reopen_declined_application(
+        &query.owner,
+        &query.repo,
+        &query.github_username,
+        &query.id,
+    )
+    .await
+    .map_err(ErrorInternalServerError)?;
+
+    Ok(HttpResponse::Ok().body(()))
+}
+
 #[post("/application/additional_info_required")]
 pub async fn additional_info_required(
     query: web::Query<VerifierActionsQueryParams>,

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

@@ -272,6 +272,7 @@ pub enum AppState {
     StartSignDatacap,
     Granted,
     TotalDatacapReached,
+    Declined,
     ChangingSP,
     Error,
 }

fplus-lib/src/core/application/lifecycle.rs

@@ -14,6 +14,7 @@ impl AppState {
             AppState::StartSignDatacap => "start sign datacap",
             AppState::Granted => "granted",
             AppState::TotalDatacapReached => "total datacap reached",
+            AppState::Declined => "declined",
             AppState::ChangingSP => "changing SPs",
             AppState::Error => "error",
         }
@@ -118,7 +119,6 @@ impl LifeCycle {
 
     pub fn reached_total_datacap(self) -> Self {
         let empty = "".to_string();
-
         LifeCycle {
             is_active: false,
             updated_at: Utc::now().to_string(),
@@ -127,6 +127,28 @@ impl LifeCycle {
         }
     }
 
+    pub fn decline(self) -> Self {
+        LifeCycle {
+            state: AppState::Declined,
+            is_active: false,
+            updated_at: Utc::now().to_string(),
+            active_request: None,
+            ..self
+        }
+    }
+
+    pub fn move_back_to_granted_state(self, verifier: &str, request_id: &str) -> Self {
+        LifeCycle {
+            state: AppState::Granted,
+            validated_by: verifier.into(),
+            validated_at: Utc::now().to_string(),
+            is_active: true,
+            updated_at: Utc::now().to_string(),
+            active_request: Some(request_id.into()),
+            ..self
+        }
+    }
+
     pub fn move_back_to_governance_review(self) -> Self {
         let empty = "".to_string();
 
@@ -142,6 +164,7 @@ impl LifeCycle {
     pub fn move_back_to_submit_state(self) -> Self {
         LifeCycle {
             state: AppState::Submitted,
+            is_active: true,
             updated_at: Utc::now().to_string(),
             ..self.clone()
         }

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

@@ -75,6 +75,25 @@ impl file::ApplicationFile {
         }
     }
 
+    pub fn decline(&self) -> Self {
+        let new_life_cycle = self.lifecycle.clone().decline();
+        Self {
+            lifecycle: new_life_cycle,
+            ..self.clone()
+        }
+    }
+
+    pub fn move_back_to_granted_state(&self, verifier: &str, request_id: &str) -> Self {
+        let new_life_cycle = self
+            .lifecycle
+            .clone()
+            .move_back_to_granted_state(verifier, request_id);
+        Self {
+            lifecycle: new_life_cycle,
+            ..self.clone()
+        }
+    }
+
     pub fn move_back_to_governance_review(&self) -> Self {
         let new_life_cycle = self.lifecycle.clone().move_back_to_governance_review(); // move back to submitted state
         let allocation = Allocations::default(); // empty allocations
@@ -197,7 +216,7 @@ impl file::ApplicationFile {
         }
     }
 
-    pub fn move_back_to_submit_state(self) -> Self {
+    pub fn move_back_to_submit_state(&self) -> Self {
         let new_life_cycle = self.lifecycle.clone().move_back_to_submit_state();
         Self {
             lifecycle: new_life_cycle,