feat: updated issue comments for the new allocation amount behaviour

fplus-database/Cargo.toml

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

fplus-database/src/database/allocators.rs

@@ -132,8 +132,8 @@ pub async fn create_or_update_allocator(
             allocator_active_model.multisig_threshold = Set(multisig_threshold);
         }
 
-        if allocation_amount_type.is_some() {
-            allocator_active_model.allocation_amount_type = Set(allocation_amount_type);
+        if let Some(allocation_amount_type) = allocation_amount_type {
+            allocator_active_model.allocation_amount_type = Set(Some(allocation_amount_type.to_lowercase()));
         } else {
             allocator_active_model.allocation_amount_type = Set(None);
         }
@@ -164,8 +164,8 @@ pub async fn create_or_update_allocator(
             new_allocator.multisig_threshold = Set(multisig_threshold);
         }
 
-        if allocation_amount_type.is_some() {
-            new_allocator.allocation_amount_type = Set(allocation_amount_type);
+        if let Some(allocation_amount_type) = allocation_amount_type {
+            new_allocator.allocation_amount_type = Set(Some(allocation_amount_type.to_lowercase()));
         } else {
             new_allocator.allocation_amount_type = Set(None);
         }

fplus-http-server/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "fplus-http-server"
 authors = ["jbesraa", "kokal33", "clriesco"]
-version = "1.7.4"
+version = "1.7.5"
 description = "FPlus main http module"
 license = "MIT OR Apache-2.0"
 edition = "2021"

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

@@ -49,7 +49,7 @@ pub async fn create_from_json(files: web::Json<ChangedAllocators>) -> actix_web:
                         break;
                     }
 
-                    let amount_type = allocation_amount.amount_type.clone().unwrap(); // Assuming you still want to unwrap here
+                    let amount_type = allocation_amount.amount_type.clone().unwrap().to_lowercase(); // Assuming you still want to unwrap here
                     let quantity_options = allocation_amount.quantity_options.unwrap(); // Assuming unwrap is desired
 
                     match validate_amount_type_and_options(&amount_type, &quantity_options) {

fplus-lib/Cargo.toml

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

fplus-lib/src/core/mod.rs

@@ -32,10 +32,10 @@ use fplus_database::database::allocation_amounts::get_allocation_quantity_option
 
 use fplus_database::models::applications::Model as ApplicationModel;
 
-use self::application::file::{
+use self::application::{allocation, file::{
     AllocationRequest, AllocationRequestType, AppState, ApplicationFile, ValidVerifierList,
     VerifierInput,
-};
+}};
 use crate::core::application::file::Allocation;
 use std::collections::HashSet;
 
@@ -1871,6 +1871,12 @@ impl LDNApplication {
         let client_address = application_file.lifecycle.client_on_chain_address.clone();
         let total_requested = application_file.datacap.total_requested_amount.clone();
         let weekly_allocation = application_file.datacap.weekly_allocation.clone();
+        let allocation_amount = application_file
+            .allocation
+            .0
+            .iter()
+            .find(|obj| Some(&obj.id) == application_file.lifecycle.active_request.as_ref()).unwrap().amount.clone();
+
 
         let issue_number = application_file.issue_number.clone();
 
@@ -1882,9 +1888,12 @@ impl LDNApplication {
 **Expected weekly DataCap usage rate**
 > {}
 
+**DataCap Amount - First Tranche**
+> {}
+
 **Client address**
 > {}",
-            total_requested, weekly_allocation, client_address
+            total_requested, weekly_allocation, allocation_amount, client_address
         );
 
         gh.add_comment_to_issue(issue_number.parse().unwrap(), &comment)