@chevre/domain 21.8.0-alpha.6 → 21.8.0-alpha.8

package/lib/chevre/repo/task.d.ts

@@ -35,7 +35,9 @@ export declare class MongoRepository {
      * 取引削除タスク冪等作成
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
+    createConfirmReserveTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>, options: IOptionOnCreate): Promise<void>;
     createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
+    createOnOrderPaymentCompletedTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {
@@ -68,7 +70,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/repo/task.js

@@ -219,6 +219,31 @@ class MongoRepository {
             }
         });
     }
+    createConfirmReserveTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     createSendOrderTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
@@ -240,6 +265,27 @@ class MongoRepository {
             }
         });
     }
+    createOnOrderPaymentCompletedTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/delivery.js

@@ -29,6 +29,23 @@ const accountTransactionIdentifier_1 = require("../factory/accountTransactionIde
  */
 function givePointAward(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // 入金識別子が存在する場合、冪等性の確保(2023-08-24~)
+        const pendingTransactionIdentifier = params.object.identifier;
+        if (typeof pendingTransactionIdentifier === 'string' && pendingTransactionIdentifier.length > 0) {
+            // すでにConfirmedのMoneyTransfer取引が存在すれば何もしない
+            const assetTransactions = yield repos.assetTransaction.search({
+                limit: 1,
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory.assetTransactionType.MoneyTransfer,
+                statuses: [factory.transactionStatusType.Confirmed],
+                object: {
+                    pendingTransaction: { identifier: { $eq: pendingTransactionIdentifier } }
+                }
+            }, ['_id']);
+            if (assetTransactions.length > 0) {
+                return;
+            }
+        }
         // アクション開始
         const action = yield repos.action.start(params);
         try {

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = void 0;
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
-const payOrder_1 = require("../order/payOrder");
 function confirmPayTransaction(data) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // アクション開始
@@ -95,14 +94,26 @@ function onConfirmed(params) {
                 allPayTransactionConfirmed = true;
             }
             if (allPayTransactionConfirmed) {
-                yield (0, payOrder_1.payOrder)({
-                    project: { id: params.project.id },
+                // onOrderPaymentCompletedタスク冪等作成
+                const onPaymentCompletedTaskData = {
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     object: {
                         confirmationNumber: params.purpose.confirmationNumber,
                         orderNumber: params.purpose.orderNumber
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
-                })(repos);
+                };
+                const onPaymentCompletedTaskAttributes = {
+                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    name: factory.taskName.OnOrderPaymentCompleted,
+                    status: factory.taskStatus.Ready,
+                    runsAt: new Date(),
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: onPaymentCompletedTaskData
+                };
+                yield repos.task.createOnOrderPaymentCompletedTaskIfNotExist(onPaymentCompletedTaskAttributes, { emitImmediately: true });
             }
         }
     });

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

@@ -30,11 +30,11 @@ export declare function createOnPlaceOrderTasksByTransaction(params: {
  */
 export declare function createOnOrderSentTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.send.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/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").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/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/syncScreeningRooms").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/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").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/syncScreeningRooms").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 declare function createOnOrderReturnedTasksByTransaction(params: {
     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/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").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/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/syncScreeningRooms").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/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").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/syncScreeningRooms").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 {};

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

@@ -270,7 +270,7 @@ function createOnPlaceOrderTasksByTransaction(params) {
     // tslint:disable-next-line:no-single-line-block-comment
     /* istanbul ignore else */
     if (potentialActions !== undefined) {
-        // 冗長なsendOrderタスク作成を回避(createSendOrderTransactionTaskIfNotExistへ移行)(2023-08-24~)
+        // 冗長なsendOrderタスク作成を回避(createSendOrderTransactionTaskIfNotExistへ移行)(2023-08-25~)
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
         // if (potentialActions.sendOrder !== undefined) {

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

@@ -88,7 +88,8 @@ function onOrderStatusChanged(params) {
                     // 注文作成時のみトークン付加
                     ...(0, factory_1.createInformTasks)(orderWithToken),
                     ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
+                    // createConfirmReserveTransactionTasksIfNotExistへ移行(2023-08-25~)
+                    // ...await createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
                     // 取引のpotentialActionsを適用(2023-08-17~)
                     ...(0, factory_1.createOnPlaceOrderTasksByTransaction)({
@@ -116,7 +117,9 @@ function onOrderStatusChanged(params) {
         yield repos.task.saveMany(tasks, { emitImmediately: true });
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                // 冗長なsendOrderタスク作成を回避(2023-08-24~)
+                // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
+                yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
+                // 冗長なsendOrderタスク作成を回避(2023-08-25~)
                 yield createSendOrderTransactionTaskIfNotExist({
                     object: params.order,
                     potentialActions: (_q = (_p = (_o = params.placeOrderTransaction) === null || _o === void 0 ? void 0 : _o.potentialActions) === null || _p === void 0 ? void 0 : _p.order) === null || _q === void 0 ? void 0 : _q.potentialActions
@@ -180,7 +183,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
     });
 }
 // const COA_TASK_DELAY_IN_SECONDS = 0;
-function createConfirmReserveTransactionTasks(order, simpleOrder) {
+function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const taskRunsAt = new Date();
         const taskRunsAt4coa = new Date();
@@ -191,51 +194,32 @@ function createConfirmReserveTransactionTasks(order, simpleOrder) {
             ...(0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order }),
             ...(0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order })
         ];
-        const tasks = [];
         yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
-            // 冗長なタスク作成を回避
-            const existingTasks = yield repos.task.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: order.project.id } },
-                name: factory.taskName.ConfirmReserveTransaction,
-                data: {
-                    object: { transactionNumber: { $eq: confirmObject.transactionNumber } },
-                    purpose: { orderNumber: { $eq: order.orderNumber } }
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: confirmObject,
+                agent: order.project,
+                purpose: simpleOrder,
+                instrument: {
+                    typeOf: 'WebAPI',
+                    identifier: (confirmObject.typeOf === 'COAReserveTransaction')
+                        ? factory.service.webAPI.Identifier.COA
+                        : factory.service.webAPI.Identifier.Chevre
                 }
-            }, {
-                data: 0, executionResults: 0, name: 0, numberOfTried: 0,
-                remainingNumberOfTries: 0, runsAt: 0, status: 0
-            });
-            if (existingTasks.length === 0) {
-                const data = {
-                    project: order.project,
-                    typeOf: factory.actionType.ConfirmAction,
-                    object: confirmObject,
-                    agent: order.project,
-                    purpose: simpleOrder,
-                    instrument: {
-                        typeOf: 'WebAPI',
-                        identifier: (confirmObject.typeOf === 'COAReserveTransaction')
-                            ? factory.service.webAPI.Identifier.COA
-                            : factory.service.webAPI.Identifier.Chevre
-                    }
-                };
-                tasks.push({
-                    project: order.project,
-                    name: factory.taskName.ConfirmReserveTransaction,
-                    status: factory.taskStatus.Ready,
-                    runsAt: (confirmObject.typeOf === 'COAReserveTransaction')
-                        ? taskRunsAt4coa
-                        : taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data
-                });
-            }
+            };
+            const confirmReserveTransactionTask = {
+                project: order.project,
+                name: factory.taskName.ConfirmReserveTransaction,
+                status: factory.taskStatus.Ready,
+                runsAt: (confirmObject.typeOf === 'COAReserveTransaction') ? taskRunsAt4coa : taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
         })));
-        return tasks;
     });
 }
 function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {

package/lib/chevre/service/order/payOrder.d.ts

@@ -2,19 +2,11 @@ import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/act
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import * as factory from '../../factory';
 /**
  * 注文を決済する
  */
-declare function payOrder(params: {
-    project: {
-        id: string;
-    };
-    object: {
-        confirmationNumber: string;
-        orderNumber: string;
-    };
-    useOnOrderStatusChanged: boolean;
-}): (repos: {
+declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
     order: OrderRepo;
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;

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

@@ -15,7 +15,6 @@ const order_1 = require("../../factory/order");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const payOrder_1 = require("./payOrder");
 const factory = require("../../factory");
 function createOrder(params) {
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
@@ -244,14 +243,26 @@ function placeOrder(params) {
                 // paymentMethods.length: 0の場合を考慮(2023-08-24~)
                 if (order.paymentMethods.length === 0) {
                     // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
-                    yield (0, payOrder_1.payOrder)({
-                        project: { id: order.project.id },
+                    // onOrderPaymentCompletedタスク作成
+                    const onPaymentCompletedTaskData = {
+                        project: { id: order.project.id, typeOf: factory.organizationType.Project },
                         object: {
                             confirmationNumber: order.confirmationNumber,
                             orderNumber: order.orderNumber
                         },
-                        useOnOrderStatusChanged: params.useOnOrderStatusChanged
-                    })(repos);
+                        useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
+                    };
+                    const onPaymentCompletedTaskAttributes = {
+                        project: { id: order.project.id, typeOf: factory.organizationType.Project },
+                        name: factory.taskName.OnOrderPaymentCompleted,
+                        status: factory.taskStatus.Ready,
+                        runsAt: new Date(),
+                        remainingNumberOfTries: 10,
+                        numberOfTried: 0,
+                        executionResults: [],
+                        data: onPaymentCompletedTaskData
+                    };
+                    yield repos.task.createOnOrderPaymentCompletedTaskIfNotExist(onPaymentCompletedTaskAttributes, { emitImmediately: true });
                 }
             }
             else {

package/lib/chevre/service/task/onOrderPaymentCompleted.d.ts

@@ -0,0 +1,6 @@
+import { IOperation } from '../task';
+import * as factory from '../../factory';
+/**
+ * タスク実行関数
+ */
+export declare function call(data: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): IOperation<void>;

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

@@ -0,0 +1,35 @@
+"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.call = void 0;
+const factory = require("../../factory");
+const registerServiceInProgress_1 = require("../../repo/action/registerServiceInProgress");
+const order_1 = require("../../repo/order");
+const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
+const payOrder_1 = require("../order/payOrder");
+/**
+ * タスク実行関数
+ */
+function call(data) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        if (settings.redisClient === undefined) {
+            throw new factory.errors.Argument('settings', 'redisClient required');
+        }
+        yield (0, payOrder_1.payOrder)(data)({
+            order: new order_1.MongoRepository(settings.connection),
+            registerActionInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection)
+        });
+    });
+}
+exports.call = call;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.2",
+    "@chevre/factory": "4.327.0-alpha.3",
     "@cinerino/sdk": "3.165.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.6"
+  "version": "21.8.0-alpha.8"
 }