@chevre/domain 25.0.0-alpha.9 → 25.1.0-alpha.0

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

@@ -19,16 +19,17 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction');
 /**
  * 進行中でない取引を処理する
  */
-function processTransactionNotInProgress(transaction) {
+function processTransactionNotInProgress(params) {
     return async (repos) => {
+        const { transaction, orderNumber } = params;
         if (transaction.status === factory_1.factory.transactionStatusType.Confirmed) {
-            const resultCustomer = await repos.orderInTransaction.findCustomerByOrderNumber({
-                orderNumber: { $eq: String(transaction.object.orderNumber) }
+            const resultCustomer = await repos.orderInTransaction.findCustomerByOrderIdentifier({
+                identifier: transaction.id
             });
             // if (resultCustomer === undefined) {
             //     throw new factory.errors.Internal('resultCustomer undefined'); // impossible process
             // }
-            const { confirmationNumber, orderNumber } = transaction.object;
+            const { confirmationNumber } = transaction.object;
             // Confirmedの取引であればobjectには必ず存在するはず
             if (typeof confirmationNumber !== 'string' || typeof orderNumber !== 'string'
                 || confirmationNumber === '' || orderNumber === '') {
@@ -62,30 +63,30 @@ function confirm(params, options) {
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: factory_1.factory.transactionType.PlaceOrder, id: params.id }, ['typeOf', 'project', 'status', 'agent', 'seller', 'object', 'result']);
-        const confirmResult = await processTransactionNotInProgress(transaction)(repos);
+        // 注文ドキュメントから注文番号を参照(取引開始時に発行済の前提)(2026-06-26~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.id,
+            project: { id: transaction.project.id }
+        }, { onlyPlaceOrder: false } // すでに取引確定済かもしれないのでfalse
+        );
+        const confirmResult = await processTransactionNotInProgress({ transaction, orderNumber })(repos);
         if (confirmResult !== undefined) {
             return confirmResult;
         }
         if (typeof params.agent?.id === 'string' && transaction.agent.id !== params.agent.id) {
             throw new factory_1.factory.errors.Forbidden('Transaction not yours');
         }
-        // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
-        const orderNumber = transaction.object.orderNumber;
-        if (typeof orderNumber !== 'string' || orderNumber === '') {
-            throw new factory_1.factory.errors.Argument('transactionId', 'orderNumber not issued');
-        }
+        // // 注文番号は興行オファー承認時に発行済のはず(2026-06-16~)
+        // const orderNumber = transaction.object.orderNumber;
+        // if (typeof orderNumber !== 'string' || orderNumber === '') {
+        //     throw new factory.errors.Argument('transactionId', 'orderNumber not issued');
+        // }
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
         if (typeof transaction.object.paymentMethods?.paymentMethodId === 'string') {
             acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
-        // 注文番号は興行オファー承認時に発行済のはずなので、ここは不要(承認オファーなしの注文は存在しえない)(2026-06-16~)
-        // const orderNumber = await issueOrderNumberIfNotExist({
-        //     project: { id: transaction.project.id },
-        //     id: transaction.id,
-        //     object: { orderDate: params.result.order.orderDate }
-        // })(repos);
         // 必要あらば注文コード発行(2024-02-05~)
         let code;
         const publishCodeExpiresInSeconds = options.publishCodeExpiresInSeconds;
@@ -107,8 +108,9 @@ function confirm(params, options) {
         // authorizeProductOfferActions,
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
-        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByOrderNumber({
-            orderNumber,
+        const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
+            // orderNumber,
+            identifier: transaction.id,
             project: { id: transaction.project.id }
         }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
@@ -125,7 +127,7 @@ function confirm(params, options) {
         }
         // retrieve customer from orderInTransaction(2024-06-24~)
         // let customer: factory.order.ICustomer = createCustomer({ transaction });
-        const customer = await repos.orderInTransaction.findCustomerByOrderNumber({ orderNumber: { $eq: orderNumber } });
+        const customer = await repos.orderInTransaction.findCustomerByOrderIdentifier({ identifier: transaction.id });
         const seller = (0, factory_2.createSeller)({ transaction });
         const { paymentMethods, placingOrder, result, eventId, reservationIds } = createResult({
             ...params,
@@ -175,7 +177,10 @@ function confirm(params, options) {
             await repos.placeOrder.confirmPlaceOrder({
                 typeOf: transaction.typeOf,
                 id: transaction.id,
-                object: { orderDate: params.result.order.orderDate },
+                object: {
+                    orderDate: params.result.order.orderDate,
+                    orderNumber
+                },
                 result: result,
                 potentialActions: potentialActions
             });
@@ -374,10 +379,10 @@ function createResult(params, options) {
         result: {
             authorizeActions, // 追加(2024-01-17~)
             ...(typeof params.code === 'string') ? { code: params.code } : undefined,
-            ...((!options.disableResultOrder) && { order: orderAsResult }), // support disableResultOrder(2026-06-15~)
-            ...((!options.disableResultOrder) && {
-                numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
-            }) // support disableResultOrder(2026-06-17~)
+            // ...((!options.disableResultOrder) && { order: orderAsResult }), // 完全廃止(2026-06-26~)
+            // ...((!options.disableResultOrder) && {
+            //     numAcceptedOffers: params.acceptedOffers.length,
+            // }) // 完全廃止(2026-06-26~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.d.ts

@@ -1,12 +1,11 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.TriggerWebhook> | factory.task.IAttributes<factory.taskName.DeleteTransaction> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.IAttributes<factory.taskName.VoidReserveTransaction>;
+type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.IAttributes<factory.taskName.DeleteTransaction> | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.IAttributes<factory.taskName.VoidReserveTransaction>;
 /**
  * 取引のタスクを作成する
  */
 export declare function createTasks(params: {
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'endDate' | 'id' | 'object' | 'project' | 'seller' | 'startDate' | 'status' | 'typeOf'>;
     runsAt: Date;
-    optimizeRedundantTasks: boolean;
-}, setting: Pick<ISetting, 'onTransactionStatusChanged' | 'storage'> | null): IPlaceOrderPotentialTask[];
+}, setting: Pick<ISetting, 'storage'> | null): IPlaceOrderPotentialTask[];
 export {};

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -9,53 +9,52 @@ const factory_1 = require("../../../../factory");
 /**
  * 取引のタスクを作成する
  */
-function createTasks(params, setting
-// settings: Settings
-) {
+function createTasks(params, setting) {
     const taskAttributes = [];
     const transaction = params.transaction;
     const taskRunsAt = params.runsAt;
-    const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
-    const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
-    const triggerWebhookTaskAttributes = [];
-    transactionWebhookUrls.forEach(({ recipient }) => {
-        if (typeof recipient?.url === 'string') {
-            const informObject = {
-                id: transaction.id,
-                typeOf: transaction.typeOf,
-                project: transaction.project,
-                seller: transaction.seller,
-                startDate: transaction.startDate,
-                status: transaction.status,
-                ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-            };
-            const data = {
-                object: informObject,
-                recipient: {
-                    id: (typeof recipient?.id === 'string') ? recipient.id : '',
-                    name: recipient?.name,
-                    typeOf: factory_1.factory.creativeWorkType.WebApplication
-                    // url: recipient.url // discontinue(2025-02-13~)
-                },
-                target: {
-                    httpMethod: 'POST',
-                    encodingType: factory_1.factory.encodingFormat.Application.json,
-                    typeOf: 'EntryPoint',
-                    urlTemplate: recipient.url
-                }
-            };
-            triggerWebhookTaskAttributes.push({
-                project: transaction.project,
-                name: factory_1.factory.taskName.TriggerWebhook,
-                status: factory_1.factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 3,
-                numberOfTried: 0,
-                executionResults: [],
-                data
-            });
-        }
-    });
+    // 取引通知は廃止(2026-06-29~)
+    // const informTransaction = setting?.onTransactionStatusChanged?.informTransaction;
+    // const transactionWebhookUrls = (Array.isArray(informTransaction)) ? informTransaction : [];
+    // const triggerWebhookTaskAttributes: factory.task.IAttributes<factory.taskName.TriggerWebhook>[] = [];
+    // transactionWebhookUrls.forEach(({ recipient }) => {
+    //     if (typeof recipient?.url === 'string') {
+    //         const informObject: factory.notification.transaction.IPlaceOrderAsNotification = {
+    //             id: transaction.id,
+    //             typeOf: transaction.typeOf,
+    //             project: transaction.project,
+    //             seller: transaction.seller,
+    //             startDate: transaction.startDate,
+    //             status: transaction.status,
+    //             ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
+    //         };
+    //         const data: factory.task.triggerWebhook.IInformAnyResourceAction = {
+    //             object: informObject,
+    //             recipient: {
+    //                 id: (typeof recipient?.id === 'string') ? recipient.id : '',
+    //                 name: recipient?.name,
+    //                 typeOf: factory.creativeWorkType.WebApplication
+    //                 // url: recipient.url // discontinue(2025-02-13~)
+    //             },
+    //             target: {
+    //                 httpMethod: 'POST',
+    //                 encodingType: factory.encodingFormat.Application.json,
+    //                 typeOf: 'EntryPoint',
+    //                 urlTemplate: recipient.url
+    //             }
+    //         };
+    //         triggerWebhookTaskAttributes.push({
+    //             project: transaction.project,
+    //             name: factory.taskName.TriggerWebhook,
+    //             status: factory.taskStatus.Ready,
+    //             runsAt: taskRunsAt,
+    //             remainingNumberOfTries: 3,
+    //             numberOfTried: 0,
+    //             executionResults: [],
+    //             data
+    //         });
+    //     }
+    // });
     const confirmedStoragePeriodInDays = setting?.storage?.transactionConfirmedInDays;
     const canceledStoragePeriodInDays = setting?.storage?.transactionCanceledInDays;
     if (typeof confirmedStoragePeriodInDays !== 'number') {
@@ -140,7 +139,7 @@ function createTasks(params, setting
             purpose: { typeOf: transaction.typeOf, id: transaction.id }
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
+    taskAttributes.push(deleteTransactionTask);
     switch (transaction.status) {
         case factory_1.factory.transactionStatusType.Confirmed: {
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
@@ -182,15 +181,7 @@ function createTasks(params, setting
             taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             break;
         case factory_1.factory.transactionStatusType.Expired:
-            // optimizeRedundantTasks(2025-03-)
-            if (params.optimizeRedundantTasks === true) {
-                if (typeof params.transaction.object.orderNumber === 'string') {
-                    taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
-                }
-            }
-            else {
-                taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
-            }
+            taskAttributes.push(voidReserveTaskAttributes, voidPaymentTaskAttributes);
             break;
         default:
             throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

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

@@ -16,9 +16,5 @@ declare function exportTasksById(params: {
      * タスク実行日時バッファ
      */
     runsTasksAfterInSeconds?: number;
-    /**
-     * support optimizeRedundantTasks(2025-03-11~)
-     */
-    optimizeRedundantTasks: boolean;
 }): ITaskAndTransactionOperation<void>;
 export { IExportTasksByIdRepos, exportTasksById };

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

@@ -26,11 +26,10 @@ function exportTasksById(params) {
                 .toDate();
         }
         // search settings
-        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onTransactionStatusChanged', 'storage']);
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
         const taskAttributes = (0, factory_2.createTasks)({
             transaction,
-            runsAt: taskRunsAt,
-            optimizeRedundantTasks: params.optimizeRedundantTasks === true
+            runsAt: taskRunsAt
         }, setting
         // settings
         );

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

@@ -1,3 +1,4 @@
+import type { OrderInTransactionRepo, IOrderInTransaction } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -15,9 +16,13 @@ declare function issueOrderNumberIfNotExist(params: {
     object: {
         orderDate: Date;
     };
+    creatingOrderInTransaction: Pick<IOrderInTransaction, 'broker' | 'seller' | 'customer'>;
+}, options: {
+    saveOrderNumberInPlaceOrderInProgress: boolean;
 }): (repos: {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
 }) => Promise<string>;
 export { issueOrderNumberIfNotExist };

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

@@ -5,40 +5,54 @@ const factory_1 = require("../../../factory");
 /**
  * 未発行であれば、注文番号を発行して取引に保管する
  */
-function issueOrderNumberIfNotExist(params) {
+function issueOrderNumberIfNotExist(params, options) {
     return async (repos) => {
-        // 1. 最初のチェック
-        let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
-        // すでに発行済であれば何もしない
-        if (typeof orderNumber === 'string') {
-            return orderNumber;
-        }
-        // 2. 発行準備
+        const { saveOrderNumberInPlaceOrderInProgress } = options;
+        // // 1. 最初のチェック
+        // let orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
+        // // すでに発行済であれば何もしない
+        // if (typeof orderNumber === 'string') {
+        //     return orderNumber;
+        // }
+        // 新注文番号発行
         const { alternateName } = await repos.project.findAlternateNameById({ id: params.project.id });
         if (typeof alternateName !== 'string') {
             throw new factory_1.factory.errors.NotFound('project.alternateName');
         }
-        // 3. 番号発行
         const issuedOrderNumber = await repos.orderNumber.issueOrderNumber({
             project: { alternateName },
             orderDate: params.object.orderDate
         });
-        // 4. 保管を試みる
-        const { modifiedCount } = await repos.placeOrder.saveOrderNumberIfNotExist({
-            id: params.id,
-            orderNumber: issuedOrderNumber
+        // 注文ドキュメント作成
+        await repos.orderInTransaction.createPlaceOrderIfNotExists({
+            ...params.creatingOrderInTransaction,
+            orderNumber: issuedOrderNumber,
+            project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
+            identifier: params.id,
         });
-        // 5. 書き込めたなら、自分が発行した番号が「真実」
-        if (modifiedCount === 1) {
-            return issuedOrderNumber;
-        }
-        // 6. 競合が発生した場合（他者が先に書き込んだ場合）
-        // DBにある「正解」を再取得して返す
-        orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
-        if (typeof orderNumber !== 'string') {
-            // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
-            throw new factory_1.factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
+        // 注文ドキュメント(存在するはず)から注文番号を参照
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.id,
+            project: { id: params.project.id }
+        }, { onlyPlaceOrder: true });
+        if (saveOrderNumberInPlaceOrderInProgress) {
+            // 取引に保管を試みる
+            await repos.placeOrder.saveOrderNumberIfNotExist({
+                id: params.id,
+                orderNumber
+            });
         }
+        // // 5. 書き込めたなら、自分が発行した番号が「真実」
+        // if (modifiedCount === 1) {
+        //     return issuedOrderNumber;
+        // }
+        // // 6. 競合が発生した場合（他者が先に書き込んだ場合）
+        // // DBにある「正解」を再取得して返す
+        // const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.id });
+        // if (typeof orderNumber !== 'string') {
+        //     // ここを通るのは、他者が保存した直後に取引がキャンセル/削除された等の極めて稀なケース
+        //     throw new factory.errors.Internal('OrderNumber conflict: failed to retrieve existing number');
+        // }
         return orderNumber;
     };
 }

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

@@ -6,13 +6,29 @@ type IVerifiedPassport = factory.waiter.passport.IPassport & {
      */
     identifier: string;
 };
-type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithoutDetail & {
-    object: factory.transaction.placeOrder.IStartParamsWithoutDetail['object'] & {
+type ICustomerInObject = Pick<factory.order.ICustomer, 'id' | 'identifier' | 'typeOf'>;
+interface IStartPlaceOrderParams {
+    project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    agent: factory.transaction.placeOrder.IAgent;
+    seller: {
+        id: string;
+    };
+    object: {
         /**
          * api経由で取引が開始されれば必ず存在するはず
          */
         clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
+        /**
+         * 注文ドキュメントに保管するcustomer
+         */
+        customer?: ICustomerInObject;
+        passport?: factory.transaction.IPassportBeforeStart;
+        name?: never;
     };
-};
-declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
+    /**
+     * 注文ドキュメントに保管する代理人
+     */
+    broker?: factory.order.IBroker;
+}
+declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -5,6 +5,7 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
+;
 function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
     // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
@@ -20,7 +21,7 @@ function createStartParams(params, expiresInSeconds, passport, seller, customerT
         // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
         // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
         // ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined, // discontinue(2026-06-22~)
-        ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
+        // ...(!minimizeStartPlaceOrderParams && typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined, // discontinue(2026-06-26~)
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };
     if (typeof seller.id !== 'string') {
@@ -39,16 +40,28 @@ function createStartParams(params, expiresInSeconds, passport, seller, customerT
         // ...(memeberOfPayload !== undefined) ? { memeberOfPayload } : undefined, // discontinue(2026-06-10~)
         identifier: agentIdentifier
     };
+    const sellerOfPlaceOrder = {
+        id: seller.id,
+        name: { ja: String(seller.name.ja) },
+        typeOf: seller.typeOf
+    };
     return {
         project: { typeOf: seller.project.typeOf, id: seller.project.id },
         typeOf: factory_1.factory.transactionType.PlaceOrder,
         agent,
-        seller: {
-            id: seller.id,
-            name: seller.name,
-            typeOf: seller.typeOf,
-            additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
-        },
+        seller: sellerOfPlaceOrder, // sellerを最小化(2026-06-26~)
+        // seller: (minimizeStartPlaceOrderParams)
+        //     ? {
+        //         id: seller.id,
+        //         name: { ja: String(seller.name.ja) },
+        //         typeOf: seller.typeOf
+        //     }
+        //     : {
+        //         id: seller.id,
+        //         name: seller.name,
+        //         typeOf: seller.typeOf,
+        //         additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+        //     },
         object: transactionObject,
         expiresInSeconds,
         ...(typeof instrument?.id === 'string') ? { instrument } : undefined

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

@@ -1,7 +1,10 @@
 import type { IssuerRepo } from '../../../repo/issuer';
 import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
+import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PassportRepo } from '../../../repo/passport';
+import type { ProjectRepo } from '../../../repo/project';
 import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -14,13 +17,15 @@ interface IStartOperationRepos {
     projectMakesOffer: ProjectMakesOfferRepo;
     seller: SellerRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
+    project: ProjectRepo;
+    orderNumber: OrderNumberRepo;
 }
 type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
-interface IStartOptions {
-    lockPassport: boolean;
-}
 /**
  * 取引開始
  */
-declare function start(params: IStartPlaceOrderParams, options: IStartOptions): IStartOperation<IStartedPlaceOrder>;
+declare function start(params: IStartPlaceOrderParams, options: {
+    saveOrderNumberInPlaceOrderInProgress: boolean;
+}): IStartOperation<IStartedPlaceOrder>;
 export { start, IStartPlaceOrderParams };

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

@@ -4,6 +4,7 @@ exports.start = start;
 const factory_1 = require("../../../factory");
 const factory_2 = require("./start/factory");
 const validateStartRequest_1 = require("./start/validateStartRequest");
+const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
 /**
  * 取引開始
  */
@@ -25,7 +26,7 @@ function start(params, options) {
         const startParams = (0, factory_2.createStartParams)(params, expiresInSeconds, passport, seller, customerType);
         let transaction;
         // lock passport(2024-07-05~)
-        if (options.lockPassport && passport !== undefined) {
+        if (passport !== undefined) {
             try {
                 await repos.passport.lock(passport);
             }
@@ -51,6 +52,22 @@ function start(params, options) {
         if (transaction === undefined) {
             transaction = await repos.placeOrder.startPlaceOrder(startParams);
         }
+        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+            project: { id: params.project.id },
+            id: transaction.id,
+            object: { orderDate: new Date() },
+            // support createOrderDocument(2026-06-23~)
+            creatingOrderInTransaction: {
+                seller: {
+                    id: seller.id,
+                    name: (typeof seller.name === 'string') ? seller.name : String(seller.name?.ja),
+                    typeOf: seller.typeOf,
+                    additionalProperty: (Array.isArray(seller.additionalProperty)) ? seller.additionalProperty : [] // 追加特性を追加(2023-08-08~)
+                },
+                ...((typeof params.object.customer?.typeOf === 'string') && { customer: params.object.customer }),
+                ...((typeof params.broker?.typeOf === 'string') && { broker: params.broker })
+            }
+        }, options)(repos);
         return transaction;
     };
 }

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

@@ -1,7 +1,5 @@
 import { factory } from '../../../factory';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
-import type { ProjectRepo } from '../../../repo/project';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 /**
  * 取引人プロフィール更新
@@ -17,7 +15,5 @@ export declare function updateAgent(params: {
     };
 }): (repos: {
     orderInTransaction: OrderInTransactionRepo;
-    orderNumber: OrderNumberRepo;
-    project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
 }) => Promise<void>;

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

@@ -3,8 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.updateAgent = updateAgent;
 const google_libphonenumber_1 = require("google-libphonenumber");
 const factory_1 = require("../../../factory");
-const issueOrderNumberIfNotExist_1 = require("./issueOrderNumberIfNotExist");
-// export type ITransactionOperation<T> = (repos: { transaction: TransactionRepo }) => Promise<T>;
 function fixCustomer(params) {
     return async (repos) => {
         let formattedTelephone;
@@ -20,7 +18,7 @@ function fixCustomer(params) {
             throw new factory_1.factory.errors.Argument('telephone', (error instanceof Error) ? error.message : String(error));
         }
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
-            typeOf: params.typeOf,
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
             id: params.id
         }, ['agent', 'object', 'typeOf', 'project']);
         if (transaction.agent.id !== params.agent.id) {
@@ -29,20 +27,20 @@ function fixCustomer(params) {
         // 注文取引の場合、object.customerにも適用
         let customer;
         if (transaction.typeOf === factory_1.factory.transactionType.PlaceOrder) {
-            // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
-            const trasactionObject = transaction.object;
-            if (typeof trasactionObject.customer?.typeOf === 'string') {
+            // orderInTransaction.customer?.typeOfは取引開始時にセットされている前提で再実装(2026-06-24~)
+            const customerByTransaction = await repos.orderInTransaction.findCustomerByOrderIdentifier({
+                identifier: params.id,
+                // project: { id: transaction.project.id }
+            });
+            // // いったんtransaction.object.customer?.typeOfは取引開始時にセットされている前提
+            // const customerByTransaction = transaction.object.customer;
+            if (typeof customerByTransaction?.typeOf === 'string') {
                 customer = {
-                    typeOf: trasactionObject.customer.typeOf,
-                    id: trasactionObject.customer.id,
-                    ...(Array.isArray(trasactionObject.customer.identifier))
-                        ? { identifier: trasactionObject.customer.identifier }
+                    typeOf: customerByTransaction.typeOf,
+                    id: customerByTransaction.id,
+                    ...(Array.isArray(customerByTransaction.identifier))
+                        ? { identifier: customerByTransaction.identifier }
                         : /* istanbul ignore next */ undefined,
-                    // discontinue(2024-05-16~)
-                    // ...(transaction.object.customer.typeOf === factory.personType.Person
-                    //     && typeof transaction.object.customer.memberOf?.typeOf === 'string')
-                    //     ? { memberOf: transaction.object.customer.memberOf }
-                    //     : undefined,
                     ...(Array.isArray(params.agent.additionalProperty))
                         ? { additionalProperty: params.agent.additionalProperty }
                         : /* istanbul ignore next */ undefined,
@@ -75,11 +73,11 @@ function updateAgent(params) {
         const { customer, transaction } = await fixCustomer(params)(repos);
         // also save in orderInTransaction(2024-06-20~)
         if (customer !== undefined) {
-            const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-                project: { id: transaction.project.id },
-                id: params.id,
-                object: { orderDate: new Date() }
-            })(repos);
+            // // 注文ドキュメントを参照(2026-06-24~)
+            // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            //     identifier: params.id,
+            //     project: { id: transaction.project.id },
+            // }, { onlyPlaceOrder: true });
             const customerName = (typeof customer.name === 'string' && customer.name !== '')
                 ? customer.name
                 : (typeof customer.givenName === 'string' && typeof customer.familyName === 'string'
@@ -91,8 +89,7 @@ function updateAgent(params) {
                 identifier: (Array.isArray(customer.identifier)) ? customer.identifier : [],
                 ...(typeof customerName === 'string') ? { name: customerName } : undefined
             };
-            await repos.orderInTransaction.setCustomer({
-                orderNumber,
+            await repos.orderInTransaction.setCustomerByIdentifier({
                 project: transaction.project,
                 identifier: params.id,
                 customer: customerInOrder