@chevre/domain 21.18.0-alpha.2 → 21.18.0-alpha.20

package/lib/chevre/service/task/onAuthorizationCreated.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const code_1 = require("../../repo/code");
@@ -26,6 +27,7 @@ const reserve_1 = require("../reserve");
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
         yield onAuthorizationCreated(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
             code: new code_1.MongoRepository(settings.connection),
@@ -38,6 +40,7 @@ function call(data) {
     });
 }
 exports.call = call;
+// tslint:disable-next-line:max-func-body-length
 function onAuthorizationCreated(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 発券対象予約ID
@@ -55,24 +58,12 @@ function onAuthorizationCreated(params) {
                 // 注文検索
                 const orderNumber = authorizationObject.orderNumber;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
-                    // 最適化(2023-01-28~)
-                    const order = yield repos.order.findByOrderNumber({
-                        orderNumber,
-                        project: { id: params.project.id },
-                        inclusion: ['acceptedOffers'],
-                        exclusion: []
-                    });
-                    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-                    reservationNumbers = acceptedOffers
-                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        .map((o) => o.itemOffered.reservationNumber);
-                    reservationNumbers = [...new Set(reservationNumbers)];
-                    reservationForIds = acceptedOffers
-                        .filter((o) => o.itemOffered.typeOf === factory.reservationType.EventReservation
-                        || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-                        .map((o) => String(o.itemOffered.reservationFor.id));
-                    reservationForIds = [...new Set(reservationForIds)];
+                    reservationNumbers = yield repos.acceptedOffer.distinctValues({
+                        orderNumber: { $in: [orderNumber] }
+                    }, 'acceptedOffers.itemOffered.reservationNumber');
+                    reservationForIds = yield repos.acceptedOffer.distinctValues({
+                        orderNumber: { $in: [orderNumber] }
+                    }, 'acceptedOffers.itemOffered.reservationFor.id');
                 }
                 break;
             case 'OwnershipInfo':

package/lib/chevre/service/task/onOrderPaymentCompleted.js

@@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -21,12 +20,12 @@ const payOrder_1 = require("../order/payOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield (0, payOrder_1.payOrder)(data)({
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
-            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
             task: new task_1.MongoRepository(settings.connection),
             transaction: new transaction_1.MongoRepository(settings.connection)
         });

package/lib/chevre/service/task/placeOrder.js

@@ -10,10 +10,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
@@ -23,22 +22,16 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield OrderService.placeOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            accountingReport: accountingReportRepo,
-            action: actionRepo,
-            order: orderRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

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

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,22 +22,16 @@ const returnOrder_1 = require("../order/returnOrder");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            registerServiceInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/sendOrder.js

@@ -10,9 +10,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
+const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
@@ -23,22 +22,16 @@ const OrderService = require("../order");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const ownershipInfoRepo = new ownershipInfo_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         yield OrderService.sendOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
-            action: actionRepo,
-            order: orderRepo,
-            ownershipInfo: ownershipInfoRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+            acceptedOffer: new acceptedOffer_1.MongoRepository(settings.connection),
+            action: new action_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task/voidRegisterServiceTransaction.js

@@ -10,9 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
-const factory = require("../../factory");
 const action_1 = require("../../repo/action");
-const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const transaction_1 = require("../../repo/transaction");
 const ProductOfferService = require("../offer/product");
@@ -21,17 +19,15 @@ const ProductOfferService = require("../offer/product");
  */
 function call(data) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
-        if (settings.redisClient === undefined) {
-            throw new factory.errors.Argument('settings', 'redisClient required');
-        }
+        // if (settings.redisClient === undefined) {
+        //     throw new factory.errors.Argument('settings', 'redisClient required');
+        // }
         const actionRepo = new action_1.MongoRepository(settings.connection);
-        const registerActionInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         yield ProductOfferService.voidTransaction(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            registerActionInProgress: registerActionInProgressRepo,
             transaction: transactionRepo
         });
     });

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import type { MongoRepository as ActionRepo } from '../../repo/action';
 import type { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -13,6 +14,7 @@ import type { MongoRepository as TransactionRepo } from '../../repo/transaction'
  * 冪等性を確保すること
  */
 export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -412,8 +412,8 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(fromLocation.orderNumber)],
                     confirmationNumbers: [String(fromLocation.confirmationNumber)]
                 }, {
-                    acceptedOffers: 0,
-                    orderedItem: 0
+                    identifier: 1,
+                    orderStatus: 1
                 });
                 const order = orders.shift();
                 if (order === undefined) {
@@ -467,8 +467,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
                     orderNumbers: [String(toLocation.orderNumber)],
                     confirmationNumbers: [String(toLocation.confirmationNumber)]
                 }, {
-                    acceptedOffers: 0,
-                    orderedItem: 0
+                    identifier: 1
                 });
                 const order = orders.shift();
                 if (order === undefined) {

package/lib/chevre/service/transaction/placeOrderInProgress/result.d.ts

@@ -10,4 +10,4 @@ export declare function createOrder(params: {
     orderStatus: factory.orderStatus;
     isGift: boolean;
     authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
-}): factory.order.IOrder;
+}): factory.transaction.placeOrder.IOrderAsResult;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.d.ts

@@ -32,7 +32,7 @@ export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderPara
     };
 };
 export declare function validateNumItems(params: {
-    order: factory.order.IOrder;
+    order: factory.transaction.placeOrder.IOrderAsResult;
     result: {
         order: IResultOrderParams;
     };

package/lib/chevre/service/transaction/returnOrder/potentialActions/returnMoneyTransfer.d.ts

@@ -2,5 +2,6 @@ import * as factory from '../../../../factory';
 export type WebAPIIdentifier = factory.service.webAPI.Identifier;
 export declare function createReturnMoneyTransferActions(params: {
     order: factory.order.IOrder;
+    moneyTransferAcceptedOffers: Pick<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>, 'itemOffered'>[];
     returnOrderActionParams?: factory.transaction.returnOrder.IReturnOrderActionParams;
 }): Promise<factory.task.IData<factory.taskName.ReturnMoneyTransfer>[]>;

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

@@ -32,9 +32,9 @@ function createReturnMoneyTransferActions(params) {
             priceCurrency: order.priceCurrency,
             orderDate: order.orderDate
         };
-        // 注文アイテムから返却アクションを作成する
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-        for (const acceptedOffer of acceptedOffers) {
+        // 注文オファーから返却アクションを作成する
+        // const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        for (const acceptedOffer of params.moneyTransferAcceptedOffers) {
             if (acceptedOffer.itemOffered.typeOf === factory.actionType.MoneyTransfer) {
                 const moneyTransfer = acceptedOffer.itemOffered;
                 const transactionNumber = String((_b = (_a = moneyTransfer.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber);

package/lib/chevre/service/transaction/returnOrder/potentialActions.d.ts

@@ -9,4 +9,5 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.returnOrder.IPotentialActionsParams;
     transaction: factory.transaction.returnOrder.ITransaction;
     emailMessageOnOrderReturned?: factory.creativeWork.message.email.ICreativeWork;
+    moneyTransferAcceptedOffers: Pick<factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>, 'itemOffered'>[];
 }): Promise<factory.transaction.returnOrder.IPotentialActions>;

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

@@ -34,7 +34,7 @@ function createPotentialActions(params) {
             const returnPaymentMethodActions = yield (0, returnPaymentMethod_1.createReturnPaymentMethodActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
             // ポイント特典の数だけ、返却アクションを作成
             const returnPointAwardActions = yield (0, returnPointAward_1.createReturnPointAwardActions)(Object.assign(Object.assign({}, params), { order }));
-            const returnMoneyTransferActions = yield (0, returnMoneyTransfer_1.createReturnMoneyTransferActions)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
+            const returnMoneyTransferActions = yield (0, returnMoneyTransfer_1.createReturnMoneyTransferActions)(Object.assign(Object.assign({}, params), { order, moneyTransferAcceptedOffers: params.moneyTransferAcceptedOffers, returnOrderActionParams }));
             // 返品後のEメール送信アクション
             const sendEmailMessaegActionsOnReturn = yield (0, sendEmailMessage_1.createSendEmailMessaegActionsOnReturn)(Object.assign(Object.assign({}, params), { order, returnOrderActionParams }));
             const potentialActionsOnReturnOrder = {

package/lib/chevre/service/transaction/returnOrder.d.ts

@@ -1,4 +1,5 @@
 import * as factory from '../../factory';
+import type { MongoRepository as AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { MongoRepository as EmailMessageRepo } from '../../repo/emailMessage';
 import type { MongoRepository as EventRepo } from '../../repo/event';
 import type { MongoRepository as MerchantReturnPolicyRepo } from '../../repo/merchantReturnPolicy';
@@ -11,6 +12,7 @@ import type { MongoRepository as SellerRepo } from '../../repo/seller';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
 export interface IStartOperationRepos {
+    acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
     merchantReturnPolicy: MerchantReturnPolicyRepo;
     offer: OfferRepo;
@@ -40,6 +42,7 @@ export declare function confirm(params: factory.transaction.returnOrder.IConfirm
         };
     };
 }): (repos: {
+    acceptedOffer: AcceptedOfferRepo;
     emailMessage?: EmailMessageRepo;
     order: OrderRepo;
     transaction: TransactionRepo;

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

@@ -172,25 +172,34 @@ function fixOrders(params) {
             project: { id: { $eq: params.project.id } },
             confirmationNumbers: [params.object.order[0].confirmationNumber],
             orderNumbers: [params.object.order[0].orderNumber]
-        }, {
-            // acceptedOffers: 0, // カスタム返品ポリシーに必要
-            customer: 0,
-            orderedItem: 0
-            // paymentMethods: 0 // 適用決済方法検証に必要
-        });
+        }, 
+        // positive projectionで検索(2023-12-08~)
+        {
+            confirmationNumber: 1, dateReturned: 1, orderDate: 1, orderNumber: 1, orderStatus: 1,
+            paymentMethods: 1, price: 1, project: 1, seller: 1, typeOf: 1
+        }
+        // {
+        //     // acceptedOffers: 0, // カスタム返品ポリシーに必要
+        //     customer: 0,
+        //     orderedItem: 0
+        //     // paymentMethods: 0 // 適用決済方法検証に必要
+        // }
+        );
         if (orders.length !== params.object.order.length) {
             throw new factory.errors.NotFound('Order');
         }
-        const offerIds = yield repos.order.searchAcceptedOfferIds({
-            project: { id: { $eq: params.project.id } },
-            confirmationNumbers: [params.object.order[0].confirmationNumber],
-            orderNumbers: [params.object.order[0].orderNumber]
-        });
-        const eventIds = yield repos.order.searchReservationForIdsByOrderNumbers({
+        const offerIds = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
-        });
-        const acceptedOffers = yield repos.order.searchAcceptedOffersByOrderNumbers({
+        }, 'acceptedOffers.id');
+        const eventIds = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: [params.object.order[0].orderNumber] }
+        }, 'acceptedOffers.itemOffered.reservationFor.id');
+        // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumbers({
+        //     orderNumber: { $in: [params.object.order[0].orderNumber] }
+        // });
+        const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: params.object.order[0].orderNumber },
+            project: { id: { $eq: params.project.id } }
         });
         return { acceptedOffers, eventIds, offerIds, orders };
     });
@@ -208,9 +217,12 @@ function checkUsedReservationExists(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let usedReservationExists = false;
         // 注文に含まれる予約の状態検証
-        const reservationNumbers = yield repos.order.searchReservationNumbersByOrderNumbers({
+        // const reservationNumbers = await repos.acceptedOffer.searchReservationNumbersByOrderNumbers({
+        //     orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
+        // });
+        const reservationNumbers = yield repos.acceptedOffer.distinctValues({
             orderNumber: { $in: params.orders.map((order) => order.orderNumber) }
-        });
+        }, 'acceptedOffers.itemOffered.reservationNumber');
         if (reservationNumbers.length > 0) {
             // 使用済の予約がひとつでもあれば不可
             const existingUsedReservations = yield repos.reservation.search({
@@ -279,42 +291,40 @@ function createOrder4returnPolicy(params) {
         orderDate: params.order.orderDate,
         orderNumber: params.order.orderNumber,
         price: params.order.price,
-        acceptedOffers: (Array.isArray(params.order.acceptedOffers))
-            ? params.order.acceptedOffers.map((o) => {
-                var _a;
-                if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
-                    const reservation = o.itemOffered;
-                    const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
-                    return {
-                        itemOffered: {
-                            additionalProperty: reservation.additionalProperty,
-                            reservationFor: {
-                                doorTime: reservation.reservationFor.doorTime,
-                                endDate: reservation.reservationFor.endDate,
-                                startDate: reservation.reservationFor.startDate
-                                // superEvent: reservation.reservationFor.superEvent
-                            },
-                            reservedTicket: {
-                                ticketedSeat: reservation.reservedTicket.ticketedSeat
-                            }
+        acceptedOffers: params.order.acceptedOffers.map((o) => {
+            var _a;
+            if (o.itemOffered.typeOf === factory.reservationType.EventReservation) {
+                const reservation = o.itemOffered;
+                const priceComponent = (_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent;
+                return {
+                    itemOffered: {
+                        additionalProperty: reservation.additionalProperty,
+                        reservationFor: {
+                            doorTime: reservation.reservationFor.doorTime,
+                            endDate: reservation.reservationFor.endDate,
+                            startDate: reservation.reservationFor.startDate
+                            // superEvent: reservation.reservationFor.superEvent
                         },
-                        priceSpecification: {
-                            priceComponent: (Array.isArray(priceComponent))
-                                ? priceComponent.map((component) => {
-                                    const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
-                                    return postingComponent;
-                                })
-                                : []
+                        reservedTicket: {
+                            ticketedSeat: reservation.reservedTicket.ticketedSeat
                         }
-                    };
-                }
-                else {
-                    return {
-                        priceSpecification: o.priceSpecification
-                    };
-                }
-            })
-            : []
+                    },
+                    priceSpecification: {
+                        priceComponent: (Array.isArray(priceComponent))
+                            ? priceComponent.map((component) => {
+                                const { accounting, name, priceCurrency, valueAddedTaxIncluded } = component, postingComponent = __rest(component, ["accounting", "name", "priceCurrency", "valueAddedTaxIncluded"]);
+                                return postingComponent;
+                            })
+                            : []
+                    }
+                };
+            }
+            else {
+                return {
+                    priceSpecification: o.priceSpecification
+                };
+            }
+        })
     };
 }
 const TIMEOUT = 5000;
@@ -389,7 +399,7 @@ function findApplicableReturnPolicy(params) {
             if (typeof returnPolicySameAsByPoject === 'string' && returnPolicySameAsByPoject.length > 0) {
                 const returnPolicyByProject = yield getReturnPolicyByProject({
                     sameAs: returnPolicySameAsByPoject,
-                    order: params.orders[0] // 同時返品可能な注文数をは1
+                    order: Object.assign(Object.assign({}, params.orders[0]), { acceptedOffers: params.acceptedOffers })
                 });
                 applicalbleReturnPolicies.push(returnPolicyByProject);
             }
@@ -601,6 +611,7 @@ function validateOffersReturnPolicy(params) {
     // 決済カード取消ポリシーを確定(2023-05-23~)
     const returnFeesMovieTicket = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
+        var _a, _b;
         const unitPriceOffer = params.offers.find((offer) => offer.id === acceptedOffer.id);
         if (unitPriceOffer === undefined) {
             throw new factory.errors.NotFound(`UnitPriceOffer ${acceptedOffer.id}`);
@@ -613,11 +624,11 @@ function validateOffersReturnPolicy(params) {
         if (policyByOffer === undefined) {
             throw new factory.errors.NotFound(`MerchantReturnPolicy acceptedOffer:${acceptedOffer.id}`);
         }
-        const movieTicketTypeChargeSpecExists = acceptedOffer.priceSpecification.priceComponent.some((component) => {
+        const movieTicketTypeChargeSpecExists = (_a = acceptedOffer.priceSpecification) === null || _a === void 0 ? void 0 : _a.priceComponent.some((component) => {
             return component.typeOf === factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
         });
-        if (movieTicketTypeChargeSpecExists) {
-            acceptedOffer.priceSpecification.priceComponent.forEach((component) => {
+        if (movieTicketTypeChargeSpecExists === true) {
+            (_b = acceptedOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.priceComponent.forEach((component) => {
                 if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
                     if (Array.isArray(component.appliesToMovieTicket)) {
                         component.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
@@ -706,12 +717,19 @@ function confirm(params) {
             emailMessageOnOrderReturned = searchEmailMessagesResult.shift();
         }
         const result = {};
+        const moneyTransferAcceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            orderNumber: { $eq: transaction.object.order[0].orderNumber },
+            project: { id: { $eq: transaction.project.id } },
+            acceptedOffers: { itemOffered: { typeOf: { $in: [factory.actionType.MoneyTransfer] } } }
+        }, ['itemOffered']);
+        debug(moneyTransferAcceptedOffers.length, 'moneyTransferAcceptedOffers found.', moneyTransferAcceptedOffers);
         const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
             dateReturned: params.object.order.dateReturned,
             orders: orders,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessageOnOrderReturned: emailMessageOnOrderReturned
+            emailMessageOnOrderReturned: emailMessageOnOrderReturned,
+            moneyTransferAcceptedOffers
         });
         // ステータス変更
         yield repos.transaction.confirm({

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.344.0",
+    "@chevre/factory": "4.346.0",
     "@cinerino/sdk": "5.3.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.18.0-alpha.2"
+  "version": "21.18.0-alpha.20"
 }

package/lib/chevre/repo/action/registerServiceInProgress.d.ts

@@ -1,29 +0,0 @@
-import { RedisClientType } from 'redis';
-/**
- * 進行アクションキーインターフェース
- */
-export interface IProgressKey {
-    agent: {
-        id: string;
-    };
-    product: {
-        id: string;
-    };
-}
-/**
- * 進行中サービス登録アクションリポジトリ
- */
-export declare class RedisRepository {
-    private static readonly KEY_PREFIX;
-    private readonly redisClient;
-    constructor(redisClient: RedisClientType);
-    /**
-     * ロックする
-     */
-    lock(progressKey: IProgressKey, holder: string): Promise<boolean>;
-    /**
-     * メンバーシップ登録進行ロックを解除する
-     */
-    unlock(progressKey: IProgressKey): Promise<void>;
-    getHolder(progressKey: IProgressKey): Promise<string | null>;
-}