@chevre/domain 21.2.0-alpha.6 → 21.2.0-alpha.60

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

@@ -7,6 +7,7 @@ const settings_1 = require("../../../../settings");
 /**
  * 取引のタスクを作成する
  */
+// tslint:disable-next-line:max-func-body-length
 function createTasks(params) {
     const taskAttributes = [];
     const transaction = params.transaction;
@@ -35,7 +36,16 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                object: Object.assign({}, (transaction.object.pendingTransaction !== undefined)
+                    ? { pendingTransaction: transaction.object.pendingTransaction }
+                    : undefined),
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);

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

@@ -17,7 +17,9 @@ function createStartParams(params, passport, seller, amount, fromLocation, toLoc
             // ↓最適化(2022-05-24~)
             // ...{ project: seller.project }
         },
-        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, authorizeActions: [], pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, 
+            // authorizeActions: [],
+            pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
                 ? { identifier: params.object.pendingTransaction.identifier }
                 : undefined) }, (passport !== undefined) ? { passport } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined),
         expires: params.expires

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

@@ -4,5 +4,6 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
     transaction: factory.transaction.ITransaction<factory.transactionType.MoneyTransfer>;
 }): Promise<factory.transaction.IPotentialActions<factory.transactionType.MoneyTransfer>>;

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

@@ -13,7 +13,7 @@ exports.createPotentialActions = void 0;
 const factory = require("../../../factory");
 function createMoneyTransferActions(params) {
     const moneyTransferActions = [];
-    const authorizeMoneyTransferActions = params.transaction.object.authorizeActions
+    const authorizeMoneyTransferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

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

@@ -519,19 +519,17 @@ function confirm(params) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
         // 取引に対する全ての承認アクションをマージ
-        transaction.object.authorizeActions = yield searchAuthorizeActions({
+        const authorizeActions = yield searchAuthorizeActions({
             transaction: transaction,
             now: now
         })(repos);
         // ポストアクションを作成
-        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({
-            transaction: transaction
-        });
+        const potentialActions = yield (0, potentialActions_1.createPotentialActions)({ authorizeActions, transaction });
         // 取引確定
         yield repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
-            authorizeActions: transaction.object.authorizeActions,
+            authorizeActions: [],
             result: {},
             potentialActions: potentialActions
         });
@@ -545,13 +543,14 @@ function searchAuthorizeActions(params) {
             purpose: {
                 typeOf: params.transaction.typeOf,
                 id: params.transaction.id
-            }
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
-            return a.endDate !== undefined
-                && moment(a.endDate)
-                    .toDate() < params.now;
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.now));
         });
         return authorizeActions;
     });
@@ -576,9 +575,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -213,7 +213,8 @@ function processPlaceOrder(params) {
                     orderDate: new Date()
                 }
             },
-            potentialActions: params.potentialActions
+            potentialActions: params.potentialActions,
+            saveAuthorizeActions: true
         })(repos);
     });
 }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -75,10 +75,49 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                object: Object.assign(Object.assign({}, (typeof transaction.object.confirmationNumber === 'string')
+                    ? { confirmationNumber: transaction.object.confirmationNumber }
+                    : undefined), (typeof transaction.object.orderNumber === 'string')
+                    ? { orderNumber: transaction.object.orderNumber }
+                    : undefined),
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
+        }
+    };
+    // 確定取引にも決済承認中止タスクを追加(2023-05-03~)
+    const voidPaymentTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidPayTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
+    // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)
+    const voidReserveTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidReserveTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes, voidReserveTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             const potentialActions = transaction.potentialActions;
@@ -107,22 +146,8 @@ function createTasks(params) {
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;
-        // 期限切れor中止の場合は、タスクリストを作成する
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
-            const voidReserveTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidReserveTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidRegisterServiceTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidRegisterServiceTransaction,
@@ -136,19 +161,6 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            const voidPaymentTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidPayTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidMoneyTransferTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidMoneyTransferTransaction,
@@ -162,7 +174,7 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            taskAttributes.push(voidReserveTaskAttributes, voidRegisterServiceTaskAttributes, voidPaymentTaskAttributes, voidMoneyTransferTaskAttributes);
+            taskAttributes.push(voidRegisterServiceTaskAttributes, voidMoneyTransferTaskAttributes);
             break;
         default:
             throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

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

@@ -36,11 +36,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/placeOrderInProgress/factory.js

@@ -4,7 +4,7 @@ exports.createStartParams = void 0;
 const factory = require("../../../factory");
 function createStartParams(params, passport, seller, broker) {
     var _a, _b, _c, _d;
-    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ passportToken: (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? params.object.passport.token : undefined, authorizeActions: [] }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
+    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ passportToken: (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? params.object.passport.token : undefined }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
         ? { clientUser: params.object.clientUser }
         : undefined), (typeof ((_b = params.object) === null || _b === void 0 ? void 0 : _b.name) === 'string') ? { name: (_c = params.object) === null || _c === void 0 ? void 0 : _c.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_d = params.object.customer) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { customer: params.object.customer } : undefined);
     if (typeof seller.id !== 'string') {

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.d.ts

@@ -3,4 +3,5 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
 export declare function createMoneyTransferActions(params: {
     order: factory.order.IOrder;
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.moneyTransfer.IAttributes[]>;

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

@@ -15,7 +15,7 @@ const order_1 = require("../../../../factory/order");
 function createMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const moneyTransferActions = [];
-        const authorizeMoneyTransferActions = params.transaction.object.authorizeActions
+        const authorizeMoneyTransferActions = params.authorizeActions
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => a.object.typeOf === factory.offerType.Offer)
             .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.d.ts

@@ -2,4 +2,5 @@ import * as factory from '../../../../factory';
 export declare function createRegisterServiceActions(params: {
     order: factory.order.IOrder;
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -17,7 +17,7 @@ const order_1 = require("../../../../factory/order");
 function createRegisterServiceActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const registerServiceActions = [];
-        const authorizeProductOfferActions = params.transaction.object.authorizeActions
+        const authorizeProductOfferActions = params.authorizeActions
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => Array.isArray(a.object)
             && a.object.length > 0

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

@@ -7,4 +7,5 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     transaction: factory.transaction.placeOrder.ITransaction;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.transaction.placeOrder.IPotentialActions>;

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

@@ -3,12 +3,14 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
 export type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
 export declare function createReservationAcceptedOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     reservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
     reservationOrderItems: factory.order.IOrderedItem[];
 };
 export declare function createProductItems(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
     productOrderItems: factory.order.IOrderedItem[];
@@ -16,6 +18,7 @@ export declare function createProductItems(params: {
 export declare function createMoneyTransferAcceptedOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     seller: factory.order.ISeller;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
     moneyTransferOrderItems: factory.order.IOrderedItem[];

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -7,7 +7,7 @@ function createReservationAcceptedOffers(params) {
     const acceptedOffers = [];
     const orderedItems = [];
     // 座席予約に対する承認アクション取り出す
-    const seatReservationAuthorizeActions = params.transaction.object.authorizeActions
+    const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     const eventIds = [];
@@ -85,7 +85,7 @@ function reservationOffers2orderedItem(params) {
 function createProductItems(params) {
     const acceptedOffers = [];
     const orderedItems = [];
-    const authorizePaymentCardOfferActions = params.transaction.object.authorizeActions
+    const authorizePaymentCardOfferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => Array.isArray(a.object)
         && a.object.length > 0
@@ -117,7 +117,11 @@ function createProductItems(params) {
 exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
-    const authorizeMoneyTansferActions = params.transaction.object.authorizeActions
+    // const authorizeMoneyTansferActions = (<IAuthorizeMoneyTransferOffer[]>params.transaction.object.authorizeActions)
+    //     .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
+    //     .filter((a) => a.object.typeOf === factory.offerType.Offer)
+    //     .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
+    const authorizeMoneyTansferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

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

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

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -23,7 +23,7 @@ function createOrder(params) {
     ];
     const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
     // 決済方法をセット
-    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction });
+    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction, authorizeActions: params.authorizeActions });
     const discounts = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
@@ -62,7 +62,7 @@ function createCustomer(params) {
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;
-    const authorizePaymentActions = params.transaction.object.authorizeActions
+    const authorizePaymentActions = params.authorizeActions
         .filter((a) => {
         var _a;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

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

@@ -2,4 +2,4 @@ import * as factory from '../../../../factory';
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -10,8 +10,8 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-function validateMovieTicket(paymentMethodType, transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
         var _a, _b, _c;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

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

@@ -7,7 +7,7 @@ export type IUnitPriceSpecification = factory.priceSpecification.IPriceSpecifica
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateTransaction(transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;
 export type IConfirmationNumberGenerator = (order: factory.order.IOrder) => string;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 export type IResultOrderParams = factory.transaction.placeOrder.IResultOrderParams & {
@@ -46,4 +46,5 @@ export declare function validatePaymentMethods(params: {
 export declare function validateEventOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     order: factory.order.IOrder;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): void;

package/lib/chevre/service/transaction/placeOrderInProgress/validation.js

@@ -13,18 +13,18 @@ const debug = createDebug('cinerino-domain:service');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction) {
+function validateTransaction(transaction, authorizeActions) {
     validateProfile(transaction);
-    validatePrice(transaction);
+    validatePrice(transaction, authorizeActions);
     // 利用可能な通貨単位に対して取引検証
-    validateMonetaryAmount(transaction);
+    validateMonetaryAmount(authorizeActions);
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
     // 検証すべきMovieTicketIF決済方法タイプのリストは、決済承認アクションのresult.issuedThrough.typeOf: MovieTicketで抽出できるのでは？
-    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(transaction);
+    const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
             try {
-                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction);
+                (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, transaction, authorizeActions);
             }
             catch (error) {
                 // 検証結果をlog(2022-06-04~)
@@ -35,11 +35,13 @@ function validateTransaction(transaction) {
         });
     }
     // 決済URLが発行されている場合、検証
-    validatePaymentUrl(transaction);
+    validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function findMovieTicketPaymentMethodTypesFromTransaction(
+// transaction: factory.transaction.placeOrder.ITransaction,
+authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a, _b;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
@@ -86,8 +88,8 @@ function validateProfile(transaction) {
         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
     }
 }
-function validatePrice(transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validatePrice(transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -110,9 +112,9 @@ function validatePrice(transaction) {
         throw new factory.errors.Argument('Transaction', 'Transaction cannot be confirmed because prices are not matched');
     }
 }
-function validatePaymentUrl(transaction) {
+function validatePaymentUrl(transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     var _a, _b;
-    const authorizeActions = transaction.object.authorizeActions;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
     const paymentUrl = (_b = transaction.object.paymentMethods) === null || _b === void 0 ? void 0 : _b.paymentUrl;
@@ -135,10 +137,10 @@ function validatePaymentUrl(transaction) {
 /**
  * JPY以外の通貨について取引を検証する
  */
-function validateMonetaryAmount(transaction
-// currencies: string[]
-) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMonetaryAmount(
+// transaction: factory.transaction.placeOrder.ITransaction,
+authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
@@ -216,7 +218,11 @@ exports.validatePaymentMethods = validatePaymentMethods;
  * イベントオファー適用条件確認
  */
 function validateEventOffers(params) {
-    const seatReservationAuthorizeActions = params.transaction.object.authorizeActions
+    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
+    //     params.transaction.object.authorizeActions
+    //         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
+    //         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
+    const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     seatReservationAuthorizeActions.forEach((a) => {

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

@@ -1,6 +1,3 @@
-/**
- * 進行中注文取引サービス
- */
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { RedisRepository as ConfirmationNumberRepo } from '../../repo/confirmationNumber';
@@ -60,6 +57,7 @@ export type IConfirmParams = factory.transaction.placeOrder.IConfirmParams & {
     result: {
         order: IResultOrderParams;
     };
+    saveAuthorizeActions: boolean;
 };
 /**
  * 注文取引を確定する

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

@@ -13,6 +13,7 @@ exports.voidAward = exports.authorizeAward = exports.publishOrderNumberIfNotExis
 /**
  * 進行中注文取引サービス
  */
+const moment = require("moment");
 const factory = require("../../factory");
 const factory_1 = require("./placeOrderInProgress/factory");
 const potentialActions_1 = require("./placeOrderInProgress/potentialActions");
@@ -95,14 +96,15 @@ function confirm(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // 取引に対する全ての承認アクションをマージ
-        transaction.object.authorizeActions = yield searchAuthorizeActions(params)(repos);
+        const authorizeActions = yield searchAuthorizeActions(params)(repos);
+        // transaction.object.authorizeActions = authorizeActions;
         // 注文番号を発行
         const orderNumber = yield publishOrderNumberIfNotExist({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction }));
+        const result = createResult(Object.assign(Object.assign({}, params), { orderNumber, transaction: transaction, authorizeActions }));
         // デフォルトEメールメッセージを検索
         let emailMessageOnOrderSent;
         if (repos.emailMessage !== undefined) {
@@ -119,14 +121,16 @@ function confirm(params) {
             order: result.order,
             potentialActions: params.potentialActions,
             transaction: transaction,
-            emailMessage: emailMessageOnOrderSent
+            emailMessage: emailMessageOnOrderSent,
+            authorizeActions
         });
         // ステータス変更
         try {
             yield repos.transaction.confirm({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                authorizeActions: transaction.object.authorizeActions,
+                // 保管有無を設定化(2023-05-16~)
+                authorizeActions: (params.saveAuthorizeActions) ? authorizeActions : [],
                 result: result,
                 potentialActions: potentialActions
             });
@@ -214,18 +218,20 @@ exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
 function createResult(params) {
     const transaction = params.transaction;
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction);
+    (0, validation_1.validateTransaction)(transaction, params.authorizeActions);
     // 注文作成
     const order = (0, result_1.createOrder)({
         orderNumber: params.orderNumber,
         transaction: transaction,
         orderDate: params.result.order.orderDate,
         orderStatus: factory.orderStatus.OrderProcessing,
-        isGift: false
+        isGift: false,
+        authorizeActions: params.authorizeActions
     });
     (0, validation_1.validateEventOffers)({
         transaction: transaction,
-        order: order
+        order: order,
+        authorizeActions: params.authorizeActions
     });
     // 注文アイテム数制限確認
     (0, validation_1.validateNumItems)({
@@ -252,10 +258,15 @@ function searchAuthorizeActions(params) {
             purpose: {
                 typeOf: factory.transactionType.PlaceOrder,
                 id: params.id
-            }
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
-        authorizeActions = authorizeActions.filter((a) => (a.endDate !== undefined && a.endDate < params.result.order.orderDate));
+        authorizeActions = authorizeActions.filter((a) => {
+            return (a.endDate instanceof Date) && moment(a.endDate)
+                .isBefore(moment(params.result.order.orderDate));
+        });
         return authorizeActions;
     });
 }
@@ -311,7 +322,7 @@ function authorizeAward(params) {
         if (Array.isArray(givePointAwardParams)) {
             const pointAwardIdentifiers = givePointAwardParams.map((g) => { var _a; return String((_a = g.object) === null || _a === void 0 ? void 0 : _a.identifier); });
             // 取引にインセンティブ付与アクションパラメータを保管する
-            yield repos.transaction.findByIdAndUpdate({
+            yield repos.transaction.findByIdAndUpdateInProgress({
                 id: transaction.id,
                 update: {
                     $set: {
@@ -339,7 +350,7 @@ function voidAward(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        yield repos.transaction.findByIdAndUpdate({
+        yield repos.transaction.findByIdAndUpdateInProgress({
             id: transaction.id,
             update: {
                 $unset: {

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

@@ -36,7 +36,16 @@ function createTasks(params) {
         numberOfTried: 0,
         executionResults: [],
         data: {
-            object: transaction
+            object: {
+                endDate: transaction.endDate,
+                id: transaction.id,
+                object: {
+                    order: transaction.object.order
+                },
+                project: transaction.project,
+                startDate: transaction.startDate,
+                typeOf: transaction.typeOf
+            }
         }
     };
     taskAttributes.push(deleteTransactionTask);