@chevre/domain 22.5.0-alpha.9 → 22.5.0

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.d.ts

@@ -13,5 +13,5 @@ declare function createInformTasks(params: {
 }, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createNextSendOrderTasks, IInTransitOrder };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderDeliveredPartially/factory.js

@@ -10,24 +10,23 @@ function createInformTasks(params, settings) {
     const { order } = params;
     const taskRunsAt = new Date();
     const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-    let informTasks = [];
+    const informTasks = [];
+    const order4inform = creteOrder4inform(order);
+    const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}:${order.acceptedOffers.page}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        const order4inform = creteOrder4inform(order);
         let recipientId = '';
         recipientId = order.customer.id;
-        informTasks = informOrder.map((informOrderParams) => {
+        informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                // agent: order.project,
                 object: order4inform,
-                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                }
-                // typeOf: factory.actionType.InformAction
+                },
+                identifier: informIdentifier // add(2024-10-24~)
             };
             return {
                 project: order.project,
@@ -39,7 +38,7 @@ function createInformTasks(params, settings) {
                 executionResults: [],
                 data: informActionAttributes
             };
-        });
+        }));
     }
     return informTasks;
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -8,24 +8,23 @@ function createInformTasks(order, settings) {
     var _a;
     const taskRunsAt = new Date();
     const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-    let informTasks = [];
+    const informTasks = [];
+    const order4inform = creteOrder4inform(order);
+    const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        const order4inform = creteOrder4inform(order);
         let recipientId = '';
         recipientId = order.customer.id;
-        informTasks = informOrder.map((informOrderParams) => {
+        informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                // agent: order.project,
                 object: order4inform,
-                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                }
-                // typeOf: factory.actionType.InformAction
+                },
+                identifier: informIdentifier // add(2024-10-24~)
             };
             return {
                 project: order.project,
@@ -37,7 +36,7 @@ function createInformTasks(order, settings) {
                 executionResults: [],
                 data: informActionAttributes
             };
-        });
+        }));
     }
     return informTasks;
 }
@@ -56,9 +55,7 @@ function createMaskedCustomer(order) {
 function creteOrder4inform(order) {
     return Object.assign({ 
         // whitelistで作成する(2022-07-19~)
-        project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: [], 
-        // numAcceptedOffers: order.acceptedOffers.length,
-        numAcceptedOffers: order.numAcceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
+        project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: [], numAcceptedOffers: order.numAcceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
         // mask
         customer: Object.assign(Object.assign({}, createMaskedCustomer(order)), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
             // identifierは必要

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.d.ts

@@ -8,5 +8,5 @@ declare function createInformTasks(order: IReturnedOrder, settings: Settings): f
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deletePerson").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderReturned/factory.js

@@ -6,27 +6,26 @@ function createInformTasks(order, settings) {
     var _a, _b;
     const taskRunsAt = new Date();
     const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-    let informTasks = [];
+    const informTasks = [];
+    const order4inform = creteOrder4inform(order);
+    const informIdentifier = `${factory.order.OrderType.Order}:${order4inform.orderNumber}:${order4inform.orderStatus}`;
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        const order4inform = creteOrder4inform(order);
         let recipientId = '';
         recipientId = order.customer.id;
         if (typeof ((_b = order.returner) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             recipientId = order.returner.id;
         }
-        informTasks = informOrder.map((informOrderParams) => {
+        informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                // agent: order.project,
                 object: order4inform,
-                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
-                }
-                // typeOf: factory.actionType.InformAction
+                },
+                identifier: informIdentifier // add(2024-10-24~)
             };
             return {
                 project: order.project,
@@ -38,7 +37,7 @@ function createInformTasks(order, settings) {
                 executionResults: [],
                 data: informActionAttributes
             };
-        });
+        }));
     }
     return informTasks;
 }

package/lib/chevre/service/order/onOrderUpdated/factory.d.ts

@@ -1,7 +1,4 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-export type IUpdatedOrder4inform = Pick<factory.order.IOrder, 'typeOf' | 'orderNumber' | 'name' | 'project'> & {
-    updatedAt: Date;
-};
-declare function createInformTasks(order: IUpdatedOrder4inform, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
+declare function createInformTasks(order: factory.notification.order.IUpdatedOrder4inform, settings: Settings): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 export { createInformTasks };

package/lib/chevre/service/order/onOrderUpdated/factory.js

@@ -6,23 +6,20 @@ function createInformTasks(order, settings) {
     var _a;
     const taskRunsAt = new Date();
     const informOrder = (_a = settings.onOrderStatusChanged) === null || _a === void 0 ? void 0 : _a.informOrder;
-    let informTasks = [];
+    const informTasks = [];
+    const order4inform = creteOrder4inform(order);
     if (Array.isArray(informOrder) && informOrder.length > 0) {
-        const order4inform = creteOrder4inform(order);
         const recipientId = '';
-        informTasks = informOrder.map((informOrderParams) => {
+        informTasks.push(...informOrder.map((informOrderParams) => {
             var _a, _b;
             const informActionAttributes = {
-                // agent: order.project,
                 object: order4inform,
-                // project: order.project,
                 recipient: {
                     url: (_a = informOrderParams.recipient) === null || _a === void 0 ? void 0 : _a.url,
                     id: recipientId,
                     name: (_b = informOrderParams.recipient) === null || _b === void 0 ? void 0 : _b.name,
                     typeOf: factory.creativeWorkType.WebApplication
                 }
-                // typeOf: factory.actionType.InformAction
             };
             return {
                 project: order.project,
@@ -34,7 +31,7 @@ function createInformTasks(order, settings) {
                 executionResults: [],
                 data: informActionAttributes
             };
-        });
+        }));
     }
     return informTasks;
 }

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -51,7 +51,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                     },
                     object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['result'], []));
+                }, ['result']));
                 authorizeOfferActionsWithInstrument = (yield repos.action.search({
                     typeOf: factory.actionType.AuthorizeAction,
                     purpose: {
@@ -67,7 +67,7 @@ function createPlacingOrderFromExistingTransaction(params) {
                         }
                     },
                     id: { $in: completedAuthorizeActionIds }
-                }, ['instrument'], []));
+                }, ['instrument']));
             }
         }
         // orderedItem生成のためにacceptedOffersを取得

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

@@ -70,7 +70,7 @@ function placeOrder(params) {
                 id: { $in: [orderActionPurpose.id] },
                 typeOf: { $in: [orderActionPurpose.typeOf] }
             }
-        }, ['id'], []);
+        }, ['id']);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(orderActionAttributes);
             try {

package/lib/chevre/service/payment/any/handlePrePublishedPaymentMethodIdOnAuthorizing.js

@@ -68,7 +68,7 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
                     transactionNumber: { $eq: params.prePublishedPaymentMethodId },
                     typeOf: { $eq: factory.assetTransactionType.Pay }
                 }
-            }, ['object', 'result'], [])).shift();
+            }, ['object', 'result'])).shift();
             if (acceptPayAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.AcceptAction);
             }

package/lib/chevre/service/payment/any.js

@@ -84,7 +84,7 @@ function invalidatePaymentUrl(params) {
                     transactionNumber: { $eq: paymentMethodIdByPaymentUrl },
                     typeOf: { $eq: factory.assetTransactionType.Pay }
                 }
-            }, ['object'], [])).shift();
+            }, ['object'])).shift();
             if (acceptPayAction !== undefined) {
                 // const paymentMethodType = transaction.object.paymentMethods?.typeOf;
                 const paymentMethodType = acceptPayAction.object.object.paymentMethod.identifier;

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts

@@ -20,7 +20,7 @@ declare function processAuthorizeCreditCard(params: {
     returnUrls3ds: string[];
     callbackType3ds?: factory.service.paymentService.ICallbackType3ds;
     orderId: string;
-    availableChannel: factory.product.IAvailableChannel;
+    availableChannel: factory.service.paymentService.IAvailableChannel;
     object: factory.assetTransaction.pay.IPaymentMethod;
     /**
      * 決済URL発行処理かどうか

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js

@@ -24,9 +24,6 @@ function processAuthorizeCreditCard(params) {
         const { shopId, shopPass, orderId } = params;
         const creditCard = params.object.creditCard;
         const { cardSeq, memberId } = creditCard;
-        if (typeof memberId === 'string' && memberId.length > 0 && typeof cardSeq === 'number') {
-            // 決済承認時のuseUsernameAsGMOMemberId判定を廃止(2024-01-04~)
-        }
         const { cardNo, cardPass, expire } = creditCard;
         const { token } = creditCard;
         const retUrl = creditCard === null || creditCard === void 0 ? void 0 : creditCard.retUrl;

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.d.ts

@@ -15,7 +15,7 @@ declare function processAuthorizeCreditCard3ds(params: {
     payTransaction: {
         id: string;
     };
-    availableChannel: factory.product.IAvailableChannel;
+    availableChannel: factory.service.paymentService.IAvailableChannel;
     pendingPaymentAgencyTransaction: Pick<ICreditCardPaymentAgencyTransaction3ds, 'entryTranArgs' | 'entryTranResult' | 'execTranArgs' | 'execTranResult'>;
 }): (repos: {
     action: ActionRepo;

package/lib/chevre/service/payment/creditCard/searchGMOTrade.d.ts

@@ -6,7 +6,7 @@ import { Settings } from '../../../settings';
  * 存在しない場合NotFoundエラー
  */
 declare function searchGMOTrade(params: {
-    availableChannel: factory.product.IAvailableChannel;
+    availableChannel: factory.service.paymentService.IAvailableChannel;
     paymentMethodId: string;
     shopId: string;
     shopPass: string;

package/lib/chevre/service/payment/creditCard/voidTransaction.js

@@ -49,7 +49,7 @@ function voidTransaction(params) {
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             object: { paymentMethodId: { $eq: paymentMethodId } },
             sameAs: { id: { $eq: transaction.id } }
-        }, ['id', 'typeOf', 'project'], [])).shift();
+        }, ['id', 'typeOf', 'project'])).shift();
         if (authorizeInvoiceAction !== undefined) {
             const cancelAction = {
                 startTime: new Date(),

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.js

@@ -12,10 +12,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.refundMovieTicket = void 0;
 const surfrock = require("@surfrock/sdk");
 const http_status_1 = require("http-status");
+const moment = require("moment");
 const errorHandler_1 = require("../../../errorHandler");
 const factory = require("../../../factory");
 const onRefund_1 = require("../any/onRefund");
 const factory_1 = require("./factory");
+function wait4payActionDelayIfNeeded(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        const { payAction } = params;
+        const minIntervalBetweenPayAndRefund = settings.movieticketReserve.minIntervalBetweenPayAndRefund;
+        let waitingNecessary = false;
+        if (typeof minIntervalBetweenPayAndRefund === 'number' && minIntervalBetweenPayAndRefund > 0) {
+            if (payAction.actionStatus !== factory.actionStatusType.CompletedActionStatus) {
+                const payStartExpected = moment()
+                    .add(-minIntervalBetweenPayAndRefund, 'milliseconds');
+                waitingNecessary = moment(payAction.startDate)
+                    .isAfter(payStartExpected);
+            }
+        }
+        if (waitingNecessary) {
+            // tslint:disable-next-line:no-console
+            console.log('wait4payActionDelayIfNeeded: waiting... minIntervalBetweenPayAndRefund:', minIntervalBetweenPayAndRefund);
+            yield new Promise((resolve) => {
+                setTimeout(() => {
+                    resolve();
+                }, minIntervalBetweenPayAndRefund);
+            });
+        }
+    });
+}
 /**
  * 決済カード返金
  */
@@ -25,6 +50,24 @@ function refundMovieTicket(params) {
         var _a, _b, _c, _d, _e, _f;
         const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
         const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
+        // 本アクションに対応するPayActionを取り出す
+        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
+        const payAction = yield repos.action.findPayAction({
+            project: { id: params.project.id },
+            paymentMethodId,
+            actionStatus: {
+                $in: [
+                    factory.actionStatusType.ActiveActionStatus,
+                    factory.actionStatusType.CompletedActionStatus,
+                    factory.actionStatusType.FailedActionStatus
+                ]
+            }
+        });
+        if (payAction === undefined) {
+            throw new factory.errors.NotFound(factory.actionType.PayAction);
+        }
+        // handle delays in the side of payment service(2024-10-23~)
+        yield wait4payActionDelayIfNeeded({ payAction })(settings);
         const availableChannel = yield repos.paymentService.findAvailableChannel({
             project: params.project,
             typeOf: factory.service.paymentService.PaymentServiceType.MovieTicket,
@@ -44,13 +87,15 @@ function refundMovieTicket(params) {
         if (useSeatInfoSyncCancel) {
             seatInfoSyncCancelIn = yield createSeatInfoSyncCancelInOnRefund({
                 project: { id: params.project.id },
-                paymentMethodId
+                paymentMethodId,
+                payAction: { id: payAction.id }
             })({ action: repos.action });
         }
         else {
             seatInfoSyncIn = yield createSeatInfoSyncInOnRefund({
                 project: { id: params.project.id },
-                paymentMethodId
+                paymentMethodId,
+                payAction: { id: payAction.id }
             })({ action: repos.action });
         }
         let recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id } }, (seatInfoSyncIn !== undefined) ? { processSeatInfoSyncResult: { seatInfoSyncIn } } : undefined), (seatInfoSyncCancelIn !== undefined) ? { processSeatInfoSyncCancelResult: { seatInfoSyncCancelIn } } : undefined));
@@ -100,15 +145,7 @@ function refundMovieTicket(params) {
         else {
             // add recipe(2024-06-04~)
             recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)(Object.assign(Object.assign({ project: { id: params.project.id } }, (processSeatInfoSyncResult !== undefined) ? { processSeatInfoSyncResult } : undefined), (processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined));
-            const actionResult = {
-            // ...(seatInfoSyncIn !== undefined) ? { seatInfoSyncIn } : undefined, // instrumentへ移行(2024-04-30~)
-            // ...(processSeatInfoSyncResult?.seatInfoSyncResult !== undefined) // discontinue(2024-06-10~)
-            //     ? { seatInfoSyncResult: processSeatInfoSyncResult.seatInfoSyncResult }
-            //     : undefined,
-            // ...(processSeatInfoSyncCancelResult?.seatInfoSyncCancelResult !== undefined) // discontinue(2024-06-10~)
-            //     ? { seatInfoSyncCancelResult: processSeatInfoSyncCancelResult.seatInfoSyncCancelResult }
-            //     : undefined
-            };
+            const actionResult = {};
             yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
             actionStatus = factory.actionStatusType.CompletedActionStatus;
         }
@@ -127,34 +164,12 @@ exports.refundMovieTicket = refundMovieTicket;
 function createSeatInfoSyncInOnRefund(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        // 本アクションに対応するPayActionを取り出す
-        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = yield repos.action.findPayAction({
-            project: { id: params.project.id },
-            paymentMethodId: params.paymentMethodId,
-            actionStatus: {
-                $in: [
-                    factory.actionStatusType.ActiveActionStatus,
-                    factory.actionStatusType.CompletedActionStatus,
-                    factory.actionStatusType.FailedActionStatus
-                ]
-            }
-        });
-        if (payAction === undefined) {
-            throw new factory.errors.NotFound('PayAction');
-        }
         const recipe = yield repos.action.findRecipeByAction({
             project: { id: params.project.id },
-            recipeFor: { id: payAction.id }
+            recipeFor: { id: params.payAction.id }
         });
-        // const seatInfoSyncInOnPay: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn | undefined =
-        //     payAction.instrument?.seatInfoSyncIn;
         const seatInfoSyncInOnPay = (_c = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.beforeMedia;
-        // if (seatInfoSyncInOnPay === undefined && payAction.instrument?.seatInfoSyncIn !== undefined) {
-        //     seatInfoSyncInOnPay = payAction.instrument.seatInfoSyncIn; // compatibility
-        // }
         if (seatInfoSyncInOnPay === undefined) {
-            // throw new factory.errors.NotFound('PayAction.instrument?.seatInfoSyncIn');
             throw new factory.errors.NotFound('PayAction.recipe.step.itemListElement.itemListElement.beforeMedia');
         }
         let seatInfoSyncIn;
@@ -167,34 +182,12 @@ function createSeatInfoSyncInOnRefund(params) {
 function createSeatInfoSyncCancelInOnRefund(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
-        // 本アクションに対応するPayActionを取り出す
-        // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = yield repos.action.findPayAction({
-            project: { id: params.project.id },
-            paymentMethodId: params.paymentMethodId,
-            actionStatus: {
-                $in: [
-                    factory.actionStatusType.ActiveActionStatus,
-                    factory.actionStatusType.CompletedActionStatus,
-                    factory.actionStatusType.FailedActionStatus
-                ]
-            }
-        });
-        if (payAction === undefined) {
-            throw new factory.errors.NotFound('PayAction');
-        }
         const recipe = yield repos.action.findRecipeByAction({
             project: { id: params.project.id },
-            recipeFor: { id: payAction.id }
+            recipeFor: { id: params.payAction.id }
         });
-        // const seatInfoSyncInOnPay: surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn | undefined =
-        //     payAction.instrument?.seatInfoSyncIn;
         const seatInfoSyncInOnPay = (_c = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.beforeMedia;
-        // if (seatInfoSyncInOnPay === undefined && payAction.instrument?.seatInfoSyncIn !== undefined) {
-        //     seatInfoSyncInOnPay = payAction.instrument.seatInfoSyncIn; // compatibility
-        // }
         if (seatInfoSyncInOnPay === undefined) {
-            // throw new factory.errors.NotFound('PayAction.instrument?.seatInfoSyncIn');
             throw new factory.errors.NotFound('PayAction.recipe.step.itemListElement.itemListElement.beforeMedia');
         }
         let seatInfoSyncCancelIn;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -150,7 +150,7 @@ function checkByIdentifierIfNotYet(params) {
                             reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
                         }
                     }
-                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'], [])).shift();
+                } }, (typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined), ['id'])).shift();
             debug('alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'placeOrderId:', placeOrderId);
             if (alreadyCheckedAction !== undefined) {
                 const recipe = yield repos.action.findRecipeByAction({

package/lib/chevre/service/payment/paymentCard.js

@@ -22,11 +22,6 @@ const onRefund_1 = require("./any/onRefund");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 function authorize(params, paymentServiceId) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // const project = <Pick<factory.project.IProject, 'id' | 'typeOf'>>await repos.project.findById({
-        //     id: params.project.id,
-        //     inclusion: ['_id', 'typeOf'],
-        //     exclusion: []
-        // });
         var _a;
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {

package/lib/chevre/service/payment.d.ts

@@ -29,7 +29,7 @@ export declare function fixOrderAsPurpose(params: {
 }, transaction: factory.assetTransaction.pay.ITransaction): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     order: OrderRepo;
-}) => Promise<Pick<factory.order.IOrder, "confirmationNumber" | "typeOf" | "orderNumber"> & {
+}) => Promise<Pick<factory.order.IOrder, "typeOf" | "orderNumber" | "confirmationNumber"> & {
     acceptedOffersMovieTicketUsed: IAcceptedOfferMovieTicketUsed[];
 }>;
 /**

package/lib/chevre/service/report/telemetry.js

@@ -181,7 +181,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         const actionsOnExpiredTransactions = yield repos.action.search({
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             purpose: { id: { $in: expiredTransactionIds } }
-        }, [], []);
+        }, []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
             return actionsOnExpiredTransactions.filter((action) => { var _a; return ((_a = action.purpose) === null || _a === void 0 ? void 0 : _a.id) === transactionId; }).length;

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -7,7 +7,7 @@ import { ReservationRepo } from '../../repo/reservation';
 import { StockHolderRepo } from '../../repo/stockHolder';
 import type { TaskRepo } from '../../repo/task';
 /**
- * 進行中の予約をキャンセルする
+ * 保留予約取消
  */
 declare function cancelPendingReservation(actionAttributes: factory.task.cancelPendingReservation.IData): (repos: {
     action: ActionRepo;

package/lib/chevre/service/reserve/cancelReservation.js

@@ -16,18 +16,24 @@ exports.processUnlockOfferRateLimit = exports.cancelReservation = exports.cancel
 const moment = require("moment");
 const factory = require("../../factory");
 const factory_1 = require("./factory");
+const onPendingReservationCanceled_1 = require("./potentialActions/onPendingReservationCanceled");
 const onReservationCanceled_1 = require("./potentialActions/onReservationCanceled");
 /**
- * 進行中の予約をキャンセルする
+ * 保留予約取消
  */
 function cancelPendingReservation(actionAttributes) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const { reserveTransaction } = yield cancelPengindIfNotYet(actionAttributes)(repos);
-        yield (0, onReservationCanceled_1.onReservationCanceled)([], // PendingReservationはドキュメントとして存在しないので空でok
-        false, {
+        yield (0, onPendingReservationCanceled_1.onPendingReservationCanceled)(
+        // [], // PendingReservationはドキュメントとして存在しないので空でok
+        // false,
+        {
             project: { id: reserveTransaction.project.id },
-            id: String((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id)
+            reservationFor: {
+                id: String((_a = reserveTransaction.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id)
+            },
+            reservationNumber: reserveTransaction.object.reservationNumber
         })({ task: repos.task }, settings);
     });
 }
@@ -61,7 +67,7 @@ function cancelPengindIfNotYet(params) {
                 id: { $in: [params.purpose.id] },
                 typeOf: { $in: [params.purpose.typeOf] }
             }
-        }, ['id'], []);
+        }, ['id']);
         if (completedActions.length === 0) {
             const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
             if (actionAttributes !== undefined) {
@@ -306,7 +312,9 @@ function cancelReservation(actionAttributesList) {
                     });
                     canceledReservations = [canceledReservation];
                 }
-                yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, true, {
+                yield (0, onReservationCanceled_1.onReservationCanceled)(canceledReservations, 
+                // true,
+                {
                     project: { id: actionAttributes.project.id },
                     id: canceledReservationForId
                 })({ task: repos.task }, settings);

package/lib/chevre/service/reserve/confirmReservation.js

@@ -133,7 +133,7 @@ params, options) {
                 id: { $in: [actionAttributes.purpose.id] },
                 typeOf: { $in: [actionAttributes.purpose.typeOf] }
             }
-        }, ['id'], []);
+        }, ['id']);
         debug(completedActions.length, 'completed reserveAction found. byTask:', options === null || options === void 0 ? void 0 : options.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
         if (completedActions.length === 0) {
             const action = yield repos.action.start(actionAttributes);