@hyper.software/common-helpers 2.2.65 → 2.2.67

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.
@@ -54,14 +54,16 @@ exports.calculateDynamicPricing = void 0;
54
54
  var moment_1 = __importDefault(require("moment"));
55
55
  var dateService_1 = require("../dateService/dateService");
56
56
  var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
57
- var basePriceMap, resultPricing, period, holidayDateSet, _i, period_1, dateStr, date, current, baseFromStore, baseForToday, isAffectedHoliday, rawPrice;
57
+ var basePriceMap, resultPricing, period, holidayDateSet, _i, period_1, dateStr, date, manualPrice, basePrice, isManual, effectiveBase, isHoliday, increase, newPrice;
58
58
  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;
59
59
  return __generator(this, function (_c) {
60
60
  switch (_c.label) {
61
61
  case 0:
62
62
  basePriceMap = __assign(__assign({}, dynamicPricing.basePrice), existingBasePriceMap);
63
63
  resultPricing = {};
64
- period = Object.keys(currentPricing);
64
+ period = Object.keys(currentPricing !== null && currentPricing !== void 0 ? currentPricing : {});
65
+ if (period.length === 0)
66
+ return [2 /*return*/, { updatedPricing: {}, updatedBasePriceMap: basePriceMap }];
65
67
  return [4 /*yield*/, Promise.all([getRoomTypesAvailability(companyId, [roomTypeId], { period: period }), getRoomsByCompanyId(companyId)])];
66
68
  case 1:
67
69
  _c.sent();
@@ -77,26 +79,30 @@ var calculateDynamicPricing = function (_a) { return __awaiter(void 0, [_a], voi
77
79
  date = (0, moment_1.default)((0, dateService_1.normalizeDate)(dateStr));
78
80
  if (!date.isValid())
79
81
  continue;
80
- current = currentPricing[dateStr];
81
- baseFromStore = existingBasePriceMap[dateStr];
82
- if (current != null && baseFromStore != null && current !== baseFromStore) {
83
- resultPricing[dateStr] = current;
82
+ manualPrice = currentPricing[dateStr] // user's input
83
+ ;
84
+ basePrice = existingBasePriceMap[dateStr] // stored original base
85
+ ;
86
+ isManual = manualPrice != null && basePrice != null && manualPrice !== basePrice;
87
+ // ✅ If user changed it → always use manual price
88
+ if (isManual || (basePrice == null && manualPrice != null)) {
89
+ resultPricing[dateStr] = manualPrice;
90
+ basePriceMap[dateStr] = manualPrice; // record it as base for future
84
91
  continue;
85
92
  }
86
- if (!(dateStr in basePriceMap)) {
87
- basePriceMap[dateStr] = current;
88
- }
89
- baseForToday = basePriceMap[dateStr];
90
- isAffectedHoliday = dynamicPricing.isActive && holidayDateSet.has(dateStr);
91
- if (isAffectedHoliday) {
92
- rawPrice = baseForToday + (dynamicPricing.amount || Math.round(baseForToday * 0.05));
93
- if (rawPrice > baseForToday + 70) {
94
- rawPrice = baseForToday + 70;
95
- }
96
- resultPricing[dateStr] = Math.round(rawPrice);
93
+ effectiveBase = basePrice != null ? basePrice : manualPrice;
94
+ if (effectiveBase == null)
95
+ continue;
96
+ basePriceMap[dateStr] = effectiveBase;
97
+ isHoliday = dynamicPricing.isActive && holidayDateSet.has(dateStr);
98
+ if (isHoliday) {
99
+ increase = dynamicPricing.amount || Math.round(effectiveBase * 0.05);
100
+ newPrice = Math.min(effectiveBase + increase, effectiveBase + 70);
101
+ resultPricing[dateStr] = Math.round(newPrice);
97
102
  }
98
103
  else {
99
- resultPricing[dateStr] = baseForToday;
104
+ // Dynamic is disabled or date is not a holiday → use base
105
+ resultPricing[dateStr] = effectiveBase;
100
106
  }
101
107
  }
102
108
  return [2 /*return*/, {
@@ -1 +1 @@
1
- {"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"dynamicPricingService.js","sourceRoot":"","sources":["../../../src/services/dynamicPricingService/dynamicPricingService.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hyper.software/common-helpers",
3
- "version": "2.2.65",
3
+ "version": "2.2.67",
4
4
  "author": "Raul Tomescu <tomescu.raul+hyper@gmail.com>",
5
5
  "description": "Hyper Software Common Javascript Helpers",
6
6
  "main": "lib/index.js",