@chevre/domain 24.0.0-alpha.6 → 24.0.0-alpha.7

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -4,6 +4,7 @@ import type { EventRepo } from '../../../repo/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { IRequestBody, IResponseBody } from './authorize/factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './authorize/validateAcceptedOffers';
 import * as factory from '../../../factory';
@@ -15,6 +16,7 @@ export interface IAuthorizeRepos {
     event: EventRepo;
     offer: OfferRepo;
     orderInTransaction: OrderInTransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;

package/lib/chevre/service/offer/eventServiceByCOA/authorize.js

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
-// import { publishOrderNumberIfNotExist } from '../../transaction/placeOrder/publishOrderNumberIfNotExist';
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
@@ -104,15 +103,9 @@ function authorize(params) {
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
         }
-        // const now = new Date();
-        // const orderNumber = await publishOrderNumberIfNotExist({
-        //     project: { id: transaction.project.id },
-        //     id: transaction.id,
-        //     object: { orderDate: now }
-        // })(repos);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
+            // 事前に発行されているはず(acceptCOAOfferにて)
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         let result;

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -44,7 +44,7 @@ function changeOffers(params) {
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');

package/lib/chevre/service/offer/moneyTransfer/authorize.d.ts

@@ -6,6 +6,7 @@ import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProductRepo } from '../../../repo/product';
 import type { ProjectRepo } from '../../../repo/project';
 import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     action: ActionRepo;
@@ -14,6 +15,7 @@ interface IAuthorizeRepos {
     assetTransaction: AssetTransactionRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }

package/lib/chevre/service/offer/moneyTransfer/authorize.js

@@ -30,7 +30,7 @@ exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../../../factory"));
 const MoneyTransferAssetTransactionService = __importStar(require("../../assetTransaction/moneyTransfer"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 function authorize(params) {
     return async (repos) => {
@@ -42,7 +42,7 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }

package/lib/chevre/service/offer/product.d.ts

@@ -12,6 +12,7 @@ import type { ProjectRepo } from '../../repo/project';
 import type { ServiceOutputRepo } from '../../repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from '../../repo/serviceOutputIdentifier';
 import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 export interface IAuthorizeOperationRepos {
     account: AccountRepo;
@@ -26,6 +27,7 @@ export interface IAuthorizeOperationRepos {
     project: ProjectRepo;
     serviceOutput: ServiceOutputRepo;
     serviceOutputIdentifier: ServiceOutputIdentifierRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }

package/lib/chevre/service/offer/product.js

@@ -31,7 +31,7 @@ const factory = __importStar(require("../../factory"));
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 const availableProductTypes_1 = require("../../factory/availableProductTypes");
 const RegisterServiceTransaction = __importStar(require("../assetTransaction/registerService"));
-const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("./any");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
@@ -117,7 +117,7 @@ function authorize(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: new Date() }

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -2,7 +2,8 @@ import * as factory from '../../../../factory';
 import type { ActionRepo } from '../../../../repo/action';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
-import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import type { ITransactionInProgress } from '../../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import { IInvoiceByTicketToken } from '../factory';
@@ -10,7 +11,7 @@ interface IFixTransactionNumberRepos {
     action: ActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts

@@ -2,7 +2,8 @@ import * as factory from '../../../../factory';
 import type { ActionRepo } from '../../../../repo/action';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
-import type { ITransactionInProgress, TransactionRepo } from '../../../../repo/transaction';
+import type { ITransactionInProgress } from '../../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import type { IInvoiceByTicketToken } from '../factory';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
@@ -21,7 +22,7 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
     action: ActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.js

@@ -122,7 +122,7 @@ function handlePrePublishedPaymentMethodIdOnAuthorizing(params) {
         let acceptPayAction;
         // transaction.objectへのアクセス回避(2024-05-30~)
         // const paymentMethodByTransaction = transaction.object.paymentMethods;
-        const paymentMethodByTransaction = await repos.transaction.findInProgressPaymentMethodId({ id: params.transaction.id });
+        const paymentMethodByTransaction = await repos.placeOrder.findInProgressPaymentMethodId({ id: params.transaction.id });
         if (params.prePublishedPaymentMethodId === paymentMethodByTransaction?.paymentMethodId) {
             // check existence of acceptAction when authorizing payment(2024-06-01~)
             acceptPayAction = (await repos.action.search({

package/lib/chevre/service/payment/any/fixOrderAsNeeded.d.ts

@@ -3,6 +3,7 @@ import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 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 fixOrderAsNeeded(params: {
     project: {
         id: string;
@@ -10,6 +11,7 @@ declare function fixOrderAsNeeded(params: {
     purpose: factory.action.authorize.paymentMethod.any.IPurpose;
 }): (repos: {
     project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     confirmationNumber: ConfirmationNumberRepo;
     orderNumber: OrderNumberRepo;

package/lib/chevre/service/payment/any/fixOrderAsNeeded.js

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
 const factory = __importStar(require("../../../factory"));
 const publishConfirmationNumberIfNotExist_1 = require("../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 function fixOrderAsNeeded(params) {
     return async (repos) => {
         const orderDate = new Date();
@@ -38,13 +38,10 @@ function fixOrderAsNeeded(params) {
             id: params.purpose.id,
             status: { $in: [factory.transactionStatusType.InProgress] },
             object: { orderDate }
-        })({
-            confirmationNumber: repos.confirmationNumber,
-            transaction: repos.transaction
-        });
+        })(repos);
         // }
         // publish orderNumber(2025-02-14~)
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: params.purpose.id,
             object: { orderDate }

package/lib/chevre/service/payment/any.d.ts

@@ -19,6 +19,7 @@ import type { SellerPaymentAcceptedRepo } from '../../repo/sellerPaymentAccepted
 import type { TaskRepo } from '../../repo/task';
 import type { TicketRepo } from '../../repo/ticket';
 import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../repo/transactionNumber';
 import * as PayTransactionService from '../assetTransaction/pay';
 import { onPaymentStatusChanged } from './any/onPaymentStatusChanged';
@@ -98,6 +99,7 @@ interface IAuthorizeRepos {
     project: ProjectRepo;
     task: TaskRepo;
     ticket: TicketRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
@@ -115,6 +117,7 @@ interface IPublishPaymentUrlRepos {
     paymentServiceProvider: PaymentServiceProviderRepo;
     project: ProjectRepo;
     ticket: TicketRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }

package/lib/chevre/service/payment/any.js

@@ -36,7 +36,7 @@ const util = __importStar(require("util"));
 const factory = __importStar(require("../../factory"));
 // import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
-const publishOrderNumberIfNotExist_1 = require("../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../transaction/placeOrder/issueOrderNumberIfNotExist");
 const fixTransactionNumber_1 = require("./any/authorize/fixTransactionNumber");
 const fixTransactionNumberOnPublishPaymentUrl_1 = require("./any/publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
 const factory_1 = require("./any/factory");
@@ -344,8 +344,8 @@ function publishPaymentUrl(params) {
             if (project.id !== transaction.project.id) {
                 throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
             }
-            // publishOrderNumber(2025-03-11~)
-            await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+            // issueOrderNumber(2025-03-11~)
+            await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
                 project: { id: transaction.project.id },
                 id: transaction.id,
                 object: { orderDate: new Date() }
@@ -411,7 +411,7 @@ function publishPaymentUrl(params) {
                 // execTranResult: result.execTranResult, // migrate to recipe(2024-06-05~)
                 // paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~) // migrate to acceptAction(2024-06-05~)
             };
-            await repos.transaction.findByIdAndUpdateInProgress({
+            await repos.placeOrder.findByIdAndUpdateInProgress({
                 id: transaction.id,
                 update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
             });

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

@@ -33,7 +33,7 @@ const orderNumber_1 = require("../../repo/orderNumber");
 const project_1 = require("../../repo/project");
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const transaction_1 = require("../../repo/transaction");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
 let coaAuthClient;
 /**
@@ -106,6 +106,7 @@ function call(params) {
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
+                    placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,
                     masterService
@@ -124,6 +125,7 @@ function call(params) {
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
+                    placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     transaction: new transaction_1.TransactionRepo(connection),
                     reserveService,
                     masterService

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

@@ -44,6 +44,7 @@ const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 // import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
@@ -93,6 +94,7 @@ function call(params) {
                 project: new project_1.ProjectRepo(connection),
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
                 // transactionProcess: transactionProcessRepo

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

@@ -38,6 +38,7 @@ const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 // import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
@@ -73,6 +74,7 @@ function call(params) {
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
                 project: new project_1.ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
             }, settings);

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

@@ -37,7 +37,7 @@ 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';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 let coaAuthClientCreated = false;
 let coaAuthClient = new COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
@@ -87,6 +87,7 @@ function call(params) {
                 reservation: new reservation_1.ReservationRepo(connection),
                 setting: new setting_1.SettingRepo(connection),
                 task: new task_1.TaskRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 reserveService
             }, settings);

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

@@ -9,6 +9,7 @@ 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,6 +19,7 @@ interface IConfirmOperationRepos {
     emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;

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

@@ -40,7 +40,7 @@ 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) => {
@@ -95,7 +95,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 }

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.d.ts

@@ -5,6 +5,7 @@ import type { ProjectRepo } from '../repo/project';
 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 { deleteTransaction } from './transaction/deleteTransaction';
 import * as MoneyTransferTransactionService from './transaction/moneyTransfer';
 import * as PlaceOrderTransactionService from './transaction/placeOrder';
@@ -32,6 +33,7 @@ export declare function updateAgent(params: {
     orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
 export type IExportTasksOperation<T> = (repos: {

package/lib/chevre/service/transaction.js

@@ -35,7 +35,7 @@ const deleteTransaction_1 = require("./transaction/deleteTransaction");
 Object.defineProperty(exports, "deleteTransaction", { enumerable: true, get: function () { return deleteTransaction_1.deleteTransaction; } });
 const MoneyTransferTransactionService = __importStar(require("./transaction/moneyTransfer"));
 const PlaceOrderTransactionService = __importStar(require("./transaction/placeOrder"));
-const publishOrderNumberIfNotExist_1 = require("./transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("./transaction/placeOrder/issueOrderNumberIfNotExist");
 const ReturnOrderTransactionService = __importStar(require("./transaction/returnOrder"));
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.placeOrder = PlaceOrderTransactionService;
@@ -120,7 +120,7 @@ function updateAgent(params) {
         // });
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
-            const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
                 project: { id: transaction.project.id },
                 id: params.id,
                 object: { orderDate: new Date() }

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.6"
+  "version": "24.0.0-alpha.7"
 }