@riocrypto/common 1.0.2734 → 1.0.2736

package/build/helpers/get-days-between-agreed-two-way-settlement-date-and-payment-date.js

@@ -10,25 +10,27 @@ const formatLocalDate = (date) => {
     return `${year}-${month}-${day}`;
 };
 const getDaysBetweenAgreedTwoWaySettlementDateAndPaymentDate = ({ country, holidays, twoWaySettlementDate, deferredPaymentType, }) => {
-    if (deferredPaymentType !== deferred_payment_type_1.DeferredPaymentType.OneDayAfter) {
+    const businessDaysToAdd = (0, deferred_payment_type_1.getDeferredPaymentBusinessDays)(deferredPaymentType);
+    if (businessDaysToAdd === 0) {
         return 0;
     }
     const timezone = (0, get_country_timezone_1.getCountryTimezone)(country);
     // Convert the two way settlement date to the country's timezone
     const settlementDateInCountryTZ = new Date(twoWaySettlementDate.toLocaleString("en-US", { timeZone: timezone }));
-    // Find the next business day after the settlement date
-    const nextBusinessDay = new Date(settlementDateInCountryTZ);
-    nextBusinessDay.setDate(settlementDateInCountryTZ.getDate() + 1);
-    while (true) {
-        const isWeekend = nextBusinessDay.getDay() === 0 || nextBusinessDay.getDay() === 6;
-        const isHoliday = holidays.dates.includes(formatLocalDate(nextBusinessDay));
+    // Walk forward one calendar day at a time, counting only business days,
+    // until the requested number of business days has been reached
+    const paymentDate = new Date(settlementDateInCountryTZ);
+    let businessDaysFound = 0;
+    while (businessDaysFound < businessDaysToAdd) {
+        paymentDate.setDate(paymentDate.getDate() + 1);
+        const isWeekend = paymentDate.getDay() === 0 || paymentDate.getDay() === 6;
+        const isHoliday = holidays.dates.includes(formatLocalDate(paymentDate));
         if (!isWeekend && !isHoliday) {
-            break; // Found the next business day
+            businessDaysFound++;
         }
-        nextBusinessDay.setDate(nextBusinessDay.getDate() + 1);
     }
-    // Calculate the calendar days difference between settlement date and next business day
-    const timeDifference = nextBusinessDay.getTime() - settlementDateInCountryTZ.getTime();
+    // Calculate the calendar days difference between settlement date and payment date
+    const timeDifference = paymentDate.getTime() - settlementDateInCountryTZ.getTime();
     const daysDifference = Math.ceil(timeDifference / (1000 * 3600 * 24));
     return daysDifference;
 };

package/build/types/deferred-payment-type.d.ts

@@ -1,5 +1,7 @@
 export declare enum DeferredPaymentType {
     None = "none",
     EndOfDay = "endOfDay",
-    OneDayAfter = "oneDayAfter"
+    OneDayAfter = "oneDayAfter",
+    TwoDaysAfter = "twoDaysAfter"
 }
+export declare const getDeferredPaymentBusinessDays: (deferredPaymentType: DeferredPaymentType) => number;

package/build/types/deferred-payment-type.js

@@ -1,9 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeferredPaymentType = void 0;
+exports.getDeferredPaymentBusinessDays = exports.DeferredPaymentType = void 0;
 var DeferredPaymentType;
 (function (DeferredPaymentType) {
     DeferredPaymentType["None"] = "none";
     DeferredPaymentType["EndOfDay"] = "endOfDay";
     DeferredPaymentType["OneDayAfter"] = "oneDayAfter";
+    DeferredPaymentType["TwoDaysAfter"] = "twoDaysAfter";
 })(DeferredPaymentType = exports.DeferredPaymentType || (exports.DeferredPaymentType = {}));
+const getDeferredPaymentBusinessDays = (deferredPaymentType) => {
+    switch (deferredPaymentType) {
+        case DeferredPaymentType.OneDayAfter:
+            return 1;
+        case DeferredPaymentType.TwoDaysAfter:
+            return 2;
+        default:
+            return 0;
+    }
+};
+exports.getDeferredPaymentBusinessDays = getDeferredPaymentBusinessDays;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@riocrypto/common",
-  "version": "1.0.2734",
+  "version": "1.0.2736",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",