@chevre/domain 21.2.0-alpha.64 → 21.2.0-alpha.65

package/example/src/playOnMoment.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+
+const startDate = moment('2023-05-24T16:00:00Z')
+    .toDate();
+const gracePeriodBeforeStartInDaysMin = {
+    timezone: 'Asia/Tokyo',
+    time: '18:00:00',
+    period: { value: 2 }
+};
+const returningDate = new Date();
+
+const minDate: string = moment(startDate)
+    .tz(gracePeriodBeforeStartInDaysMin.timezone)
+    .startOf('days')
+    .subtract(gracePeriodBeforeStartInDaysMin.period.value, 'days')
+    .format('YYYY-MM-DD');
+console.log('minDate:', minDate);
+
+const returnMaxDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`)
+    .tz(gracePeriodBeforeStartInDaysMin.timezone);
+console.log(returnMaxDate);
+
+console.log(returnMaxDate.isSameOrAfter(moment(returningDate)));

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnPaymentMethod.js

@@ -133,31 +133,39 @@ exports.createReturnPaymentMethodActions = createReturnPaymentMethodActions;
 function createReturnPaymentMethodIssuedThroughMovieTicketActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const order = params.order;
-        const returnFeesMovieTicket = params.transaction.object.returnPolicy.returnFeesMovieTicket;
+        const returnFeesMovieTicketByTransaction = params.transaction.object.returnPolicy.returnFeesMovieTicket;
         return Promise.all(params.order.paymentMethods
             .filter((paymentMethod) => {
             return paymentMethod.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.MovieTicket;
         })
-            // 決済カード着券取消有無設定があれば適用
+            // 決済カード着券取消有無設定を適用
             .filter((paymentMethod) => {
-            var _a;
+            // デフォルトで実行する
+            let returnPaymentMethod = true;
             const movieTicketIdentifier = paymentMethod.accountId;
-            const returnFeesMovieTicketSetting = (_a = returnFeesMovieTicket === null || returnFeesMovieTicket === void 0 ? void 0 : returnFeesMovieTicket.find((r) => r.identifier === String(movieTicketIdentifier))) === null || _a === void 0 ? void 0 : _a.returnFees;
+            const returnFeesMovieTicketSettingsByIdentifier = returnFeesMovieTicketByTransaction === null || returnFeesMovieTicketByTransaction === void 0 ? void 0 : returnFeesMovieTicketByTransaction.filter((r) => {
+                var _a;
+                return r.identifier === String(movieTicketIdentifier)
+                    && ((_a = r.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === paymentMethod.typeOf;
+            });
             // 設定がなければスルー
-            if (typeof returnFeesMovieTicketSetting !== 'string') {
-                return true;
-            }
-            // 設定があれば適用
-            switch (returnFeesMovieTicketSetting) {
-                case factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn:
-                    // 取消実行する
-                    return true;
-                case factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
-                    // 取消実行しない
-                    return false;
-                default:
-                    throw new factory.errors.NotImplemented(`returnFees ${returnFeesMovieTicketSetting} not implemented`);
+            if (Array.isArray(returnFeesMovieTicketSettingsByIdentifier) && returnFeesMovieTicketSettingsByIdentifier.length > 0) {
+                returnFeesMovieTicketSettingsByIdentifier.forEach((returnFeesMovieTicketSetting) => {
+                    const returnFeesEnumeration = returnFeesMovieTicketSetting.returnFees;
+                    switch (returnFeesEnumeration) {
+                        case factory.merchantReturnPolicy.ReturnFeesEnumeration.FreeReturn:
+                            break;
+                        // ひとつでも「取消を実行しない」に設定されていれば、実行しない
+                        case factory.merchantReturnPolicy.ReturnFeesEnumeration.ReturnFeesCustomerResponsibility:
+                            // 取消実行しない
+                            returnPaymentMethod = false;
+                            break;
+                        default:
+                            throw new factory.errors.NotImplemented(`returnFees ${returnFeesEnumeration} not implemented`);
+                    }
+                });
             }
+            return returnPaymentMethod;
         })
             .map((p) => __awaiter(this, void 0, void 0, function* () {
             const potentialActionsOnRefund = yield createReturnPaymentMethodPotentialActions({

package/lib/chevre/service/transaction/returnOrder.js

@@ -13,7 +13,7 @@ exports.exportTasksById = exports.confirm = exports.start = void 0;
 /**
  * 返品取引サービス
  */
-const moment = require("moment");
+const moment = require("moment-timezone");
 const factory = require("../../factory");
 const factory_1 = require("./returnOrder/exportTasks/factory");
 const potentialActions_1 = require("./returnOrder/potentialActions");
@@ -236,7 +236,7 @@ function findApplicableReturnPolicy(params) {
     if (params.reason === factory.transaction.returnOrder.Reason.Customer) {
         // 適用可能なポリシーにフィルター
         applicalbleReturnPolicies = returnPolicies.filter((returnPolicy) => {
-            var _a, _b, _c, _d, _e;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             let satisfyMerchantReturnDays = false;
             let offerItemCondition;
             const itemConditionId = (_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
@@ -268,6 +268,8 @@ function findApplicableReturnPolicy(params) {
             if (offerItemCondition !== undefined) {
                 let satisfyGracePeriodMaxValue = true;
                 let satisfyGracePeriodMinValue = true;
+                let satisfyGracePeriodInDaysMax = true;
+                let satisfyGracePeriodInDaysMin = true;
                 // 全イベントについて猶予の確認ができれば適用
                 const gracePeriodMaxValue = (_c = (_b = offerItemCondition.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservationFor.gracePeriodBeforeStart) === null || _c === void 0 ? void 0 : _c.maxValue;
                 const gracePeriodMinValue = (_e = (_d = offerItemCondition.itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservationFor.gracePeriodBeforeStart) === null || _e === void 0 ? void 0 : _e.minValue;
@@ -285,7 +287,36 @@ function findApplicableReturnPolicy(params) {
                             .add(gracePeriodMinValue, 'seconds'));
                     });
                 }
-                satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue;
+                const gracePeriodBeforeStartInDaysMax = (_g = (_f = offerItemCondition.itemOffered.serviceOutput) === null || _f === void 0 ? void 0 : _f.reservationFor.gracePeriodBeforeStartInDays) === null || _g === void 0 ? void 0 : _g.max;
+                if (typeof (gracePeriodBeforeStartInDaysMax === null || gracePeriodBeforeStartInDaysMax === void 0 ? void 0 : gracePeriodBeforeStartInDaysMax.period.value) === 'number'
+                    && typeof gracePeriodBeforeStartInDaysMax.time === 'string') {
+                    satisfyGracePeriodInDaysMax = params.events.every((event) => {
+                        const minDate = moment(event.startDate)
+                            .tz(gracePeriodBeforeStartInDaysMax.timezone)
+                            .startOf('days')
+                            .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
+                            .format('YYYY-MM-DD');
+                        const returnMinDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMax.time}`)
+                            .tz(gracePeriodBeforeStartInDaysMax.timezone);
+                        return returnMinDate.isSameOrBefore(moment(returningDate));
+                    });
+                }
+                const gracePeriodBeforeStartInDaysMin = (_j = (_h = offerItemCondition.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservationFor.gracePeriodBeforeStartInDays) === null || _j === void 0 ? void 0 : _j.min;
+                if (typeof (gracePeriodBeforeStartInDaysMin === null || gracePeriodBeforeStartInDaysMin === void 0 ? void 0 : gracePeriodBeforeStartInDaysMin.period.value) === 'number'
+                    && typeof gracePeriodBeforeStartInDaysMin.time === 'string') {
+                    satisfyGracePeriodInDaysMin = params.events.every((event) => {
+                        const minDate = moment(event.startDate)
+                            .tz(gracePeriodBeforeStartInDaysMin.timezone)
+                            .startOf('days')
+                            .subtract(gracePeriodBeforeStartInDaysMin.period.value, 'days')
+                            .format('YYYY-MM-DD');
+                        const returnMaxDate = moment(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`)
+                            .tz(gracePeriodBeforeStartInDaysMin.timezone);
+                        return returnMaxDate.isSameOrAfter(moment(returningDate));
+                    });
+                }
+                satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue
+                    && satisfyGracePeriodInDaysMax && satisfyGracePeriodInDaysMin;
             }
             return satisfyMerchantReturnDays && satisfyItemCondition;
         });
@@ -402,7 +433,8 @@ function validateOffersReturnPolicy(params) {
                         component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
                             returnFeesMovieTicket.push({
                                 identifier: String(appliesToMovieTicket.identifier),
-                                returnFees: policyByOffer.customerRemorseReturnFeesMovieTicket
+                                returnFees: policyByOffer.customerRemorseReturnFeesMovieTicket,
+                                serviceOutput: { typeOf: appliesToMovieTicket.serviceOutput.typeOf }
                             });
                         });
                     }

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.6",
+    "@chevre/factory": "4.313.0-alpha.8",
     "@cinerino/sdk": "3.156.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.64"
+  "version": "21.2.0-alpha.65"
 }