@chevre/domain 22.9.0-alpha.97 → 22.9.0-alpha.98

package/example/src/moment.ts

@@ -1,21 +1,22 @@
 // tslint:disable:no-console
-import * as moment from 'moment-timezone';
+import * as moment from 'moment';
 
-const importFrom = '2024-04-23T22:45:00.414Z';
-const importThrough = '2024-04-25T22:45:00.414Z';
-const targetImportFrom = moment(importFrom)
-    .tz('Asia/Tokyo')
-    .startOf('day');
-const targetImportThrough = moment(importThrough)
-    .tz('Asia/Tokyo')
-    .endOf('day');
-console.log(targetImportFrom.toDate(), targetImportThrough.toDate());
+const eventStartDate = '2025-04-10T01:00:00Z';
+// const timeFormat = 'HH:mm:ssZ';
+const time = '00:00:00+09:00';
+// const time = '00:00:00Z';
 
-const targetImportFrom2 = moment(`${moment(importFrom)
-    .tz('Asia/Tokyo')
-    .format('YYYY-MM-DD')}T00:00:00+09:00`);
-const targetImportThrough2 = moment(`${moment(importThrough)
-    .tz('Asia/Tokyo')
-    .format('YYYY-MM-DD')}T00:00:00+09:00`)
-    .add(1, 'day');
-console.log(targetImportFrom2.toDate(), targetImportThrough2.toDate());
+// tslint:disable-next-line:no-magic-numbers
+const offset = time.slice(8);
+console.log('offset:', offset);
+
+// const opensMoment = moment(time, timeFormat, true);
+// const utcOffset = opensMoment.utcOffset();
+
+// const eventStartDateMoment = moment.utc(eventStartDate);
+const eventStartDateMoment = moment(eventStartDate, true);
+console.log(eventStartDateMoment);
+console.log(eventStartDateMoment.utcOffset(offset));
+
+const usageDate = moment(`${eventStartDateMoment.format('YYYY-MM-DD')}T${time}`, true);
+console.log(usageDate);

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.js

@@ -259,7 +259,7 @@ function validateQuantityRequirement(params) {
  * 事前予約要件を検証する
  */
 function validateAdvanceBookingRequirement(params) {
-    var _a;
+    var _a, _b;
     let requirementSatisfied = true;
     // reimplement using advanceBookingRequirementRepo(2025-04-08~)
     const advanceBookingRequirementId = (_a = params.unitPriceOffer.advanceBookingRequirement) === null || _a === void 0 ? void 0 : _a.id;
@@ -271,7 +271,18 @@ function validateAdvanceBookingRequirement(params) {
         const advanceBookingRequirementMaxValue = advanceBookingRequirement.maxValue;
         const advanceBookingRequirementMinValue = advanceBookingRequirement.minValue;
         const advanceBookingRequirementUnitCode = advanceBookingRequirement.unitCode;
-        const usageDate = moment(params.reservationFor.startDate);
+        const valueReferenceOpens = (_b = advanceBookingRequirement.valueReference) === null || _b === void 0 ? void 0 : _b.opens;
+        let usageDate = moment(params.reservationFor.startDate, true);
+        if (typeof valueReferenceOpens === 'string') {
+            // support valueReference(2025-04-10~)
+            // tslint:disable-next-line:no-magic-numbers
+            const opensOffset = valueReferenceOpens.slice(8); // format: HH:mm:ssZ
+            // tslint:disable-next-line:no-console
+            debug('opensOffset:', opensOffset);
+            usageDate = usageDate.utcOffset(opensOffset);
+            usageDate = moment(`${usageDate.format('YYYY-MM-DD')}T${valueReferenceOpens}`, true);
+        }
+        debug('usageDate:', usageDate);
         if (typeof advanceBookingRequirementMaxValue === 'number' && typeof advanceBookingRequirementUnitCode === 'string') {
             if (advanceBookingRequirementMaxValue < 0) {
                 throw new factory.errors.NotImplemented('negative value as advanceBookingRequirement.maxValue not implemented');
@@ -280,7 +291,7 @@ function validateAdvanceBookingRequirement(params) {
                 throw new factory.errors.NotImplemented(`only ${factory.unitCode.Day} implemented`);
             }
             const usageDateMustBeBefore = moment(params.now)
-                .add(advanceBookingRequirementMinValue, 'days');
+                .add(advanceBookingRequirementMaxValue, 'days');
             if (!usageDate.isSameOrBefore(usageDateMustBeBefore)) {
                 requirementSatisfied = false;
             }

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -31,8 +31,6 @@ function wait4payActionDelayIfNeeded(params) {
             }
         }
         if (waitingNecessary) {
-            // tslint:disable-next-line:no-console
-            console.log('wait4payActionDelayIfNeeded: waiting... minIntervalBetweenPayAndRefund:', minIntervalBetweenPayAndRefund);
             yield new Promise((resolve) => {
                 setTimeout(() => {
                     resolve();

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.9.0-alpha.97"
+  "version": "22.9.0-alpha.98"
 }