@chevre/domain 24.0.0-alpha.2 → 24.0.0-alpha.21

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

@@ -36,7 +36,8 @@ const paymentService_1 = require("../../repo/paymentService");
 const potentialAction_1 = require("../../repo/potentialAction");
 const product_1 = require("../../repo/product");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const returnOrder_1 = require("../../repo/transaction/returnOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const RefundTransactionService = __importStar(require("../assetTransaction/refund"));
 /**
@@ -58,7 +59,7 @@ function call(params) {
             potentialAction: new potentialAction_1.PotentialActionRepo(connection),
             product: new product_1.ProductRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection),
+            returnOrder: new returnOrder_1.ReturnOrderRepo(connection),
             transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
         });
     };
@@ -104,7 +105,7 @@ function fixOrderAndTransaction(params) {
         }
         // const orderNumber = params.purpose.orderNumber;
         const orderNumber = orderByPaymentMethodId.orderNumber;
-        const returnOrderTransaction = (await repos.transaction.projectFields({
+        const returnOrderTransaction = (await repos.returnOrder.findReturnOrderTransactions({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.ReturnOrder,

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

@@ -31,13 +31,13 @@ const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const sendOrder_1 = require("../order/sendOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return async ({ connection, settings }) => {
+    return async ({ connection }) => {
         await (0, sendOrder_1.sendOrder)({
             ...data,
             object: {
@@ -57,7 +57,7 @@ function call(data) {
             ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
-        }, settings);
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
+        });
     };
 }

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

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const voidTransaction_1 = require("../offer/moneyTransfer/voidTransaction");
 /**
  * タスク実行関数
@@ -12,11 +13,13 @@ function call(data) {
     return async ({ connection }) => {
         const actionRepo = new action_1.ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
-        const transactionRepo = new transaction_1.TransactionRepo(connection);
+        const placeOrderRepo = new placeOrder_1.PlaceOrderRepo(connection);
+        // const transactionRepo = new TransactionRepo(connection);
         await (0, voidTransaction_1.voidTransaction)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            transaction: transactionRepo
+            placeOrder: placeOrderRepo
+            // transaction: transactionRepo
         });
     };
 }

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

@@ -8,7 +8,8 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
+// import { TransactionRepo } from '../../repo/transaction';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -27,7 +28,8 @@ function call(params) {
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
+            // transaction: new TransactionRepo(connection)
         }
         // settings
         );

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const product_1 = require("../offer/product");
 /**
  * タスク実行関数
@@ -12,11 +12,11 @@ function call(data) {
     return async ({ connection }) => {
         const actionRepo = new action_1.ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
-        const transactionRepo = new transaction_1.TransactionRepo(connection);
+        const placeOrderRepo = new placeOrder_1.PlaceOrderRepo(connection);
         await (0, product_1.voidTransaction)(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            transaction: transactionRepo
+            placeOrder: placeOrderRepo
         });
     };
 }

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

@@ -36,8 +36,8 @@ const reserveInterface_1 = require("../../repo/reserveInterface");
 const setting_1 = require("../../repo/setting");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 let coaAuthClientCreated = false;
 let coaAuthClient = new COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
@@ -87,7 +87,8 @@ function call(params) {
                 reservation: new reservation_1.ReservationRepo(connection),
                 setting: new setting_1.SettingRepo(connection),
                 task: new task_1.TaskRepo(connection),
-                transaction: new transaction_1.TransactionRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                // transaction: new TransactionRepo(connection),
                 reserveService
             }, settings);
         }

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -12,6 +12,9 @@ import type { ReservationRepo } from '../../repo/reservation';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
+import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
+import type { MoneyTransferRepo } from '../../repo/transaction/moneyTransfer';
 /**
  * 取引に関わるリソースを削除する
  * 冪等性を確保すること
@@ -30,4 +33,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
+    returnOrder: ReturnOrderRepo;
+    moneyTransfer: MoneyTransferRepo;
 }) => Promise<void>;

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

@@ -50,15 +50,40 @@ function createDeleteTransactionTasksByAgentId(params) {
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
         if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
             const transactionTypeOf = params.object.typeOf;
-            const transactions = await repos.transaction.projectFields({
-                project: { id: { $eq: params.object.project.id } },
-                agent: {
-                    ids: [agentIdSpecified],
-                    typeOf: factory.personType.Person
-                },
-                typeOf: transactionTypeOf,
-                inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
-            });
+            let transactions;
+            if (transactionTypeOf === factory.transactionType.PlaceOrder) {
+                transactions = await repos.placeOrder.findPlaceOrderTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
+            else if (transactionTypeOf === factory.transactionType.ReturnOrder) {
+                transactions = await repos.returnOrder.findReturnOrderTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
+            else {
+                transactions = await repos.moneyTransfer.findMoneyTransferTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
             const deleteAt = new Date();
             let deleteTransactionTasks;
             switch (transactionTypeOf) {
@@ -166,11 +191,28 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory.errors.ArgumentNull('object.id');
         }
-        const transaction = (await repos.transaction.projectFields({
-            ids: [deletingTransactionId],
-            typeOf: params.object.typeOf,
-            inclusion: ['typeOf', 'project', 'status', 'result']
-        })).shift();
+        let transaction;
+        if (params.object.typeOf === factory.transactionType.PlaceOrder) {
+            transaction = (await repos.placeOrder.findPlaceOrderTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
+        else if (params.object.typeOf === factory.transactionType.ReturnOrder) {
+            transaction = (await repos.returnOrder.findReturnOrderTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
+        else {
+            transaction = (await repos.moneyTransfer.findMoneyTransferTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
         if (transaction === undefined) {
             // すでに削除済
             return;

package/lib/chevre/service/transaction/moneyTransfer.d.ts

@@ -9,7 +9,7 @@ import type { SellerRepo } from '../../repo/seller';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
-import type { IStartedTransaction, TransactionRepo } from '../../repo/transaction';
+import type { IStartedTransaction, MoneyTransferRepo } from '../../repo/transaction/moneyTransfer';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 import { moneyTransfer as MoneyTransferFactory } from '../../factory/transaction';
 export interface IStartOperationRepos {
@@ -21,7 +21,7 @@ export interface IStartOperationRepos {
     project: ProjectRepo;
     seller: SellerRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    moneyTransfer: MoneyTransferRepo;
     transactionNumber: TransactionNumberRepo;
     assetTransaction: AssetTransactionRepo;
 }
@@ -29,11 +29,11 @@ export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export type ITaskAndTransactionOperation<T> = (repos: {
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    moneyTransfer: MoneyTransferRepo;
 }) => Promise<T>;
 export type IConfirmOperation<T> = (repos: {
     action: ActionRepo;
-    transaction: TransactionRepo;
+    moneyTransfer: MoneyTransferRepo;
 }) => Promise<T>;
 export type IStartParams = MoneyTransferFactory.IStartParams;
 /**
@@ -48,7 +48,7 @@ export type IAuthorizeOperation<T> = (repos: {
     product: ProductRepo;
     project: ProjectRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    moneyTransfer: MoneyTransferRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<T>;
 /**

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

@@ -72,7 +72,7 @@ function start(params) {
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
         // 取引開始
         const startParams = (0, factory_2.createStartParams)(params, passport, seller, amount, fromLocation, toLocation, transactionNumber);
-        const transaction = await repos.transaction.start(startParams);
+        const transaction = await repos.moneyTransfer.startMoneyTransfer(startParams);
         await authorizePaymentCard({
             transaction: {
                 ...transaction,
@@ -202,7 +202,7 @@ function processAuthorizePaymentCard(params) {
     //     jwt: JWTCredentials;
     // }
     ) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.moneyTransfer.findMoneyTransferInProgressById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.purpose.id
         }, ['agent', 'project', 'recipient', 'seller', 'typeOf', 'object']);
@@ -566,7 +566,7 @@ function validateToLocation(project, toLocationBeforeStart, issuedThrough) {
 function confirm(params) {
     return async (repos) => {
         const now = new Date();
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.moneyTransfer.findMoneyTransferById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['typeOf', 'status', 'project']);
@@ -591,7 +591,7 @@ function confirm(params) {
         // ポストアクションを作成
         const potentialActions = await (0, potentialActions_1.createPotentialActions)({ authorizeActions, transaction });
         // 取引確定
-        await repos.transaction.confirm({
+        await repos.moneyTransfer.confirmMoneyTransfer({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
             result: {},
@@ -625,7 +625,7 @@ function exportTasksById(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.moneyTransfer.findMoneyTransferById({
             typeOf: factory.transactionType.MoneyTransfer,
             id: params.id
         }, ['endDate', 'status', 'project', 'startDate', 'typeOf', 'object', 'potentialActions']);

package/lib/chevre/service/transaction/placeOrder/confirm.d.ts

@@ -8,7 +8,7 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { SettingRepo } from '../../../repo/setting';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IConfirmOperationRepos {
@@ -18,7 +18,7 @@ interface IConfirmOperationRepos {
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     confirmationNumber: ConfirmationNumberRepo;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -40,19 +40,20 @@ const potentialActions_1 = require("./confirm/potentialActions");
 const publishCode_1 = require("./confirm/publishCode");
 const validation_1 = require("./confirm/validation");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
-const publishOrderNumberIfNotExist_1 = require("./publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 const debug = (0, debug_1.default)('chevre-domain:service:transaction');
+/**
+ * 進行中でない取引を処理する
+ */
 function processTransactionNotInProgress(transaction) {
     return async (repos) => {
         if (transaction.status === factory.transactionStatusType.Confirmed) {
-            // retrieve customer from orderInTransaction(2024-06-24~)
-            // let resultCustomer: factory.order.ICustomer | undefined = createCustomer({ transaction });
             const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
                 orderNumber: { $eq: String(transaction.object.orderNumber) }
             });
-            if (resultCustomer === undefined) {
-                throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
-            }
+            // if (resultCustomer === undefined) {
+            //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
+            // }
             // すでに確定済の場合
             return {
                 ...transaction.result,
@@ -80,7 +81,7 @@ function confirm(params, options) {
             status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
         const confirmResult = await processTransactionNotInProgress(transaction)(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
@@ -95,7 +96,7 @@ function confirm(params, options) {
             acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
         // 注文番号を発行
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: params.result.order.orderDate }
@@ -179,7 +180,7 @@ function confirm(params, options) {
         })(repos);
         // ステータス変更
         try {
-            await repos.transaction.confirm({
+            await repos.placeOrder.confirmPlaceOrder({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
                 result: result,

package/lib/chevre/service/transaction/placeOrder/exportTasksById.d.ts

@@ -1,15 +1,16 @@
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
-type ITaskAndTransactionOperation<T> = (repos: {
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
+interface IExportTasksByIdRepos {
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
-}) => Promise<T>;
+    placeOrder: PlaceOrderRepo;
+}
+type ITaskAndTransactionOperation<T> = (repos: IExportTasksByIdRepos) => Promise<T>;
 /**
  * 取引のタスクを出力します
  */
-export declare function exportTasksById(params: {
+declare function exportTasksById(params: {
     id: string;
     /**
      * タスク実行日時バッファ
@@ -20,4 +21,4 @@ export declare function exportTasksById(params: {
      */
     optimizeRedundantTasks: boolean;
 }): ITaskAndTransactionOperation<void>;
-export {};
+export { IExportTasksByIdRepos, exportTasksById };

package/lib/chevre/service/transaction/placeOrder/exportTasksById.js

@@ -38,7 +38,7 @@ function exportTasksById(params) {
     return async (repos
     // settings: Settings
     ) => {
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.id
         }, ['endDate', 'object', 'project', 'seller', 'startDate', 'status', 'typeOf']);

package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.d.ts → issueOrderNumberIfNotExist.d.ts}

@@ -1,10 +1,10 @@
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-declare function publishOrderNumberIfNotExist(params: {
+declare function issueOrderNumberIfNotExist(params: {
     project: {
         id: string;
     };
@@ -17,7 +17,7 @@ declare function publishOrderNumberIfNotExist(params: {
     };
 }): (repos: {
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     orderNumber: OrderNumberRepo;
 }) => Promise<string>;
-export { publishOrderNumberIfNotExist };
+export { issueOrderNumberIfNotExist };

package/lib/chevre/service/transaction/placeOrder/{publishOrderNumberIfNotExist.js → issueOrderNumberIfNotExist.js}

@@ -23,36 +23,44 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.publishOrderNumberIfNotExist = publishOrderNumberIfNotExist;
+exports.issueOrderNumberIfNotExist = issueOrderNumberIfNotExist;
 const factory = __importStar(require("../../../factory"));
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-function publishOrderNumberIfNotExist(params) {
+function issueOrderNumberIfNotExist(params) {
     return async (repos) => {
-        // 最適化(2023-02-03~)
-        let orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.id });
+        // 1. 最初のチェック
+        let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
         // すでに発行済であれば何もしない
         if (typeof orderNumber === 'string') {
             return orderNumber;
         }
-        // 注文番号を発行
+        // 2. 発行準備
         const { alternateName } = await repos.project.findAlternateNameById({ id: params.project.id });
         if (typeof alternateName !== 'string') {
             throw new factory.errors.NotFound('project.alternateName');
         }
-        orderNumber = await repos.orderNumber.publishByTimestamp({
+        // 3. 番号発行
+        const issuedOrderNumber = await repos.orderNumber.issueOrderNumber({
             project: { alternateName },
             orderDate: params.object.orderDate
         });
-        // 取引に存在しなければ保管
-        await repos.transaction.saveOrderNumberIfNotExist({ id: params.id, orderNumber });
-        // 注文番号を取引から再取得
-        // 最適化(2023-02-03~)
-        orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.id });
-        // 万が一処理が想定通りでない場合orderNumberが存在しない
+        // 4. 保管を試みる
+        const { modifiedCount } = await repos.placeOrder.saveOrderNumberIfNotExist({
+            id: params.id,
+            orderNumber: issuedOrderNumber
+        });
+        // 5. 書き込めたなら、自分が発行した番号が「真実」
+        if (modifiedCount === 1) {
+            return issuedOrderNumber;
+        }
+        // 6. 競合が発生した場合（他者が先に書き込んだ場合）
+        // DBにある「正解」を再取得して返す
+        orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
         if (typeof orderNumber !== 'string') {
-            throw new factory.errors.Internal('transaction.object.orderNumber not found');
+            // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
+            throw new factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
         }
         return orderNumber;
     };

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.d.ts

@@ -1,5 +1,5 @@
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 /**
  * 未発行であれば、注文の確認番号を発行して取引に保管する
@@ -16,7 +16,7 @@ declare function publishConfirmationNumberIfNotExist(params: {
         orderDate: Date;
     };
 }): (repos: {
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     confirmationNumber: ConfirmationNumberRepo;
 }) => Promise<string>;
 export { publishConfirmationNumberIfNotExist };

package/lib/chevre/service/transaction/placeOrder/publishConfirmationNumberIfNotExist.js

@@ -30,7 +30,7 @@ const factory = __importStar(require("../../../factory"));
  */
 function publishConfirmationNumberIfNotExist(params) {
     return async (repos) => {
-        let confirmationNumber = await repos.transaction.findInProgressConfirmationNumberById({
+        let confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
             id: params.id,
             status: { $in: params.status.$in }
         });
@@ -41,13 +41,13 @@ function publishConfirmationNumberIfNotExist(params) {
         // 確認番号を発行
         confirmationNumber = await repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
         // 取引に存在しなければ保管
-        await repos.transaction.saveConfirmationNumberIfNotExist({
+        await repos.placeOrder.saveConfirmationNumberIfNotExist({
             id: params.id,
             status: { $in: params.status.$in },
             confirmationNumber
         });
         // 確認番号を取引から再取得
-        confirmationNumber = await repos.transaction.findInProgressConfirmationNumberById({
+        confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
             id: params.id,
             status: { $in: params.status.$in }
         });

package/lib/chevre/service/transaction/placeOrder/start.d.ts

@@ -4,7 +4,7 @@ import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { PassportRepo } from '../../../repo/passport';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
-import type { IStartedTransaction, TransactionRepo } from '../../../repo/transaction';
+import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { placeOrder as PlaceOrderFactory } from '../../../factory/transaction';
 interface IStartOperationRepos {
     issuer: IssuerRepo;
@@ -13,7 +13,7 @@ interface IStartOperationRepos {
     passport: PassportRepo;
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 type IStartParams = PlaceOrderFactory.IStartParams;
@@ -23,5 +23,5 @@ interface IStartOptions {
 /**
  * 取引開始
  */
-declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedTransaction>;
+declare function start(params: IStartParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
 export { start };

package/lib/chevre/service/transaction/placeOrder/start.js

@@ -54,7 +54,7 @@ function start(params, options) {
             }
             catch (error) {
                 // in case already locked
-                const alreadyStartedTransaction = (await repos.transaction.projectFields({
+                const alreadyStartedTransaction = (await repos.placeOrder.findPlaceOrderTransactions({
                     limit: 1, page: 1,
                     typeOf: factory.transactionType.PlaceOrder,
                     project: { id: { $eq: startParams.project.id } },
@@ -72,7 +72,7 @@ function start(params, options) {
             }
         }
         if (transaction === undefined) {
-            transaction = await repos.transaction.start(startParams);
+            transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
         return transaction;
     };