@chevre/domain 21.2.0-alpha.67 → 21.2.0-alpha.69

package/lib/chevre/repo/reservation.d.ts

@@ -23,7 +23,9 @@ export declare class MongoRepository {
     /**
      * 予約検索
      */
-    search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: any): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
+    search<T extends factory.reservationType>(params: factory.reservation.ISearchConditions<T>, projection?: {
+        [key: string]: 0 | 1;
+    }): Promise<factory.reservation.IReservation<factory.reservationType.EventReservation>[]>;
     findById<T extends factory.reservationType>(params: {
         id: string;
         inclusion?: string[];

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

@@ -64,6 +64,7 @@ function start(params) {
             });
         }
         const policiesByOffer = yield searchPoliciesByOffer({ offers })(repos);
+        const { usedReservationExists } = yield checkUsedReservationExists({ orders })(repos);
         const appliedReturnPolicy = findApplicableReturnPolicy({
             acceptedOffers,
             events,
@@ -73,7 +74,8 @@ function start(params) {
             reason: params.object.reason,
             returnPolicies,
             offers,
-            policiesByOffer
+            policiesByOffer,
+            usedReservationExists
         });
         validateAppliedReturnPolicy({ merchantReturnPolicy: appliedReturnPolicy });
         // アイテム検証
@@ -174,12 +176,9 @@ function validateOrder(params) {
         }
     });
 }
-function validateItems(params) {
+function checkUsedReservationExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
-            // 販売者都合の場合、特に検証しない
-            return;
-        }
+        let usedReservationExists = false;
         // 注文に含まれる予約の状態検証
         const reservationNumbers = yield repos.order.searchReservationNumbersByOrderNumbers({
             orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
@@ -192,11 +191,38 @@ function validateItems(params) {
                 typeOf: factory.reservationType.EventReservation,
                 reservationNumber: { $in: reservationNumbers },
                 attended: true
-            });
+            }, { _id: 1 });
             if (existingUsedReservations.length > 0) {
-                throw new factory.errors.Argument('orderNumber', 'some reservations already used');
+                usedReservationExists = true;
             }
         }
+        return { usedReservationExists };
+    });
+}
+function validateItems(params) {
+    return (__) => __awaiter(this, void 0, void 0, function* () {
+        if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
+            // 販売者都合の場合、特に検証しない
+            return;
+        }
+        // アイテムコンディション検証へ移行
+        // 注文に含まれる予約の状態検証
+        // const reservationNumbers = await repos.order.searchReservationNumbersByOrderNumbers({
+        //     orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
+        // });
+        // if (reservationNumbers.length > 0) {
+        //     // 使用済の予約がひとつでもあれば不可
+        //     const existingUsedReservations = await repos.reservation.search({
+        //         limit: 1,
+        //         page: 1,
+        //         typeOf: factory.reservationType.EventReservation,
+        //         reservationNumber: { $in: reservationNumbers },
+        //         attended: true
+        //     });
+        //     if (existingUsedReservations.length > 0) {
+        //         throw new factory.errors.Argument('orderNumber', 'some reservations already used');
+        //     }
+        // }
     });
 }
 function searchPoliciesByOffer(params) {
@@ -225,6 +251,7 @@ function searchPoliciesByOffer(params) {
  */
 // tslint:disable-next-line:max-func-body-length
 function findApplicableReturnPolicy(params) {
+    var _a;
     if (params.reason === factory.transaction.returnOrder.Reason.Seller) {
         // 販売者都合の場合、手数料なしの返金返品ポリシーを適用
         return {
@@ -237,8 +264,9 @@ function findApplicableReturnPolicy(params) {
     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;
+            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;
@@ -270,8 +298,6 @@ 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,24 +311,27 @@ function findApplicableReturnPolicy(params) {
                 if (typeof gracePeriodMinValue === 'number') {
                     satisfyGracePeriodMinValue = params.events.every((event) => {
                         return moment(event.startDate)
-                            .isSameOrAfter(moment(params.returningDate)
+                            .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 minDate = moment(event.startDate)
+                        const maxDate = 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);
+                        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') {
@@ -314,33 +343,22 @@ function findApplicableReturnPolicy(params) {
                             .format('YYYY-MM-DD');
                         const returnMaxDate = moment.tz(`${minDate}T${gracePeriodBeforeStartInDaysMin.time}`, gracePeriodBeforeStartInDaysMin.timezone);
                         debug('returnMaxDate:', returnMaxDate, 'returningDate:', returningDate);
-                        return returnMaxDate.isSameOrAfter(moment(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;
+                    && satisfyGracePeriodInDaysMax && satisfyGracePeriodInDaysMin && satisfyOnlyUnused;
             }
             return satisfyMerchantReturnDays && satisfyItemCondition;
         });
-        // returnPolicies.forEach((returnPolicy) => {
-        //     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) {
-        //             applicalbleReturnPolicies.push(returnPolicy);
-        //         }
-        //     } else {
-        //         // 日数制限なし
-        //         applicalbleReturnPolicies.push(returnPolicy);
-        //     }
-        // });
     }
     // 販売者にポリシーが存在しなければ返品不可
     if (applicalbleReturnPolicies.length === 0) {
@@ -366,13 +384,16 @@ function findApplicableReturnPolicy(params) {
             appliedReturnPolicy = returnPolicy;
         }
     });
-    return {
-        merchantReturnDays: appliedReturnPolicy.merchantReturnDays,
-        restockingFee: appliedReturnPolicy.restockingFee,
-        returnFees,
-        returnFeesMovieTicket,
-        typeOf: 'MerchantReturnPolicy'
-    };
+    let appliedItemCondition;
+    const appliedItemConditionId = (_a = appliedReturnPolicy.itemCondition) === null || _a === void 0 ? void 0 : _a.id;
+    if (typeof appliedItemConditionId === 'string') {
+        appliedItemCondition = params.offerItemConditions.find((o) => o.id === appliedItemConditionId);
+        if (appliedItemCondition === undefined) {
+            throw new factory.errors.NotFound('OfferItemCondition');
+        }
+    }
+    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);
 }
 /**
  * 注文中のオファーの返品ポリシーを検証

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.10",
-    "@cinerino/sdk": "3.157.0-alpha.0",
+    "@chevre/factory": "4.313.0-alpha.11",
+    "@cinerino/sdk": "3.157.0-alpha.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.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.67"
+  "version": "21.2.0-alpha.69"
 }