Fix maturity date, issue date validation, add testing docs, up version (#479)

Author: zupzup

CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.3.6
+
+* Add validation for maturity date
+* Add docs for testing
+
 # 0.3.5
 
 * Properly propagate and log errors when getting a file (e.g. an avatar)

crates/bcr-ebill-api/Cargo.toml

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

crates/bcr-ebill-core/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bcr-ebill-core"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2024"
 
 [lib]

crates/bcr-ebill-core/src/bill/validation.rs

@@ -8,7 +8,7 @@ use crate::{
         },
     },
     constants::{ACCEPT_DEADLINE_SECONDS, PAYMENT_DEADLINE_SECONDS, RECOURSE_DEADLINE_SECONDS},
-    util,
+    util::{self, date::start_of_day_as_timestamp},
 };
 
 use super::{BillAction, BillIssueData, BillType, BillValidateActionData, RecourseReason};
@@ -34,8 +34,17 @@ pub fn validate_bill_issue(data: &BillIssueData) -> Result<(u64, BillType), Vali
         ));
     }
 
-    util::date::date_string_to_timestamp(&data.issue_date, None)?;
-    util::date::date_string_to_timestamp(&data.maturity_date, None)?;
+    let issue_date_ts = util::date::date_string_to_timestamp(&data.issue_date, None)?;
+    let maturity_date_ts = util::date::date_string_to_timestamp(&data.maturity_date, None)?;
+    let start_of_day = start_of_day_as_timestamp(data.timestamp);
+
+    if maturity_date_ts < start_of_day {
+        return Err(ValidationError::MaturityDateInThePast);
+    }
+
+    if issue_date_ts > maturity_date_ts {
+        return Err(ValidationError::IssueDateAfterMaturityDate);
+    }
 
     let bill_type = match data.t {
         0 => BillType::PromissoryNote,
@@ -591,8 +600,8 @@ mod tests {
             t: 0,
             country_of_issuing: "AT".into(),
             city_of_issuing: "Vienna".into(),
-            issue_date: "2024-08-12".into(),
-            maturity_date: "2024-11-12".into(),
+            issue_date: "2025-08-12".into(),
+            maturity_date: "2025-11-12".into(),
             drawee: TEST_PUB_KEY_SECP.into(),
             payee: OTHER_TEST_PUB_KEY_SECP.into(),
             sum: "500".into(),
@@ -618,6 +627,8 @@ mod tests {
     #[case::invalid_file_id( BillIssueData { file_upload_ids: vec!["".into()], ..valid_bill_issue_data() }, ValidationError::InvalidFileUploadId)]
     #[case::invalid_issue_date( BillIssueData { issue_date: "invaliddate".into(), ..valid_bill_issue_data() }, ValidationError::InvalidDate)]
     #[case::invalid_maturity_date( BillIssueData { maturity_date: "invaliddate".into(), ..valid_bill_issue_data() }, ValidationError::InvalidDate)]
+    #[case::maturity_date_before_now( BillIssueData { maturity_date: "2004-01-12".into(), ..valid_bill_issue_data() }, ValidationError::MaturityDateInThePast)]
+    #[case::issue_date_after_maturity_date( BillIssueData { issue_date: "2028-01-12".into(), ..valid_bill_issue_data() }, ValidationError::IssueDateAfterMaturityDate)]
     #[case::invalid_bill_type( BillIssueData { t: 5, ..valid_bill_issue_data() }, ValidationError::InvalidBillType)]
     #[case::drawee_equals_payee( BillIssueData { drawee: TEST_PUB_KEY_SECP.into(), payee: TEST_PUB_KEY_SECP.into(), ..valid_bill_issue_data() }, ValidationError::DraweeCantBePayee)]
     #[case::invalid_payee( BillIssueData { payee: "invalidkey".into(), ..valid_bill_issue_data() }, ValidationError::InvalidSecp256k1Key("invalidkey".into()))]

crates/bcr-ebill-core/src/lib.rs

@@ -180,6 +180,14 @@ pub enum ValidationError {
     #[error("invalid date")]
     InvalidDate,
 
+    /// error returned if the maturity date is in the past
+    #[error("maturity date can't be in the past")]
+    MaturityDateInThePast,
+
+    /// error returned if the issue date is after the maturity date
+    #[error("issue date after maturity date")]
+    IssueDateAfterMaturityDate,
+
     /// error returned if the currency was invalid
     #[error("invalid currency")]
     InvalidCurrency,

crates/bcr-ebill-core/src/util/date.rs

@@ -21,6 +21,17 @@ pub fn seconds(timestamp: u64) -> DateTimeUtc {
     }
 }
 
+/// Returns the start of day timestamp for the given timestamp
+pub fn start_of_day_as_timestamp(timestamp: u64) -> u64 {
+    let dt = seconds(timestamp);
+    let date = dt.date_naive();
+    let end_of_day_time =
+        NaiveTime::from_hms_micro_opt(00, 00, 00, 000_000).expect("is a valid time");
+    let date_time = date.and_time(end_of_day_time);
+    let date_utc = Utc.from_utc_datetime(&date_time);
+    date_utc.timestamp() as u64
+}
+
 /// Returns the end of day timestamp for the given timestamp
 pub fn end_of_day_as_timestamp(timestamp: u64) -> u64 {
     let dt = seconds(timestamp);
@@ -88,6 +99,16 @@ mod tests {
         );
     }
 
+    #[test]
+    fn test_start_of_day() {
+        let ts = Utc
+            .with_ymd_and_hms(2025, 1, 15, 5, 10, 45)
+            .unwrap()
+            .timestamp() as u64;
+        let start_of_day = start_of_day_as_timestamp(ts);
+        assert!(start_of_day < ts,);
+    }
+
     #[test]
     fn test_end_of_day() {
         let ts = Utc

crates/bcr-ebill-persistence/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bcr-ebill-persistence"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2024"
 
 [lib]

crates/bcr-ebill-transport/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bcr-ebill-transport"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2024"
 
 [lib]

crates/bcr-ebill-wasm/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "bcr-ebill-wasm"
-version = "0.3.5"
+version = "0.3.6"
 edition = "2024"
 
 [lib]

crates/bcr-ebill-wasm/main.js

@@ -218,6 +218,13 @@ async function triggerContact() {
 async function triggerBill() {
   let measured = measure(async () => {
     console.log("creating bill");
+
+    const now = new Date();
+    const issue_date = now.toISOString().split('T')[0];
+    const threeMonthsLater = new Date(now);
+    threeMonthsLater.setMonth(now.getMonth() + 3);
+    const maturity_date = threeMonthsLater.toISOString().split('T')[0];
+
     let file_upload_id = document.getElementById("file_upload_id").value || undefined;
     let node_id = document.getElementById("node_id_bill").value;
     let identity = await identityApi.detail();
@@ -226,8 +233,8 @@ async function triggerBill() {
         t: 1,
         country_of_issuing: "AT",
         city_of_issuing: "Vienna",
-        issue_date: "2024-01-22",
-        maturity_date: "2024-06-22",
+        issue_date,
+        maturity_date,
         payee: identity.node_id,
         drawee: node_id,
         sum: "1500",