@chevre/domain 21.7.0-alpha.9 → 21.8.0-alpha.0

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

@@ -22,7 +22,9 @@ const factory_1 = require("./onOrderStatusChanged/factory");
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -40,7 +42,13 @@ function onOrderStatusChanged(params) {
         };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderDelivered:
-                tasks = (0, factory_1.createInformTasks)(params.order);
+                tasks = [
+                    ...(0, factory_1.createInformTasks)(params.order),
+                    // 取引のpotentialActionsを適用(2023-08-17~)
+                    ...(0, factory_1.createOnOrderSentTasksByTransaction)({
+                        potentialActions: (_e = (_d = (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions
+                    })
+                ];
                 // プロダクト登録プロセスロック解除
                 try {
                     const placeOrderTransaction = params.placeOrderTransaction;
@@ -69,6 +77,12 @@ function onOrderStatusChanged(params) {
                     throw error;
                 }
                 break;
+            // OrderPaymentDueを追加(2023-08-23~)
+            case factory.orderStatus.OrderPaymentDue:
+                tasks = [
+                    ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos)
+                ];
+                break;
             case factory.orderStatus.OrderProcessing:
                 const orderWithToken = yield (0, factory_1.getOrderWithToken)({ order: params.order, expiresIn: TOKEN_EXPIRES_IN });
                 tasks = [
@@ -76,15 +90,26 @@ function onOrderStatusChanged(params) {
                     ...(0, factory_1.createInformTasks)(orderWithToken),
                     ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
+                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
+                    // 取引のpotentialActionsを適用(2023-08-17~)
+                    ...(0, factory_1.createOnPlaceOrderTasksByTransaction)({
+                        object: params.order,
+                        // potentialActions: params.potentialActions
+                        potentialActions: (_h = (_g = (_f = params.placeOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.potentialActions
+                    })
                 ];
                 break;
             case factory.orderStatus.OrderReturned:
+                const potentialActionsByTransaction = (_m = (_l = (_k = (_j = params.returnOrderTransaction) === null || _j === void 0 ? void 0 : _j.potentialActions) === null || _k === void 0 ? void 0 : _k.returnOrder) === null || _l === void 0 ? void 0 : _l.find((returnOrderActionByTransaction) => {
+                    return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
+                })) === null || _m === void 0 ? void 0 : _m.potentialActions;
                 tasks = [
                     ...(0, factory_1.createInformTasks)(params.order),
-                    ...yield createReturnReserveTransactionTasks(params.order, simpleOrder)(repos),
+                    ...createReturnReserveTransactionTasks(params.order, simpleOrder),
                     // 決済取引返却タスクを作成(2022-06-09~)
-                    ...yield createReturnPayTransactionTasks(params.order, simpleOrder, params.returnOrderTransaction)(repos)
+                    ...createReturnPayTransactionTasks(params.order, simpleOrder, params.returnOrderTransaction),
+                    // 取引のpotentialActionsを適用(2023-08-19~)
+                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction })
                 ];
                 break;
             default:
@@ -98,7 +123,13 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
         const taskRunsAt = moment(order.orderDate)
             .toDate();
         const tasks = [];
-        yield Promise.all(order.paymentMethods.map((paymentMethod) => __awaiter(this, void 0, void 0, function* () {
+        yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO 注文にpaymentStatusを保証した後に実装する
+            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行
+            // if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
+            //     return;
+            // }
             // 冗長なタスク作成を回避
             const existingTasks = yield repos.task.search({
                 limit: 1,
@@ -106,7 +137,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 project: { id: { $eq: order.project.id } },
                 name: factory.taskName.ConfirmPayTransaction,
                 data: {
-                    object: { transactionNumber: { $eq: paymentMethod.paymentMethodId } },
+                    object: { transactionNumber: { $eq: invoice.paymentMethodId } },
                     purpose: { orderNumber: { $eq: order.orderNumber } }
                 }
             }, {
@@ -117,13 +148,15 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 const data = {
                     project: order.project,
                     typeOf: factory.actionType.ConfirmAction,
-                    object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: paymentMethod.paymentMethodId }],
+                    object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
                     agent: order.project,
                     purpose: Object.assign(Object.assign({}, simpleOrder), { confirmationNumber: order.confirmationNumber }),
                     instrument: {
                         typeOf: 'WebAPI',
                         identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre
-                    }
+                    },
+                    processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue,
+                    useOnOrderStatusChanged: true
                 };
                 tasks.push({
                     project: order.project,
@@ -254,112 +287,108 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
 }
 const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
-    return (__) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const taskRunsAt = moment(order.dateReturned)
-            .toDate();
-        const taskRunsAt4coa = moment(order.dateReturned)
-            .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
-        const tasks = [];
-        const returnActionRecipient = {
-            typeOf: order.seller.typeOf,
-            id: order.seller.id,
-            name: order.seller.name
-        };
-        const reservationNumbers = [];
-        // 注文アイテムから返却アクションを作成する
-        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
-        for (const acceptedOffer of acceptedOffers) {
-            if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
-                || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
-                const reservation = acceptedOffer.itemOffered;
-                const reservationNumber = reservation.reservationNumber;
-                // 予約番号ごとに返却アクションを作成する
-                if (!reservationNumbers.includes(reservationNumber)) {
-                    let returnReserveTransactionAction;
-                    switch ((_a = acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) {
-                        case factory.service.webAPI.Identifier.COA:
-                            const superEventLocationBranchCode = (_b = reservation.reservationFor) === null || _b === void 0 ? void 0 : _b.superEvent.location.branchCode;
-                            const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                            const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                            let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                            // COAでは数字のみ受け付けるので数字以外を除去
-                            telNum = telNum.replace(/[^\d]/g, '');
-                            returnReserveTransactionAction = {
-                                project: order.project,
-                                typeOf: factory.actionType.ReturnAction,
-                                object: {
-                                    theaterCode: superEventLocationBranchCode,
-                                    reserveNum: reservationNumber,
-                                    telNum: telNum,
-                                    typeOf: 'COAReserveTransaction'
-                                },
-                                agent: order.project,
-                                // potentialActions: {},
-                                purpose: simpleOrder,
-                                instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
-                                recipient: returnActionRecipient
-                            };
-                            break;
-                        default:
-                            returnReserveTransactionAction = {
-                                project: order.project,
-                                typeOf: factory.actionType.ReturnAction,
-                                object: {
-                                    typeOf: factory.assetTransactionType.Reserve,
-                                    transactionNumber: reservationNumber
-                                },
-                                agent: order.project,
-                                // potentialActions: {},
-                                purpose: simpleOrder,
-                                instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
-                                recipient: returnActionRecipient
-                            };
-                    }
-                    tasks.push({
-                        project: order.project,
-                        name: factory.taskName.ReturnReserveTransaction,
-                        status: factory.taskStatus.Ready,
-                        runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
-                            ? taskRunsAt4coa
-                            : taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: returnReserveTransactionAction
-                    });
-                    reservationNumbers.push(reservationNumber);
+    var _a, _b;
+    const taskRunsAt = moment(order.dateReturned)
+        .toDate();
+    const taskRunsAt4coa = moment(order.dateReturned)
+        .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
+        .toDate();
+    const tasks = [];
+    const returnActionRecipient = {
+        typeOf: order.seller.typeOf,
+        id: order.seller.id,
+        name: order.seller.name
+    };
+    const reservationNumbers = [];
+    // 注文アイテムから返却アクションを作成する
+    const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+    for (const acceptedOffer of acceptedOffers) {
+        if (acceptedOffer.itemOffered.typeOf === factory.reservationType.EventReservation
+            || acceptedOffer.itemOffered.typeOf === factory.reservationType.BusReservation) {
+            const reservation = acceptedOffer.itemOffered;
+            const reservationNumber = reservation.reservationNumber;
+            // 予約番号ごとに返却アクションを作成する
+            if (!reservationNumbers.includes(reservationNumber)) {
+                let returnReserveTransactionAction;
+                switch ((_a = acceptedOffer.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) {
+                    case factory.service.webAPI.Identifier.COA:
+                        const superEventLocationBranchCode = (_b = reservation.reservationFor) === null || _b === void 0 ? void 0 : _b.superEvent.location.branchCode;
+                        const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
+                        const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
+                        let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
+                        // COAでは数字のみ受け付けるので数字以外を除去
+                        telNum = telNum.replace(/[^\d]/g, '');
+                        returnReserveTransactionAction = {
+                            project: order.project,
+                            typeOf: factory.actionType.ReturnAction,
+                            object: {
+                                theaterCode: superEventLocationBranchCode,
+                                reserveNum: reservationNumber,
+                                telNum: telNum,
+                                typeOf: 'COAReserveTransaction'
+                            },
+                            agent: order.project,
+                            // potentialActions: {},
+                            purpose: simpleOrder,
+                            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
+                            recipient: returnActionRecipient
+                        };
+                        break;
+                    default:
+                        returnReserveTransactionAction = {
+                            project: order.project,
+                            typeOf: factory.actionType.ReturnAction,
+                            object: {
+                                typeOf: factory.assetTransactionType.Reserve,
+                                transactionNumber: reservationNumber
+                            },
+                            agent: order.project,
+                            // potentialActions: {},
+                            purpose: simpleOrder,
+                            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre },
+                            recipient: returnActionRecipient
+                        };
                 }
-            }
-        }
-        return tasks;
-    });
-}
-const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
-function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
-    return (__1) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const taskRunsAt = moment(order.dateReturned)
-            .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
-        const tasks = [];
-        const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
-        const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
-        if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
-            tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.ReturnPayTransaction,
+                tasks.push({
+                    project: order.project,
+                    name: factory.taskName.ReturnReserveTransaction,
                     status: factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
+                    runsAt: (returnReserveTransactionAction.object.typeOf === 'COAReserveTransaction')
+                        ? taskRunsAt4coa
+                        : taskRunsAt,
                     remainingNumberOfTries: 10,
                     numberOfTried: 0,
                     executionResults: [],
-                    data: a
-                };
-            }));
+                    data: returnReserveTransactionAction
+                });
+                reservationNumbers.push(reservationNumber);
+            }
         }
-        return tasks;
-    });
+    }
+    return tasks;
+}
+const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
+function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
+    var _a, _b;
+    const taskRunsAt = moment(order.dateReturned)
+        .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
+        .toDate();
+    const tasks = [];
+    const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
+    const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;
+    if (Array.isArray(returnPayActionsByReturnOrderTransaction)) {
+        tasks.push(...returnPayActionsByReturnOrderTransaction.map((a) => {
+            return {
+                project: a.project,
+                name: factory.taskName.ReturnPayTransaction,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: a
+            };
+        }));
+    }
+    return tasks;
 }

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

@@ -0,0 +1,23 @@
+import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+/**
+ * 注文を決済する
+ */
+declare function payOrder(params: {
+    project: {
+        id: string;
+    };
+    object: {
+        confirmationNumber: string;
+        orderNumber: string;
+    };
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    registerActionInProgress: RegisterServiceInProgressRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+export { payOrder };

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

@@ -0,0 +1,74 @@
+"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.payOrder = void 0;
+const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
+const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
+const factory = require("../../factory");
+/**
+ * 注文を決済する
+ */
+function payOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
+        const orderNumber = params.object.orderNumber;
+        const confirmationNumber = params.object.confirmationNumber;
+        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+            project: { id: params.project.id },
+            confirmationNumber,
+            orderNumber
+        })({ transaction: repos.transaction });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: []
+        });
+        try {
+            order = yield repos.order.changeStatus({
+                project: { id: order.project.id },
+                orderNumber,
+                orderStatus: factory.orderStatus.OrderPaymentDue,
+                previousOrderStatus: factory.orderStatus.OrderProcessing
+            });
+        }
+        catch (error) {
+            let throwsError = true;
+            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
+            order = yield repos.order.findByOrderNumber({
+                orderNumber: params.object.orderNumber,
+                project: { id: params.project.id },
+                inclusion: [],
+                exclusion: []
+            });
+            if (order.orderStatus === factory.orderStatus.OrderDelivered
+                || order.orderStatus === factory.orderStatus.OrderReturned) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (params.useOnOrderStatusChanged) {
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                 }),
+                placeOrderTransaction
+            })({
+                registerActionInProgress: repos.registerActionInProgress,
+                task: repos.task
+            });
+        }
+    });
+}
+exports.payOrder = payOrder;

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

@@ -4,8 +4,8 @@ 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 { IExternalOrder } from './onOrderStatusChanged';
 import * as factory from '../../factory';
-type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 /**
  * 注文取引なしに注文を作成する
  */
@@ -15,7 +15,6 @@ declare function placeOrderWithoutTransaction(params: {
         id: string;
     };
     object: IExternalOrder;
-    potentialActions?: factory.action.trade.order.IPotentialActions;
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
@@ -35,7 +34,6 @@ declare function placeOrder(params: {
         confirmationNumber: string;
         orderNumber: string;
     };
-    potentialActions?: factory.action.trade.order.IPotentialActions;
     useOnOrderStatusChanged: boolean;
 }): (repos: {
     accountingReport: AccountingReportRepo;

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

@@ -15,6 +15,7 @@ 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型に変換(でないと検索クエリを効率的に使えない)
@@ -98,12 +99,6 @@ function placeOrderWithoutTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const order = params.object;
-        // 注文番号から取引と注文をfixする
-        // const { order, placeOrderTransaction } = await createOrderFromBody({
-        //     project: { id: params.project.id },
-        //     confirmationNumber: params.object.confirmationNumber,
-        //     orderNumber: params.object.orderNumber
-        // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
@@ -145,24 +140,24 @@ function placeOrderWithoutTransaction(params) {
         yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         // 経理レポートを保管
         yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-        yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order: order })({
-            registerActionInProgress: repos.registerActionInProgress,
-            task: repos.task
-        });
-        // 潜在アクション
-        yield onPlaceOrder({
-            object: order,
-            potentialActions: params.potentialActions
-        })(repos);
+        // await onOrderStatusChanged({ order: <factory.order.IOrder>order })({
+        //     registerActionInProgress: repos.registerActionInProgress,
+        //     task: repos.task
+        // });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
 /**
  * 注文を作成する
  */
+// tslint:disable-next-line:max-func-body-length
 function placeOrder(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
         // 注文番号から取引と注文をfixする
         const { order, placeOrderTransaction } = yield createOrderFromBody({
             project: { id: params.project.id },
@@ -226,71 +221,33 @@ function placeOrder(params) {
             }
             yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
-        if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+        if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order })({
-                registerActionInProgress: repos.registerActionInProgress,
-                task: repos.task
-            });
-        }
-        // 潜在アクション
-        yield onPlaceOrder({
-            object: order,
-            potentialActions: params.potentialActions
-        })(repos);
-    });
-}
-exports.placeOrder = placeOrder;
-/**
- * 注文作成後のアクション
- */
-function onPlaceOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = params.potentialActions;
-        const now = new Date();
-        // potentialActionsのためのタスクを生成
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (potentialActions.sendOrder !== undefined) {
-                const sendOrderTask = {
-                    project: potentialActions.sendOrder.project,
-                    name: factory.taskName.SendOrder,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    // data: potentialActions.sendOrder
-                    data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
-                        ? { potentialActions: potentialActions.sendOrder.potentialActions }
-                        : undefined)
-                };
-                taskAttributes.push(sendOrderTask);
+            // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
+            if (order.orderStatus === factory.orderStatus.OrderPaymentDue) {
+                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
+                    registerActionInProgress: repos.registerActionInProgress,
+                    task: repos.task
+                });
             }
-            // ポイント付与
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (Array.isArray(potentialActions.givePointAward)) {
-                taskAttributes.push(...potentialActions.givePointAward.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.GivePointAward,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
+            else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
+                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
+                yield (0, payOrder_1.payOrder)({
+                    project: { id: order.project.id },
+                    object: {
+                        confirmationNumber: order.confirmationNumber,
+                        orderNumber: order.orderNumber
+                    },
+                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                })(repos);
             }
         }
-        // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
+        // onOrderStatusChangedへ移行(2023-08-17~)
+        // await onPlaceOrder({
+        //     object: order,
+        //     potentialActions: params.potentialActions
+        // })(repos);
     });
 }
+exports.placeOrder = placeOrder;

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

@@ -9,12 +9,11 @@ declare function returnOrder(params: {
     agent: factory.action.transfer.returnAction.order.IAgent;
     object: {
         orderNumber: string;
-        dateReturned?: Date;
+        dateReturned: Date;
     };
     project: {
         id: string;
     };
-    potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
     useOnOrderStatusChanged: boolean;
 }): (repos: {
     action: ActionRepo;