@chevre/domain 21.2.0-alpha.15 → 21.2.0-alpha.151

package/lib/chevre/service/task.js

@@ -18,16 +18,24 @@ const factory = require("../factory");
 const task_1 = require("../repo/task");
 const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
+const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
+const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
 function executeById(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeById({ id: params.id });
+            task = yield taskRepo.executeById({
+                id: params.id,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -46,12 +54,18 @@ exports.executeById = executeById;
  */
 function executeByName(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeOneByName(params);
+            task = yield taskRepo.executeOneByName({
+                name: params.name,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -127,7 +141,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }
@@ -144,7 +160,9 @@ function notifyAbortedTasks(params) {
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }

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

@@ -0,0 +1,21 @@
+import * as factory from '../../factory';
+import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
+import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+/**
+ * 取引に関わるリソースを削除する
+ * 冪等性を確保すること
+ */
+export declare function deleteTransaction(params: factory.task.IData<factory.taskName.DeleteTransaction>): (repos: {
+    accountingReport: AccountingReportRepo;
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+    ownershipInfo: OwnershipInfoRepo;
+    reservation: ReservationRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;

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

@@ -0,0 +1,232 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.deleteTransaction = void 0;
+const factory = require("../../factory");
+const deleteOrder_1 = require("../order/deleteOrder");
+/**
+ * 取引に関わるリソースを削除する
+ * 冪等性を確保すること
+ */
+function deleteTransaction(params) {
+    // tslint:disable-next-line:max-func-body-length
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const transactions = yield repos.transaction.search({
+            ids: [params.object.id],
+            typeOf: params.object.typeOf,
+            inclusion: [],
+            exclusion: []
+        });
+        const transaction = transactions.shift();
+        if (transaction === undefined) {
+            // すでに削除済
+            return;
+        }
+        // アクション開始
+        const actionAttributes = {
+            typeOf: factory.actionType.DeleteAction,
+            project: transaction.project,
+            object: params.object,
+            agent: transaction.project
+        };
+        let deletePayTransactionResult;
+        let deleteRefundResult;
+        let payTransactionNumbers = [];
+        let deleteReservationsResult;
+        let deleteReserveTransactionResult;
+        let deletedReservationNumbers = [];
+        let deleteActionResult;
+        const action = yield repos.action.start(actionAttributes);
+        try {
+            const transactionTypeOf = transaction.typeOf;
+            switch (transactionTypeOf) {
+                case factory.transactionType.PlaceOrder:
+                    // 取引に対する全ての承認アクションを検索
+                    const authorizeActions = yield repos.action.searchByPurpose({
+                        typeOf: factory.actionType.AuthorizeAction,
+                        purpose: {
+                            typeOf: transaction.typeOf,
+                            id: transaction.id
+                        }
+                    });
+                    switch (transaction.status) {
+                        case factory.transactionStatusType.Canceled:
+                        case factory.transactionStatusType.Expired:
+                            break;
+                        case factory.transactionStatusType.Confirmed:
+                            const deletingOrder = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order;
+                            if (typeof (deletingOrder === null || deletingOrder === void 0 ? void 0 : deletingOrder.orderNumber) === 'string') {
+                                yield (0, deleteOrder_1.deleteOrder)({
+                                    object: deletingOrder
+                                })(repos);
+                            }
+                            break;
+                        default:
+                    }
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO サービス登録取引を削除
+                    // 決済取引を削除
+                    const deletePayTransactionsByPlaceOrderResult = yield deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
+                    deletePayTransactionResult = deletePayTransactionsByPlaceOrderResult.deletePayTransactionResult;
+                    deleteRefundResult = deletePayTransactionsByPlaceOrderResult.deleteRefundResult;
+                    payTransactionNumbers = deletePayTransactionsByPlaceOrderResult.payTransactionNumbers;
+                    // 取引上での予約を削除
+                    const deleteReservationsByPlaceOrderResult = yield deleteReservationsByPlaceOrder({ authorizeActions, transaction })(repos);
+                    deleteReservationsResult = deleteReservationsByPlaceOrderResult.deleteResult;
+                    deleteReserveTransactionResult = deleteReservationsByPlaceOrderResult.deleteReserveTransactionResult;
+                    deletedReservationNumbers = deleteReservationsByPlaceOrderResult.reserveTransactionNumbers;
+                    // アクション削除(2023-05-19~)
+                    deleteActionResult = yield repos.action.deleteByPurpose({
+                        project: { id: transaction.project.id },
+                        purpose: { id: transaction.id, typeOf: transaction.typeOf },
+                        typeOf: {
+                            $in: [
+                                factory.actionType.AuthorizeAction,
+                                factory.actionType.InformAction,
+                                factory.actionType.OrderAction
+                            ]
+                        }
+                    });
+                    // 取引削除
+                    yield repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    break;
+                // implemented(2022-06-09~)
+                case factory.transactionType.ReturnOrder:
+                    // 取引削除
+                    yield repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    break;
+                // implemented(2022-06-09~)
+                case factory.transactionType.MoneyTransfer:
+                    // 取引削除
+                    yield repos.transaction.findByIdAndDelete({ id: transaction.id });
+                    break;
+                default:
+                    throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
+            }
+        }
+        catch (error) {
+            // actionにエラー結果を追加
+            try {
+                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        // アクション完了
+        const actionResult = {
+            deletePayTransactionResult,
+            deleteRefundResult,
+            payTransactionNumbers,
+            deleteReservationsResult,
+            deleteReserveTransactionResult,
+            deletedReservationNumbers,
+            deleteActionResult
+        };
+        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+    });
+}
+exports.deleteTransaction = deleteTransaction;
+function deleteReservationsByPlaceOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let deleteResult;
+        let deleteReserveTransactionResult;
+        const authorizeActions = params.authorizeActions;
+        // 予約取引番号を抽出
+        const authorizeReservationOfferActions = authorizeActions
+            .filter((a) => {
+            var _a, _b;
+            const pendingTransactionNumber = (_b = (_a = a.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber;
+            return a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation
+                && typeof pendingTransactionNumber === 'string'
+                && pendingTransactionNumber.length > 0;
+        });
+        const reserveTransactionNumbers = authorizeReservationOfferActions
+            .map((a) => { var _a; return String((_a = a.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.transactionNumber); });
+        if (reserveTransactionNumbers.length > 0) {
+            // 該当予約番号の予約を削除する(プロジェクトでも絞ること)
+            const deleteReservationsResult = yield repos.reservation.deleteByReservationNumbers({
+                project: { id: params.transaction.project.id },
+                reservationNumbers: reserveTransactionNumbers
+            });
+            deleteResult = {
+                n: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.n,
+                ok: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.ok,
+                deletedCount: deleteReservationsResult === null || deleteReservationsResult === void 0 ? void 0 : deleteReservationsResult.deletedCount
+            };
+            // 予約取引を削除(プロジェクトでも絞ること)(2022-06-07~)
+            const deleteAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                transactionNumbers: reserveTransactionNumbers,
+                typeOf: factory.assetTransactionType.Reserve
+            });
+            deleteReserveTransactionResult = {
+                n: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.n,
+                ok: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.ok,
+                deletedCount: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.deletedCount
+            };
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO 予約取消取引も削除可能か？
+        }
+        return { deleteResult, deleteReserveTransactionResult, reserveTransactionNumbers };
+    });
+}
+function deletePayTransactionsByPlaceOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let deletePayTransactionResult;
+        let deleteRefundResult;
+        const authorizeActions = params.authorizeActions;
+        // 決済取引番号を抽出
+        const authorizePaymentActions = authorizeActions
+            .filter((a) => {
+            var _a;
+            const pendingTransactionNumber = (_a = a.object) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
+            return a.object.typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment
+                && typeof pendingTransactionNumber === 'string'
+                && pendingTransactionNumber.length > 0;
+        });
+        const payTransactionNumbers = authorizePaymentActions.map((a) => String(a.object.paymentMethodId));
+        if (payTransactionNumbers.length > 0) {
+            // 決済取引を削除(プロジェクトでも絞ること)(2022-06-07~)
+            const deleteAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                project: { id: params.transaction.project.id },
+                transactionNumbers: payTransactionNumbers,
+                typeOf: factory.assetTransactionType.Pay
+            });
+            deletePayTransactionResult = {
+                n: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.n,
+                ok: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.ok,
+                deletedCount: deleteAssetTransactionsResult === null || deleteAssetTransactionsResult === void 0 ? void 0 : deleteAssetTransactionsResult.deletedCount
+            };
+            // 返金取引も削除(2023-05-19~)
+            const refundTransactions = yield repos.assetTransaction.search({
+                typeOf: factory.assetTransactionType.Refund,
+                object: { paymentMethodId: { $in: payTransactionNumbers } }
+            }, ['transactionNumber'], []);
+            if (refundTransactions.length > 0) {
+                const deleteRefundAssetTransactionsResult = yield repos.assetTransaction.deleteByTransactionNumber({
+                    project: { id: params.transaction.project.id },
+                    transactionNumbers: refundTransactions.map((refundTransaction) => refundTransaction.transactionNumber),
+                    typeOf: factory.assetTransactionType.Refund
+                });
+                deleteRefundResult = {
+                    n: deleteRefundAssetTransactionsResult === null || deleteRefundAssetTransactionsResult === void 0 ? void 0 : deleteRefundAssetTransactionsResult.n,
+                    ok: deleteRefundAssetTransactionsResult === null || deleteRefundAssetTransactionsResult === void 0 ? void 0 : deleteRefundAssetTransactionsResult.ok,
+                    deletedCount: deleteRefundAssetTransactionsResult === null || deleteRefundAssetTransactionsResult === void 0 ? void 0 : deleteRefundAssetTransactionsResult.deletedCount
+                };
+            }
+        }
+        return { deletePayTransactionResult, deleteRefundResult, payTransactionNumbers };
+    });
+}

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.d.ts

@@ -1,2 +1,2 @@
 import * as factory from '../../../factory';
-export declare function createStartParams(params: factory.transaction.moneyTransfer.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: factory.seller.ISeller, amount: factory.monetaryAmount.IMonetaryAmount, fromLocation: factory.assetTransaction.moneyTransfer.IFromLocationBeforeStart, toLocation: factory.transaction.moneyTransfer.IToLocation, transactionNumber: string): factory.transaction.IStartParams<factory.transactionType.MoneyTransfer>;
+export declare function createStartParams(params: factory.transaction.moneyTransfer.IStartParamsWithoutDetail, passport: factory.waiter.passport.IPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf'>, amount: factory.monetaryAmount.IMonetaryAmount, fromLocation: factory.assetTransaction.moneyTransfer.IFromLocationBeforeStart, toLocation: factory.transaction.moneyTransfer.IToLocation, transactionNumber: string): factory.transaction.IStartParams<factory.transactionType.MoneyTransfer>;

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

@@ -28,7 +28,7 @@ const CodeService = require("../code");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const seller = yield repos.seller.findById({ id: params.seller.id });
+        const seller = yield repos.seller.findById({ id: params.seller.id }, ['name', 'typeOf'], []);
         const passport = yield (0, validation_1.validateWaiterPassport)(params);
         // 金額をfix
         const amount = params.object.amount;
@@ -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/findCreditCard.js

@@ -106,7 +106,7 @@ function getCreditCardPaymentServiceChannel(params) {
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
             serviceType: { codeValue: { $eq: params.paymentMethodType } }
-        });
+        }, [], []);
         const paymentServiceSetting = paymentServices.shift();
         if (paymentServiceSetting === undefined) {
             throw new factory.errors.NotFound('PaymentService');

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

@@ -22,7 +22,7 @@ function findPaymentCardPermit(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.product.ProductType.PaymentCard }
-        });
+        }, [], []);
         const accountProduct = searchProductsResult
             .find((p) => { var _a, _b; return ((_b = (_a = p.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === params.accountType; });
         if (accountProduct === undefined) {

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

@@ -316,7 +316,7 @@ function processAuthorizeCreditCard(params) {
             project: { id: { $eq: params.project.id } },
             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
             serviceType: { codeValue: { $eq: params.paymentMethodType } }
-        });
+        }, [], []);
         const creditCardPaymentService = searchCreditCardPaymentServicesResult.shift();
         if (creditCardPaymentService === undefined) {
             throw new factory.errors.NotFound('CreditCardPaymentService');
@@ -338,8 +338,12 @@ function processAuthorizeCreditCard(params) {
             },
             purpose: params.purpose,
             paymentServiceType: factory.service.paymentService.PaymentServiceType.CreditCard,
-            useCancelPayTransactionOnFailed: false,
-            useCheckMovieTicketBeforePay: false
+            options: {
+                useCancelPayTransactionOnFailed: false,
+                useCheckMovieTicketBeforePay: false,
+                useCheckByIdentifierIfNotYet: false,
+                useSearchTrade4accountId: false
+            }
         })(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[]>;