npm - @hyper.software/common-helpers - Versions diffs - 2.2.56 → 2.2.58 - Mend

@hyper.software/common-helpers 2.2.56 → 2.2.58

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (7) hide show

package/lib/services/bookingService/__tests__/bookingService.calculateDynamic.test.d.ts CHANGED Viewed

	@@ -1 +0,0 @@
1	- export {};

package/lib/services/bookingService/__tests__/bookingService.calculateDynamic.test.js CHANGED Viewed

@@ -1,262 +1,199 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
-    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
-    function verb(n) { return function (v) { return step([n, v]); }; }
-    function step(op) {
-        if (f) throw new TypeError("Generator is already executing.");
-        while (g && (g = 0, op[0] && (_ = 0)), _) try {
-            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
-            if (y = 0, t) op = [op[0] & 2, t.value];
-            switch (op[0]) {
-                case 0: case 1: t = op; break;
-                case 4: _.label++; return { value: op[1], done: false };
-                case 5: _.label++; y = op[1]; op = [0]; continue;
-                case 7: op = _.ops.pop(); _.trys.pop(); continue;
-                default:
-                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
-                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
-                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
-                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
-                    if (t[2]) _.ops.pop();
-                    _.trys.pop(); continue;
-            }
-            op = body.call(thisArg, _);
-        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
-        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
-    }
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-var moment_1 = __importDefault(require("moment"));
-var dynamicPricingService_1 = require("../../dynamicPricingService/dynamicPricingService");
-var interfaces_1 = require("../../../interfaces");
-describe('calculateDynamicPricing', function () {
-    var today = (0, moment_1.default)().startOf('day');
-    var nearDate = today.clone().add(7, 'days').format('YYYY-MM-DD');
-    var farDate = today.clone().add(60, 'days').format('YYYY-MM-DD');
-    var basePrice = 100;
-    var baseDynamicPricing = function (overrides) {
-        if (overrides === void 0) { overrides = {}; }
-        return (__assign({ isActive: true, basePrice: {}, startDate: today.format('YYYY-MM-DD'), endDate: farDate, type: interfaces_1.DYNAMIC_PRICING_TYPE.INCREASE, amount: 20 }, overrides));
-    };
-    var mockCompany = {
-        id: 'comp1',
-        holidays: [],
-    };
-    var mockGetRoomTypesAvailability = function (available, date) {
-        var _a;
-        return jest.fn().mockResolvedValue({
-            roomType1: {
-                availability: (_a = {},
-                    _a[date] = available,
-                    _a),
-            },
-        });
-    };
-    var mockGetRoomsByCompanyId = function (count) {
-        return jest.fn().mockResolvedValue({
-            list: Array(count).fill({ roomTypeId: 'roomType1' }),
-        });
-    };
-    // it('returns base price when dynamic pricing is inactive', async () => {
-    //   const result = await calculateDynamicPricing({
-    //     currentPricing: { [today.format('YYYY-MM-DD')]: 100 },
-    //     dynamicPricing: baseDynamicPricing({ isActive: false }),
-    //     existingBasePriceMap: { [today.format('YYYY-MM-DD')]: 90 },
-    //     company: mockCompany,
-    //     roomTypeId: 'roomType1',
-    //     companyId: 'comp1',
-    //     getRoomTypesAvailability: mockGetRoomTypesAvailability(5, today.format('YYYY-MM-DD')),
-    //     getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-    //   })
-    //   expect(result.updatedPricing[today.format('YYYY-MM-DD')]).toBe(90)
-    // })
-    it('applies holiday dynamic pricing if date is near holiday', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var holidayDate, companyWithHoliday, pricing, result;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    holidayDate = (0, moment_1.default)(today).add(1, 'day').format('YYYY-MM-DD');
-                    companyWithHoliday = {
-                        id: 'comp1',
-                        holidays: [{ date: holidayDate, enableDynamicPricing: true }],
-                    };
-                    pricing = (_a = {},
-                        _a[holidayDate] = 100,
-                        _a);
-                    return [4 /*yield*/, (0, dynamicPricingService_1.calculateDynamicPricing)({
-                            currentPricing: pricing,
-                            dynamicPricing: baseDynamicPricing(),
-                            existingBasePriceMap: {},
-                            company: companyWithHoliday,
-                            roomTypeId: 'roomType1',
-                            companyId: 'comp1',
-                            getRoomTypesAvailability: mockGetRoomTypesAvailability(1, holidayDate),
-                            getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-                        })];
-                case 1:
-                    result = _b.sent();
-                    expect(result.updatedPricing[holidayDate]).toBeGreaterThan(100);
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    // it('uses fallback pricing if base price exists and dynamic pricing is off', async () => {
-    //   const result = await calculateDynamicPricing({
-    //     currentPricing: { [today.format('YYYY-MM-DD')]: 100 },
-    //     dynamicPricing: baseDynamicPricing({ isActive: false }),
-    //     existingBasePriceMap: { [today.format('YYYY-MM-DD')]: 95 },
-    //     company: mockCompany,
-    //     roomTypeId: 'roomType1',
-    //     companyId: 'comp1',
-    //     getRoomTypesAvailability: mockGetRoomTypesAvailability(3, today.format('YYYY-MM-DD')),
-    //     getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-    //   })
-    //   expect(result.updatedPricing[today.format('YYYY-MM-DD')]).toBe(95)
-    // })
-    it('keeps price near base when availability is 100% and date is far', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, price;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, dynamicPricingService_1.calculateDynamicPricing)({
-                        currentPricing: (_a = {}, _a[farDate] = basePrice, _a),
-                        dynamicPricing: baseDynamicPricing(),
-                        existingBasePriceMap: {},
-                        company: mockCompany,
-                        roomTypeId: 'roomType1',
-                        companyId: 'comp1',
-                        getRoomTypesAvailability: mockGetRoomTypesAvailability(10, farDate),
-                        getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-                    })];
-                case 1:
-                    result = _b.sent();
-                    price = result.updatedPricing[farDate];
-                    expect(price).toBeGreaterThanOrEqual(basePrice);
-                    expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.1));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('increases price moderately with 50% availability and date is far', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, price;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, dynamicPricingService_1.calculateDynamicPricing)({
-                        currentPricing: (_a = {}, _a[farDate] = basePrice, _a),
-                        dynamicPricing: baseDynamicPricing(),
-                        existingBasePriceMap: {},
-                        company: mockCompany,
-                        roomTypeId: 'roomType1',
-                        companyId: 'comp1',
-                        getRoomTypesAvailability: mockGetRoomTypesAvailability(5, farDate),
-                        getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-                    })];
-                case 1:
-                    result = _b.sent();
-                    price = result.updatedPricing[farDate];
-                    expect(price).toBeGreaterThanOrEqual(basePrice);
-                    expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.4));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('maximizes price with 1 room left and date is far', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, price;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, dynamicPricingService_1.calculateDynamicPricing)({
-                        currentPricing: (_a = {}, _a[farDate] = basePrice, _a),
-                        dynamicPricing: baseDynamicPricing(),
-                        existingBasePriceMap: {},
-                        company: mockCompany,
-                        roomTypeId: 'roomType1',
-                        companyId: 'comp1',
-                        getRoomTypesAvailability: mockGetRoomTypesAvailability(1, farDate),
-                        getRoomsByCompanyId: mockGetRoomsByCompanyId(50),
-                    })];
-                case 1:
-                    result = _b.sent();
-                    price = result.updatedPricing[farDate];
-                    expect(price).toBeGreaterThanOrEqual(basePrice);
-                    expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.5));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('slightly increases price with 100% availability and date is near', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, price;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, dynamicPricingService_1.calculateDynamicPricing)({
-                        currentPricing: (_a = {}, _a[nearDate] = basePrice, _a),
-                        dynamicPricing: baseDynamicPricing(),
-                        existingBasePriceMap: {},
-                        company: mockCompany,
-                        roomTypeId: 'roomType1',
-                        companyId: 'comp1',
-                        getRoomTypesAvailability: mockGetRoomTypesAvailability(10, nearDate),
-                        getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-                    })];
-                case 1:
-                    result = _b.sent();
-                    price = result.updatedPricing[nearDate];
-                    expect(price).toBeGreaterThanOrEqual(basePrice);
-                    expect(price).toBeLessThanOrEqual(Math.round(133));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-    it('strongly increases price with 50% availability and date is near', function () { return __awaiter(void 0, void 0, void 0, function () {
-        var result, price;
-        var _a;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0: return [4 /*yield*/, (0, dynamicPricingService_1.calculateDynamicPricing)({
-                        currentPricing: (_a = {}, _a[nearDate] = basePrice, _a),
-                        dynamicPricing: baseDynamicPricing(),
-                        existingBasePriceMap: {},
-                        company: mockCompany,
-                        roomTypeId: 'roomType1',
-                        companyId: 'comp1',
-                        getRoomTypesAvailability: mockGetRoomTypesAvailability(5, nearDate),
-                        getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
-                    })];
-                case 1:
-                    result = _b.sent();
-                    price = result.updatedPricing[nearDate];
-                    expect(price).toBeGreaterThanOrEqual(basePrice);
-                    expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.4));
-                    return [2 /*return*/];
-            }
-        });
-    }); });
-});
+// import moment from 'moment'
+// import { calculateDynamicPricing } from '../../dynamicPricingService/dynamicPricingService'
+// import { ICompany, IRoomTypePricePlanPricingInformation, IDynamicPricing, DYNAMIC_PRICING_TYPE } from '../../../interfaces'
+// describe('calculateDynamicPricing', () => {
+//   const today = moment().startOf('day')
+//   const nearDate = today.clone().add(7, 'days').format('YYYY-MM-DD')
+//   const farDate = today.clone().add(60, 'days').format('YYYY-MM-DD')
+//   const basePrice = 100
+//   const baseDynamicPricing = (overrides: Partial<IDynamicPricing> = {}): IDynamicPricing => ({
+//     isActive: true,
+//     basePrice: {},
+//     startDate: today.format('YYYY-MM-DD'),
+//     endDate: farDate,
+//     type: DYNAMIC_PRICING_TYPE.INCREASE,
+//     amount: 20,
+//     ...overrides,
+//   })
+//   const mockCompany: ICompany = {
+//     id: 'comp1',
+//     holidays: [],
+//   } as any
+//   const mockGetRoomTypesAvailability = (available: number, date: string) =>
+//     jest.fn().mockResolvedValue({
+//       roomType1: {
+//         availability: {
+//           [date]: available,
+//         },
+//       },
+//     })
+//   const mockGetRoomsByCompanyId = (count: number) =>
+//     jest.fn().mockResolvedValue({
+//       list: Array(count).fill({ roomTypeId: 'roomType1' }),
+//     })
+//   it('applies holiday dynamic pricing if date is near holiday', async () => {
+//     const holidayDate = moment(today).add(1, 'day').format('YYYY-MM-DD')
+//     const companyWithHoliday: ICompany = {
+//       id: 'comp1',
+//       holidays: [{ date: holidayDate, enableDynamicPricing: true }],
+//     } as any
+//     const pricing: IRoomTypePricePlanPricingInformation = {
+//       [holidayDate]: 100,
+//     }
+//     const result = await calculateDynamicPricing({
+//       currentPricing: pricing,
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: companyWithHoliday,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(1, holidayDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     expect(result.updatedPricing[holidayDate]).toBeGreaterThan(100)
+//   })
+//   it('keeps price near base when availability is 100% and date is far', async () => {
+//     const result = await calculateDynamicPricing({
+//       currentPricing: { [farDate]: basePrice },
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: mockCompany,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(10, farDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     const price = result.updatedPricing[farDate]
+//     expect(price).toBeGreaterThanOrEqual(basePrice)
+//     expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.1))
+//   })
+//   it('increases price moderately with 50% availability and date is far', async () => {
+//     const result = await calculateDynamicPricing({
+//       currentPricing: { [farDate]: basePrice },
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: mockCompany,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(5, farDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     const price = result.updatedPricing[farDate]
+//     expect(price).toBeGreaterThanOrEqual(basePrice)
+//     expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.4))
+//   })
+//   it('maximizes price with 1 room left and date is far', async () => {
+//     const result = await calculateDynamicPricing({
+//       currentPricing: { [farDate]: basePrice },
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: mockCompany,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(1, farDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(50),
+//     })
+//     const price = result.updatedPricing[farDate]
+//     expect(price).toBeGreaterThanOrEqual(basePrice)
+//     expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.5))
+//   })
+//   it('slightly increases price with 100% availability and date is near', async () => {
+//     const result = await calculateDynamicPricing({
+//       currentPricing: { [nearDate]: basePrice },
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: mockCompany,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(10, nearDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     const price = result.updatedPricing[nearDate]
+//     expect(price).toBeGreaterThanOrEqual(basePrice)
+//     expect(price).toBeLessThanOrEqual(Math.round(133))
+//   })
+//   it('strongly increases price with 50% availability and date is near', async () => {
+//     const result = await calculateDynamicPricing({
+//       currentPricing: { [nearDate]: basePrice },
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: mockCompany,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(5, nearDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     const price = result.updatedPricing[nearDate]
+//     expect(price).toBeGreaterThanOrEqual(basePrice)
+//     expect(price).toBeLessThanOrEqual(Math.round(basePrice * 1.4))
+//   })
+//   it('reverts to base price when dynamic pricing is turned off', async () => {
+//     const dateStr = today.clone().add(1, 'day').format('YYYY-MM-DD')
+//     const result = await calculateDynamicPricing({
+//       currentPricing: { [dateStr]: 130 },
+//       dynamicPricing: baseDynamicPricing({ isActive: false }),
+//       existingBasePriceMap: { [dateStr]: 100 },
+//       company: {
+//         id: 'comp1',
+//         holidays: [{ date: dateStr, enableDynamicPricing: true }],
+//       } as any,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(3, dateStr),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     expect(result.updatedPricing[dateStr]).toBe(100)
+//   })
+//   it('does not apply dynamic pricing if holiday has enableDynamicPricing: false', async () => {
+//     const holidayDate = today.clone().add(1, 'day').format('YYYY-MM-DD')
+//     const companyWithHoliday: ICompany = {
+//       id: 'comp1',
+//       holidays: [{ date: holidayDate, enableDynamicPricing: false }],
+//     } as any
+//     const pricing: IRoomTypePricePlanPricingInformation = {
+//       [holidayDate]: 100,
+//     }
+//     const result = await calculateDynamicPricing({
+//       currentPricing: pricing,
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: companyWithHoliday,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(1, holidayDate),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     expect(result.updatedPricing[holidayDate]).toBe(100)
+//   })
+//   it('only changes pricing for 3 days around enabled holiday', async () => {
+//     const holiday = today.clone().add(10, 'days')
+//     const dayBefore = holiday.clone().subtract(1, 'day').format('YYYY-MM-DD')
+//     const dayOf = holiday.format('YYYY-MM-DD')
+//     const dayAfter = holiday.clone().add(1, 'day').format('YYYY-MM-DD')
+//     const unrelated = today.clone().add(20, 'days').format('YYYY-MM-DD')
+//     const pricing: IRoomTypePricePlanPricingInformation = {
+//       [dayBefore]: 100,
+//       [dayOf]: 100,
+//       [dayAfter]: 100,
+//       [unrelated]: 100,
+//     }
+//     const result = await calculateDynamicPricing({
+//       currentPricing: pricing,
+//       dynamicPricing: baseDynamicPricing(),
+//       existingBasePriceMap: {},
+//       company: {
+//         id: 'comp1',
+//         holidays: [{ date: dayOf, enableDynamicPricing: true }],
+//       } as any,
+//       roomTypeId: 'roomType1',
+//       companyId: 'comp1',
+//       getRoomTypesAvailability: mockGetRoomTypesAvailability(1, dayOf),
+//       getRoomsByCompanyId: mockGetRoomsByCompanyId(10),
+//     })
+//     expect(result.updatedPricing[unrelated]).toBe(100)
+//     expect(result.updatedPricing[dayBefore]).toBeGreaterThan(100)
+//     expect(result.updatedPricing[dayOf]).toBeGreaterThan(100)
+//     expect(result.updatedPricing[dayAfter]).toBeGreaterThan(100)
+//   })
+// })
 //# sourceMappingURL=bookingService.calculateDynamic.test.js.map

package/lib/services/bookingService/__tests__/bookingService.calculateDynamic.test.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"bookingService.calculateDynamic.test.js","sourceRoot":"","sources":["../../../../src/services/bookingService/__tests__/bookingService.calculateDynamic.test.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;~~AAAA,~~kDAA2B~~;~~AAC3B~~,~~2FAA2F~~;~~AAC3F~~,~~kDAA2H~~;~~AAE3H~~,~~QAAQ~~,~~CAAC~~,~~yBAAyB~~,~~EAAE~~;~~IAClC~~,~~IAAM~~,~~KAAK~~,~~GAAG~~,~~IAAA,gBAAM,GAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA~~;~~IACrC~~,~~IAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA~~;~~IAClE~~,~~IAAM,OAAO,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA~~;~~IAClE~~,~~IAAM,SAAS,GAAG,GAAG,CAAA~~;~~IAErB~~,~~IAAM,~~kBAAkB~~,GAAG,UAAC,SAAwC~~;~~QAAxC~~,~~0BAAA,EAAA,cAAwC~~;~~QAAsB~~,~~OAAA,YACxF,QAAQ,EAAE,IAAI,EACd,SAAS,EAAE,EAAE,EACb,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,EACrC,~~OAAO,~~EAAE~~,~~OAAO~~,~~EAChB~~,~~IAAI~~,~~EAAE~~,~~iCAAoB~~,~~CAAC~~,~~QAAQ,EACnC,MAAM,EAAE,EAAE,IACP,SAAS,EACZ~~;~~IARwF~~,~~CAQxF,CAAA~~;~~IAEF~~,~~IAAM,~~WAAW~~,GAAa~~;~~QAC5B~~,~~EAAE,EAAE,OAAO~~;~~QACX~~,~~QAAQ,EAAE,EAAE~~;~~KACN~~,~~CAAA~~;~~IAER~~,~~IAAM,4BAA4B,GAAG,UAAC,SAAiB,EAAE,IAAY;;QACnE,OAAA,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC~~;~~YAC1B~~,SAAS,~~EAAE~~;~~gBACT~~,~~YAAY~~;~~oBACV~~,~~GAAC~~,~~IAAI,IAAG,SAAS~~;~~uBAClB;aACF;SACF~~,~~CAAC~~;~~IANF~~,~~CAME,CAAA~~;~~IAEJ~~,~~IAAM,uBAAuB,GAAG,UAAC,KAAa~~;~~QAC5C~~,~~OAAA,IAAI,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC~~;~~YAC1B~~,~~IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC~~;~~SACrD~~,~~CAAC~~;~~IAFF~~,~~CAEE,CAAA~~;~~IAEJ~~,~~0EAA0E~~;~~IAC1E~~,~~mDAAmD~~;~~IACnD~~,~~6DAA6D~~;~~IAC7D,+DAA+D;IAC/D~~,~~kEAAkE~~;~~IAClE~~,4BAA4B;~~IAC5B,+BAA+B~~;~~IAC/B~~,~~0BAA0B~~;~~IAC1B~~,~~6FAA6F~~;~~IAC7F~~,~~wDAAwD~~;~~IACxD~~,OAAO;~~IAEP~~,~~uEAAuE~~;~~IACvE~~,~~KAAK~~;~~IAEL~~,~~EAAE~~,~~CAAC~~,~~yDAAyD~~,~~EAAE;;;;;;oBACtD,WAAW,GAAG,IAAA,gBAAM,EAAC,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA~~;~~oBAC9D~~,~~kBAAkB,GAAa~~;~~wBACnC~~,~~EAAE,EAAE,OAAO~~;~~wBACX~~,~~QAAQ,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,EAAE,IAAI,EAAE,CAAC~~;~~qBACvD~~,~~CAAA~~;~~oBAEF~~,~~OAAO~~;~~wBACX~~,~~GAAC,WAAW,IAAG,GAAG~~;~~2BACnB~~,~~CAAA~~;~~oBAEc~~,~~qBAAM,IAAA,+CAAuB,EAAC~~;~~4BAC3C~~,~~cAAc,EAAE,~~OAAO;~~4BACvB~~,~~cAAc~~,~~EAAE~~,~~kBAAkB,EAAE~~;~~4BACpC~~,~~oBAAoB,EAAE,EAAE~~;~~4BACxB~~,~~OAAO,EAAE,kBAAkB~~;~~4BAC3B~~,~~UAAU,EAAE,WAAW~~;~~4BACvB~~,~~SAAS,EAAE,OAAO~~;~~4BAClB~~,~~wBAAwB,EAAE,~~4BAA4B,~~CAAC~~,~~CAAC,EAAE,WAAW,CAAC~~;~~4BACtE~~,~~mBAAmB,EAAE,uBAAuB,CAAC,EAAE,CAAC~~;~~yBACjD~~,~~CAAC,EAAA;;oBATI,MAAM,GAAG,SASb~~;~~oBAEF~~,~~MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,eAAe,CAAC,GAAG,CAAC,CAAA;;;;SAChE,CAAC,CAAA~~;~~IAEF~~,~~4FAA4F~~;~~IAC5F~~,~~mDAAmD~~;~~IACnD~~,~~6DAA6D~~;~~IAC7D,+DAA+D;IAC/D~~,~~kEAAkE~~;~~IAClE~~,~~4BAA4B~~;~~IAC5B,+BAA+B;IAC/B~~,~~0BAA0B~~;~~IAC1B~~,~~6FAA6F~~;~~IAC7F~~,~~wDAAwD~~;~~IACxD~~,~~OAAO~~;~~IAEP~~,~~uEAAuE~~;~~IACvE~~,~~KAAK~~;~~IAEL~~,~~EAAE,CAAC,iEAAiE,EAAE;;;;;wBACrD,qBAAM,IAAA,+CAAuB,EAAC~~;~~wBAC3C~~,~~cAAc,YAAI,GAAC,OAAO,IAAG,~~SAAS,~~KAAE~~;~~wBACxC~~,~~cAAc,EAAE,kBAAkB,EAAE~~;~~wBACpC~~,~~oBAAoB,EAAE,EAAE~~;~~wBACxB~~,OAAO,~~EAAE~~,~~WAAW~~;~~wBACpB~~,~~UAAU~~,~~EAAE~~,~~WAAW~~;~~wBACvB~~,~~SAAS~~,~~EAAE,OAAO~~;~~wBAClB~~,~~wBAAwB,EAAE,~~4BAA4B,~~CAAC~~,~~EAAE~~,~~EAAE~~,~~OAAO,CAAC~~;~~wBACnE~~,~~mBAAmB,EAAE,uBAAuB,CAAC,EAAE,CAAC~~;~~qBACjD~~,~~CAAC,EAAA;;oBATI,MAAM,GAAG,SASb~~;~~oBAEI~~,~~KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,~~OAAO,~~CAAC~~,~~CAAA~~;~~oBAC5C~~,~~MAAM~~,~~CAAC~~,~~KAAK~~,~~CAAC~~,~~CAAC~~,~~sBAAsB~~,~~CAAC~~,~~SAAS,CAAC,CAAA~~;~~oBAC/C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,~~SAAS,~~GAAG~~,~~GAAG,CAAC,CAAC,CAAA;;;;SAC/D,CAAC,CAAA~~;~~IAEF~~,~~EAAE,CAAC,kEAAkE,EAAE;;;;;wBACtD,qBAAM,IAAA,+CAAuB,EAAC~~;~~wBAC3C~~,~~cAAc,YAAI,GAAC,~~OAAO~~,IAAG,SAAS,KAAE~~;~~wBACxC~~,~~cAAc,EAAE,kBAAkB,EAAE~~;~~wBACpC~~,~~oBAAoB,EAAE,EAAE~~;~~wBACxB~~,~~OAAO,EAAE,WAAW~~;~~wBACpB~~,~~UAAU,EAAE,WAAW~~;~~wBACvB~~,~~SAAS,EAAE,OAAO~~;~~wBAClB~~,~~wBAAwB,EAAE,4BAA4B,CAAC,CAAC,EAAE,OAAO,CAAC~~;~~wBAClE~~,mBAAmB,~~EAAE,~~uBAAuB,~~CAAC~~,~~EAAE~~,~~CAAC~~;~~qBACjD~~,~~CAAC,EAAA;;oBATI,MAAM,GAAG,SASb~~;~~oBAEI~~,~~KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA~~;~~oBAC5C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAA~~;~~oBAC/C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,~~SAAS~~,GAAG,GAAG,CAAC,CAAC,CAAA;;;;SAC/D,CAAC,CAAA~~;~~IAEF~~,~~EAAE,CAAC,kDAAkD,EAAE;;;;;wBACtC,qBAAM,IAAA,+CAAuB,EAAC~~;~~wBAC3C~~,~~cAAc,YAAI,GAAC,~~OAAO,~~IAAG~~,~~SAAS,KAAE~~;~~wBACxC~~,~~cAAc,EAAE,kBAAkB,EAAE~~;~~wBACpC~~,~~oBAAoB,EAAE,EAAE~~;~~wBACxB~~,~~OAAO,EAAE,WAAW~~;~~wBACpB~~,~~UAAU,EAAE,WAAW~~;~~wBACvB~~,~~SAAS,EAAE,OAAO~~;~~wBAClB~~,~~wBAAwB,EAAE,~~4BAA4B,~~CAAC~~,~~CAAC~~,~~EAAE~~,~~OAAO~~,~~CAAC~~;~~wBAClE~~,~~mBAAmB~~,~~EAAE~~,~~uBAAuB,CAAC,EAAE,CAAC~~;~~qBACjD~~,~~CAAC,EAAA;;oBATI,MAAM,GAAG,SASb~~;~~oBAEI~~,~~KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA~~;~~oBAC5C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,~~SAAS,~~CAAC~~,~~CAAA~~;~~oBAC~~/C,~~MAAM~~,~~CAAC~~,~~KAAK,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAA;;;;SAC/D,CAAC,CAAA~~;~~IAEF~~,~~EAAE,CAAC,kEAAkE,EAAE;;;;;wBACtD,qBAAM,IAAA,+CAAuB,EAAC~~;~~wBAC3C~~,~~cAAc,YAAI,GAAC,QAAQ,IAAG,SAAS,KAAE~~;~~wBACzC~~,~~cAAc,EAAE,kBAAkB,EAAE~~;~~wBACpC~~,~~oBAAoB,EAAE,EAAE~~;~~wBACxB~~,~~OAAO,EAAE,WAAW~~;~~wBACpB~~,~~UAAU,EAAE,WAAW~~;~~wBACvB~~,~~SAAS,EAAE,OAAO~~;~~wBAClB~~,~~wBAAwB,EAAE,4BAA4B,CAAC,EAAE,EAAE,~~QAAQ~~,CAAC~~;~~wBACpE~~,~~mBAAmB,EAAE,uBAAuB,CAAC,EAAE,CAAC~~;~~qBACjD~~,~~CAAC,EAAA;;oBATI,MAAM,GAAG,SASb~~;~~oBAEI~~,~~KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA~~;~~oBAC7C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAA~~;~~oBAC/C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,~~mBAAmB~~,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAA;;;;SACnD,CAAC,CAAA~~;~~IAEF~~,~~EAAE,CAAC,iEAAiE,EAAE;;;;;wBACrD,qBAAM,IAAA,+CAAuB,EAAC~~;~~wBAC3C~~,~~cAAc,YAAI,GAAC,QAAQ,IAAG,SAAS,KAAE~~;~~wBACzC~~,~~cAAc,EAAE,~~kBAAkB,~~EAAE~~;~~wBACpC~~,~~oBAAoB,EAAE,EAAE~~;~~wBACxB~~,~~OAAO,EAAE,WAAW~~;~~wBACpB~~,~~UAAU,EAAE,WAAW~~;~~wBACvB~~,SAAS~~,EAAE,OAAO~~;~~wBAClB~~,~~wBAAwB,EAAE,4BAA4B,CAAC,CAAC,EAAE,QAAQ,CAAC~~;~~wBACnE~~,~~mBAAmB,EAAE,uBAAuB,CAAC,EAAE,CAAC~~;~~qBACjD~~,~~CAAC,EAAA;;oBATI,MAAM,GAAG,SASb~~;~~oBAEI~~,~~KAAK,GAAG,MAAM,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAA~~;~~oBAC7C~~,~~MAAM,CAAC,KAAK,CAAC,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAA~~;~~oBAC/C~~,~~MAAM,CAAC,~~KAAK~~,CAAC,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAA;;;;SAC/D,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA~~"}
1	+ {"version":3,"file":"bookingService.calculateDynamic.test.js","sourceRoot":"","sources":["../../../../src/services/bookingService/__tests__/bookingService.calculateDynamic.test.ts"],"names":[],"mappings":"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"}

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

@@ -16,3 +16,7 @@ export declare const calculateDynamicPricing: ({ currentPricing, dynamicPricing,
     updatedPricing: IRoomTypePricePlanPricingInformation;
     updatedBasePriceMap: Record<string, number>;
 }>;
+export declare const getDynamicMultiplier: ({ availabilityRatio, isNearFuture, }: {
+    availabilityRatio: number;
+    isNearFuture: boolean;
+}) => number;

package/lib/services/dynamicPricingService/dynamicPricingService.js CHANGED Viewed

@@ -50,21 +50,27 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateDynamicPricing = void 0;
+exports.getDynamicMultiplier = 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, rawPrice;
+    var basePriceMap, resultPricing, period, _c, roomTypesAvailability, roomsData, roomTypeAvailability, totalRooms, holidayDateSet, today, _i, period_1, dateStr, date, current, base, availableRooms, availabilityRatio, leadTimeDays, isNearHoliday, isNearFuture, isAffectedHoliday, baseForToday, occupancyMultiplier, leadTimeMultiplier, rawPrice, cappedPrice, expected;
+    var _d, _e, _f, _g, _h;
     var currentPricing = _b.currentPricing, dynamicPricing = _b.dynamicPricing, existingBasePriceMap = _b.existingBasePriceMap, company = _b.company, roomTypeId = _b.roomTypeId, companyId = _b.companyId, getRoomTypesAvailability = _b.getRoomTypesAvailability, getRoomsByCompanyId = _b.getRoomsByCompanyId;
-    return __generator(this, function (_c) {
-        switch (_c.label) {
+    return __generator(this, function (_j) {
+        switch (_j.label) {
             case 0:
                 basePriceMap = __assign(__assign({}, dynamicPricing.basePrice), existingBasePriceMap);
                 resultPricing = {};
                 period = Object.keys(currentPricing);
-                return [4 /*yield*/, Promise.all([getRoomTypesAvailability(companyId, [roomTypeId], { period: period }), getRoomsByCompanyId(companyId)])];
+                return [4 /*yield*/, Promise.all([
+                        getRoomTypesAvailability(companyId, [roomTypeId], { period: period }),
+                        getRoomsByCompanyId(companyId),
+                    ])];
             case 1:
-                _c.sent();
+                _c = _j.sent(), roomTypesAvailability = _c[0], roomsData = _c[1];
+                roomTypeAvailability = (_e = (_d = roomTypesAvailability === null || roomTypesAvailability === void 0 ? void 0 : roomTypesAvailability[roomTypeId]) === null || _d === void 0 ? void 0 : _d.availability) !== null && _e !== void 0 ? _e : {};
+                totalRooms = ((_f = roomsData === null || roomsData === void 0 ? void 0 : roomsData.list) === null || _f === void 0 ? void 0 : _f.filter(function (r) { return (r === null || r === void 0 ? void 0 : r.roomTypeId) === roomTypeId; }).length) || 1;
                 holidayDateSet = new Set((company.holidays || [])
                     .filter(function (h) { return h.enableDynamicPricing; })
                     .flatMap(function (h) { return [
@@ -72,26 +78,40 @@ var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], voi
                     (0, moment_1.default)(h.date).format('YYYY-MM-DD'),
                     (0, moment_1.default)(h.date).add(1, 'day').format('YYYY-MM-DD'),
                 ]; }));
+                today = (0, moment_1.default)();
                 for (_i = 0, period_1 = period; _i < period_1.length; _i++) {
                     dateStr = period_1[_i];
                     date = (0, moment_1.default)((0, dateService_1.normalizeDate)(dateStr));
                     if (!date.isValid())
                         continue;
                     current = currentPricing[dateStr];
-                    if (!(dateStr in basePriceMap)) {
-                        basePriceMap[dateStr] = current;
-                    }
-                    baseForToday = basePriceMap[dateStr];
+                    base = (_g = basePriceMap[dateStr]) !== null && _g !== void 0 ? _g : current;
+                    availableRooms = (_h = roomTypeAvailability[dateStr]) !== null && _h !== void 0 ? _h : 0;
+                    availabilityRatio = availableRooms / totalRooms;
+                    leadTimeDays = date.diff(today, 'days');
+                    isNearHoliday = leadTimeDays <= 7;
+                    isNearFuture = leadTimeDays < 30;
                     isAffectedHoliday = holidayDateSet.has(dateStr);
-                    if (dynamicPricing.isActive && isAffectedHoliday) {
-                        rawPrice = baseForToday + (dynamicPricing.amount || Math.round(baseForToday * 0.05));
-                        if (rawPrice > baseForToday + 70) {
-                            rawPrice = baseForToday + 70;
+                    if (isAffectedHoliday) {
+                        if (!(dateStr in basePriceMap)) {
+                            basePriceMap[dateStr] = base;
                         }
-                        resultPricing[dateStr] = Math.round(rawPrice);
+                        baseForToday = basePriceMap[dateStr];
+                        occupancyMultiplier = (0, exports.getDynamicMultiplier)({ availabilityRatio: availabilityRatio, isNearFuture: isNearFuture });
+                        leadTimeMultiplier = leadTimeDays >= 60 ? 1.0 : 1 + (60 - leadTimeDays) * 0.005;
+                        rawPrice = baseForToday * occupancyMultiplier * leadTimeMultiplier;
+                        cappedPrice = isNearHoliday && availableRooms <= 1
+                            ? Math.min(rawPrice, baseForToday + 70)
+                            : Math.min(rawPrice, baseForToday * 1.45);
+                        resultPricing[dateStr] = Math.round(cappedPrice);
+                    }
+                    else if (!dynamicPricing.isActive && base !== undefined) {
+                        resultPricing[dateStr] = base;
                     }
                     else {
-                        resultPricing[dateStr] = baseForToday;
+                        expected = base ? Math.round(base * (0, exports.getDynamicMultiplier)({ availabilityRatio: availabilityRatio, isNearFuture: isNearFuture })) : current;
+                        resultPricing[dateStr] =
+                            current === expected || current === Math.round((base !== null && base !== void 0 ? base : 0) * 1.2) ? (base !== null && base !== void 0 ? base : current) : current;
                     }
                 }
                 return [2 /*return*/, {
@@ -102,4 +122,15 @@ var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], voi
     });
 }); };
 exports.calculateDynamicPricing = calculateDynamicPricing;
+var getDynamicMultiplier = function (_a) {
+    var availabilityRatio = _a.availabilityRatio, isNearFuture = _a.isNearFuture;
+    if (availabilityRatio <= 0.02)
+        return isNearFuture ? 1.5 : 1.4;
+    if (availabilityRatio <= 0.5)
+        return isNearFuture ? 1.4 : 1.2;
+    if (availabilityRatio < 1)
+        return isNearFuture ? 1.2 : 1.05;
+    return isNearFuture ? 1.1 : 1.0;
+};
+exports.getDynamicMultiplier = getDynamicMultiplier;
 //# sourceMappingURL=dynamicPricingService.js.map

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

	@@ -1 +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,EAkB7C;;QAjBC,cAAc,oBAAA,EACd,cAAc,oBAAA,EACd,oBAAoB,0BAAA,EACpB,OAAO,aAAA,EACP,UAAU,gBAAA,EACV,SAAS,eAAA,EACT,wBAAwB,8BAAA,EACxB,mBAAmB,yBAAA;;;;gBAcb,YAAY,yBAAQ,cAAc,CAAC,SAAS,GAAK,oBAAoB,CAAE,CAAA;gBACvE,aAAa,GAAyC,EAAE,CAAA;gBAExD,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,cAAc,CAAC,CAAA;~~gBAE1C~~,qBAAM,OAAO,CAAC,GAAG,CAAC,~~CAAC,~~wBAAwB,CAAC,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,QAAA,EAAE,CAAC,EAAE,~~mBAAmB~~,CAAC,SAAS,CAAC,CAAC,CAAC,~~EAAA;;gBAAlH~~,~~SAAkH~~,CAAA;~~gBAE5G~~,cAAc,GAAG,IAAI,GAAG,CAC5B,CAAC,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;qBACrB,MAAM,CAAC,UAAC,CAAC,IAAK,OAAA,CAAC,CAAC,oBAAoB,EAAtB,CAAsB,CAAC;qBACrC,OAAO,CAAC,UAAC,CAAC,IAAK,OAAA;oBACd,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;oBACtD,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;oBACnC,IAAA,gBAAM,EAAC,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC;iBAClD,EAJe,CAIf,CAAC,CACL,CAAA;~~gBAED~~,WAA4B,EAAN,iBAAM,EAAN,oBAAM,EAAN,IAAM,EAAE,CAAC;oBAApB,OAAO;oBACV,IAAI,GAAG,IAAA,gBAAM,EAAC,IAAA,2BAAa,EAAC,OAAO,CAAC,CAAC,CAAA;oBAC3C,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;wBAAE,SAAQ;oBAEvB,OAAO,GAAG,cAAc,CAAC,OAAO,CAAC,CAAA;~~oBAEvC~~,IAAI,CAAC,CAAC,OAAO,~~IAAI~~,~~YAAY~~,CAAC,~~EAAE~~,CAAC;~~wBAC~~/B,YAAY,CAAC,~~OAAO~~,CAAC,~~GAAG~~,~~OAAO~~,CAAA;~~oBACjC~~,CAAC;~~oBAEK~~,YAAY,GAAG,YAAY,~~CAAC~~,~~OAAO~~,~~CAAC,~~CAAA;~~oBACpC~~,iBAAiB,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;oBAErD,IAAI,~~cAAc~~,CAAC,~~QAAQ~~,IAAI,~~iBAAiB~~,EAAE,CAAC;~~wBAC7C~~,~~QAAQ~~,GAAG,YAAY,GAAG,CAAC,~~cAAc~~,CAAC,~~MAAM~~,~~IAAI~~,~~IAAI~~,~~CAAC~~,~~KAAK~~,~~CAAC~~,YAAY,GAAG,IAAI,CAAC,CAAC,CAAA;~~wBAExF~~,~~IAAI,~~QAAQ,GAAG,YAAY,GAAG,~~EAAE~~,~~EAAE~~,CAAC;~~4BACjC~~,~~QAAQ~~,GAAG,YAAY,GAAG,EAAE,~~CAAA~~;~~wBAC9B~~,CAAC;~~wBAED~~,aAAa,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAA;oBAC/C,CAAC;yBAAM,CAAC;~~wBACN~~,aAAa,CAAC,OAAO,CAAC,GAAG,~~YAAY~~,CAAA;~~oBACvC~~,CAAC;gBACH,CAAC;gBAED,sBAAO;wBACL,cAAc,EAAE,aAAa;wBAC7B,mBAAmB,EAAE,YAAY;qBAClC,EAAA;;;KACF,CAAA;~~AArEY~~,QAAA,uBAAuB,~~2BAqEnC~~"}
1	+ {"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

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