@chevre/domain 21.6.0-alpha.8 → 21.6.0-alpha.9

package/example/src/chevre/migrateMovieAvailabilityStarts.ts

@@ -24,6 +24,7 @@ async function main() {
     let i = 0;
     let updateCount = 0;
     let datePublishedUndefinedCount = 0;
+    let datePublishedIsAfterNowCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const movie: chevre.factory.creativeWork.movie.ICreativeWork = doc.toObject();
@@ -38,6 +39,14 @@ async function main() {
 
         if (alreadyMigrated) {
             console.log('already exist...', movie.project.id, movie.id, movie.identifier, availabilityStarts, availabilityEnds, i);
+
+            if (moment(movie.datePublished)
+                .isAfter(moment())) {
+                datePublishedIsAfterNowCount += 1;
+                // tslint:disable-next-line:max-line-length
+                // throw new Error(`movie.datePublished isAfter now ${movie.project.id} ${movie.id} ${movie.identifier} ${movie.datePublished}`);
+
+            }
         } else {
             if (movie.datePublished === undefined) {
                 console.error('movie.datePublished undefined', movie.project.id, movie.id, movie.identifier, i);
@@ -63,6 +72,8 @@ async function main() {
     console.log(i, 'creativeWorks checked');
     console.log(updateCount, 'creativeWorks updated');
     console.log(datePublishedUndefinedCount, 'datePublishedUndefinedCount');
+    console.log(datePublishedIsAfterNowCount, 'datePublishedIsAfterNowCount');
+
 }
 
 main()

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

@@ -155,8 +155,8 @@ function fixOrders(params) {
             // 不要な属性は参照しない
             acceptedOffers: 0,
             customer: 0,
-            orderedItem: 0,
-            paymentMethods: 0
+            orderedItem: 0
+            // paymentMethods: 0 // 適用決済方法検証に必要
         });
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
@@ -268,104 +268,20 @@ function findApplicableReturnPolicy(params) {
         };
     }
     const returnPolicies = params.returnPolicies;
-    const returningDate = moment(params.returningDate);
+    // const returningDate = moment(params.returningDate);
     let applicalbleReturnPolicies = [];
     if (params.reason === factory.transaction.returnOrder.Reason.Customer) {
         // 適用可能なポリシーにフィルター
         // tslint:disable-next-line:max-func-body-length
         applicalbleReturnPolicies = returnPolicies.filter((returnPolicy) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-            let satisfyMerchantReturnDays = false;
-            let offerItemCondition;
-            const itemConditionId = (_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
-            if (typeof itemConditionId === 'string') {
-                offerItemCondition = params.offerItemConditions.find((o) => o.id === itemConditionId);
-                if (offerItemCondition === undefined) {
-                    throw new factory.errors.NotFound('OfferItemCondition');
-                }
-            }
-            const merchantReturnDays = returnPolicy.merchantReturnDays;
-            if (typeof merchantReturnDays === 'number') {
-                // 返品適用日数を確認する
-                const everyOrderApplicable = params.orders.every((order) => {
-                    const mustBeReturnedUntil = moment(order.orderDate)
-                        .add(merchantReturnDays, 'days');
-                    return mustBeReturnedUntil.isSameOrAfter(returningDate);
-                });
-                // 全注文について日数の確認ができれば適用
-                if (everyOrderApplicable) {
-                    satisfyMerchantReturnDays = true;
-                }
-            }
-            else {
-                // 日数制限なし
-                satisfyMerchantReturnDays = true;
-            }
-            // イベント開始猶予を検証する(2023-05-22~)
-            let satisfyItemCondition = true;
-            if (offerItemCondition !== undefined) {
-                let satisfyGracePeriodMaxValue = true;
-                let satisfyGracePeriodMinValue = 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;
-                if (typeof gracePeriodMaxValue === 'number') {
-                    satisfyGracePeriodMaxValue = params.events.every((event) => {
-                        return moment(event.startDate)
-                            .isSameOrBefore(moment(params.returningDate)
-                            .add(gracePeriodMaxValue, 'seconds'));
-                    });
-                }
-                if (typeof gracePeriodMinValue === 'number') {
-                    satisfyGracePeriodMinValue = params.events.every((event) => {
-                        return moment(event.startDate)
-                            .isAfter(moment(params.returningDate)
-                            .add(gracePeriodMinValue, 'seconds'));
-                    });
-                }
-                let satisfyGracePeriodInDaysMax = true;
-                let satisfyGracePeriodInDaysMin = true;
-                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 maxDate = moment(event.startDate)
-                            .tz(gracePeriodBeforeStartInDaysMax.timezone)
-                            .startOf('days')
-                            .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
-                            .format('YYYY-MM-DD');
-                        const returnMinDate = moment.tz(`${maxDate}T${gracePeriodBeforeStartInDaysMax.time}`, gracePeriodBeforeStartInDaysMax.timezone);
-                        debug('returnMinDate:', returnMinDate, 'returningDate:', returningDate);
-                        return returnMinDate.isSameOrBefore(moment(returningDate));
-                    });
-                }
-                debug('gracePeriodBeforeStartInDaysMax:', gracePeriodBeforeStartInDaysMax);
-                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.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
-                        debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
-                        return returnMaxDate.isAfter(moment(returningDate));
-                    });
-                }
-                debug('satisfyGracePeriodInDaysMin:', satisfyGracePeriodInDaysMin);
-                let satisfyOnlyUnused = true;
-                if (((_k = offerItemCondition.itemOffered.serviceOutput) === null || _k === void 0 ? void 0 : _k.onlyUnused) === true) {
-                    if (params.usedReservationExists) {
-                        satisfyOnlyUnused = false;
-                    }
-                }
-                debug('usedReservationExists:', params.usedReservationExists, 'satisfyOnlyUnused:', satisfyOnlyUnused);
-                satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue
-                    && satisfyGracePeriodInDaysMax && satisfyGracePeriodInDaysMin && satisfyOnlyUnused;
-            }
-            return satisfyMerchantReturnDays && satisfyItemCondition;
+            return isSellerReturnPolicyApplicable({
+                returnPolicy,
+                events: params.events,
+                offerItemConditions: params.offerItemConditions,
+                orders: params.orders,
+                returningDate: params.returningDate,
+                usedReservationExists: params.usedReservationExists
+            });
         });
     }
     // 販売者にポリシーが存在しなければ返品不可
@@ -403,6 +319,119 @@ function findApplicableReturnPolicy(params) {
     return Object.assign({ merchantReturnDays: appliedReturnPolicy.merchantReturnDays, restockingFee: appliedReturnPolicy.restockingFee, returnFees,
         returnFeesMovieTicket, typeOf: appliedReturnPolicy.typeOf }, (typeof (appliedItemCondition === null || appliedItemCondition === void 0 ? void 0 : appliedItemCondition.typeOf) === 'string') ? { itemCondition: appliedItemCondition } : undefined);
 }
+// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+function isSellerReturnPolicyApplicable(params) {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    const returnPolicy = params.returnPolicy;
+    const returningDate = moment(params.returningDate);
+    let satisfyMerchantReturnDays = false;
+    let satisfyApplicablePaymentMethod = false;
+    let offerItemCondition;
+    const itemConditionId = (_a = returnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
+    if (typeof itemConditionId === 'string') {
+        offerItemCondition = params.offerItemConditions.find((o) => o.id === itemConditionId);
+        if (offerItemCondition === undefined) {
+            throw new factory.errors.NotFound('OfferItemCondition');
+        }
+    }
+    const merchantReturnDays = returnPolicy.merchantReturnDays;
+    if (typeof merchantReturnDays === 'number') {
+        // 返品適用日数を確認する
+        const everyOrderApplicable = params.orders.every((order) => {
+            const mustBeReturnedUntil = moment(order.orderDate)
+                .add(merchantReturnDays, 'days');
+            return mustBeReturnedUntil.isSameOrAfter(returningDate);
+        });
+        // 全注文について日数の確認ができれば適用
+        if (everyOrderApplicable) {
+            satisfyMerchantReturnDays = true;
+        }
+    }
+    else {
+        // 日数制限なし
+        satisfyMerchantReturnDays = true;
+    }
+    // 適用決済方法検証(2023-08-08~)
+    const applicablePaymentMethod = returnPolicy.applicablePaymentMethod;
+    if (Array.isArray(applicablePaymentMethod)) {
+        const everyOrderApplicable = params.orders.every((order) => {
+            // 全決済方法区分がapplicablePaymentMethodに含まれれば適用
+            return order.paymentMethods.every((paymentMethod) => applicablePaymentMethod.includes(paymentMethod.typeOf));
+        });
+        // 全注文について確認ができれば適用
+        if (everyOrderApplicable) {
+            satisfyApplicablePaymentMethod = true;
+        }
+    }
+    else {
+        satisfyApplicablePaymentMethod = true;
+    }
+    // イベント開始猶予を検証する(2023-05-22~)
+    let satisfyItemCondition = true;
+    if (offerItemCondition !== undefined) {
+        let satisfyGracePeriodMaxValue = true;
+        let satisfyGracePeriodMinValue = 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;
+        if (typeof gracePeriodMaxValue === 'number') {
+            satisfyGracePeriodMaxValue = params.events.every((event) => {
+                return moment(event.startDate)
+                    .isSameOrBefore(moment(params.returningDate)
+                    .add(gracePeriodMaxValue, 'seconds'));
+            });
+        }
+        if (typeof gracePeriodMinValue === 'number') {
+            satisfyGracePeriodMinValue = params.events.every((event) => {
+                return moment(event.startDate)
+                    .isAfter(moment(params.returningDate)
+                    .add(gracePeriodMinValue, 'seconds'));
+            });
+        }
+        let satisfyGracePeriodInDaysMax = true;
+        let satisfyGracePeriodInDaysMin = true;
+        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 maxDate = moment(event.startDate)
+                    .tz(gracePeriodBeforeStartInDaysMax.timezone)
+                    .startOf('days')
+                    .subtract(gracePeriodBeforeStartInDaysMax.period.value, 'days')
+                    .format('YYYY-MM-DD');
+                const returnMinDate = moment.tz(`${maxDate}T${gracePeriodBeforeStartInDaysMax.time}`, gracePeriodBeforeStartInDaysMax.timezone);
+                debug('returnMinDate:', returnMinDate, 'returningDate:', returningDate);
+                return returnMinDate.isSameOrBefore(moment(returningDate));
+            });
+        }
+        debug('gracePeriodBeforeStartInDaysMax:', gracePeriodBeforeStartInDaysMax);
+        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.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
+                debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
+                return returnMaxDate.isAfter(moment(returningDate));
+            });
+        }
+        debug('satisfyGracePeriodInDaysMin:', satisfyGracePeriodInDaysMin);
+        let satisfyOnlyUnused = true;
+        if (((_k = offerItemCondition.itemOffered.serviceOutput) === null || _k === void 0 ? void 0 : _k.onlyUnused) === true) {
+            if (params.usedReservationExists) {
+                satisfyOnlyUnused = false;
+            }
+        }
+        debug('usedReservationExists:', params.usedReservationExists, 'satisfyOnlyUnused:', satisfyOnlyUnused);
+        satisfyItemCondition = satisfyGracePeriodMaxValue && satisfyGracePeriodMinValue
+            && satisfyGracePeriodInDaysMax && satisfyGracePeriodInDaysMin && satisfyOnlyUnused;
+    }
+    return satisfyMerchantReturnDays && satisfyApplicablePaymentMethod && satisfyItemCondition;
+}
 /**
  * 注文中のオファーの返品ポリシーを検証
  */

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.324.0-alpha.4",
+    "@chevre/factory": "4.324.0-alpha.5",
     "@cinerino/sdk": "3.162.3",
     "@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.6.0-alpha.8"
+  "version": "21.6.0-alpha.9"
 }