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

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/lib/chevre/repo/mongoose/schemas/offerItemCondition.d.ts

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import { Schema } from 'mongoose';
-declare const modelName = "Offer";
+declare const modelName = "OfferItemCondition";
 /**
  * アイテムコンディションスキーマ
  */

package/lib/chevre/repo/mongoose/schemas/offerItemCondition.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = exports.modelName = void 0;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
-const modelName = 'Offer';
+const modelName = 'OfferItemCondition';
 exports.modelName = modelName;
 /**
  * アイテムコンディションスキーマ

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.js

@@ -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) {
@@ -309,14 +313,21 @@ 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) => {
-        const appliedReturnPolicyRestockingFee = (typeof appliedReturnPolicy.restockingFee === 'number')
-            ? appliedReturnPolicy.restockingFee
+        var _a, _b;
+        const appliedReturnPolicyRestockingFeeValue = (_a = appliedReturnPolicy.restockingFee) === null || _a === void 0 ? void 0 : _a.value;
+        const restockingFeeValue = (_b = returnPolicy.restockingFee) === null || _b === void 0 ? void 0 : _b.value;
+        const appliedReturnPolicyRestockingFee = (typeof appliedReturnPolicyRestockingFeeValue === 'number')
+            ? appliedReturnPolicyRestockingFeeValue
             : 0;
-        const restockingFee = (typeof returnPolicy.restockingFee === 'number') ? returnPolicy.restockingFee : 0;
+        const restockingFee = (typeof restockingFeeValue === 'number') ? restockingFeeValue : 0;
         if (restockingFee < appliedReturnPolicyRestockingFee) {
             appliedReturnPolicy = returnPolicy;
         }
@@ -325,6 +336,7 @@ function findApplicableReturnPolicy(params) {
         merchantReturnDays: appliedReturnPolicy.merchantReturnDays,
         restockingFee: appliedReturnPolicy.restockingFee,
         returnFees,
+        returnFeesMovieTicket,
         typeOf: 'MerchantReturnPolicy'
     };
 }
@@ -365,8 +377,40 @@ 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
+                            });
+                        });
+                    }
+                }
+            });
+        }
+    });
+    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.6",
     "@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.62"
+  "version": "21.2.0-alpha.64"
 }