@chevre/domain 21.37.0-alpha.12 → 21.37.0-alpha.14

package/example/src/chevre/processOrder.ts

@@ -0,0 +1,87 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const acceptedOfferRepo = await chevre.repository.AcceptedOffer.createInstance(mongoose.connection);
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
+
+    const cursor = orderRepo.getCursor(
+        {
+            'project.id': { $eq: project.id },
+            // orderNumber: { $eq: 'SSK9-4896645-5698154' },
+            orderDate: {
+                $lte: moment('2024-07-03T18:00:00Z')
+                    .toDate(),
+                $gte: moment('2024-06-30T18:00:00Z')
+                    .toDate()
+            },
+            orderStatus: { $eq: chevre.factory.orderStatus.OrderProcessing }
+        },
+        {
+            confirmationNumber: 1,
+            orderDate: 1, orderNumber: 1,
+            project: 1, typeOf: 1, orderStatus: 1
+        }
+    );
+    console.log('orders found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const order: Pick<chevre.factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf' | 'orderStatus'> = doc.toObject();
+        if (order.orderStatus !== chevre.factory.orderStatus.OrderProcessing) {
+            console.log('nothing to do', order.orderStatus, order.orderNumber);
+        } else {
+            const { orderNumber } = order;
+
+            const itemOfferedTypeOfs = <chevre.factory.order.IItemOffered['typeOf'][]>await acceptedOfferRepo.distinctValues(
+                { orderNumber: { $in: [orderNumber] } },
+                'acceptedOffers.itemOffered.typeOf'
+            );
+            const serialNumbers = await acceptedOfferRepo.distinctValues(
+                { orderNumber: { $in: [orderNumber] } },
+                'acceptedOffers.serialNumber'
+            );
+            const offeredThroughIdentifier = (<chevre.factory.service.webAPI.Identifier[]>await acceptedOfferRepo.distinctValues(
+                { orderNumber: { $in: [orderNumber] } },
+                'acceptedOffers.offeredThrough.identifier'
+            )).shift();
+
+            console.log('processing order', order, itemOfferedTypeOfs, serialNumbers, offeredThroughIdentifier);
+            await (await chevre.service.order.createService()).processOrder({
+                order: {
+                    ...order,
+                    itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    serialNumbers,
+                    offeredThroughIdentifier
+                },
+                options: { force: true }
+            })({ task: taskRepo });
+            console.log('order processed', order.orderNumber);
+            updateCount += 1;
+            console.log('updated.', order.project.id, order.orderNumber, order.orderDate, i);
+        }
+    });
+
+    console.log(i, 'orders checked');
+    console.log(updateCount, 'orders updated');
+}
+
+main()
+    .then()
+    .catch(console.error);
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

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

@@ -75,6 +75,7 @@ export declare class MongoRepository {
         };
     }): Promise<{
         id: string;
+        status: factory.taskStatus;
     } | undefined>;
     /**
      * タスク識別子から冪等作成する
@@ -127,6 +128,14 @@ export declare class MongoRepository {
     retry(params: {
         intervalInMinutes: number;
     }): Promise<UpdateWriteOpResult>;
+    /**
+     * 実行中止済タスクを強制的にリトライ
+     * 中止済タスクでなければ何もしない
+     */
+    retryForciblyIfAborted(params: {
+        id: string;
+        remainingNumberOfTries: number;
+    }): Promise<import("mongodb").UpdateResult>;
     abortOne(params: {
         intervalInMinutes: number;
     }): Promise<factory.task.ITask<factory.taskName> | null>;

package/lib/chevre/repo/task.js

@@ -201,12 +201,13 @@ class MongoRepository {
                 'project.id': { $eq: params.project.id },
                 name: { $eq: params.name },
                 identifier: { $exists: true, $eq: params.identifier }
-            }, { _id: 1 })
+            }, { _id: 1, status: 1 })
                 .exec();
             if (doc === null) {
                 return;
             }
-            return { id: doc.id };
+            const { id, status } = doc.toObject();
+            return { id, status };
         });
     }
     /**
@@ -514,6 +515,26 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 実行中止済タスクを強制的にリトライ
+     * 中止済タスクでなければ何もしない
+     */
+    retryForciblyIfAborted(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.taskModel.updateOne({
+                _id: { $eq: params.id },
+                status: { $eq: factory.taskStatus.Aborted }
+            }, {
+                $set: {
+                    status: factory.taskStatus.Ready
+                },
+                $inc: {
+                    remainingNumberOfTries: params.remainingNumberOfTries
+                }
+            })
+                .exec();
+        });
+    }
     abortOne(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const lastTriedAtShoudBeLessThan = moment()

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

@@ -5,15 +5,15 @@ type IProcessingOrder = factory.order.IOrder & {
 };
 declare function createInformTasks(order: IProcessingOrder): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createConfirmReservationActionObject4ChevreByOrder(params: {
-    order: factory.order.IOrder & {
+    order: Pick<factory.order.IOrder, 'confirmationNumber' | 'orderNumber'> & {
         serialNumbers: string[];
     };
 }): factory.action.interact.confirm.reservation.IObject<factory.service.webAPI.Identifier.Chevre>[];
 declare function createConfirmReservationActionObject4COAByOrder(params: {
-    order: factory.order.IOrder & {
+    order: {
         serialNumbers: string[];
     };
 }): factory.task.confirmReserveTransaction.IObject4COAOptimized[];
 type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-declare function createCheckResourceTask(order: IProcessingOrder): factory.task.checkResource.IAttributes;
-export { IExternalOrder, createInformTasks, createCheckResourceTask, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder };
+declare function createCheckResourceTask(order: Pick<IProcessingOrder, 'orderNumber' | 'project' | 'typeOf'>): factory.task.checkResource.IAttributes;
+export { IExternalOrder, IProcessingOrder, createInformTasks, createCheckResourceTask, createConfirmReservationActionObject4ChevreByOrder, createConfirmReservationActionObject4COAByOrder };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.d.ts

@@ -0,0 +1,16 @@
+import type { MongoRepository as TaskRepo } from '../../../../repo/task';
+import * as factory from '../../../../factory';
+import { IProcessingOrder } from './factory';
+declare function processOrder(params: {
+    order: Pick<IProcessingOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {
+        itemOfferedTypeOf: factory.order.IItemOffered['typeOf'];
+        serialNumbers: string[];
+        offeredThroughIdentifier?: factory.service.webAPI.Identifier;
+    };
+    options: {
+        force: boolean;
+    };
+}): (repos: {
+    task: TaskRepo;
+}) => Promise<void>;
+export { processOrder };

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

@@ -0,0 +1,168 @@
+"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.processOrder = void 0;
+/**
+ * 注文処理時処理
+ */
+const createDebug = require("debug");
+const util = require("util");
+const factory = require("../../../../factory");
+const factory_1 = require("./factory");
+const debug = createDebug('chevre-domain:service:order');
+function processOrder(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const simpleOrder = {
+            typeOf: params.order.typeOf,
+            // seller: {
+            //     id: params.order.seller.id,
+            //     typeOf: params.order.seller.typeOf,
+            //     name: params.order.seller.name
+            // }, // 廃止(2024-03-06~)
+            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
+            orderNumber: params.order.orderNumber,
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
+            orderDate: params.order.orderDate
+        };
+        if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
+            yield createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
+        }
+        else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
+            || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
+            // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
+            yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder, params.options)(repos);
+        }
+        else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
+            yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
+        }
+    });
+}
+exports.processOrder = processOrder;
+const NUM_TRY_CONFIRM_RESERVE_TRANSACTION = 20;
+function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, options) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        const taskRunsAt4coa = new Date();
+        let confirmObjects;
+        if (order.offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {
+            confirmObjects = (0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order });
+        }
+        else {
+            confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
+        }
+        yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: confirmObject,
+                agent: order.project,
+                purpose: simpleOrder
+                // instrument廃止(2024-03-13~)
+                // instrument: {
+                //     typeOf: 'WebAPI',
+                //     identifier: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction)
+                //         ? factory.service.webAPI.Identifier.COA
+                //         : factory.service.webAPI.Identifier.Chevre
+                // }
+            };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmReserveTransactionTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmReserveTransaction,
+                status: factory.taskStatus.Ready,
+                runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
+                remainingNumberOfTries: NUM_TRY_CONFIRM_RESERVE_TRANSACTION,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
+            if (options.force === true) {
+                const existingTask = yield repos.task.findByIdentifier({
+                    identifier: taskIdentifier,
+                    name: confirmReserveTransactionTask.name,
+                    project: { id: confirmReserveTransactionTask.project.id }
+                });
+                if (typeof (existingTask === null || existingTask === void 0 ? void 0 : existingTask.id) === 'string') {
+                    const retryResult = yield repos.task.retryForciblyIfAborted({
+                        id: existingTask.id,
+                        remainingNumberOfTries: NUM_TRY_CONFIRM_RESERVE_TRANSACTION
+                    });
+                    debug('retryResult:', retryResult, 'taskIdentifier:', taskIdentifier);
+                }
+            }
+        })));
+    });
+}
+function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        yield Promise.all(order.serialNumbers.map((moneyTransferTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: {
+                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
+                    transactionNumber: moneyTransferTransactionNumber,
+                    typeOf: factory.assetTransactionType.MoneyTransfer
+                },
+                agent: order.project,
+                purpose: simpleOrder
+            };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmMoneyTransferTransactionTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmMoneyTransfer,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmMoneyTransferTransactionTask, { emitImmediately: true });
+        })));
+    });
+}
+function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const taskRunsAt = new Date();
+        yield Promise.all(order.serialNumbers.map((registerServiceTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: {
+                    endDate: order.orderDate,
+                    transactionNumber: registerServiceTransactionNumber,
+                    typeOf: factory.assetTransactionType.RegisterService
+                },
+                agent: order.project,
+                purpose: simpleOrder
+            };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmRegisterServiceTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmRegisterService,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmRegisterServiceTask, { emitImmediately: true });
+        })));
+    });
+}

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

@@ -1,11 +1,10 @@
 import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { IExternalOrder } from './onOrderProcessing/factory';
+import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
+import { processOrder } from './onOrderProcessing/processOrder';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
-    order: Omit<factory.order.IOrder, 'orderStatus'> & {
-        orderStatus: factory.orderStatus.OrderProcessing;
-        numAcceptedOffers: number;
+    order: IProcessingOrder & {
         itemOfferedTypeOf: factory.order.IItemOffered['typeOf'];
         serialNumbers: string[];
         offeredThroughIdentifier?: factory.service.webAPI.Identifier;
@@ -14,4 +13,4 @@ declare function onOrderProcessing(params: {
 }): (repos: {
     task: TaskRepo;
 }) => Promise<void>;
-export { IExternalOrder, onOrderProcessing };
+export { IExternalOrder, onOrderProcessing, processOrder };

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

@@ -9,16 +9,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderProcessing = void 0;
+exports.processOrder = exports.onOrderProcessing = void 0;
 /**
  * 注文処理時処理
  */
 const createDebug = require("debug");
-const util = require("util");
 const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderProcessing/factory");
+const processOrder_1 = require("./onOrderProcessing/processOrder");
+Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return processOrder_1.processOrder; } });
 const debug = createDebug('chevre-domain:service:order');
 function onOrderProcessing(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -27,20 +28,6 @@ function onOrderProcessing(params) {
         let tasks = [];
         const sendEmailMessageByOrderPotentialActions = (_f = (_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) === null || _f === void 0 ? void 0 : _f.sendEmailMessage;
         const sendEmailMessageByOnOrderProcessing = (_k = (_j = (_h = (_g = params.placeOrderTransaction) === null || _g === void 0 ? void 0 : _g.potentialActions) === null || _h === void 0 ? void 0 : _h.order) === null || _j === void 0 ? void 0 : _j.onOrderProcessing) === null || _k === void 0 ? void 0 : _k.sendEmailMessage;
-        // const maskedCustomer = createMaskedCustomer(params.order, { noProfile: true });
-        const simpleOrder = {
-            typeOf: params.order.typeOf,
-            // seller: {
-            //     id: params.order.seller.id,
-            //     typeOf: params.order.seller.typeOf,
-            //     name: params.order.seller.name
-            // }, // 廃止(2024-03-06~)
-            // customer: { typeOf: maskedCustomer.typeOf, id: maskedCustomer.id }, // 廃止(2024-03-06~)
-            orderNumber: params.order.orderNumber,
-            // price: params.order.price,
-            // priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
-        };
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
@@ -54,21 +41,7 @@ function onOrderProcessing(params) {
         yield repos.task.saveMany(tasks, { emitImmediately: true });
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
-                if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
-                    yield createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
-                }
-                else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
-                    || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
-                    // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
-                    yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
-                }
-                else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
-                    yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
-                }
-                // 完全廃止(2024-03-12~)
-                // await createGivePointAwardTaskIfNotExist({
-                //     potentialActions: params.placeOrderTransaction?.potentialActions?.order?.potentialActions
-                // })(repos);
+                yield (0, processOrder_1.processOrder)({ order: params.order, options: { force: false } })(repos);
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
@@ -83,107 +56,3 @@ function onOrderProcessing(params) {
     });
 }
 exports.onOrderProcessing = onOrderProcessing;
-function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        const taskRunsAt4coa = new Date();
-        let confirmObjects;
-        if (order.offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {
-            confirmObjects = (0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order });
-        }
-        else {
-            confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
-        }
-        yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: confirmObject,
-                agent: order.project,
-                purpose: simpleOrder
-                // instrument廃止(2024-03-13~)
-                // instrument: {
-                //     typeOf: 'WebAPI',
-                //     identifier: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction)
-                //         ? factory.service.webAPI.Identifier.COA
-                //         : factory.service.webAPI.Identifier.Chevre
-                // }
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmReserveTransactionTask = {
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmReserveTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: (confirmObject.typeOf === factory.assetTransactionType.COAReserveTransaction) ? taskRunsAt4coa : taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
-        })));
-    });
-}
-function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        yield Promise.all(order.serialNumbers.map((moneyTransferTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: {
-                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
-                    transactionNumber: moneyTransferTransactionNumber,
-                    typeOf: factory.assetTransactionType.MoneyTransfer
-                },
-                agent: order.project,
-                purpose: simpleOrder
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmMoneyTransferTransactionTask = {
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmMoneyTransfer,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            yield repos.task.createIfNotExistByIdentifier(confirmMoneyTransferTransactionTask, { emitImmediately: true });
-        })));
-    });
-}
-function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = new Date();
-        yield Promise.all(order.serialNumbers.map((registerServiceTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
-            const data = {
-                project: order.project,
-                typeOf: factory.actionType.ConfirmAction,
-                object: {
-                    endDate: order.orderDate,
-                    transactionNumber: registerServiceTransactionNumber,
-                    typeOf: factory.assetTransactionType.RegisterService
-                },
-                agent: order.project,
-                purpose: simpleOrder
-            };
-            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
-            const confirmRegisterServiceTask = {
-                identifier: taskIdentifier,
-                project: order.project,
-                name: factory.taskName.ConfirmRegisterService,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            };
-            yield repos.task.createIfNotExistByIdentifier(confirmRegisterServiceTask, { emitImmediately: true });
-        })));
-    });
-}

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

@@ -6,6 +6,6 @@ import { onOrderDelivered } from './onOrderStatusChanged/onOrderDelivered';
 import { onOrderDeliveredPartially } from './onOrderStatusChanged/onOrderDeliveredPartially';
 import { onOrderInTransit } from './onOrderStatusChanged/onOrderInTransit';
 import { onOrderPaymentDue } from './onOrderStatusChanged/onOrderPaymentDue';
-import { IExternalOrder, onOrderProcessing } from './onOrderStatusChanged/onOrderProcessing';
+import { IExternalOrder, onOrderProcessing, processOrder } from './onOrderStatusChanged/onOrderProcessing';
 import { onOrderReturned } from './onOrderStatusChanged/onOrderReturned';
-export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned };
+export { IExternalOrder, onOrderCancelled, onOrderDelivered, onOrderDeliveredPartially, onOrderInTransit, onOrderPaymentDue, onOrderProcessing, onOrderReturned, processOrder };

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
+exports.processOrder = exports.onOrderReturned = exports.onOrderProcessing = exports.onOrderPaymentDue = exports.onOrderInTransit = exports.onOrderDeliveredPartially = exports.onOrderDelivered = exports.onOrderCancelled = void 0;
 /**
  * 注文ステータス変更時処理
  */
@@ -16,5 +16,6 @@ const onOrderPaymentDue_1 = require("./onOrderStatusChanged/onOrderPaymentDue");
 Object.defineProperty(exports, "onOrderPaymentDue", { enumerable: true, get: function () { return onOrderPaymentDue_1.onOrderPaymentDue; } });
 const onOrderProcessing_1 = require("./onOrderStatusChanged/onOrderProcessing");
 Object.defineProperty(exports, "onOrderProcessing", { enumerable: true, get: function () { return onOrderProcessing_1.onOrderProcessing; } });
+Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return onOrderProcessing_1.processOrder; } });
 const onOrderReturned_1 = require("./onOrderStatusChanged/onOrderReturned");
 Object.defineProperty(exports, "onOrderReturned", { enumerable: true, get: function () { return onOrderReturned_1.onOrderReturned; } });

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

@@ -4,10 +4,10 @@
 import { confirmPayTransaction } from './order/confirmPayTransaction';
 import { deleteOrder } from './order/deleteOrder';
 import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
-import { onOrderProcessing } from './order/onOrderStatusChanged';
+import { onOrderProcessing, processOrder } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { payOrder } from './order/payOrder';
 import { placeOrder } from './order/placeOrder';
 import { placeOrderWithoutTransaction } from './order/placeOrderWithoutTransaction';
 import { sendOrder } from './order/sendOrder';
-export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderProcessing, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };
+export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderProcessing, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, processOrder, sendOrder };

package/lib/chevre/service/order.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderProcessing = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
+exports.sendOrder = exports.processOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderProcessing = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
@@ -13,6 +13,7 @@ Object.defineProperty(exports, "onAssetTransactionStatusChanged", { enumerable:
 Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "onOrderProcessing", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderProcessing; } });
+Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return onOrderStatusChanged_1.processOrder; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");
 Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
 const payOrder_1 = require("./order/payOrder");

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.37.0-alpha.12"
+  "version": "21.37.0-alpha.14"
 }