Email Notifications Sending (#619)

Author: zupzup

CHANGELOG.md

@@ -4,6 +4,8 @@
 * Email Notifications
     * Add email notifications API
     * Add email notifications registration API
+    * Add email notifications sending logic
+* Fix issue where the notification sender defaulted to the personal identity instead of the signer identity
 * Added `app_url` property to config - defaults to `https://bitcredit-dev.minibill.tech` (config break)
 * Small fix to WASM build addressing the rustwasm organization archiving
 

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace.package]
-version = "0.4.4"
+version = "0.4.5"
 edition = "2024"
 license = "MIT"
 

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

@@ -153,11 +153,11 @@ impl EmailClientApi for EmailClient {
             .to_bech32()
             .map_err(|_| Error::NostrKey)?;
 
-        let payload = SendEmailNotificationPayload {
+        let payload = NotificationSendPayload {
             kind: kind.to_string(),
             id: id.to_string(),
-            sender: sender_npub,
             receiver: receiver.npub().to_bech32().map_err(|_| Error::NostrKey)?,
+            sender: sender_npub,
         };
 
         let key_pair = Keypair::from_secret_key(SECP256K1, private_key);
@@ -206,14 +206,14 @@ pub struct RegisterEmailNotificationResponse {
 
 #[derive(Debug, Serialize)]
 pub struct SendEmailNotificationRequest {
-    pub payload: SendEmailNotificationPayload,
+    pub payload: NotificationSendPayload,
     pub signature: String,
 }
 
 #[derive(Debug, Serialize, BorshSerialize)]
-pub struct SendEmailNotificationPayload {
+pub struct NotificationSendPayload {
     pub kind: String,
     pub id: String,
-    pub sender: String,
     pub receiver: String,
+    pub sender: String,
 }

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

@@ -156,6 +156,7 @@ impl BillService {
         }
 
         let mut bill_files: Vec<File> = vec![];
+        // TODO(multi-relay): don't default to first
         if let Some(nostr_relay) = nostr_relays.first() {
             for file_upload_id in data.file_upload_ids.iter() {
                 let (file_name, file_bytes) = &self

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

@@ -3948,8 +3948,11 @@ pub mod tests {
                 always(),
                 eq(ActionType::AcceptBill),
                 recipient_check.clone(),
+                always(),
+                always(),
+                always(),
             )
-            .returning(|_, _, _, _, _| Ok(()));
+            .returning(|_, _, _, _, _, _, _, _| Ok(()));
 
         // send pay timeout notification
         ctx.notification_service
@@ -3960,8 +3963,11 @@ pub mod tests {
                 always(),
                 eq(ActionType::PayBill),
                 recipient_check,
+                always(),
+                always(),
+                always(),
             )
-            .returning(|_, _, _, _, _| Ok(()));
+            .returning(|_, _, _, _, _, _, _, _| Ok(()));
 
         // marks accept bill timeout as sent
         ctx.notification_service

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

@@ -1,13 +1,16 @@
 use super::Result;
 use super::service::BillService;
-use crate::service::bill_service::{BillAction, BillServiceApi};
+use crate::service::{
+    bill_service::{BillAction, BillServiceApi},
+    notification_service::event::BillChainEvent,
+};
 use bcr_ebill_core::{
     NodeId,
-    bill::{BillId, PaymentState, RecourseReason},
+    bill::{BillId, BillKeys, BitcreditBill, PaymentState, RecourseReason},
     blockchain::{
         Blockchain,
         bill::{
-            BillOpCode, OfferToSellWaitingForPayment, RecourseWaitingForPayment,
+            BillBlockchain, BillOpCode, OfferToSellWaitingForPayment, RecourseWaitingForPayment,
             block::BillRecourseReasonBlockData,
         },
     },
@@ -72,6 +75,14 @@ impl BillService {
                         .await?;
                     // invalidate bill cache, so payment state is updated on next fetch
                     self.store.invalidate_bill_in_cache(bill_id).await?;
+                    // the bill is paid now - trigger notification
+                    if let PaymentState::PaidConfirmed(_) = payment_state
+                        && let Err(e) = self
+                            .trigger_is_paid_notification(identity, &chain, &bill_keys, &bill)
+                            .await
+                    {
+                        log::error!("Could not send is-paid notification for {bill_id}: {e}");
+                    }
                 }
             }
             Err(e) => {
@@ -81,6 +92,26 @@ impl BillService {
         Ok(())
     }
 
+    async fn trigger_is_paid_notification(
+        &self,
+        identity: &Identity,
+        blockchain: &BillBlockchain,
+        bill_keys: &BillKeys,
+        last_version_bill: &BitcreditBill,
+    ) -> Result<()> {
+        let chain_event = BillChainEvent::new(
+            last_version_bill,
+            blockchain,
+            bill_keys,
+            true,
+            &identity.node_id, // TODO(company-notifications): how to handle jobs as company participant?
+        )?;
+        self.notification_service
+            .send_bill_is_paid_event(&chain_event)
+            .await?;
+        Ok(())
+    }
+
     pub(super) async fn check_bill_in_recourse_payment(
         &self,
         bill_id: &BillId,

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

@@ -20,6 +20,7 @@ impl BillService {
         bill_action: &BillAction,
         identity: &Identity,
         contacts: &HashMap<NodeId, Contact>,
+        signer_node_id: &NodeId,
     ) -> Result<()> {
         let last_version_bill = self
             .get_last_version_bill(blockchain, bill_keys, identity, contacts)
@@ -30,7 +31,7 @@ impl BillService {
             blockchain,
             bill_keys,
             true,
-            &identity.node_id,
+            signer_node_id,
         )?;
 
         match bill_action {

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

@@ -35,7 +35,9 @@ use bcr_ebill_core::bill::{
     BillIssueData, BillValidateActionData, PastPaymentDataPayment, PastPaymentDataRecourse,
     PastPaymentDataSell, PastPaymentResult, PastPaymentStatus, PaymentState,
 };
-use bcr_ebill_core::blockchain::bill::block::BillParticipantBlockData;
+use bcr_ebill_core::blockchain::bill::block::{
+    BillParticipantBlockData, BillRequestRecourseBlockData,
+};
 use bcr_ebill_core::blockchain::bill::create_bill_to_share_with_external_party;
 use bcr_ebill_core::company::{Company, CompanyKeys};
 use bcr_ebill_core::constants::{
@@ -215,6 +217,7 @@ impl BillService {
         let bill_keys = self.store.get_keys(bill_id).await?;
         let latest_ts = chain.get_latest_block().timestamp;
         let contacts = self.contact_store.get_map().await?;
+        let mut recoursee = None;
 
         if let Some(action) = match chain.get_latest_block().op_code {
             BillOpCode::RequestToPay | BillOpCode::OfferToSell
@@ -226,6 +229,12 @@ impl BillService {
                 Some(ActionType::AcceptBill)
             }
             BillOpCode::RequestRecourse if (latest_ts + RECOURSE_DEADLINE_SECONDS <= now) => {
+                if let Ok(recourse_block) = chain
+                    .get_latest_block()
+                    .get_decrypted_block::<BillRequestRecourseBlockData>(&bill_keys)
+                {
+                    recoursee = Some(recourse_block.recoursee.node_id());
+                }
                 Some(ActionType::RecourseBill)
             }
             _ => None,
@@ -256,6 +265,9 @@ impl BillService {
                     .get_last_version_bill(&chain, &bill_keys, &identity, &contacts)
                     .await?;
 
+                let holder = bill.endorsee.as_ref().unwrap_or(&bill.payee).node_id();
+                let drawee = &bill.drawee.node_id;
+
                 for node_id in participants {
                     if let Some(contact) = self.contact_store.get(&node_id).await? {
                         recipient_options.push(Some(contact.try_into()?));
@@ -269,11 +281,14 @@ impl BillService {
 
                 self.notification_service
                     .send_request_to_action_timed_out_event(
-                        &identity.node_id,
+                        &identity.node_id, // TODO(company-notifications): how to handle jobs as company participant?
                         bill_id,
                         Some(bill.sum),
                         action.to_owned(),
                         recipients,
+                        &holder,
+                        drawee,
+                        &recoursee,
                     )
                     .await?;
 
@@ -934,6 +949,7 @@ impl BillServiceApi for BillService {
         debug!("getting file {} for bill with id: {bill_id}", file.name);
         validate_bill_id_network(bill_id)?;
         let nostr_relays = get_config().nostr_config.relays.clone();
+        // TODO(multi-relay): don't default to first
         if let Some(nostr_relay) = nostr_relays.first() {
             let file_bytes = self
                 .file_upload_client
@@ -1028,6 +1044,7 @@ impl BillServiceApi for BillService {
             &bill_action,
             &identity.identity,
             &contacts,
+            &signer_public_data.node_id(),
         )
         .await?;
 

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

@@ -300,6 +300,7 @@ impl CompanyServiceApi for CompanyService {
             ));
         }
 
+        // TODO(multi-relay): don't default to first
         let (proof_of_registration_file, logo_file) = match nostr_relays.first() {
             Some(nostr_relay) => {
                 // Save the files locally with the identity public key
@@ -522,6 +523,7 @@ impl CompanyServiceApi for CompanyService {
             return Ok(());
         }
 
+        // TODO(multi-relay): don't default to first
         let (logo_file, proof_of_registration_file) = match nostr_relays.first() {
             Some(nostr_relay) => {
                 let logo_file = if ignore_logo_file_upload_id {
@@ -820,6 +822,7 @@ impl CompanyServiceApi for CompanyService {
         debug!("getting file {file_name} for company with id: {id}",);
         validate_node_id_network(id)?;
         let nostr_relays = get_config().nostr_config.relays.clone();
+        // TODO(multi-relay): don't default to first
         if let Some(nostr_relay) = nostr_relays.first() {
             let mut file = None;
             if let Some(logo_file) = company.logo_file

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

@@ -372,6 +372,7 @@ impl ContactServiceApi for ContactService {
                 return Ok(());
             }
 
+            // TODO(multi-relay): don't default to first
             if let Some(nostr_relay) = nostr_relays.first() {
                 if !ignore_avatar_file_upload_id {
                     let avatar_file = self
@@ -447,6 +448,7 @@ impl ContactServiceApi for ContactService {
 
         let contact = match t {
             ContactType::Company | ContactType::Person => {
+                // TODO(multi-relay): don't default to first
                 let (avatar_file, proof_document_file) = match nostr_relays.first() {
                     Some(nostr_relay) => {
                         let avatar_file = self
@@ -564,6 +566,7 @@ impl ContactServiceApi for ContactService {
 
         let identity_public_key = self.identity_store.get_key_pair().await?.pub_key();
 
+        // TODO(multi-relay): don't default to first
         let (avatar_file, proof_document_file) = match nostr_relays.first() {
             Some(nostr_relay) => {
                 let avatar_file = self
@@ -649,6 +652,7 @@ impl ContactServiceApi for ContactService {
         debug!("getting file {file_name} for contact with id: {node_id}",);
         validate_node_id_network(node_id)?;
         let nostr_relays = contact.nostr_relays.clone();
+        // TODO(multi-relay): don't default to first
         if let Some(nostr_relay) = nostr_relays.first() {
             let mut file = None;
             if let Some(avatar_file) = contact.avatar_file