@hyper.software/common-helpers 2.2.45 → 2.2.47

package/lib/services/dynamicPricingService/dynamicPricingService.d.ts

@@ -4,6 +4,14 @@ export declare const calculateDynamicPricing: ({ currentPricing, dynamicPricing,
     dynamicPricing: IDynamicPricing;
     existingBasePriceMap: Record<string, number>;
     company: ICompany;
+    roomTypeId: string;
+    companyId: string;
+    getRoomTypesAvailability: (companyId: string, roomTypeIds: string[], options: {
+        period: string[];
+    }) => Promise<any>;
+    getRoomsByCompanyId: (companyId: string) => Promise<{
+        list: any[];
+    }>;
 }) => Promise<{
     updatedPricing: IRoomTypePricePlanPricingInformation;
     updatedBasePriceMap: Record<string, number>;

package/lib/services/dynamicPricingService/dynamicPricingService.js

@@ -52,53 +52,44 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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, holidayDateSet, _i, _c, dateStr, date, current, base, baseForToday, increasedPrice;
-    var _d;
+    var basePriceMap, updatedPricing, period, affectedDates, _i, period_1, dateStr, manualPrice, basePrice, isAffected, dynamicPrice, isManuallyOverridden;
+    var _c;
     var currentPricing = _b.currentPricing, dynamicPricing = _b.dynamicPricing, existingBasePriceMap = _b.existingBasePriceMap, company = _b.company;
-    return __generator(this, function (_e) {
-        basePriceMap = __assign(__assign({}, dynamicPricing.basePrice), existingBasePriceMap);
-        resultPricing = {};
-        holidayDateSet = new Set((company.holidays || [])
+    return __generator(this, function (_d) {
+        basePriceMap = __assign({}, existingBasePriceMap);
+        updatedPricing = {};
+        period = Object.keys(currentPricing);
+        affectedDates = 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'),
             (0, moment_1.default)(h.date).format('YYYY-MM-DD'),
             (0, moment_1.default)(h.date).add(1, 'day').format('YYYY-MM-DD'),
         ]; }));
-        for (_i = 0, _c = Object.keys(currentPricing); _i < _c.length; _i++) {
-            dateStr = _c[_i];
-            date = (0, moment_1.default)((0, dateService_1.normalizeDate)(dateStr));
-            if (!date.isValid())
+        for (_i = 0, period_1 = period; _i < period_1.length; _i++) {
+            dateStr = period_1[_i];
+            manualPrice = currentPricing[dateStr];
+            basePrice = (_c = basePriceMap[dateStr]) !== null && _c !== void 0 ? _c : manualPrice;
+            basePriceMap[dateStr] = basePrice;
+            isAffected = affectedDates.has(dateStr);
+            if (!isAffected) {
+                updatedPricing[dateStr] = manualPrice;
                 continue;
-            current = currentPricing[dateStr];
-            base = (_d = basePriceMap[dateStr]) !== null && _d !== void 0 ? _d : current;
-            if (!(dateStr in basePriceMap)) {
-                basePriceMap[dateStr] = base;
             }
-            if (dynamicPricing.isActive && holidayDateSet.has(dateStr)) {
-                baseForToday = basePriceMap[dateStr];
-                increasedPrice = baseForToday;
-                if (dynamicPricing.amount) {
-                    if (dynamicPricing.type === 'INCREASE') {
-                        increasedPrice = baseForToday + dynamicPricing.amount;
-                    }
-                    else if (dynamicPricing.type === 'DECREASE') {
-                        increasedPrice = Math.max(0, baseForToday - dynamicPricing.amount);
-                    }
-                }
-                else {
-                    increasedPrice = Math.round(baseForToday * 1.05);
-                }
-                resultPricing[dateStr] = increasedPrice;
-            }
-            else {
-                resultPricing[dateStr] = base;
+            if (!dynamicPricing.isActive) {
+                updatedPricing[dateStr] = basePrice;
+                continue;
             }
+            dynamicPrice = basePrice + (dynamicPricing.amount || Math.round(basePrice * 0.05));
+            if (dynamicPrice > basePrice + 70)
+                dynamicPrice = basePrice + 70;
+            dynamicPrice = Math.round(dynamicPrice);
+            isManuallyOverridden = manualPrice !== dynamicPrice;
+            updatedPricing[dateStr] = isManuallyOverridden ? manualPrice : dynamicPrice;
         }
         return [2 /*return*/, {
-                updatedPricing: resultPricing,
+                updatedPricing: updatedPricing,
                 updatedBasePriceMap: basePriceMap,
             }];
     });

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,GAAyC,EAAE,CAAA;QAExD,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,WAAiD,EAA3B,KAAA,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,EAA3B,cAA2B,EAA3B,IAA2B,EAAE,CAAC;YAAzC,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;YACjC,IAAI,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,mCAAI,OAAO,CAAA;YAE7C,IAAI,CAAC,CAAC,OAAO,IAAI,YAAY,CAAC,EAAE,CAAC;gBAC/B,YAAY,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;YAC9B,CAAC;YAED,IAAI,cAAc,CAAC,QAAQ,IAAI,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;gBACrD,YAAY,GAAG,YAAY,CAAC,OAAO,CAAC,CAAA;gBACtC,cAAc,GAAG,YAAY,CAAA;gBAEjC,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;oBAC1B,IAAI,cAAc,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBACvC,cAAc,GAAG,YAAY,GAAG,cAAc,CAAC,MAAM,CAAA;oBACvD,CAAC;yBAAM,IAAI,cAAc,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;wBAC9C,cAAc,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,YAAY,GAAG,cAAc,CAAC,MAAM,CAAC,CAAA;oBACpE,CAAC;gBACH,CAAC;qBAAM,CAAC;oBACN,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC,CAAA;gBAClD,CAAC;gBAED,aAAa,CAAC,OAAO,CAAC,GAAG,cAAc,CAAA;YACzC,CAAC;iBAAM,CAAC;gBACN,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAA;YAC/B,CAAC;QACH,CAAC;QAED,sBAAO;gBACL,cAAc,EAAE,aAAa;gBAC7B,mBAAmB,EAAE,YAAY;aAClC,EAAA;;KACF,CAAA;AA9DY,QAAA,uBAAuB,2BA8DnC"}
+{"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,kDAA2B;AAGpB,IAAM,uBAAuB,GAAG,iEAAO,EAc7C;;;QAbC,cAAc,oBAAA,EACd,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,OAAO,aAAA;;QAcD,YAAY,gBAAQ,oBAAoB,CAAE,CAAA;QAC1C,cAAc,GAAyC,EAAE,CAAA;QACzD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;QAEpC,aAAa,GAAG,IAAI,GAAG,CAC3B,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,WAA4B,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;YAApB,OAAO;YACV,WAAW,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;YACrC,SAAS,GAAG,MAAA,YAAY,CAAC,OAAO,CAAC,mCAAI,WAAW,CAAA;YACtD,YAAY,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;YAE3B,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAE7C,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,cAAc,CAAC,OAAO,CAAC,GAAG,WAAW,CAAA;gBACrC,SAAQ;YACV,CAAC;YAED,IAAI,CAAC,cAAc,CAAC,QAAQ,EAAE,CAAC;gBAC7B,cAAc,CAAC,OAAO,CAAC,GAAG,SAAS,CAAA;gBACnC,SAAQ;YACV,CAAC;YAEG,YAAY,GAAG,SAAS,GAAG,CAAC,cAAc,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,IAAI,CAAC,CAAC,CAAA;YACtF,IAAI,YAAY,GAAG,SAAS,GAAG,EAAE;gBAAE,YAAY,GAAG,SAAS,GAAG,EAAE,CAAA;YAChE,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,CAAA;YAEjC,oBAAoB,GAAG,WAAW,KAAK,YAAY,CAAA;YAEzD,cAAc,CAAC,OAAO,CAAC,GAAG,oBAAoB,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,YAAY,CAAA;QAC7E,CAAC;QAED,sBAAO;gBACL,cAAc,gBAAA;gBACd,mBAAmB,EAAE,YAAY;aAClC,EAAA;;KACF,CAAA;AA9DY,QAAA,uBAAuB,2BA8DnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyper.software/common-helpers",
-  "version": "2.2.45",
+  "version": "2.2.47",
   "author": "Raul Tomescu <tomescu.raul+hyper@gmail.com>",
   "description": "Hyper Software Common Javascript Helpers",
   "main": "lib/index.js",