next version, update changelog, fix clippy, expose error,add debug logs, rename upload files function (#454)

Author: zupzup

CHANGELOG.md

@@ -1,6 +1,10 @@
 # 0.3.2
 
 * Fixed `request_to_accept` calling the correct action
+* Multi-identity Nostr consumer and currently-active-identity-sending
+* Added more thorough logging, especially debug logging
+* Expose Error types to TS
+* Use string for `log_level` in config
 
 # 0.3.1
 

crates/bcr-ebill-api/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bcr-ebill-api"
-version = "0.3.1"
+version = "0.3.2"
 edition = "2024"
 
 [lib]

crates/bcr-ebill-api/src/data/mod.rs

@@ -9,4 +9,4 @@ pub use bcr_ebill_core::GeneralSearchFilterItemType;
 pub use bcr_ebill_core::GeneralSearchResult;
 pub use bcr_ebill_core::OptionalPostalAddress;
 pub use bcr_ebill_core::PostalAddress;
-pub use bcr_ebill_core::UploadFilesResult;
+pub use bcr_ebill_core::UploadFileResult;

crates/bcr-ebill-api/src/external/bitcoin.rs

@@ -2,6 +2,7 @@ use crate::{get_config, util};
 use async_trait::async_trait;
 use bcr_ebill_core::ServiceTraitBounds;
 use bitcoin::{Network, secp256k1::Scalar};
+use log::debug;
 use serde::Deserialize;
 use std::str::FromStr;
 use thiserror::Error;
@@ -144,6 +145,7 @@ impl BitcoinClientApi for BitcoinClient {
     }
 
     async fn check_if_paid(&self, address: &str, sum: u64) -> Result<(bool, u64)> {
+        debug!("checking if btc address {address} is paid {sum}");
         let info_about_address = self.get_address_info(address).await?;
 
         // the received and spent sum need to add up to the sum

crates/bcr-ebill-api/src/service/bill_service/issue.rs

@@ -11,7 +11,7 @@ use bcr_ebill_core::{
     util::BcrKeys,
 };
 use bcr_ebill_transport::BillChainEvent;
-use log::error;
+use log::{debug, error};
 
 impl BillService {
     #[allow(clippy::too_many_arguments)]
@@ -34,6 +34,7 @@ impl BillService {
         drawer_keys: BcrKeys,
         timestamp: u64,
     ) -> Result<BitcreditBill> {
+        debug!("issuing bill with type {t}");
         let (sum, bill_type) = self.validate_bill_issue(
             &sum,
             &file_upload_ids,
@@ -98,6 +99,7 @@ impl BillService {
                 (public_data_drawee, public_data_payee)
             }
         };
+        debug!("issuing bill with drawee {public_data_drawee:?} and payee {public_data_payee:?}");
 
         let identity = self.identity_store.get_full().await?;
         let keys = BcrKeys::new();
@@ -204,8 +206,11 @@ impl BillService {
             error!("Error propagating bill via Nostr {e}");
         }
 
+        debug!("issued bill with id {bill_id}");
+
         // If we're the drawee, we immediately accept the bill with timestamp increased by 1 sec
         if bill.drawer == bill.drawee {
+            debug!("we are drawer and drawee of bill: {bill_id} - immediately accepting");
             self.execute_bill_action(
                 &bill_id,
                 BillAction::Accept,

crates/bcr-ebill-api/src/service/bill_service/payment.rs

@@ -8,7 +8,7 @@ use bcr_ebill_core::{
     identity::{Identity, IdentityWithAll},
     util::BcrKeys,
 };
-use log::info;
+use log::{debug, info};
 use std::collections::HashMap;
 
 impl BillService {
@@ -38,6 +38,7 @@ impl BillService {
             .await
         {
             if paid && sum > 0 {
+                debug!("bill {bill_id} is paid - setting to paid and invalidating cache");
                 self.store.set_to_paid(bill_id, &address_to_pay).await?;
                 // invalidate bill cache, so payment state is updated on next fetch
                 self.store.invalidate_bill_in_cache(bill_id).await?;
@@ -70,6 +71,9 @@ impl BillService {
                 .await
             {
                 if paid && sum > 0 {
+                    debug!(
+                        "bill {bill_id} is recourse-paid - creating recourse block if we're recourser"
+                    );
                     // If we are the recourser and a bill issuer and it's paid, we add a Recourse block
                     if payment_info.recourser.node_id == identity.identity.node_id {
                         if let Some(signer_identity) =
@@ -150,6 +154,7 @@ impl BillService {
                 .await
             {
                 if paid && sum > 0 {
+                    debug!("bill {bill_id} got bought - creating sell block if we're seller");
                     // If we are the seller and a bill issuer and it's paid, we add a Sell block
                     if payment_info.seller.node_id == identity.identity.node_id {
                         if let Some(signer_identity) =

crates/bcr-ebill-api/src/service/bill_service/service.rs

@@ -264,6 +264,9 @@ impl BillServiceApi for BillService {
         role: &BillsFilterRole,
         current_identity_node_id: &str,
     ) -> Result<Vec<LightBitcreditBillResult>> {
+        debug!(
+            "searching bills with {search_term:?} from {date_range_from:?} to {date_range_to:?} and {role:?}"
+        );
         let bills = self.get_bills(current_identity_node_id).await?;
         let mut result = vec![];
 
@@ -361,6 +364,7 @@ impl BillServiceApi for BillService {
         for bill_id in bill_ids.iter() {
             // if bill was not in cache - recalculate and cache it
             if !bills.iter().any(|bill| *bill_id == bill.id) {
+                debug!("Bill {bill_id} was not in the cache - recalculate");
                 let calculated_bill = self
                     .recalculate_and_cache_bill(
                         bill_id,
@@ -409,6 +413,7 @@ impl BillServiceApi for BillService {
             .iter()
             .any(|p| p == &caller_public_data.node_id)
         {
+            debug!("caller is not a participant of bill {bill_id}");
             return Err(Error::NotFound);
         }
 
@@ -462,6 +467,7 @@ impl BillServiceApi for BillService {
         file_name: &str,
         bill_private_key: &str,
     ) -> Result<Vec<u8>> {
+        debug!("getting file {file_name} for bill with id: {bill_id}");
         let read_file = self
             .file_upload_store
             .open_attached_file(bill_id, file_name)
@@ -537,6 +543,10 @@ impl BillServiceApi for BillService {
         signer_keys: &BcrKeys,
         timestamp: u64,
     ) -> Result<BillBlockchain> {
+        debug!(
+            "Executing bill action {:?} for bill {bill_id}",
+            &bill_action
+        );
         // fetch data
         let identity = self.identity_store.get_full().await?;
         let contacts = self.contact_store.get_map().await?;
@@ -591,6 +601,8 @@ impl BillServiceApi for BillService {
         )
         .await?;
 
+        debug!("Executed bill action {:?} for bill {bill_id}", &bill_action);
+
         Ok(blockchain)
     }
 
@@ -682,6 +694,7 @@ impl BillServiceApi for BillService {
             .iter()
             .any(|p| p == current_identity_node_id)
         {
+            debug!("caller is not a participant of bill {bill_id}");
             return Err(Error::NotFound);
         }
 
@@ -706,6 +719,7 @@ impl BillServiceApi for BillService {
             .iter()
             .any(|p| p == current_identity_node_id)
         {
+            debug!("caller is not a participant of bill {bill_id}");
             return Err(Error::NotFound);
         }
 

crates/bcr-ebill-api/src/service/company_service.rs

@@ -23,7 +23,7 @@ use crate::{
     util,
 };
 use async_trait::async_trait;
-use log::{error, info};
+use log::{debug, error, info};
 use std::sync::Arc;
 
 #[async_trait]
@@ -145,6 +145,7 @@ impl CompanyService {
         public_key: &str,
     ) -> Result<Option<File>> {
         if let Some(upload_id) = upload_id {
+            debug!("processing upload file for company {id}: {upload_id:?}");
             let (file_name, file_bytes) = &self
                 .file_upload_store
                 .read_temp_upload_file(upload_id)
@@ -218,6 +219,7 @@ impl CompanyServiceApi for CompanyService {
         logo_file_upload_id: Option<String>,
         timestamp: u64,
     ) -> Result<Company> {
+        debug!("creating company");
         let keys = BcrKeys::new();
         let private_key = keys.get_private_key_string();
         let public_key = keys.get_public_key();
@@ -287,6 +289,7 @@ impl CompanyServiceApi for CompanyService {
             .add_block(&id, create_company_block)
             .await?;
         self.identity_blockchain_store.add_block(&new_block).await?;
+        debug!("company with id {id} created");
 
         // TODO NOSTR: create company topic and subscribe to it
         // TODO NOSTR: upload files to nostr
@@ -322,7 +325,9 @@ impl CompanyServiceApi for CompanyService {
         proof_of_registration_file_upload_id: Option<String>,
         timestamp: u64,
     ) -> Result<()> {
+        debug!("editing company with id: {id}");
         if !self.store.exists(id).await {
+            debug!("company with id {id} does not exist");
             return Err(super::Error::NotFound);
         }
         let full_identity = self.identity_store.get_full().await?;
@@ -446,6 +451,7 @@ impl CompanyServiceApi for CompanyService {
         self.company_blockchain_store
             .add_block(id, &new_block)
             .await?;
+        debug!("company with id {id} updated");
 
         if let Some(upload_id) = logo_file_upload_id {
             if let Err(e) = self
@@ -466,6 +472,10 @@ impl CompanyServiceApi for CompanyService {
         signatory_node_id: String,
         timestamp: u64,
     ) -> Result<()> {
+        debug!(
+            "adding signatory {} to company with id: {id}",
+            &signatory_node_id
+        );
         if !self.store.exists(id).await {
             return Err(super::Error::Validation(format!(
                 "No company with id: {id} found.",
@@ -513,7 +523,7 @@ impl CompanyServiceApi for CompanyService {
                 company_id: id.to_owned(),
                 block_hash: new_block.hash.clone(),
                 block_id: new_block.id,
-                signatory: signatory_node_id,
+                signatory: signatory_node_id.clone(),
             },
             &full_identity.key_pair,
             timestamp,
@@ -524,6 +534,10 @@ impl CompanyServiceApi for CompanyService {
         self.identity_blockchain_store
             .add_block(&new_identity_block)
             .await?;
+        debug!(
+            "added signatory {} to company with id: {id}",
+            &signatory_node_id
+        );
 
         // TODO NOSTR: propagate block to company topic
         // TODO NOSTR: propagate company and files to new signatory
@@ -537,6 +551,10 @@ impl CompanyServiceApi for CompanyService {
         signatory_node_id: String,
         timestamp: u64,
     ) -> Result<()> {
+        debug!(
+            "removing signatory {} from company with id: {id}",
+            &signatory_node_id
+        );
         if !self.store.exists(id).await {
             return Err(super::Error::Validation(format!(
                 "No company with id: {id} found.",
@@ -607,6 +625,10 @@ impl CompanyServiceApi for CompanyService {
                 error!("Could not delete local company chain for {id}: {e}");
             }
         }
+        debug!(
+            "removed signatory {} to company with id: {id}",
+            &signatory_node_id
+        );
 
         Ok(())
     }
@@ -636,6 +658,7 @@ impl CompanyServiceApi for CompanyService {
         file_name: &str,
         private_key: &str,
     ) -> Result<Vec<u8>> {
+        debug!("getting file {file_name} for company with id: {id}",);
         let read_file = self
             .file_upload_store
             .open_attached_file(id, file_name)

crates/bcr-ebill-api/src/service/contact_service.rs

@@ -17,7 +17,7 @@ use crate::{
 };
 
 use super::Result;
-use log::info;
+use log::{debug, info};
 
 #[cfg_attr(test, automock)]
 #[async_trait]
@@ -108,6 +108,7 @@ impl ContactService {
         public_key: &str,
     ) -> Result<Option<File>> {
         if let Some(upload_id) = upload_id {
+            debug!("processing upload file for contact {id}: {upload_id:?}");
             let (file_name, file_bytes) = &self
                 .file_upload_store
                 .read_temp_upload_file(upload_id)
@@ -185,6 +186,7 @@ impl ContactServiceApi for ContactService {
         avatar_file_upload_id: Option<String>,
         proof_document_file_upload_id: Option<String>,
     ) -> Result<()> {
+        debug!("updating contact with node_id: {node_id}");
         let mut contact = match self.store.get(node_id).await? {
             Some(contact) => contact,
             None => {
@@ -274,6 +276,7 @@ impl ContactServiceApi for ContactService {
         }
 
         self.store.update(node_id, contact).await?;
+        debug!("updated contact with node_id: {node_id}");
 
         Ok(())
     }
@@ -292,6 +295,7 @@ impl ContactServiceApi for ContactService {
         avatar_file_upload_id: Option<String>,
         proof_document_file_upload_id: Option<String>,
     ) -> Result<Contact> {
+        debug!("creating {:?} contact with node_id {node_id}", &t);
         if util::crypto::validate_pub_key(node_id).is_err() {
             return Err(super::Error::Validation(format!(
                 "Not a valid secp256k1 key: {node_id}",
@@ -313,7 +317,7 @@ impl ContactServiceApi for ContactService {
 
         let contact = Contact {
             node_id: node_id.to_owned(),
-            t,
+            t: t.clone(),
             name,
             email,
             postal_address,
@@ -327,6 +331,7 @@ impl ContactServiceApi for ContactService {
         };
 
         self.store.insert(node_id, contact.clone()).await?;
+        debug!("contact {:?} with node_id {node_id} created", &t);
         Ok(contact)
     }
 
@@ -343,6 +348,7 @@ impl ContactServiceApi for ContactService {
         file_name: &str,
         private_key: &str,
     ) -> Result<Vec<u8>> {
+        debug!("getting file {file_name} for contact with id: {id}",);
         let read_file = self
             .file_upload_store
             .open_attached_file(id, file_name)