[FIL-865] Add endpoints to handle decrease allowance (#288)

* Add endpoints to handle decrease allowance

Author: Filip-L

fplus-http-server/src/main.rs

@@ -87,7 +87,9 @@ async fn main() -> std::io::Result<()> {
                     .service(router::application::approve_storage_providers)
                     .service(router::application::allocation_failed)
                     .service(router::application::decline)
-                    .service(router::application::reopen_declined_application),
+                    .service(router::application::reopen_declined_application)
+                    .service(router::application::propose_decrease_allowance)
+                    .service(router::application::approve_decrease_allowance),
             )
             .service(router::application::merged)
             .service(router::application::active)

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

@@ -4,12 +4,15 @@ use actix_web::{
 };
 
 use fplus_lib::core::{
-    application::file::{StorageProviderChangeVerifier, VerifierInput},
+    application::file::{
+        DecreaseClientAllowanceVerifier, StorageProviderChangeVerifier, VerifierInput,
+    },
     ApplicationQueryParams, BranchDeleteInfo, CompleteGovernanceReviewInfo,
     CompleteNewApplicationApprovalInfo, CompleteNewApplicationProposalInfo, CreateApplicationInfo,
-    DcReachedInfo, GithubQueryParams, LDNApplication, MoreInfoNeeded, NotifyRefillInfo,
-    StorageProvidersChangeApprovalInfo, StorageProvidersChangeProposalInfo, SubmitKYCInfo,
-    TriggerSSAInfo, ValidationPullRequestData, VerifierActionsQueryParams,
+    DcReachedInfo, DecreaseAllowanceApprovalInfo, DecreaseAllowanceProposalInfo, GithubQueryParams,
+    LDNApplication, MoreInfoNeeded, NotifyRefillInfo, StorageProvidersChangeApprovalInfo,
+    StorageProvidersChangeProposalInfo, SubmitKYCInfo, TriggerSSAInfo, ValidationPullRequestData,
+    VerifierActionsQueryParams,
 };
 
 #[post("/application")]
@@ -232,6 +235,62 @@ pub async fn approve_storage_providers(
     ))
 }
 
+#[post("/application/propose_decrease_allowance")]
+pub async fn propose_decrease_allowance(
+    info: web::Json<DecreaseAllowanceProposalInfo>,
+    query: web::Query<VerifierActionsQueryParams>,
+) -> actix_web::Result<impl Responder> {
+    let ldn_application =
+        LDNApplication::load(query.id.clone(), query.owner.clone(), query.repo.clone())
+            .await
+            .map_err(ErrorNotFound)?;
+    let verifier = DecreaseClientAllowanceVerifier {
+        github_username: query.github_username.clone(),
+        signing_address: info.signer.signing_address.clone(),
+        decrease_allowance_cid: info.signer.decrease_allowance_cid.clone(),
+    };
+
+    ldn_application
+        .propose_decrease_allowance(
+            &verifier,
+            &query.owner,
+            &query.repo,
+            &info.amount_to_decrease,
+            &info.reason_for_decrease,
+        )
+        .await
+        .map_err(ErrorInternalServerError)?;
+    Ok(HttpResponse::Ok().body(
+        serde_json::to_string_pretty("Success")
+            .expect("Serialization of static string should succeed"),
+    ))
+}
+
+#[post("/application/approve_decrease_allowance")]
+pub async fn approve_decrease_allowance(
+    info: web::Json<DecreaseAllowanceApprovalInfo>,
+    query: web::Query<VerifierActionsQueryParams>,
+) -> actix_web::Result<impl Responder> {
+    let ldn_application =
+        LDNApplication::load(query.id.clone(), query.owner.clone(), query.repo.clone())
+            .await
+            .map_err(ErrorNotFound)?;
+    let verifier = DecreaseClientAllowanceVerifier {
+        github_username: query.github_username.clone(),
+        signing_address: info.signer.signing_address.clone(),
+        decrease_allowance_cid: info.signer.decrease_allowance_cid.clone(),
+    };
+
+    ldn_application
+        .approve_decrease_allowance(&verifier, &query.owner, &query.repo, &info.request_id)
+        .await
+        .map_err(ErrorInternalServerError)?;
+    Ok(HttpResponse::Ok().body(
+        serde_json::to_string_pretty("Success")
+            .expect("Serialization of static string should succeed"),
+    ))
+}
+
 #[post("/application/approve")]
 pub async fn approve(
     query: web::Query<VerifierActionsQueryParams>,

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

@@ -143,10 +143,10 @@ impl Allocations {
         self.clone()
     }
 
-    pub fn total_requested(&self) -> u64 {
-        let mut total_amount: u64 = 0;
+    pub fn total_requested(&self) -> i64 {
+        let mut total_amount: i64 = 0;
         for allocation in self.0.iter() {
-            if let Some(amount) = parse_size_to_bytes(&allocation.amount) {
+            if let Ok(amount) = parse_size_to_bytes(&allocation.amount) {
                 total_amount += amount;
             }
         }

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

@@ -1,5 +1,6 @@
 use std::{collections::HashMap, str::FromStr};
 
+use chrono::Utc;
 use serde::{Deserialize, Serialize};
 
 use crate::error::LDNError;
@@ -274,6 +275,7 @@ pub enum AppState {
     TotalDatacapReached,
     Declined,
     ChangingSP,
+    DecreasingDataCap,
     Error,
 }
 
@@ -309,6 +311,7 @@ pub enum AllocationRequestType {
     First,
     Removal,
     Refill(u8),
+    Decrease,
 }
 
 impl std::fmt::Display for AllocationRequestType {
@@ -317,6 +320,7 @@ impl std::fmt::Display for AllocationRequestType {
             AllocationRequestType::First => write!(f, "First"),
             AllocationRequestType::Removal => write!(f, "Removal"),
             AllocationRequestType::Refill(_) => write!(f, "Refill"),
+            AllocationRequestType::Decrease => write!(f, "Decrease"),
         }
     }
 }
@@ -436,6 +440,13 @@ pub struct VerifierInput {
     pub increase_allowance_cid: Option<String>,
 }
 
+#[derive(Serialize, Deserialize, Debug, Clone)]
+pub struct DecreaseClientAllowanceVerifier {
+    pub github_username: String,
+    pub signing_address: String,
+    pub decrease_allowance_cid: String,
+}
+
 impl From<VerifierInput> for Verifier {
     fn from(input: VerifierInput) -> Self {
         Self {
@@ -448,6 +459,18 @@ impl From<VerifierInput> for Verifier {
     }
 }
 
+impl From<&DecreaseClientAllowanceVerifier> for Verifier {
+    fn from(input: &DecreaseClientAllowanceVerifier) -> Self {
+        Self {
+            github_username: input.github_username.clone(),
+            signing_address: input.signing_address.clone(),
+            created_at: Utc::now().to_string(),
+            message_cid: input.decrease_allowance_cid.clone(),
+            increase_allowance_cid: None,
+        }
+    }
+}
+
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct Verifier {
     #[serde(rename = "Github Username")]

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

@@ -16,6 +16,7 @@ impl AppState {
             AppState::TotalDatacapReached => "total datacap reached",
             AppState::Declined => "declined",
             AppState::ChangingSP => "changing SPs",
+            AppState::DecreasingDataCap => "decreasing datacap",
             AppState::Error => "error",
         }
     }

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

@@ -1,3 +1,4 @@
+use crate::core::application::file::DecreaseClientAllowanceVerifier;
 use file::{AppState, SpsChangeRequest, SpsChangeRequests};
 
 use self::file::{AllocationRequest, Allocations, LifeCycle, Verifier, Version};
@@ -137,6 +138,32 @@ impl file::ApplicationFile {
         }
     }
 
+    pub fn start_decrease_request(
+        &self,
+        allocation_request: &AllocationRequest,
+        verifier: &DecreaseClientAllowanceVerifier,
+        request_id: &str,
+        app_state: &AppState,
+    ) -> Self {
+        let allocations = self.allocation.clone().push(allocation_request.clone());
+
+        let allocations_after_sign = if *app_state == AppState::Granted {
+            allocations.add_signer_and_complete(request_id.into(), verifier.into())
+        } else {
+            allocations.add_signer(&allocation_request.id, verifier.into())
+        };
+        let updated_lifecycle = self.lifecycle.update_lifecycle_after_sign(
+            app_state,
+            &verifier.github_username,
+            &request_id.to_string(),
+        );
+        Self {
+            allocation: allocations_after_sign,
+            lifecycle: updated_lifecycle,
+            ..self.clone()
+        }
+    }
+
     pub fn handle_changing_sps_request(
         &mut self,
         validated_by: &String,
@@ -208,10 +235,12 @@ impl file::ApplicationFile {
         let new_allocation = self
             .allocation
             .clone()
-            .add_signer_and_complete(request_id, signer);
+            .add_signer_and_complete(request_id, signer.clone());
+        let lifecycle_after_complete =
+            app_lifecycle.finish_grant_datacap_approval(&signer.github_username);
         Self {
             allocation: new_allocation,
-            lifecycle: app_lifecycle,
+            lifecycle: lifecycle_after_complete,
             ..self.clone()
         }
     }