@chevre/domain 25.2.0-alpha.9 → 26.0.0-alpha.0

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

@@ -1,6 +1,32 @@
 import { factory } from '../../../../../factory';
 import type { ISetting } from '../../../../../repo/setting';
 import type { IOrderAsResult } from '../factory/result';
+/**
+ * Eメール送信パラメータ
+ */
+interface ISendEmailMessageParams {
+    /**
+     * Eメールカスタマイズ
+     * メール本文をカスタマイズしたい場合、PUGテンプレートを指定
+     * 挿入変数として`order`を使用できます
+     * {@link https://pugjs.org/api/getting-started.html}
+     */
+    object?: factory.creativeWork.message.email.ICustomization;
+}
+/**
+ * 取引確定後アクションパラメータ
+ */
+export interface IPotentialActionsParams {
+    order?: {
+        potentialActions?: {
+            sendOrder?: {
+                potentialActions?: {
+                    sendEmailMessage?: ISendEmailMessageParams[];
+                };
+            };
+        };
+    };
+}
 export declare function createSendEmailMessageActions(params: {
     order: IOrderAsResult & {
         confirmationNumber: string;
@@ -12,8 +38,8 @@ export declare function createSendEmailMessageActions(params: {
     customer: factory.order.ICustomer;
     seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
-    potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
+    potentialActions?: IPotentialActionsParams;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
-    sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];
 }>;
+export {};

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

@@ -2,11 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageActions = createSendEmailMessageActions;
 const emailMessageBuilder_1 = require("../../../../../emailMessageBuilder");
-const factory_1 = require("../../../../../factory");
 async function createSendEmailMessageActions(params, setting) {
     // 注文配送メール送信設定
     const emailMessages = [];
-    const sendEmailMessageActions = [];
+    // const sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[] = [];
     const sendEmailMessageOnOrderSentParams = params.potentialActions?.order?.potentialActions?.sendOrder?.potentialActions?.sendEmailMessage;
     if (Array.isArray(sendEmailMessageOnOrderSentParams)) {
         // pugテンプレートに渡す変数を最小化(2026-06-19~)
@@ -27,16 +26,16 @@ async function createSendEmailMessageActions(params, setting) {
                 // ...(params.emailMessage !== undefined) ? { emailMessage: params.emailMessage } : undefined
             }, setting);
             emailMessages.push(emailMessage);
-            // 送信アクション最適化に対応(2024-04-29~)
-            const sendEmailMessageActionObject = {
-                identifier: emailMessage.identifier,
-                typeOf: factory_1.factory.creativeWorkType.EmailMessage
-            };
-            // optimize(2024-05-07~)
-            sendEmailMessageActions.push({
-                object: sendEmailMessageActionObject
-            });
+            // // 送信アクション最適化に対応(2024-04-29~)
+            // const sendEmailMessageActionObject: factory.action.transfer.send.message.email.IObject = {
+            //     identifier: emailMessage.identifier,
+            //     typeOf: factory.creativeWorkType.EmailMessage
+            // };
+            // // optimize(2024-05-07~)
+            // sendEmailMessageActions.push({
+            //     object: sendEmailMessageActionObject
+            // });
         }));
     }
-    return { sendEmailMessageActions, emailMessages };
+    return { emailMessages };
 }

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

@@ -1,6 +1,8 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
+import { IPotentialActionsParams } from './potentialActions/sendEmailMessage';
 import { IOrderAsResult } from './factory/result';
+export { IPotentialActionsParams };
 /**
  * 取引のポストアクションを作成する
  */
@@ -15,8 +17,8 @@ export declare function createPotentialActions(params: {
     customer: factory.order.ICustomer;
     seller: Pick<factory.order.ISeller, 'name' | 'typeOf'>;
     paymentMethods: factory.order.IReferencedInvoice[];
-    potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
+    potentialActions?: IPotentialActionsParams;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
-    potentialActions: factory.transaction.placeOrder.IPotentialActions;
+    potentialActions?: never;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];
 }>;

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

@@ -7,14 +7,13 @@ const sendEmailMessage_1 = require("./potentialActions/sendEmailMessage");
  */
 async function createPotentialActions(params, setting) {
     // 注文処理開始メール送信設定
-    const { emailMessages, sendEmailMessageActions } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
+    const { emailMessages } = await (0, sendEmailMessage_1.createSendEmailMessageActions)(params, setting);
     return {
         emailMessages,
-        potentialActions: {
-            order: {
-                onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
-                // potentialActions: { sendOrder: sendOrderActionAttributes }
-            }
-        }
+        // potentialActions: {
+        //     order: {
+        //         onOrderProcessing: { sendEmailMessage: sendEmailMessageActions } // optimize(2024-06-29~)
+        //     }
+        // }
     };
 }

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

@@ -2,14 +2,42 @@ import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import { factory } from '../../../../factory';
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
 type IOrderAcceptedOffer = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'offeredThrough' | 'serialNumber' | 'priceSpecification' | 'id'>;
-export declare function createAuthorizeOfferResultsExpected(params: {
-    authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
-}): Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
+interface IAcceptedOfferInResult extends Pick<factory.product.ITicketOffer, 'acceptedPaymentMethod' | 'id' | 'typeOf'> {
+    typeOf: factory.offerType.Offer;
+    id: string;
+    includesObject: {
+        amountOfThisGood: number;
+    };
+    /**
+     * 取引確定時の検証に必要な情報のみ保管する
+     */
+    priceSpecification?: Pick<factory.priceSpecification.unitPrice.IPriceSpecification, 'eligibleQuantity'>;
+}
+export type IAggregateProgramMembershipUsed = (factory.assetTransaction.reserve.IPermitIssuedThroughFaceToFace | factory.assetTransaction.reserve.IPermitIssuedThroughMembershipService)[];
+type IPreparedResult = Pick<factory.action.authorize.offer.eventService.IResult, 'price' | 'typeOf'> & {
+    /**
+     * オファーIDごとの集計
+     */
+    offers?: IAcceptedOfferInResult[];
+    itemOffered?: {
+        serviceOutput: {
+            /**
+             * programMembershipUsed required(2024-08-15~)
+             */
+            programMembershipUsed: IAggregateProgramMembershipUsed;
+        };
+    };
+};
 /**
  * 注文ドキュメントと予約取引ドキュメントを参照することによって生成した、単価オファー検証条件
  * 元々オファー承認アクションのresultに保管されていた
  */
-type IPreparedUnitPriceOfferConditions = Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>;
+type IPreparedUnitPriceOfferConditions = Pick<IAuthorizeEventServiceOffer, 'id'> & {
+    result?: IPreparedResult;
+};
+export declare function createAuthorizeOfferResultsExpected(params: {
+    authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
+}): Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
 declare function prepareUnitPriceOfferConditions(params: {
     project: {
         id: string;

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

@@ -1,8 +1,13 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createAuthorizeOfferResultsExpected = createAuthorizeOfferResultsExpected;
 exports.prepareUnitPriceOfferConditions = prepareUnitPriceOfferConditions;
+const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../../../../factory");
+const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder:confirm:prepareUnitPriceOfferConditions');
 function acceptedOffers2authorizeResult(params) {
     const { acceptedOffers4result, unitPriceOffers } = params;
     const programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
@@ -83,9 +88,13 @@ function prepareUnitPriceOfferConditions(params) {
         }
         const conditions = [];
         const offerIds = [...new Set(params.acceptedOffers.map((o) => String(o.id)))];
-        const unitPriceOffers = await repos.offer.search({
+        const unitPriceOffers = await repos.offer.findUnitPriceOffers({
             id: { $in: offerIds }
+        }, {
+            acceptedPaymentMethod: 1,
+            priceSpecification: 1,
         });
+        debug('unitPriceOffers:', unitPriceOffers);
         for (const authorizeEventServiceOfferAction of params.authorizeEventServiceOfferActions) {
             if (authorizeEventServiceOfferAction.result === undefined) {
                 throw new Error('authorizeEventServiceOfferAction.result should exist');

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

@@ -1,6 +1,10 @@
 import { factory } from '../../../../../factory';
 export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
-export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
+export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction & {
+    result?: factory.action.authorize.offer.eventService.IResult & {
+        onlyPrice?: boolean;
+    };
+};
 export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
     object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
     instrument?: never;

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

@@ -6,7 +6,11 @@ export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction,
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: {
+    id: string;
+}, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer, options: {
+    paymentMethodIdByTransaction?: string;
+}): void;
 /**
  * 注文オファー数検証
  */
@@ -47,5 +51,5 @@ export declare function validateEventOffers(params: {
      * 承認アクションのresultに条件が保管されているはず(2026-07-06時点で)
      */
     authorizeOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[];
-    unitPriceOfferConditions?: IPreparedUnitPriceOfferConditions[];
+    unitPriceOfferConditions: IPreparedUnitPriceOfferConditions[];
 }): void;

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

@@ -21,8 +21,8 @@ const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, eventReservationAcceptedOffers, payTransactions, customer) {
-    // validateProfile(transaction);
+function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, eventReservationAcceptedOffers, payTransactions, customer, options) {
+    const { paymentMethodIdByTransaction } = options;
     validateProfile({ customer });
     (0, validatePrice_1.validatePrice)(authorizePaymentActions, authorizeEventServiceOfferActions);
     // 請求のreferencesOrder検証(2025-11-23~)
@@ -61,7 +61,7 @@ function validateTransaction(transaction, acceptPayActions, authorizePaymentActi
         });
     }
     // 決済URLが発行されている場合、検証
-    validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions);
+    validatePaymentUrl({ paymentMethodIdByTransaction, acceptPayActions, authorizePaymentActions });
 }
 function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentActions, eventReservationAcceptedOffers) {
     const paymentMethodTypes = [];
@@ -106,16 +106,19 @@ function validateProfile(params) {
         throw new factory_1.factory.errors.Argument('Transaction', 'customer name required');
     }
 }
-function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions) {
+function validatePaymentUrl(params) {
+    const { paymentMethodIdByTransaction, acceptPayActions, authorizePaymentActions } = params;
     // 決済URLが発行されている場合、検証
-    const paymentMethodId = transaction.object.paymentMethods?.paymentMethodId;
+    const paymentMethodId = paymentMethodIdByTransaction;
+    debug('validatePaymentUrl: paymentMethodIdByTransaction:', paymentMethodIdByTransaction);
     if (typeof paymentMethodId === 'string' && paymentMethodId.length > 0) {
         // check existing accept action(2025-02-26~)
         const acceptActionExists = acceptPayActions.some(({ object, result }) => {
             return object.transactionNumber === paymentMethodId
-                && result?.paymentMethodId === paymentMethodId
-                && typeof result?.paymentUrl === 'string';
+                && result?.paymentMethodId === paymentMethodId;
+            // && typeof result?.paymentUrl === 'string'; // result.paymentUrlは廃止(2026-07-14~)
         });
+        debug('validatePaymentUrl: acceptActionExists:', acceptActionExists);
         if (!acceptActionExists) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.AcceptAction);
         }
@@ -127,6 +130,7 @@ function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActio
                 : undefined;
             return resultAsInvoice?.paymentMethodId === paymentMethodId;
         });
+        debug('validatePaymentUrl: authorizePaymentAction4paymentUrlExists:', authorizePaymentAction4paymentUrlExists);
         if (!authorizePaymentAction4paymentUrlExists) {
             throw new factory_1.factory.errors.Argument('Transaction', 'Payment for published payment URL required');
         }
@@ -305,7 +309,15 @@ function validateEventOffers(params) {
         const everyActionsMatched = unitPriceOfferConditions.length === params.authorizeOfferActions.length
             && params.authorizeOfferActions.every((authorizeEventServiceOfferAction) => {
                 const conditionExpected = unitPriceOfferConditions.find(({ id }) => id === authorizeEventServiceOfferAction.id);
-                const resultMatched = (0, util_1.isDeepStrictEqual)(conditionExpected?.result, authorizeEventServiceOfferAction.result);
+                let resultMatched;
+                // 承認アクションのresultが最適化済の場合,price以外を比較しても意味がないので比較しない(2026-07-10~)
+                if (authorizeEventServiceOfferAction.result?.onlyPrice === true) {
+                    resultMatched = typeof conditionExpected?.result?.price === 'number'
+                        && conditionExpected?.result.price === authorizeEventServiceOfferAction.result.price;
+                }
+                else {
+                    resultMatched = (0, util_1.isDeepStrictEqual)(conditionExpected?.result, authorizeEventServiceOfferAction.result);
+                }
                 debug('validateEventOffers: unitPriceOfferConditions: resultMatched?', resultMatched, params.project.id, authorizeEventServiceOfferAction.id);
                 if (!resultMatched) {
                     console.error('validateEventOffers: unitPriceOfferConditions not matched!', params.project.id, authorizeEventServiceOfferAction.id, conditionExpected?.result, authorizeEventServiceOfferAction.result);
@@ -321,7 +333,9 @@ function validateEventOffers(params) {
         }
     }
     else {
-        validatingAuthorizeOfferActions = [...params.authorizeOfferActions];
+        // unitPriceOfferConditionsの準備は必須化(2026-07-13~)
+        throw new factory_1.factory.errors.NotImplemented('unitPriceOfferConditions must be an array');
+        // validatingAuthorizeOfferActions = [...params.authorizeOfferActions];
     }
     const { paymentMethods } = params;
     const firstCreditCardPaymentMethodIdentifier = paymentMethods.find((referenceInvoice) => {

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

@@ -13,6 +13,7 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 import { PlaceOrderFactory } from '../../../factory/transaction';
 import { IOrderAsResult } from './confirm/factory/result';
+import { IPotentialActionsParams } from './confirm/potentialActions';
 interface IConfirmOperationRepos {
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
@@ -41,13 +42,13 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
+}
+type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
     /**
-     * 2026-07-06~
-     * 実験的に
+     * 取引確定後アクション
      */
-    usePrepareUnitPriceOfferConditions?: boolean;
-}
-type IConfirmParams = PlaceOrderFactory.IConfirmParams;
+    potentialActions?: IPotentialActionsParams;
+};
 interface IConfirmResult {
     order: Pick<IOrderAsResult, 'confirmationNumber' | 'orderNumber'>;
     customer: factory.order.ICustomer;

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

@@ -58,9 +58,9 @@ function processTransactionNotInProgress(params) {
 function confirm(params, options) {
     return async (repos) => {
         // 確認番号を事前発行
-        await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
+        const confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
-            status: { $in: [factory_1.factory.transactionStatusType.Confirmed, factory_1.factory.transactionStatusType.InProgress] },
+            // status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             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']);
@@ -82,10 +82,12 @@ function confirm(params, options) {
         // if (typeof orderNumber !== 'string' || orderNumber === '') {
         //     throw new factory.errors.Argument('transactionId', 'orderNumber not issued');
         // }
+        // 注文に決済方法IDが発行済か確認(2026-07-12)
+        const paymentMethodIdByTransaction = await repos.orderInTransaction.findPaymentMethodId({ id: params.id });
         // 取引に対する全ての承認アクションをマージ
         const completedAuthorizeActions = await searchAuthorizeActions(params)(repos);
         let acceptPayActions = [];
-        if (typeof transaction.object.paymentMethods?.paymentMethodId === 'string') {
+        if (typeof paymentMethodIdByTransaction === 'string') {
             acceptPayActions = await searchAcceptPayActions(params)(repos);
         }
         // 必要あらば注文コード発行(2024-02-05~)
@@ -110,21 +112,16 @@ function confirm(params, options) {
         serialNumbers } = dissolveAuthorizeActions(completedAuthorizeActions);
         // orderInTransactionから検索する(2024-03-04~)
         const acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
-            // orderNumber,
             identifier: transaction.id,
             project: { id: transaction.project.id }
-        }))
+        }, { onlyPlaceOrder: true }))
             .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         // 単価オファーの全適用条件を検証するために、単価オファーを参照(2026-07-06~)
-        let unitPriceOfferConditions;
-        const { usePrepareUnitPriceOfferConditions } = options;
-        if (usePrepareUnitPriceOfferConditions === true) {
-            unitPriceOfferConditions = await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({
-                project: { id: transaction.project.id, },
-                acceptedOffers,
-                authorizeEventServiceOfferActions
-            })({ offer: repos.offer });
-        }
+        const unitPriceOfferConditions = await (0, prepareUnitPriceOfferConditions_1.prepareUnitPriceOfferConditions)({
+            project: { id: transaction.project.id, },
+            acceptedOffers,
+            authorizeEventServiceOfferActions
+        })({ offer: repos.offer });
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
         // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
@@ -142,30 +139,28 @@ function confirm(params, options) {
         const seller = (0, factory_2.createSeller)({ transaction });
         const { paymentMethods, placingOrder, result, eventId, reservationIds } = createResult({
             ...params,
-            orderNumber, transaction,
+            orderNumber,
+            confirmationNumber,
+            transaction,
             acceptPayActions,
             authorizePaymentActions, authorizeEventServiceOfferActions,
             acceptedOffers, payTransactions, customer,
+            unitPriceOfferConditions,
             ...(typeof code === 'string') ? { code } : undefined,
-            ...((Array.isArray(unitPriceOfferConditions)) && { unitPriceOfferConditions })
+            paymentMethodIdByTransaction
         }, options);
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
             throw new factory_1.factory.errors.NotFound('setting.defaultSenderEmail');
         }
-        const { emailMessages, potentialActions } = await (0, potentialActions_1.createPotentialActions)({
+        const { emailMessages } = await (0, potentialActions_1.createPotentialActions)({
             order: placingOrder, // createEmailMessageでのorder.acceptedOffersへの依存性を排除したのでこちらでよいはず(2024-02-21~)
             customer,
             seller,
             paymentMethods,
-            // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
-            // transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            // ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
-        }, 
-        // settings
-        setting);
+        }, setting);
         // メッセージ保管(2024-04-28~)
         await saveMessagesIfNeeded({
             project: { id: transaction.project.id },
@@ -178,10 +173,11 @@ function confirm(params, options) {
                 id: transaction.id,
                 object: {
                     orderDate: params.result.order.orderDate,
-                    orderNumber
+                    orderNumber,
+                    confirmationNumber: placingOrder.confirmationNumber
                 },
                 result: result,
-                potentialActions: potentialActions
+                // ...((options.useTransactionPotentialActions) && { potentialActions }) // support undefined(2026-07-17~)
             });
         }
         catch (error) {
@@ -318,7 +314,10 @@ function createResult(params, options) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer);
+    const { paymentMethodIdByTransaction } = params;
+    (0, validation_1.validateTransaction)({ id: transaction.id }, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, eventReservationAcceptedOffers, params.payTransactions, params.customer, {
+        ...((typeof paymentMethodIdByTransaction === 'string') && { paymentMethodIdByTransaction })
+    });
     const { paymentMethods, price } = (0, factory_2.createPaymentMethods)({ authorizePaymentActions: params.authorizePaymentActions });
     const orderedItem = (0, orderedItem_1.acceptedOffers2orderedItem)({
         eventReservationAcceptedOffers
@@ -328,7 +327,7 @@ function createResult(params, options) {
         order: { price },
         paymentMethods,
         authorizeOfferActions: params.authorizeEventServiceOfferActions,
-        ...((Array.isArray(params.unitPriceOfferConditions)) && { unitPriceOfferConditions: params.unitPriceOfferConditions })
+        unitPriceOfferConditions: params.unitPriceOfferConditions
     });
     // 注文オファー検証
     (0, validation_1.validateAcceptedOffers)({
@@ -341,8 +340,10 @@ function createResult(params, options) {
         result: params.result
     });
     (0, validation_1.validatePaymentMethods)({ order: { paymentMethods } }, options);
-    // 確認番号を発行
-    const { confirmationNumber } = createConfirmationNumber({ transaction });
+    // 取引のobjectへの依存を排除する(2026-07-08~)
+    const { confirmationNumber } = params;
+    // // 確認番号を発行
+    // const { confirmationNumber } = createConfirmationNumber({ transaction });
     // 注文作成
     const orderAsResult = (0, result_1.createOrderAsResult)({
         orderNumber: params.orderNumber,
@@ -433,14 +434,3 @@ function searchAuthorizeActions(params) {
         return authorizeActions;
     };
 }
-function createConfirmationNumber(params) {
-    const confirmationNumber = params.transaction.object.confirmationNumber;
-    // 取引に確認番号が保管されていなければ、確認番号を発行
-    if (typeof confirmationNumber !== 'string') {
-        // 事前に発行済なはずなので、ありえないフロー
-        throw new factory_1.factory.errors.Internal('object.confirmationNumber undefined');
-    }
-    return {
-        confirmationNumber,
-    };
-}

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

@@ -1,6 +1,6 @@
 import { factory } from '../../../../factory';
 import type { ISetting } from '../../../../repo/setting';
-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>;
+type IPlaceOrderPotentialTask = factory.task.IAttributes<factory.taskName.PlaceOrder> | factory.task.deleteTransaction.IAttributes | factory.task.IAttributes<factory.taskName.VoidPayTransaction> | factory.task.voidReserveTransaction.IAttributes;
 /**
  * 取引のタスクを作成する
  */

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

@@ -33,6 +33,6 @@ function exportTasksById(params) {
         }, setting
         // settings
         );
-        await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+        await repos.task.saveMany(taskAttributes);
     };
 }

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

@@ -1,22 +1,19 @@
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
-import { factory } from '../../../factory';
+import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 /**
- * 未発行であれば、注文の確認番号を発行して取引に保管する
+ * 未発行であれば、確認番号を発行して注文ドキュメントに保管する
+ * reimplement using OrderInTransactionRepo(2026-07-09~)
  */
 declare function publishConfirmationNumberIfNotExist(params: {
     /**
      * 取引ID
      */
     id: string;
-    status: {
-        $in: factory.transactionStatusType[];
-    };
     object: {
         orderDate: Date;
     };
 }): (repos: {
-    placeOrder: PlaceOrderRepo;
     confirmationNumber: ConfirmationNumberRepo;
+    orderInTransaction: OrderInTransactionRepo;
 }) => Promise<string>;
 export { publishConfirmationNumberIfNotExist };

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

@@ -1,36 +1,54 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishConfirmationNumberIfNotExist = publishConfirmationNumberIfNotExist;
+const debug_1 = __importDefault(require("debug"));
+// import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 const factory_1 = require("../../../factory");
+const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder:publishConfirmationNumberIfNotExist');
 /**
- * 未発行であれば、注文の確認番号を発行して取引に保管する
+ * 未発行であれば、確認番号を発行して注文ドキュメントに保管する
+ * reimplement using OrderInTransactionRepo(2026-07-09~)
  */
 function publishConfirmationNumberIfNotExist(params) {
     return async (repos) => {
-        let confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
-            id: params.id,
-            status: { $in: params.status.$in }
-        });
+        // let confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
+        //     id: params.id,
+        //     status: { $in: params.status.$in }
+        // });
+        let confirmationNumber = await repos.orderInTransaction.findConfirmationNumberByIdentifier({ identifier: params.id });
+        debug('already exists?', confirmationNumber);
         // すでに発行済であれば何もしない
         if (typeof confirmationNumber === 'string') {
             return confirmationNumber;
         }
         // 確認番号を発行
         confirmationNumber = await repos.confirmationNumber.publish({ orderDate: params.object.orderDate });
-        // 取引に存在しなければ保管
-        await repos.placeOrder.saveConfirmationNumberIfNotExist({
-            id: params.id,
-            status: { $in: params.status.$in },
+        debug('saving new confirmationNumber...', confirmationNumber);
+        // // 取引に存在しなければ保管
+        // await repos.placeOrder.saveConfirmationNumberIfNotExist({
+        //     id: params.id,
+        //     status: { $in: params.status.$in },
+        //     confirmationNumber
+        // });
+        // 注文ドキュメントにも保管(2026-07-08~)
+        const saveResult = await repos.orderInTransaction.saveConfirmationNumberIfNotExist({
+            identifier: params.id,
             confirmationNumber
-        });
+        }, { onlyPlaceOrder: true });
+        debug('saveConfirmationNumberIfNotExist result:', JSON.stringify(saveResult));
         // 確認番号を取引から再取得
-        confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
-            id: params.id,
-            status: { $in: params.status.$in }
-        });
+        // confirmationNumber = await repos.placeOrder.findInProgressConfirmationNumberById({
+        //     id: params.id,
+        //     status: { $in: params.status.$in }
+        // });
+        confirmationNumber = await repos.orderInTransaction.findConfirmationNumberByIdentifier({ identifier: params.id });
+        debug('confirmationNumber should exist:', confirmationNumber);
         // 万が一処理が想定通りでない場合confirmationNumberが存在しない
         if (typeof confirmationNumber !== 'string') {
-            throw new factory_1.factory.errors.Internal('transaction.object.confirmationNumber not found');
+            throw new factory_1.factory.errors.Internal('orderInTransaction.confirmationNumber not found');
         }
         return confirmationNumber;
     };

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

@@ -9,7 +9,7 @@ import type { ProjectMakesOfferRepo } from '../../../repo/projectMakesOffer';
 import type { SellerRepo } from '../../../repo/seller';
 import type { IStartedPlaceOrder, PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { IStartPlaceOrderParams } from './start/factory';
-interface IStartOperationRepos {
+export interface IStartOperationRepos {
     issuer: IssuerRepo;
     member: MemberRepo;
     memberProgram: MemberProgramRepo;