@darkpos/pricing 1.0.90 → 1.0.91

package/__TEST__/order/getRecommendedEndDate.test.js

@@ -0,0 +1,96 @@
+const moment = require('moment-timezone');
+const usePricing = require('../../lib/index');
+
+const defaults = {
+  store: {
+    _settings: {
+      order: {
+        endDate: {
+          readySchedule: [
+            {
+              _id: '682373ef8256034ae1f2c195',
+              dayOfWeek: [2],
+              recommended: 'auto_recommended',
+              addDays: 1,
+              cutDay: 1,
+              skipDays: undefined,
+              readyHour: null,
+              cutHour: null,
+            },
+          ],
+        },
+      },
+    },
+  },
+};
+describe('getRecommendedEndDate function', () => {
+  test('getRecommendedEndDate, skipDays undefined', () => {
+    const pricingService = usePricing(defaults);
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingService.store.getRecommendedEndDate();
+    expect(result).toBe('2025-05-14T15:00:00Z'); // 2025-05-14T15:00:00Z
+  });
+
+  test('getRecommendedEndDate, skipDays with dayOfWeek undefined', () => {
+    const pricingService = usePricing({
+      store: {
+        _settings: {
+          order: {
+            endDate: {
+              readySchedule: [
+                {
+                  _id: '682373ef8256034ae1f2c195',
+                  dayOfWeek: null,
+                  recommended: 'auto_recommended',
+                  addDays: 1,
+                  cutDay: 1,
+                  skipDays: [1],
+                  readyHour: null,
+                  cutHour: null,
+                },
+              ],
+            },
+          },
+        },
+      },
+    });
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingService.store.getRecommendedEndDate();
+
+    expect(result).toBe(null); // null
+  });
+  test('getRecommendedEndDate, skipDays with one day', () => {
+    const pricingService = usePricing({
+      store: {
+        _settings: {
+          order: {
+            endDate: {
+              readySchedule: [
+                {
+                  _id: '682373ef8256034ae1f2c195',
+                  dayOfWeek: [2],
+                  recommended: 'auto_recommended',
+                  addDays: 1,
+                  cutDay: 1,
+                  skipDays: [1],
+                  readyHour: null,
+                  cutHour: null,
+                },
+              ],
+            },
+          },
+        },
+      },
+    });
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingService.store.getRecommendedEndDate();
+
+    expect(result).toBe('2025-05-14T15:00:00Z'); // 2025-05-14T15:00:00Z
+  });
+});

package/__TEST__/order/pickEndDate.test.js

@@ -138,4 +138,19 @@ describe('pickEndDate function', () => {
 
     expect(result).toBe('2024-09-05T00:00:00Z'); // 2024-09-04 20:00:00 EDT
   });
+  test('Get EndDate, undefined skipdays', () => {
+    const schedule = {
+      addDays: 1,
+      readyHour: { hour: 20, minute: 0 },
+      cutHour: { hour: 16, minute: 0 },
+      cutDay: 1,
+    };
+
+    const now = moment('2025-05-13T15:00:00Z').tz('America/New_York');
+    jest.spyOn(moment, 'now').mockImplementation(() => now.valueOf());
+
+    const result = pricingService.store.pickEndDate(schedule);
+
+    expect(result).toBe('2025-05-15T00:00:00Z'); // 2024-09-04 20:00:00 EDT
+  });
 });

package/lib/store/getRecommendedEndDate.js

@@ -1,22 +1,25 @@
-module.exports = ({ actions, settings }) =>
-  function getRecommendedEndDate() {
-    const readySchedule =
-      settings.order &&
+module.exports = ({ actions, settings }) => {
+  const getReadyScheduleSetting = () =>
+    (settings.order &&
       settings.order.endDate &&
-      settings.order.endDate.readySchedule;
+      settings.order.endDate.readySchedule) ||
+    [];
+  return function getRecommendedEndDate() {
+    const readySchedule = getReadyScheduleSetting();
 
-    if (readySchedule) {
-      const dayOfWeek = new Date().getDay();
-      const day = dayOfWeek || 7;
-      const schedule = settings.order.endDate.readySchedule.find(item =>
-        item.dayOfWeek.includes(day)
-      );
-      return schedule
-        ? actions.pickEndDate({
-            ...schedule,
-          })
-        : null;
-    }
+    const dayOfWeek = new Date().getDay();
+    const day = dayOfWeek || 7;
+    const schedule = readySchedule.find(item => {
+      if (item && item.dayOfWeek) {
+        return item.dayOfWeek.includes(day);
+      }
+      return false;
+    });
 
-    return null;
+    return schedule
+      ? actions.pickEndDate({
+          ...schedule,
+        })
+      : null;
   };
+};

package/lib/store/pickEndDate.js

@@ -11,13 +11,8 @@ module.exports = ({ settings, _, moment }) => {
   const MAX_ADD_DAYS = 365;
 
   return function pickEndDate(schedule = {}) {
-    const {
-      addDays: addDaysParam,
-      readyHour,
-      skipDays = [],
-      cutHour,
-      cutDay = 0,
-    } = schedule;
+    const { addDays: addDaysParam, readyHour, cutHour, cutDay = 0 } = schedule;
+    const skipDays = schedule.skipDays || [];
 
     const todayTZ = moment().tz(timezone);
     let endDateTZ = todayTZ.clone();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darkpos/pricing",
-  "version": "1.0.90",
+  "version": "1.0.91",
   "description": "Pricing calculator",
   "author": "Dark POS",
   "license": "ISC",
@@ -51,5 +51,5 @@
     "supertest": "^6.2.3",
     "supervisor": "^0.12.0"
   },
-  "gitHead": "9c351c72bca0563fb454c0cb51d50dcaf49ba37d"
+  "gitHead": "5526c9bdbba87270466443c92066c06c9fa87d52"
 }