@chevre/domain 25.0.0-alpha.2 → 25.0.0-alpha.20

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
 const factory_1 = require("../../../../factory");
 const publishConfirmationNumberIfNotExist_1 = require("../../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
-const issueOrderNumberIfNotExist_1 = require("../../../transaction/placeOrder/issueOrderNumberIfNotExist");
 function fixOrderAsNeeded(params) {
     return async (repos) => {
         const orderDate = new Date();
@@ -17,12 +16,11 @@ function fixOrderAsNeeded(params) {
             object: { orderDate }
         })(repos);
         // }
-        // publish orderNumber(2025-02-14~)
-        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
+        // 注文ドキュメントを参照(2026-06-24~)
+        const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            identifier: params.purpose.id,
             project: { id: params.project.id },
-            id: params.purpose.id,
-            object: { orderDate }
-        })(repos);
+        }, { onlyPlaceOrder: true });
         return { confirmationNumber, orderNumber };
     };
 }

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

@@ -14,6 +14,7 @@ import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -43,6 +44,7 @@ interface IAuthorizeRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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

@@ -7,10 +7,8 @@ import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
-import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
-import type { ProjectRepo } from '../../../repo/project';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TicketRepo } from '../../../repo/ticket';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
@@ -24,11 +22,9 @@ interface IPublishPaymentUrlRepos {
     event: EventRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
-    orderNumber: OrderNumberRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-    project: ProjectRepo;
     ticket: TicketRepo;
     placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;

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

@@ -35,9 +35,7 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishPaymentUrl = publishPaymentUrl;
 const factory_1 = require("../../../factory");
-// import type { TransactionProcessRepo } from '../../repo/transactionProcess';
 const PayTransactionService = __importStar(require("../../assetTransaction/pay"));
-const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const fixTransactionNumberOnPublishPaymentUrl_1 = require("./publishPaymentUrl/fixTransactionNumberOnPublishPaymentUrl");
 const factory_2 = require("./factory");
 /**
@@ -54,12 +52,11 @@ function publishPaymentUrl(params) {
             if (project.id !== transaction.project.id) {
                 throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
             }
-            // issueOrderNumber(2025-03-11~)
-            await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
-                project: { id: transaction.project.id },
-                id: transaction.id,
-                object: { orderDate: new Date() }
-            })(repos);
+            // // 注文ドキュメントを参照(2026-06-24~)
+            // const orderNumber = await repos.orderInTransaction.findOrderNumberByIdentifier({
+            //     identifier: transaction.id,
+            //     project: { id: transaction.project.id },
+            // });
             // 取引番号生成
             const { transactionNumber, ticketToken } = await (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
                 object: params.object,

package/lib/chevre/service/reserve/findByCode.js

@@ -39,7 +39,7 @@ function findByCode(params) {
                                 // typeOf?: { $in?: factory.order.IItemOffered['typeOf'][] };
                             }
                         }
-                    }, { noName: true })).shift();
+                    })).shift();
                     if (acceptedOffer === undefined) {
                         throw new factory_1.factory.errors.NotFound('acceptedOffer');
                     }

package/lib/chevre/service/reserve/searchByOrder.js

@@ -16,7 +16,7 @@ function searchByOrder(params) {
                 // typeOf: { $in: [reservationType] }
                 }
             }
-        }, { noName: true });
+        });
         const reservationIds = acceptedOffers.map((offer) => {
             if (offer.itemOffered.typeOf === reservationType) {
                 return offer.itemOffered.id;

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

@@ -3,16 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
 const factory_1 = require("../../factory");
-// import { ActionRepo } from '../../repo/action';
 const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-const orderNumber_1 = require("../../repo/orderNumber");
-const project_1 = require("../../repo/project");
+// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+// import { OrderNumberRepo } from '../../repo/orderNumber';
+// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionRepo } from '../../repo/transaction';
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
 let coaAuthClient;
@@ -87,10 +86,9 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
-                    project: new project_1.ProjectRepo(connection),
+                    // orderNumber: new OrderNumberRepo({ connection }),
+                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });
@@ -106,10 +104,10 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
-                    project: new project_1.ProjectRepo(connection),
+                    // orderInTransaction: new OrderInTransactionRepo(connection),
+                    // orderNumber: new OrderNumberRepo({ connection }),
+                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const pay_1 = require("../../repo/action/pay");
 const refund_1 = require("../../repo/action/refund");
 const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
@@ -17,6 +16,7 @@ const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
+const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -27,10 +27,8 @@ const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
-// import { TransactionRepo } from '../../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");
 /**
  * タスク実行関数
@@ -60,7 +58,6 @@ function call(params) {
                 sameAs: { id: params.id } // タスクIDを関連付け(2024-04-20~)
             })({
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-                // action: new ActionRepo(connection),
                 actions: {
                     pay: new pay_1.PayActionRepo(connection),
                     refund: new refund_1.RefundActionRepo(connection),
@@ -79,6 +76,7 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
+                orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
@@ -89,9 +87,7 @@ function call(params) {
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
-                // transactionProcess: transactionProcessRepo
             }, settings);
         }
         catch (error) {

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

@@ -139,7 +139,7 @@ function fixOrderAsPurpose(params) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: params.project.id } }
-        }, { noName: true });
+        });
         return {
             ...order,
             acceptedOffers

package/lib/chevre/service/task/payment/payByTask.js

@@ -76,7 +76,7 @@ function fixOrderAsPurpose(params, transaction) {
                     // reservedTicket: { ticketedSeat: { seatNumber: { $in: seatNumbers } } } // 座席番号による絞りは廃止(2026-06-01~)
                     }
                 }
-            }, { noName: true });
+            });
         }
         return {
             ...orderWithoutAcceptedOffers,

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
-// import { ActionRepo } from '../../repo/action';
 const acceptPay_1 = require("../../repo/action/acceptPay");
 const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const assetTransaction_1 = require("../../repo/assetTransaction");
@@ -10,17 +9,16 @@ const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
 const eventSeries_1 = require("../../repo/eventSeries");
 const issuer_1 = require("../../repo/issuer");
-const orderNumber_1 = require("../../repo/orderNumber");
+// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
+// import { OrderNumberRepo } from '../../repo/orderNumber';
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
-const project_1 = require("../../repo/project");
+// import { ProjectRepo } from '../../repo/project';
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
 const ticket_1 = require("../../repo/ticket");
-// import { TransactionRepo } from '../../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");
 /**
  * タスク実行関数
@@ -43,7 +41,6 @@ function call(params) {
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 sameAs: { id: params.id }
             })({
-                // action: new ActionRepo(connection),
                 acceptPayAction: actionRepo,
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
@@ -51,14 +48,14 @@ function call(params) {
                 event: new event_1.EventRepo(connection),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
                 issuer: new issuer_1.IssuerRepo(connection),
-                orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
+                // orderInTransaction: new OrderInTransactionRepo(connection),
+                // orderNumber: new OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
-                project: new project_1.ProjectRepo(connection),
+                // project: new ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
                 placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
-                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
             }, settings);
         }

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

@@ -1,4 +1,9 @@
 import { factory } from '../../../../../factory';
+type IOrderAsResult = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'typeOf'> & {
+    orderStatus: factory.orderStatus.OrderPaymentDue;
+    identifier?: never;
+    url?: never;
+};
 /**
  * 注文取引結果としての注文を生成する
  */
@@ -6,5 +11,5 @@ declare function createOrderAsResult(params: {
     orderNumber: string;
     orderDate: Date;
     price: number;
-}): factory.transaction.placeOrder.IOrderAsResult;
-export { createOrderAsResult };
+}): IOrderAsResult;
+export { createOrderAsResult, IOrderAsResult };

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

@@ -1,7 +1,8 @@
 import { factory } from '../../../../../factory';
 import type { ISetting } from '../../../../../repo/setting';
+import type { IOrderAsResult } from '../factory/result';
 export declare function createSendEmailMessageActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult & {
+    order: IOrderAsResult & {
         confirmationNumber: string;
         orderStatus: factory.orderStatus;
         price: number;
@@ -9,10 +10,9 @@ export declare function createSendEmailMessageActions(params: {
         typeOf: factory.order.OrderType;
     };
     customer: factory.order.ICustomer;
-    seller: factory.order.ISeller;
+    seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];

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

@@ -3,34 +3,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
 const factory_1 = require("../../../../../factory");
-async function createSendEmailMessageActions(params, 
-// settings: Settings
-setting) {
+async function createSendEmailMessageActions(params, setting) {
     // 注文配送メール送信設定
     const emailMessages = [];
-    // const sendEmailMessageActions: factory.action.transfer.send.message.email.IAttributes[] = [];
     const sendEmailMessageActions = [];
-    // const sendActionPurpose: factory.action.transfer.send.message.email.IPurpose = {
-    //     typeOf: params.order.typeOf,
-    //     orderNumber: params.order.orderNumber,
-    //     price: params.order.price,
-    //     priceCurrency: params.order.priceCurrency,
-    //     orderDate: params.order.orderDate
-    // };
     const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
+        // pugテンプレートに渡す変数を最小化(2026-06-19~)
         const orderAsCreateEmailParams = {
-            ...params.order,
+            // ...params.order,
+            // paymentMethods: params.paymentMethods
             customer: params.customer,
             seller: params.seller,
-            paymentMethods: params.paymentMethods
+            orderNumber: params.order.orderNumber,
+            confirmationNumber: params.order.confirmationNumber,
+            price: params.order.price
         };
         await Promise.all(sendEmailMessageOnOrderSentParams.map(async (s, index) => {
             const emailMessage = await (0, emailMessageBuilder_1.createSendOrderMessage)({
                 order: orderAsCreateEmailParams,
                 index,
                 ...(s.object !== undefined) ? { email: s.object } : undefined,
-                ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
+                // ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
             }, setting);
             emailMessages.push(emailMessage);
             // 送信アクション最適化に対応(2024-04-29~)
@@ -40,16 +34,7 @@ setting) {
             };
             // optimize(2024-05-07~)
             sendEmailMessageActions.push({
-                // project: params.order.project,
-                // typeOf: factory.actionType.SendAction,
                 object: sendEmailMessageActionObject
-                // agent: params.order.project,
-                // recipient: {
-                //     typeOf: params.order.customer.typeOf,
-                //     id: params.order.customer.id
-                // },
-                // potentialActions: {},
-                // purpose: sendActionPurpose
             });
         }));
     }

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

@@ -1,10 +1,11 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
+import { IOrderAsResult } from './factory/result';
 /**
  * 取引のポストアクションを作成する
  */
 export declare function createPotentialActions(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult & {
+    order: IOrderAsResult & {
         confirmationNumber: string;
         orderStatus: factory.orderStatus.OrderPaymentDue;
         price: number;
@@ -12,10 +13,9 @@ export declare function createPotentialActions(params: {
         typeOf: factory.order.OrderType;
     };
     customer: factory.order.ICustomer;
-    seller: factory.order.ISeller;
+    seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     potentialActions: factory.transaction.placeOrder.IPotentialActions;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];

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

@@ -5,14 +5,9 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
 /**
  * 取引のポストアクションを作成する
  */
-async function createPotentialActions(params, 
-// settings: Settings
-setting) {
+async function createPotentialActions(params, setting) {
     // 注文処理開始メール送信設定
     const { emailMessages, sendEmailMessageActions } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
-    // const sendOrderActionAttributes: factory.transaction.placeOrder.IPotentialSendOrderAction = {
-    //     potentialActions: { sendEmailMessage: sendEmailMessageActions }
-    // };
     return {
         emailMessages,
         potentialActions: {

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

@@ -4,7 +4,6 @@ import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOff
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
@@ -12,13 +11,13 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 import { PlaceOrderFactory } from '../../../factory/transaction';
+import { IOrderAsResult } from './confirm/factory/result';
 interface IConfirmOperationRepos {
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
@@ -40,14 +39,10 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
-    /**
-     * 取引ドキュメントのresult.order,result,numAcceptedOffersを保管しないオプション(2026-06-15~)
-     */
-    disableResultOrder: boolean;
 }
 type IConfirmParams = PlaceOrderFactory.IConfirmParams;
 interface IConfirmResult {
-    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
+    order: Pick<IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
     customer: factory.order.ICustomer;
     code?: string;
     /**

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,
@@ -136,17 +138,18 @@ function confirm(params, options) {
             acceptedOffers, payTransactions, customer,
             ...(typeof code === 'string') ? { code } : undefined
         }, options);
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderSent;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
-            });
-            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderSent: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
+        //     });
+        //     emailMessageOnOrderSent = searchEmailMessagesResult.shift();
+        // }
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
@@ -160,7 +163,7 @@ function confirm(params, options) {
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             // transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
+            // ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
         }, 
         // settings
         setting);
@@ -373,10 +376,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/issueOrderNumberIfNotExist.d.ts

@@ -1,3 +1,4 @@
+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';
@@ -18,6 +19,7 @@ declare function issueOrderNumberIfNotExist(params: {
 }): (repos: {
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     orderNumber: OrderNumberRepo;
 }) => Promise<string>;
 export { issueOrderNumberIfNotExist };