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

package/example/src/chevre/deleteTasksByName.ts

@@ -1,5 +1,5 @@
 // tslint:disable:no-console
-import * as moment from 'moment';
+// import * as moment from 'moment';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';

package/example/src/chevre/searchReservationNumbersByOrderNumbers.ts

@@ -4,6 +4,7 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 // const project = { id: String(process.env.PROJECT_ID) };
+const orderNumbers = ['TTT9-4703865-8892744', 'TTT9-4703865-8398074', 'SSK6-4815238-3010844'];
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
@@ -11,10 +12,45 @@ async function main() {
     const orderRepo = new chevre.repository.Order(mongoose.connection);
 
     const reservatioForIds = await orderRepo.searchReservationForIdsByOrderNumbers({
-        orderNumber: { $in: ['TTT9-4703865-8892744', 'TTT9-4703865-8398074', 'SSK9-4703865-4744524'] }
+        orderNumber: { $in: orderNumbers }
     });
     console.log('reservatioForIds found', reservatioForIds);
     console.log(reservatioForIds.length, 'reservatioForIds found');
+
+    const reservationNumbers = await orderRepo.searchReservationNumbersByOrderNumbers({
+        orderNumber: { $in: orderNumbers }
+    });
+    console.log('reservationNumbers found', reservationNumbers);
+    console.log(reservationNumbers.length, 'reservationNumbers found');
+
+    const offers = await orderRepo.searchAcceptedOffersByOrderNumbers({
+        orderNumber: { $in: orderNumbers }
+    });
+    console.log('offers found', offers);
+    console.log(offers.length, 'offers found');
+
+    const movieTickets: any[] = [];
+    offers.forEach((offer) => {
+        const movieTicketTypeChargeSpecExists = offer.priceSpecification.priceComponent.some((component) => {
+            return component.typeOf === chevre.factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        });
+        if (movieTicketTypeChargeSpecExists) {
+            offer.priceSpecification.priceComponent.forEach((component) => {
+                if (component.typeOf === chevre.factory.priceSpecificationType.UnitPriceSpecification) {
+                    if (Array.isArray(component.appliesToMovieTicket)) {
+                        component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
+                            movieTickets.push({
+                                identifier: appliesToMovieTicket.identifier,
+                                paymentMethodType: appliesToMovieTicket.serviceOutput.typeOf,
+                                offerId: offer.id
+                            });
+                        });
+                    }
+                }
+            });
+        }
+    });
+    console.log('movieTickets found', movieTickets);
 }
 
 main()

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/repo/order.d.ts

@@ -94,7 +94,11 @@ export declare class MongoRepository {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: any): Promise<factory.order.IOrder[]>;
+    searchWithUnwoundAcceptedOffer(params: factory.order.ISearchConditions, projection?: {
+        [key: string]: any;
+    }): Promise<Omit<factory.order.IOrder[], 'acceptedOffers'> & {
+        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered> | factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+    }>;
     /**
      * 特典口座情報が未保管であれば保管する
      */
@@ -118,5 +122,16 @@ export declare class MongoRepository {
             $in: string[];
         };
     }): Promise<string[]>;
+    /**
+     * 注文に含まれるacceptedOffersを検索する
+     */
+    searchAcceptedOffersByOrderNumbers(params: {
+        orderNumber: {
+            $in: string[];
+        };
+    }): Promise<{
+        id: string;
+        priceSpecification: factory.order.ITicketPriceSpecification;
+    }[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
 }

package/lib/chevre/repo/order.js

@@ -1002,12 +1002,12 @@ class MongoRepository {
             if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
                 return [];
             }
-            const reservationNumbers = yield this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
-                orderNumber: params.orderNumber.$in
+            return this.orderModel.distinct('acceptedOffers.itemOffered.reservationNumber', {
+                'acceptedOffers.itemOffered.reservationNumber': { $exists: true },
+                orderNumber: { $in: params.orderNumber.$in }
             })
                 .setOptions({ maxTimeMS: 10000 })
                 .exec();
-            return [...new Set(reservationNumbers)];
         });
     }
     /**
@@ -1020,12 +1020,32 @@ class MongoRepository {
             }
             return this.orderModel.distinct('acceptedOffers.itemOffered.reservationFor.id', {
                 'acceptedOffers.itemOffered.reservationFor.id': { $exists: true },
-                orderNumber: params.orderNumber.$in
+                orderNumber: { $in: params.orderNumber.$in }
             })
                 .setOptions({ maxTimeMS: 10000 })
                 .exec();
         });
     }
+    /**
+     * 注文に含まれるacceptedOffersを検索する
+     */
+    searchAcceptedOffersByOrderNumbers(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.orderNumber.$in) || params.orderNumber.$in.length === 0) {
+                return [];
+            }
+            const aggregate = this.orderModel.aggregate();
+            aggregate.unwind('$acceptedOffers');
+            aggregate.match({ orderNumber: { $in: params.orderNumber.$in } });
+            aggregate.project({
+                _id: 0,
+                id: '$acceptedOffers.id',
+                priceSpecification: '$acceptedOffers.priceSpecification'
+            });
+            return aggregate.option({ maxTimeMS: 10000 })
+                .exec();
+        });
+    }
     getCursor(conditions, projection) {
         return this.orderModel.find(conditions, projection)
             .sort({ orderDate: factory.sortType.Descending })

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");
@@ -25,7 +25,7 @@ function start(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
-        const { eventIds, offerIds, orders } = yield fixOrders(params)(repos);
+        const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
         const seller = yield repos.seller.findById({ id: String(orders[0].seller.id) }, { additionalProperty: 0, paymentAccepted: 0 });
         yield validateOrder({ orders })(repos);
@@ -63,6 +63,7 @@ function start(params) {
         }
         const policiesByOffer = yield searchPoliciesByOffer({ offers })(repos);
         const appliedReturnPolicy = findApplicableReturnPolicy({
+            acceptedOffers,
             events,
             offerItemConditions,
             orders,
@@ -156,7 +157,10 @@ function fixOrders(params) {
         const eventIds = yield repos.order.searchReservationForIdsByOrderNumbers({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
         });
-        return { eventIds, offerIds, orders };
+        const acceptedOffers = yield repos.order.searchAcceptedOffersByOrderNumbers({
+            orderNumber: { $in: [params.object.order[0].orderNumber] }
+        });
+        return { acceptedOffers, eventIds, offerIds, orders };
     });
 }
 function validateOrder(params) {
@@ -232,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;
@@ -264,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;
@@ -281,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;
         });
@@ -309,7 +344,11 @@ function findApplicableReturnPolicy(params) {
         throw new factory.errors.Argument('Seller', 'has no applicable return policies');
     }
     // オファーの返品ポリシーから返品手数料タイプを決定する
-    const { returnFees } = validateOffersReturnPolicy({ offers: params.offers, policiesByOffer: params.policiesByOffer });
+    const { returnFees, returnFeesMovieTicket } = validateOffersReturnPolicy({
+        acceptedOffers: params.acceptedOffers,
+        offers: params.offers,
+        policiesByOffer: params.policiesByOffer
+    });
     // restockingFeeが最低のポリシーを自動選択
     let appliedReturnPolicy = applicalbleReturnPolicies[0];
     applicalbleReturnPolicies.forEach((returnPolicy) => {
@@ -328,6 +367,7 @@ function findApplicableReturnPolicy(params) {
         merchantReturnDays: appliedReturnPolicy.merchantReturnDays,
         restockingFee: appliedReturnPolicy.restockingFee,
         returnFees,
+        returnFeesMovieTicket,
         typeOf: 'MerchantReturnPolicy'
     };
 }
@@ -368,8 +408,41 @@ function validateOffersReturnPolicy(params) {
     else {
         throw new factory.errors.NotImplemented('returnFees not defined');
     }
-    // 決済カード取消有無はどうか？
-    return { returnFees };
+    // 決済カード取消ポリシーを確定(2023-05-23~)
+    const returnFeesMovieTicket = [];
+    params.acceptedOffers.forEach((acceptedOffer) => {
+        const unitPriceOffer = params.offers.find((offer) => offer.id === acceptedOffer.id);
+        if (unitPriceOffer === undefined) {
+            throw new factory.errors.NotFound(`UnitPriceOffer ${acceptedOffer.id}`);
+        }
+        if (!Array.isArray(unitPriceOffer.hasMerchantReturnPolicy) || unitPriceOffer.hasMerchantReturnPolicy.length === 0) {
+            throw new factory.errors.NotFound(`offer.hasMerchantReturnPolicy ${acceptedOffer.id}`);
+        }
+        const hasMerchantReturnPolicy = unitPriceOffer.hasMerchantReturnPolicy[0];
+        const policyByOffer = params.policiesByOffer.find((policy) => policy.id === hasMerchantReturnPolicy.id);
+        if (policyByOffer === undefined) {
+            throw new factory.errors.NotFound(`MerchantReturnPolicy acceptedOffer:${acceptedOffer.id}`);
+        }
+        const movieTicketTypeChargeSpecExists = acceptedOffer.priceSpecification.priceComponent.some((component) => {
+            return component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        });
+        if (movieTicketTypeChargeSpecExists) {
+            acceptedOffer.priceSpecification.priceComponent.forEach((component) => {
+                if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
+                    if (Array.isArray(component.appliesToMovieTicket)) {
+                        component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
+                            returnFeesMovieTicket.push({
+                                identifier: String(appliesToMovieTicket.identifier),
+                                returnFees: policyByOffer.customerRemorseReturnFeesMovieTicket,
+                                serviceOutput: { typeOf: appliesToMovieTicket.serviceOutput.typeOf }
+                            });
+                        });
+                    }
+                }
+            });
+        }
+    });
+    return { returnFees, returnFeesMovieTicket };
 }
 function validateAppliedReturnPolicy(params) {
     var _a;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.5",
+    "@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.63"
+  "version": "21.2.0-alpha.65"
 }