@chevre/domain 21.8.0-alpha.1 → 21.8.0-alpha.3

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.taskModel.find(
+        {
+            'project.id': { $eq: project.id },
+            name: { $eq: chevre.factory.taskName.SendOrder },
+            'data.object.orderNumber': {
+                $exists: true,
+                $eq: 'xxx'
+            }
+        }
+    )
+        .limit(1)
+        .exec();
+    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,7 @@ export declare class MongoRepository {
      * 取引削除タスク冪等作成
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
+    createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
         executor: {

package/lib/chevre/repo/task.js

@@ -230,6 +230,27 @@ class MongoRepository {
             }
         });
     }
+    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
+                });
+            }
+        });
+    }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

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,109 @@
+"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 factory = require("../../factory");
+const PayTransactionService = require("../assetTransaction/pay");
+const payOrder_1 = require("../order/payOrder");
+function confirmPayTransaction(data) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // アクション開始
+        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) {
+                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/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;

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-24~)
         // 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

@@ -24,7 +24,7 @@ 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;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -115,6 +115,16 @@ function onOrderStatusChanged(params) {
             default:
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderProcessing:
+                // 冗長なsendOrderタスク作成を回避(2023-08-24~)
+                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;
@@ -285,6 +295,30 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
         }
     });
 }
+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;

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

@@ -233,14 +233,29 @@ 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 },
-                    object: {
-                        confirmationNumber: order.confirmationNumber,
-                        orderNumber: order.orderNumber
-                    },
-                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
-                })(repos);
+                // 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
+                });
+                // paymentMethods.length: 0の場合を考慮(2023-08-24~)
+                if (order.paymentMethods.length === 0) {
+                    // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
+                    yield (0, payOrder_1.payOrder)({
+                        project: { id: order.project.id },
+                        object: {
+                            confirmationNumber: order.confirmationNumber,
+                            orderNumber: order.orderNumber
+                        },
+                        useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                    })(repos);
+                }
+            }
+            else {
+                throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
             }
         }
         // onOrderStatusChangedへ移行(2023-08-17~)
@@ -248,6 +263,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/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/package.json

@@ -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.1"
+  "version": "21.8.0-alpha.3"
 }