@chevre/domain 21.8.0-alpha.0 → 21.8.0-alpha.10

package/example/src/chevre/db/stats.ts

@@ -0,0 +1,22 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+const KILO_BYTES = 1024;
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const stats = await mongoose.connection.db.collection('tasks')
+        .stats({
+            scale: KILO_BYTES * KILO_BYTES
+        });
+    console.log('scaleFactor:', stats.scaleFactor);
+    console.log('avgObjSize:', stats.avgObjSize);
+    console.log('count:', stats.count);
+    console.log('size:', stats.size);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/example/src/chevre/searchTasks.ts

@@ -0,0 +1,31 @@
+// tslint:disable:no-console
+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: true });
+
+    const taskRepo = new chevre.repository.Task(mongoose.connection);
+
+    const tasks = await taskRepo.search(
+        {
+            limit: 1,
+            project: { id: { $eq: project.id } },
+            name: { $in: [chevre.factory.taskName.SendOrder] },
+            data: {
+                object: {
+                    orderNumber: { $eq: 'xxx' }
+                }
+            }
+        }
+    );
+    console.log('tasks found', tasks);
+    console.log(tasks.length, 'tasks found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -83,6 +83,12 @@ schema.index({ 'data.object.itemOffered.membershipFor.id': 1, runsAt: -1 }, {
         'data.object.itemOffered.membershipFor.id': { $exists: true }
     }
 });
+schema.index({ 'data.object.orderNumber': 1, runsAt: -1 }, {
+    name: 'searchByDataObjectOrderNumber',
+    partialFilterExpression: {
+        'data.object.orderNumber': { $exists: true }
+    }
+});
 schema.index({ 'data.object.transactionNumber': 1, runsAt: -1 }, {
     name: 'searchByDataObjectTransactionNumber',
     partialFilterExpression: {

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

@@ -35,6 +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: {
@@ -67,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

@@ -31,7 +31,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -115,32 +115,21 @@ class MongoRepository {
         }
         const objectIdEq = (_k = (_j = (_h = params.data) === null || _h === void 0 ? void 0 : _h.object) === null || _j === void 0 ? void 0 : _j.id) === null || _k === void 0 ? void 0 : _k.$eq;
         if (typeof objectIdEq === 'string') {
-            andConditions.push({
-                'data.object.id': {
-                    $exists: true,
-                    $eq: objectIdEq
-                }
-            });
+            andConditions.push({ 'data.object.id': { $exists: true, $eq: objectIdEq } });
         }
-        const objectTransactionNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.transactionNumber) === null || _o === void 0 ? void 0 : _o.$eq;
+        const objectOrderNumberEq = (_o = (_m = (_l = params.data) === null || _l === void 0 ? void 0 : _l.object) === null || _m === void 0 ? void 0 : _m.orderNumber) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof objectOrderNumberEq === 'string') {
+            andConditions.push({ 'data.object.orderNumber': { $exists: true, $eq: objectOrderNumberEq } });
+        }
+        const objectTransactionNumberEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.object) === null || _q === void 0 ? void 0 : _q.transactionNumber) === null || _r === void 0 ? void 0 : _r.$eq;
         if (typeof objectTransactionNumberEq === 'string') {
-            andConditions.push({
-                'data.object.transactionNumber': {
-                    $exists: true,
-                    $eq: objectTransactionNumberEq
-                }
-            });
+            andConditions.push({ 'data.object.transactionNumber': { $exists: true, $eq: objectTransactionNumberEq } });
         }
-        const objectPurposeIdEq = (_r = (_q = (_p = params.data) === null || _p === void 0 ? void 0 : _p.purpose) === null || _q === void 0 ? void 0 : _q.id) === null || _r === void 0 ? void 0 : _r.$eq;
+        const objectPurposeIdEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.id) === null || _u === void 0 ? void 0 : _u.$eq;
         if (typeof objectPurposeIdEq === 'string') {
-            andConditions.push({
-                'data.purpose.id': {
-                    $exists: true,
-                    $eq: objectPurposeIdEq
-                }
-            });
+            andConditions.push({ 'data.purpose.id': { $exists: true, $eq: objectPurposeIdEq } });
         }
-        const objectPurposeOrderNumberEq = (_u = (_t = (_s = params.data) === null || _s === void 0 ? void 0 : _s.purpose) === null || _t === void 0 ? void 0 : _t.orderNumber) === null || _u === void 0 ? void 0 : _u.$eq;
+        const objectPurposeOrderNumberEq = (_x = (_w = (_v = params.data) === null || _v === void 0 ? void 0 : _v.purpose) === null || _w === void 0 ? void 0 : _w.orderNumber) === null || _x === void 0 ? void 0 : _x.$eq;
         if (typeof objectPurposeOrderNumberEq === 'string') {
             andConditions.push({
                 'data.purpose.orderNumber': {
@@ -230,6 +219,73 @@ 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({
+                '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
+                });
+            }
+        });
+    }
+    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.d.ts

@@ -0,0 +1,26 @@
+import * as factory from '../../factory';
+import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
+import { MongoRepository as ActionRepo } from '../../repo/action';
+import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/action/registerServiceInProgress';
+import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
+import { MongoRepository as OrderRepo } from '../../repo/order';
+import { MongoRepository as ProductRepo } from '../../repo/product';
+import { MongoRepository as ProjectRepo } from '../../repo/project';
+import { MongoRepository as SellerRepo } from '../../repo/seller';
+import { MongoRepository as TaskRepo } from '../../repo/task';
+import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): (repos: {
+    action: ActionRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+    accountingReport: AccountingReportRepo;
+    event: EventRepo;
+    product: ProductRepo;
+    project: ProjectRepo;
+    seller: SellerRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+    registerServiceInProgress: RegisterServiceInProgressRepo;
+}) => Promise<void>;
+export { confirmPayTransaction };

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

@@ -0,0 +1,124 @@
+"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.confirmPayTransaction = void 0;
+const createDebug = require("debug");
+const factory = require("../../factory");
+const PayTransactionService = require("../assetTransaction/pay");
+const debug = createDebug('chevre-domain:service:order');
+function confirmPayTransaction(data) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // アクション開始
+        const action = yield repos.action.start(data);
+        try {
+            for (const confirmingTransaction of data.object) {
+                yield PayTransactionService.confirm({
+                    transactionNumber: confirmingTransaction.transactionNumber,
+                    potentialActions: {
+                        pay: {
+                            purpose: {
+                                typeOf: data.purpose.typeOf,
+                                confirmationNumber: data.purpose.confirmationNumber,
+                                orderNumber: data.purpose.orderNumber
+                            }
+                        }
+                    }
+                })({
+                    action: repos.action,
+                    accountingReport: repos.accountingReport,
+                    assetTransaction: repos.assetTransaction,
+                    event: repos.event,
+                    order: repos.order,
+                    product: repos.product,
+                    project: repos.project,
+                    seller: repos.seller,
+                    task: repos.task
+                });
+            }
+        }
+        catch (error) {
+            // actionにエラー結果を追加
+            try {
+                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        // アクション完了
+        const actionResult = {};
+        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        // processOrder連携(2023-08-23~)
+        yield onConfirmed(data)({
+            assetTransaction: repos.assetTransaction,
+            order: repos.order,
+            registerActionInProgress: repos.registerServiceInProgress,
+            task: repos.task,
+            transaction: repos.transaction
+        });
+    });
+}
+exports.confirmPayTransaction = confirmPayTransaction;
+function onConfirmed(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        if (params.processOrder === true) {
+            // 注文のpaymentMethodIdを取得
+            const order = yield repos.order.findByOrderNumber({
+                orderNumber: params.purpose.orderNumber,
+                project: { id: params.project.id },
+                inclusion: ['paymentMethods'],
+                exclusion: []
+            });
+            // PayTransactionのステータス検証
+            let allPayTransactionConfirmed = false;
+            const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
+                .map((invoice) => invoice.paymentMethodId);
+            if (paymentMethodIds.length > 0) {
+                debug('checking allPayTransactionConfirmed...', 'orderNumber:', params.purpose.orderNumber);
+                const referencedPayTransactions = yield repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.Pay,
+                    transactionNumber: { $in: paymentMethodIds }
+                }, ['status']);
+                allPayTransactionConfirmed =
+                    referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
+                debug('allPayTransactionConfirmed?:', allPayTransactionConfirmed, 'referencedPayTransactions:', JSON.stringify(referencedPayTransactions), 'orderNumber:', params.purpose.orderNumber);
+            }
+            else {
+                allPayTransactionConfirmed = true;
+            }
+            if (allPayTransactionConfirmed) {
+                // 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
+                };
+                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

@@ -21,9 +21,6 @@ export declare function createConfirmRegisterServiceActionObjectByOrder(params:
     order: factory.order.IOrder;
 }): factory.action.interact.confirm.registerService.IObject[];
 export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
-/**
- * 注文作成後のアクション
- */
 export declare function createOnPlaceOrderTasksByTransaction(params: {
     object: factory.order.IOrder | IExternalOrder;
     potentialActions?: factory.action.trade.order.IPotentialActions;
@@ -33,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

@@ -262,71 +262,6 @@ function createConfirmRegisterServiceActionObjectByOrder(params) {
     });
 }
 exports.createConfirmRegisterServiceActionObjectByOrder = createConfirmRegisterServiceActionObjectByOrder;
-/**
- * 注文作成後のアクション
- */
-// export function onPlaceOrder(params: {
-//     object: factory.order.IOrder | IExternalOrder;
-//     potentialActions?: factory.action.trade.order.IPotentialActions;
-// }) {
-//     return async (repos: {
-//         task: TaskRepo;
-//     }) => {
-//         const potentialActions = params.potentialActions;
-//         const now = new Date();
-//         // potentialActionsのためのタスクを生成
-//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
-//         // 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: factory.task.IAttributes<factory.taskName.SendOrder> = {
-//                     project: potentialActions.sendOrder.project,
-//                     name: factory.taskName.SendOrder,
-//                     status: factory.taskStatus.Ready,
-//                     runsAt: now, // なるはやで実行
-//                     remainingNumberOfTries: 10,
-//                     numberOfTried: 0,
-//                     executionResults: [],
-//                     // data: potentialActions.sendOrder
-//                     data: {
-//                         project: potentialActions.sendOrder.project,
-//                         object: {
-//                             ...potentialActions.sendOrder.object,
-//                             confirmationNumber: params.object.confirmationNumber
-//                         },
-//                         ...(potentialActions.sendOrder.potentialActions !== undefined)
-//                             ? { potentialActions: potentialActions.sendOrder.potentialActions }
-//                             : undefined
-//                     }
-//                 };
-//                 taskAttributes.push(sendOrderTask);
-//             }
-//             // ポイント付与
-//             // tslint:disable-next-line:no-single-line-block-comment
-//             /* istanbul ignore else */
-//             if (Array.isArray(potentialActions.givePointAward)) {
-//                 taskAttributes.push(...potentialActions.givePointAward.map(
-//                     (a): factory.task.IAttributes<factory.taskName.GivePointAward> => {
-//                         return {
-//                             project: a.project,
-//                             name: factory.taskName.GivePointAward,
-//                             status: factory.taskStatus.Ready,
-//                             runsAt: now, // なるはやで実行
-//                             remainingNumberOfTries: 10,
-//                             numberOfTried: 0,
-//                             executionResults: [],
-//                             data: a
-//                         };
-//                     }));
-//             }
-//         }
-//         // タスク保管
-//         await repos.task.saveMany(taskAttributes, { emitImmediately: true });
-//     };
-// }
 function createOnPlaceOrderTasksByTransaction(params) {
     const potentialActions = params.potentialActions;
     const now = new Date();
@@ -335,29 +270,33 @@ function createOnPlaceOrderTasksByTransaction(params) {
     // tslint:disable-next-line:no-single-line-block-comment
     /* istanbul ignore else */
     if (potentialActions !== undefined) {
+        // 冗長なsendOrderタスク作成を回避(createSendOrderTransactionTaskIfNotExistへ移行)(2023-08-25~)
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */
-        if (potentialActions.sendOrder !== undefined) {
-            const sendOrderTaskData = {
-                project: potentialActions.sendOrder.project,
-                object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber })
-                // 廃止(2023-08-21~)
-                // ...(potentialActions.sendOrder.potentialActions !== undefined)
-                //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
-                //     : undefined
-            };
-            const sendOrderTask = {
-                project: potentialActions.sendOrder.project,
-                name: factory.taskName.SendOrder,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: sendOrderTaskData
-            };
-            taskAttributes.push(sendOrderTask);
-        }
+        // if (potentialActions.sendOrder !== undefined) {
+        //     const sendOrderTaskData: factory.task.IData<factory.taskName.SendOrder> = {
+        //         project: potentialActions.sendOrder.project,
+        //         object: {
+        //             ...potentialActions.sendOrder.object,
+        //             confirmationNumber: params.object.confirmationNumber
+        //         }
+        //         // 廃止(2023-08-21~)
+        //         // ...(potentialActions.sendOrder.potentialActions !== undefined)
+        //         //     ? { potentialActions: potentialActions.sendOrder.potentialActions }
+        //         //     : undefined
+        //     };
+        //     const sendOrderTask: factory.task.IAttributes<factory.taskName.SendOrder> = {
+        //         project: potentialActions.sendOrder.project,
+        //         name: factory.taskName.SendOrder,
+        //         status: factory.taskStatus.Ready,
+        //         runsAt: now, // なるはやで実行
+        //         remainingNumberOfTries: 10,
+        //         numberOfTried: 0,
+        //         executionResults: [],
+        //         data: sendOrderTaskData
+        //     };
+        //     taskAttributes.push(sendOrderTask);
+        // }
         // ポイント付与
         // tslint:disable-next-line:no-single-line-block-comment
         /* istanbul ignore else */

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

@@ -13,18 +13,20 @@ exports.onOrderStatusChanged = void 0;
 /**
  * 注文ステータス変更時処理
  */
+const createDebug = require("debug");
 const google_libphonenumber_1 = require("google-libphonenumber");
-const moment = require("moment");
 const factory = require("../../factory");
 const order_1 = require("../../factory/order");
 const product_1 = require("../offer/product");
 const factory_1 = require("./onOrderStatusChanged/factory");
+const debug = createDebug('chevre-domain:service:order');
 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;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -89,7 +91,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)({
@@ -115,21 +118,30 @@ function onOrderStatusChanged(params) {
             default:
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderProcessing:
+                // 冗長な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
+                })(repos);
+                break;
+            default:
+        }
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;
 function createConfirmPayTransactionTasks(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
+        const taskRunsAt = new Date();
         const tasks = [];
         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;
-            // }
+            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
+            if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
+                return;
+            }
             // 冗長なタスク作成を回避
             const existingTasks = yield repos.task.search({
                 limit: 1,
@@ -173,69 +185,49 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
         return tasks;
     });
 }
-const COA_TASK_DELAY_IN_SECONDS = 0;
-function createConfirmReserveTransactionTasks(order, simpleOrder) {
+// const COA_TASK_DELAY_IN_SECONDS = 0;
+function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
-        const taskRunsAt4coa = moment(order.orderDate)
-            .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
+        const taskRunsAt = new Date();
+        const taskRunsAt4coa = new Date();
+        // const taskRunsAt4coa = moment(order.orderDate)
+        //     .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
+        //     .toDate();
         const confirmObjects = [
             ...(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) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
+        const taskRunsAt = new Date();
         if (USE_CONFIRM_REGISTER_SERVICE_TRANSACTION) {
             const confirmObjects = (0, factory_1.createConfirmRegisterServiceActionObjectByOrder)({ order });
             const tasks = [];
@@ -285,14 +277,38 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
         }
     });
 }
-const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
+function createSendOrderTransactionTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const now = new Date();
+        const sendOrderByTransaction = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendOrder;
+        if (sendOrderByTransaction !== undefined) {
+            const sendOrderTaskData = {
+                project: sendOrderByTransaction.project,
+                object: Object.assign(Object.assign({}, sendOrderByTransaction.object), { confirmationNumber: params.object.confirmationNumber })
+            };
+            const sendOrderTask = {
+                project: sendOrderByTransaction.project,
+                name: factory.taskName.SendOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: sendOrderTaskData
+            };
+            yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+        }
+    });
+}
+// const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     var _a, _b;
-    const taskRunsAt = moment(order.dateReturned)
-        .toDate();
-    const taskRunsAt4coa = moment(order.dateReturned)
-        .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
-        .toDate();
+    const taskRunsAt = new Date();
+    const taskRunsAt4coa = new Date();
+    // const taskRunsAt4coa = moment(order.dateReturned)
+    //     .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
+    //     .toDate();
     const tasks = [];
     const returnActionRecipient = {
         typeOf: order.seller.typeOf,
@@ -367,12 +383,13 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
     }
     return tasks;
 }
-const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
+// 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 taskRunsAt = new Date();
+    // 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;

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/payOrder.js

@@ -38,8 +38,8 @@ function payOrder(params) {
             order = yield repos.order.changeStatus({
                 project: { id: order.project.id },
                 orderNumber,
-                orderStatus: factory.orderStatus.OrderPaymentDue,
-                previousOrderStatus: factory.orderStatus.OrderProcessing
+                orderStatus: factory.orderStatus.OrderProcessing,
+                previousOrderStatus: factory.orderStatus.OrderPaymentDue
             });
         }
         catch (error) {

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

@@ -42,5 +42,7 @@ declare function placeOrder(params: {
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
-}) => Promise<void>;
+}) => Promise<{
+    order: factory.order.IOrder;
+}>;
 export { placeOrder, placeOrderWithoutTransaction };

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型に変換(でないと検索クエリを効率的に使えない)
@@ -233,14 +232,41 @@ function placeOrder(params) {
             }
             else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
                 // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
-                yield (0, payOrder_1.payOrder)({
-                    project: { id: order.project.id },
+                // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
+                yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
+                    order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderPaymentDue }),
+                    placeOrderTransaction
+                })({
+                    registerActionInProgress: repos.registerActionInProgress,
+                    task: repos.task
+                });
+            }
+            else {
+                throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
+            }
+            // paymentMethods.length: 0の場合を考慮(2023-08-24~)
+            if (order.paymentMethods.length === 0) {
+                // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
+                // 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 });
             }
         }
         // onOrderStatusChangedへ移行(2023-08-17~)
@@ -248,6 +274,7 @@ function placeOrder(params) {
         //     object: order,
         //     potentialActions: params.potentialActions
         // })(repos);
+        return { order };
     });
 }
 exports.placeOrder = placeOrder;

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

@@ -1,10 +1,10 @@
 /**
  * 注文サービス
  */
+import { confirmPayTransaction } from './order/confirmPayTransaction';
 import { deleteOrder } from './order/deleteOrder';
 import { onOrderStatusChanged } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
-import { returnOrder } from './order/returnOrder';
 import { sendOrder } from './order/sendOrder';
-export { deleteOrder, onOrderStatusChanged, onOrderUpdated, placeOrder, placeOrderWithoutTransaction, returnOrder, sendOrder };
+export { confirmPayTransaction, deleteOrder, onOrderStatusChanged, onOrderUpdated, placeOrder, placeOrderWithoutTransaction, sendOrder };

package/lib/chevre/service/order.js

@@ -1,9 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.returnOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.deleteOrder = void 0;
+exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
+const confirmPayTransaction_1 = require("./order/confirmPayTransaction");
+Object.defineProperty(exports, "confirmPayTransaction", { enumerable: true, get: function () { return confirmPayTransaction_1.confirmPayTransaction; } });
 const deleteOrder_1 = require("./order/deleteOrder");
 Object.defineProperty(exports, "deleteOrder", { enumerable: true, get: function () { return deleteOrder_1.deleteOrder; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
@@ -13,7 +15,6 @@ Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: functi
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
 Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrder_1.placeOrderWithoutTransaction; } });
-const returnOrder_1 = require("./order/returnOrder");
-Object.defineProperty(exports, "returnOrder", { enumerable: true, get: function () { return returnOrder_1.returnOrder; } });
+// import { returnOrder } from './order/returnOrder';
 const sendOrder_1 = require("./order/sendOrder");
 Object.defineProperty(exports, "sendOrder", { enumerable: true, get: function () { return sendOrder_1.sendOrder; } });

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

@@ -22,8 +22,7 @@ const project_1 = require("../../repo/project");
 const seller_1 = require("../../repo/seller");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const PayTransactionService = require("../assetTransaction/pay");
-const payOrder_1 = require("../order/payOrder");
+const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
  */
@@ -32,106 +31,19 @@ function call(data) {
         if (settings.redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const orderRepo = new order_1.MongoRepository(settings.connection);
-        const accountingReportRepo = new accountingReport_1.MongoRepository(settings.connection);
-        const eventRepo = new event_1.MongoRepository(settings.connection);
-        const productRepo = new product_1.MongoRepository(settings.connection);
-        const projectRepo = new project_1.MongoRepository(settings.connection);
-        const sellerRepo = new seller_1.MongoRepository(settings.connection);
-        const taskRepo = new task_1.MongoRepository(settings.connection);
-        const transactionRepo = new transaction_1.MongoRepository(settings.connection);
-        const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        // アクション開始
-        const action = yield actionRepo.start(data);
-        try {
-            for (const confirmingTransaction of data.object) {
-                yield PayTransactionService.confirm({
-                    transactionNumber: confirmingTransaction.transactionNumber,
-                    potentialActions: {
-                        pay: {
-                            purpose: {
-                                typeOf: data.purpose.typeOf,
-                                confirmationNumber: data.purpose.confirmationNumber,
-                                orderNumber: data.purpose.orderNumber
-                            }
-                        }
-                    }
-                })({
-                    action: actionRepo,
-                    accountingReport: accountingReportRepo,
-                    assetTransaction: assetTransactionRepo,
-                    event: eventRepo,
-                    order: orderRepo,
-                    product: productRepo,
-                    project: projectRepo,
-                    seller: sellerRepo,
-                    task: taskRepo
-                });
-            }
-        }
-        catch (error) {
-            // actionにエラー結果を追加
-            try {
-                const actionError = Object.assign(Object.assign({}, error), { message: error.message, name: error.name });
-                yield actionRepo.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
-            }
-            catch (__) {
-                // 失敗したら仕方ない
-            }
-            throw error;
-        }
-        // アクション完了
-        const actionResult = {};
-        yield actionRepo.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        // processOrder連携(2023-08-23~)
-        yield onConfirmed(data)({
-            assetTransaction: assetTransactionRepo,
-            order: orderRepo,
-            registerActionInProgress: registerServiceInProgressRepo,
-            task: taskRepo,
-            transaction: transactionRepo
+        yield (0, confirmPayTransaction_1.confirmPayTransaction)(data)({
+            action: new action_1.MongoRepository(settings.connection),
+            assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            order: new order_1.MongoRepository(settings.connection),
+            accountingReport: new accountingReport_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
+            product: new product_1.MongoRepository(settings.connection),
+            project: new project_1.MongoRepository(settings.connection),
+            seller: new seller_1.MongoRepository(settings.connection),
+            task: new task_1.MongoRepository(settings.connection),
+            transaction: new transaction_1.MongoRepository(settings.connection),
+            registerServiceInProgress: new registerServiceInProgress_1.RedisRepository(settings.redisClient)
         });
     });
 }
 exports.call = call;
-function onConfirmed(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        if (params.processOrder === true) {
-            // 注文のpaymentMethodIdを取得
-            const order = yield repos.order.findByOrderNumber({
-                orderNumber: params.purpose.orderNumber,
-                project: { id: params.project.id },
-                inclusion: ['paymentMethods'],
-                exclusion: []
-            });
-            // PayTransactionのステータス検証
-            let allPayTransactionConfirmed = false;
-            const paymentMethodIds = order.paymentMethods.filter((invoice) => typeof invoice.paymentMethodId === 'string' && invoice.paymentMethodId.length > 0)
-                .map((invoice) => invoice.paymentMethodId);
-            if (paymentMethodIds.length > 0) {
-                const referencedPayTransactions = yield repos.assetTransaction.search({
-                    project: { id: { $eq: params.project.id } },
-                    typeOf: factory.assetTransactionType.Pay,
-                    transactionNumber: { $in: paymentMethodIds }
-                }, ['status']);
-                allPayTransactionConfirmed =
-                    referencedPayTransactions.every((payTransation) => payTransation.status === factory.transactionStatusType.Confirmed);
-            }
-            else {
-                allPayTransactionConfirmed = true;
-            }
-            if (allPayTransactionConfirmed) {
-                yield (0, payOrder_1.payOrder)({
-                    project: { id: params.project.id },
-                    object: {
-                        confirmationNumber: params.purpose.confirmationNumber,
-                        orderNumber: params.purpose.orderNumber
-                    },
-                    useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
-                })(repos);
-            }
-        }
-    });
-}

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/lib/chevre/service/task/returnOrder.js

@@ -17,7 +17,7 @@ const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
-const OrderService = require("../order");
+const returnOrder_1 = require("../order/returnOrder");
 /**
  * タスク実行関数
  */
@@ -32,7 +32,7 @@ function call(data) {
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new transaction_1.MongoRepository(settings.connection);
         const registerServiceInProgressRepo = new registerServiceInProgress_1.RedisRepository(settings.redisClient);
-        yield OrderService.returnOrder(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
+        yield (0, returnOrder_1.returnOrder)(Object.assign(Object.assign({}, data), { useOnOrderStatusChanged: true }))({
             action: actionRepo,
             order: orderRepo,
             ownershipInfo: ownershipInfoRepo,

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

@@ -22,6 +22,7 @@ const validation_1 = require("./placeOrderInProgress/validation");
 const validateSeller_1 = require("./placeOrderInProgress/validation/validateSeller");
 const validation_2 = require("./validation");
 const errorHandler_1 = require("../../errorHandler");
+const settings_1 = require("../../settings");
 exports.POINT_AWARD_IDENTIFIER_NAME = 'pointAwardIdentifiers';
 /**
  * 取引開始
@@ -226,7 +227,9 @@ function createResult(params) {
         orderNumber: params.orderNumber,
         transaction: transaction,
         orderDate: params.result.order.orderDate,
-        orderStatus: factory.orderStatus.OrderProcessing,
+        // OrderPaymentDueオプションを追加(2023-08-25~)
+        // 注文作成時のステータスとなる
+        orderStatus: (settings_1.USE_ORDER_PAYMENT_DUE_ON_PLACED) ? factory.orderStatus.OrderPaymentDue : factory.orderStatus.OrderProcessing,
         isGift: false,
         authorizeActions: params.authorizeActions
     });

package/lib/chevre/settings.d.ts

@@ -42,6 +42,7 @@ export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
 export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;
 export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_CUSTOM_SENDER_EMAIL: boolean;
+export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
 export declare const INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_CUSTOM_SENDER_EMAIL = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -74,6 +74,7 @@ exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIR
 exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = process.env.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT === '1';
 exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1';
 exports.USE_CUSTOM_SENDER_EMAIL = process.env.USE_CUSTOM_SENDER_EMAIL === '1';
+exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.327.0-alpha.1",
+    "@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.0"
+  "version": "21.8.0-alpha.10"
 }