@hyper.software/common-helpers 2.3.2 → 2.3.4

package/lib/services/dynamicPricingService/dynamicPricingService.js

@@ -54,14 +54,14 @@ exports.calculateDynamicPricing = void 0;
 var moment_1 = __importDefault(require("moment"));
 var dateService_1 = require("../dateService/dateService");
 var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
-    var basePriceMap, resultPricing, period, holidayDateSet, _i, period_1, dateStr, date, current, baseForToday, isAffectedHoliday, increase, rawPrice;
+    var basePriceMap, resultPricing, period, affectedDatesSet, _i, period_1, dateStr, isAffected, current, date, base, increase, rawPrice;
     var _c;
     var currentPricing = _b.currentPricing, dynamicPricing = _b.dynamicPricing, existingBasePriceMap = _b.existingBasePriceMap, company = _b.company;
     return __generator(this, function (_d) {
         basePriceMap = __assign(__assign({}, dynamicPricing.basePrice), existingBasePriceMap);
         resultPricing = {};
         period = Object.keys(currentPricing);
-        holidayDateSet = new Set((company.holidays || [])
+        affectedDatesSet = new Set((company.holidays || [])
             .filter(function (h) { return h.enableDynamicPricing; })
             .flatMap(function (h) { return [
             (0, moment_1.default)(h.date).subtract(1, 'day').format('YYYY-MM-DD'),
@@ -71,27 +71,29 @@ var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], voi
         if (!dynamicPricing.isActive) {
             return [2 /*return*/, {
                     updatedPricing: currentPricing,
-                    updatedBasePriceMap: basePriceMap,
+                    updatedBasePriceMap: {},
                 }];
         }
         for (_i = 0, period_1 = period; _i < period_1.length; _i++) {
             dateStr = period_1[_i];
+            isAffected = affectedDatesSet.has(dateStr);
+            current = currentPricing[dateStr];
             date = (0, moment_1.default)((0, dateService_1.normalizeDate)(dateStr));
-            if (!date.isValid())
+            if (!isAffected || !date.isValid()) {
+                resultPricing[dateStr] = current;
                 continue;
-            current = currentPricing[dateStr];
+            }
             if (!(dateStr in basePriceMap) && typeof current === 'number') {
                 basePriceMap[dateStr] = current;
             }
-            baseForToday = basePriceMap[dateStr];
-            isAffectedHoliday = holidayDateSet.has(dateStr);
-            if (!isAffectedHoliday || baseForToday == null) {
-                resultPricing[dateStr] = baseForToday !== null && baseForToday !== void 0 ? baseForToday : current;
+            base = basePriceMap[dateStr];
+            if (base == null) {
+                resultPricing[dateStr] = current;
                 continue;
             }
-            increase = (_c = dynamicPricing.amount) !== null && _c !== void 0 ? _c : Math.round(baseForToday * 0.05);
+            increase = (_c = dynamicPricing.amount) !== null && _c !== void 0 ? _c : Math.round(base * 0.05);
             increase += 10;
-            rawPrice = Math.min(baseForToday + increase, baseForToday + 70);
+            rawPrice = Math.min(base + increase, base + 70);
             resultPricing[dateStr] = Math.round(rawPrice);
         }
         return [2 /*return*/, {

package/lib/services/dynamicPricingService/dynamicPricingService.js.map

@@ -1 +1 @@
-{"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA2B;AAE3B,0DAA0D;AAEnD,IAAM,uBAAuB,GAAG,iEAAO,EAU7C;;;QATC,cAAc,oBAAA,EACd,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,OAAO,aAAA;;QAUD,YAAY,yBAAQ,cAAc,CAAC,SAAS,GAAK,oBAAoB,CAAE,CAAA;QACvE,aAAa,GAAwC,EAAE,CAAA;QAEvD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAEpC,cAAc,GAAG,IAAI,GAAG,CAC5B,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;aACrB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,oBAAoB,EAAtB,CAAsB,CAAC;aACrC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA;YACd,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACtD,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACnC,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;SAClD,EAJe,CAIf,CAAC,CACL,CAAA;QAED,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,sBAAO;oBACL,cAAc,EAAE,cAAc;oBAC9B,mBAAmB,EAAE,YAAY;iBAClC,EAAA;QACH,CAAC;QAED,WAA4B,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;YAApB,OAAO;YACV,IAAI,GAAG,IAAA,gBAAM,EAAC,IAAA,2BAAa,EAAC,OAAO,CAAC,CAAC,CAAA;YAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;gBAAE,SAAQ;YAEvB,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YAEvC,IAAI,CAAC,CAAC,OAAO,IAAI,YAAY,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC9D,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;YACjC,CAAC;YAEK,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YACpC,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAErD,IAAI,CAAC,iBAAiB,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;gBAC/C,aAAa,CAAC,OAAO,CAAC,GAAG,YAAY,aAAZ,YAAY,cAAZ,YAAY,GAAI,OAAO,CAAA;gBAChD,SAAQ;YACV,CAAC;YAEG,QAAQ,GAAG,MAAA,cAAc,CAAC,MAAM,mCAAI,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAA;YACvE,QAAQ,IAAI,EAAE,CAAA;YAER,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,YAAY,GAAG,QAAQ,EAAE,YAAY,GAAG,EAAE,CAAC,CAAA;YAErE,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC/C,CAAC;QAED,sBAAO;gBACL,cAAc,EAAE,aAAa;gBAC7B,mBAAmB,EAAE,YAAY;aAClC,EAAA;;KACF,CAAA;AAlEY,QAAA,uBAAuB,2BAkEnC"}
+{"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA2B;AAE3B,0DAA0D;AAEnD,IAAM,uBAAuB,GAAG,iEAAO,EAU7C;;;QATC,cAAc,oBAAA,EACd,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,OAAO,aAAA;;QAUD,YAAY,yBAAQ,cAAc,CAAC,SAAS,GAAK,oBAAoB,CAAE,CAAA;QACvE,aAAa,GAAwC,EAAE,CAAA;QAEvD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAEpC,gBAAgB,GAAG,IAAI,GAAG,CAC9B,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;aACrB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,oBAAoB,EAAtB,CAAsB,CAAC;aACrC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA;YACd,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACtD,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;YACnC,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;SAClD,EAJe,CAIf,CAAC,CACL,CAAA;QAED,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;YAC7B,sBAAO;oBACL,cAAc,EAAE,cAAc;oBAC9B,mBAAmB,EAAE,EAAE;iBACxB,EAAA;QACH,CAAC;QAED,WAA4B,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;YAApB,OAAO;YACV,UAAU,GAAG,gBAAgB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC1C,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YACjC,IAAI,GAAG,IAAA,gBAAM,EAAC,IAAA,2BAAa,EAAC,OAAO,CAAC,CAAC,CAAA;YAC3C,IAAI,CAAC,UAAU,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC;gBACnC,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;gBAChC,SAAQ;YACV,CAAC;YAED,IAAI,CAAC,CAAC,OAAO,IAAI,YAAY,CAAC,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC9D,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;YACjC,CAAC;YAEK,IAAI,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;YAClC,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;gBACjB,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,CAAA;gBAChC,SAAQ;YACV,CAAC;YAEG,QAAQ,GAAG,MAAA,cAAc,CAAC,MAAM,mCAAI,IAAI,CAAC,KAAK,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;YAC/D,QAAQ,IAAI,EAAE,CAAA;YACR,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;YAErD,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;QAC/C,CAAC;QAED,sBAAO;gBACL,cAAc,EAAE,aAAa;gBAC7B,mBAAmB,EAAE,YAAY;aAClC,EAAA;;KACF,CAAA;AAlEY,QAAA,uBAAuB,2BAkEnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyper.software/common-helpers",
-  "version": "2.3.2",
+  "version": "2.3.4",
   "author": "Raul Tomescu <tomescu.raul+hyper@gmail.com>",
   "description": "Hyper Software Common Javascript Helpers",
   "main": "lib/index.js",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@babel/preset-env": "^7.23.3",
-    "@hyper.software/common-models": "2.10.5",
+    "@hyper.software/common-models": "^2.10.20",
     "@hyper.software/tslint-config": "^1.0.1",
     "@sentry/types": "^7.77.0",
     "@types/cookie": "^0.5.3",