Fix reject to accept state without req to accept (#480)

Author: zupzup

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 * Add validation for maturity date
 * Add docs for testing
+* Fix reject to accept not showing correctly without req to accept
+* Add endpoint `clear_bill_cache` to clear the bill cache
 
 # 0.3.5
 

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

@@ -151,9 +151,7 @@ impl BillService {
             requested_to_pay = true;
             time_of_request_to_pay = Some(req_to_pay_block.timestamp);
             paid = self.store.is_paid(&bill.id).await?;
-            if chain.block_with_operation_code_exists(BillOpCode::RejectToPay) {
-                rejected_to_pay = true;
-            }
+            rejected_to_pay = chain.block_with_operation_code_exists(BillOpCode::RejectToPay);
             let deadline_base =
                 get_deadline_base_for_req_to_pay(req_to_pay_block.timestamp, &bill.maturity_date)?;
             if !paid
@@ -252,7 +250,7 @@ impl BillService {
         }
 
         let mut request_to_accept_timed_out = false;
-        let mut rejected_to_accept = false;
+        let rejected_to_accept = chain.block_with_operation_code_exists(BillOpCode::RejectToAccept);
         let accepted = chain.block_with_operation_code_exists(BillOpCode::Accept);
         let mut time_of_request_to_accept = None;
         let mut requested_to_accept = false;
@@ -261,7 +259,6 @@ impl BillService {
         {
             requested_to_accept = true;
             time_of_request_to_accept = Some(req_to_accept_block.timestamp);
-            rejected_to_accept = chain.block_with_operation_code_exists(BillOpCode::RejectToAccept);
 
             if !accepted
                 && !rejected_to_accept

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

@@ -148,6 +148,8 @@ pub trait BillServiceApi: ServiceTraitBounds {
         bill_id: &str,
         current_identity_node_id: &str,
     ) -> Result<Vec<Endorsement>>;
+
+    async fn clear_bill_cache(&self) -> Result<()>;
 }
 
 #[cfg(test)]

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

@@ -883,4 +883,9 @@ impl BillServiceApi for BillService {
 
         Ok(result)
     }
+
+    async fn clear_bill_cache(&self) -> Result<()> {
+        self.store.clear_bill_cache().await?;
+        Ok(())
+    }
 }

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

@@ -66,6 +66,7 @@ pub mod tests {
             async fn get_bill_from_cache(&self, id: &str) -> Result<Option<BitcreditBillResult>>;
             async fn save_bill_to_cache(&self, id: &str, bill: &BitcreditBillResult) -> Result<()>;
             async fn invalidate_bill_in_cache(&self, id: &str) -> Result<()>;
+            async fn clear_bill_cache(&self) -> Result<()>;
             async fn exists(&self, id: &str) -> bool;
             async fn get_ids(&self) -> Result<Vec<String>>;
             async fn save_keys(&self, id: &str, keys: &BillKeys) -> Result<()>;

crates/bcr-ebill-persistence/src/bill.rs

@@ -19,6 +19,8 @@ pub trait BillStoreApi: Send + Sync {
     async fn save_bill_to_cache(&self, id: &str, bill: &BitcreditBillResult) -> Result<()>;
     /// Invalidates the cached bill
     async fn invalidate_bill_in_cache(&self, id: &str) -> Result<()>;
+    /// clear the bill cache
+    async fn clear_bill_cache(&self) -> Result<()>;
     /// Checks if the given bill exists
     async fn exists(&self, id: &str) -> bool;
     /// Gets all bill ids

crates/bcr-ebill-persistence/src/db/bill.rs

@@ -90,6 +90,11 @@ impl BillStoreApi for SurrealBillStore {
         Ok(())
     }
 
+    async fn clear_bill_cache(&self) -> Result<()> {
+        let _: Vec<BitcreditBillResultDb> = self.db().await?.delete(Self::CACHE_TABLE).await?;
+        Ok(())
+    }
+
     async fn exists(&self, id: &str) -> bool {
         let db_con = match self.db().await {
             Ok(con) => con,

crates/bcr-ebill-transport/src/handler/mod.rs

@@ -236,6 +236,7 @@ mod test_utils {
             async fn get_bill_from_cache(&self, id: &str) -> Result<Option<BitcreditBillResult>>;
             async fn save_bill_to_cache(&self, id: &str, bill: &BitcreditBillResult) -> Result<()>;
             async fn invalidate_bill_in_cache(&self, id: &str) -> Result<()>;
+            async fn clear_bill_cache(&self) -> Result<()>;
             async fn exists(&self, id: &str) -> bool;
             async fn get_ids(&self) -> Result<Vec<String>>;
             async fn save_keys(&self, id: &str, keys: &BillKeys) -> Result<()>;

crates/bcr-ebill-wasm/index.html

@@ -45,6 +45,9 @@ <h2>Company Testing</h2>
     <div>
         <h2>Bill Testing</h2>
         <div>
+            <button type="button" id="clear_bill_cache">Clear Bill Cache</button>
+            <br />
+            <br />
             Contact Id: <input type="text" id="node_id_bill"/>
             <button type="button" id="contact_test">Create Contact for node id</button>
             <button type="button" id="bill_test">Create bill with contact for node id</button>

crates/bcr-ebill-wasm/main.js

@@ -25,6 +25,7 @@ document.getElementById("reject_pay").addEventListener("click", rejectPayBill);
 document.getElementById("reject_buying").addEventListener("click", rejectBuyingBill);
 document.getElementById("reject_recourse").addEventListener("click", rejectRecourseBill);
 document.getElementById("bill_test").addEventListener("click", triggerBill);
+document.getElementById("clear_bill_cache").addEventListener("click", clearBillCache);
 
 async function start() {
   let config = {
@@ -410,6 +411,13 @@ async function fetchBillSearch() {
   await measured();
 }
 
+async function clearBillCache() {
+  let measured = measure(async () => {
+    return await billApi.clear_bill_cache();
+  });
+  await measured();
+}
+
 function measure(promiseFunction) {
   return async function (...args) {
     const startTime = performance.now();