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

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

@@ -17,23 +17,20 @@ const factory_1 = require("../../../../factory");
 const validateInvoiceReferencesOrder_1 = require("./validation/validateInvoiceReferencesOrder");
 const validateMovieTicket_1 = require("./validation/validateMovieTicket");
 const validatePrice_1 = require("./validation/validatePrice");
-const debug = (0, debug_1.default)('chevre-domain:service:transaction');
+const debug = (0, debug_1.default)('chevre-domain:service:transaction:placeOrder:confirm:validation');
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-function validateTransaction(transaction, acceptPayActions, authorizePaymentActions, authorizeEventServiceOfferActions, 
-// authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[],
-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~)
     (0, validateInvoiceReferencesOrder_1.validateInvoiceReferencesOrder)(authorizePaymentActions, eventReservationAcceptedOffers);
-    // 利用可能な通貨単位に対して取引検証
-    validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions);
+    // // 利用可能な通貨単位に対して取引検証
+    // validateMonetaryAmount(authorizePaymentActions, authorizeEventServiceOfferActions); // discontinue(2026-07-06~)
     // 利用可能なMovieTicketIF決済方法タイプに対して動的にコーディング
     const movieTicketPaymentMethodTypes = findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentActions, eventReservationAcceptedOffers);
-    debug('processing validateMovieTicket... movieTicketPaymentMethodTypes:', movieTicketPaymentMethodTypes);
     if (Array.isArray(movieTicketPaymentMethodTypes) && movieTicketPaymentMethodTypes.length > 0) {
         movieTicketPaymentMethodTypes.forEach((paymentMethodType) => {
             const authorizeMovieTicketActions = authorizePaymentActions.filter((a) => {
@@ -59,13 +56,12 @@ eventReservationAcceptedOffers, payTransactions, customer) {
                     authorizedMovieTickets.push(...object.paymentMethod.movieTickets);
                 }
             });
-            debug(authorizedMovieTickets.length, 'movie tickets authorized', 'transaction:', transaction.id);
             // validateMovieTicket(paymentMethodType, { id: transaction.id }, authorizePaymentActions, eventReservationAcceptedOffers);
             (0, validateMovieTicket_1.validateMovieTicket)(paymentMethodType, { id: transaction.id }, authorizedMovieTickets, eventReservationAcceptedOffers);
         });
     }
     // 決済URLが発行されている場合、検証
-    validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActions);
+    validatePaymentUrl({ paymentMethodIdByTransaction, acceptPayActions, authorizePaymentActions });
 }
 function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentActions, eventReservationAcceptedOffers) {
     const paymentMethodTypes = [];
@@ -95,18 +91,6 @@ function findMovieTicketPaymentMethodTypesFromTransaction(authorizePaymentAction
     // ];
     return [...new Set(paymentMethodTypes)];
 }
-// function validateProfile(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'object'>) {
-//     // object.customerで検証(2022-05-26~)
-//     const profile = transaction.object.customer;
-//     const profileSatisfied = typeof profile?.typeOf === 'string' && profile.typeOf.length > 0
-//         && typeof profile.email === 'string' && profile.email.length > 0
-//         && typeof profile.familyName === 'string' && profile.familyName.length > 0
-//         && typeof profile.givenName === 'string' && profile.givenName.length > 0
-//         && typeof profile.telephone === 'string' && profile.telephone.length > 0;
-//     if (!profileSatisfied) {
-//         throw new factory.errors.Argument('Transaction', 'Customer Profile Required');
-//     }
-// }
 function validateProfile(params) {
     const profile = params.customer;
     const profileSatisfied = typeof profile?.typeOf === 'string' && profile.typeOf.length > 0
@@ -122,9 +106,11 @@ 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 }) => {
@@ -132,6 +118,7 @@ function validatePaymentUrl(transaction, acceptPayActions, authorizePaymentActio
                 && result?.paymentMethodId === paymentMethodId
                 && typeof result?.paymentUrl === 'string';
         });
+        debug('validatePaymentUrl: acceptActionExists:', acceptActionExists);
         if (!acceptActionExists) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.AcceptAction);
         }
@@ -143,68 +130,69 @@ 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');
         }
     }
 }
-/**
- * JPY以外の通貨について取引を検証する
- */
-function validateMonetaryAmount(_authorizePaymentActions, authorizeEventServiceOfferActions) {
-    // PaymentCard決済を廃止したので、JPY以外の通貨に対しての承認はありえない(2026-04-18~)
-    const authorizeMonetaryAmountActions = [];
-    // const authorizeMonetaryAmountActions = authorizePaymentActions.filter(({ result }) => {
-    //     const resultAsInvoice = (Array.isArray(result))
-    //         // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-    //         ? result[0]
-    //         : undefined;
-    //     // JPY以外の通貨に対して承認可能なのはPaymentServiceType.PaymentCardのみ
-    //     return resultAsInvoice?.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.PaymentCard
-    //         && resultAsInvoice.totalPaymentDue?.currency !== factory.priceCurrency.JPY;
-    // });
-    const requiredMonetaryAmountByCurrencyType = [];
-    authorizeEventServiceOfferActions.forEach((a) => {
-        const amount = a.result?.amount;
-        if (Array.isArray(amount)) {
-            amount.forEach((monetaryAmount) => {
-                if (typeof monetaryAmount.value === 'number') {
-                    requiredMonetaryAmountByCurrencyType.push({ currency: monetaryAmount.currency, value: monetaryAmount.value });
-                }
-            });
-        }
-    }, 0);
-    const requiredCurrencyTypes = [...new Set(requiredMonetaryAmountByCurrencyType.map((m) => m.currency))];
-    const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map(({ result }) => {
-            const resultAsInvoice = (Array.isArray(result))
-                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-                ? result[0]
-                : undefined;
-            return resultAsInvoice?.totalPaymentDue?.currency;
-        }))];
-    if (requiredCurrencyTypes.length !== authorizedCurrencyTypes.length) {
-        throw new factory_1.factory.errors.Argument('Transaction', 'MonetaryAmount account types not matched');
-    }
-    const requireMonetaryAmountSatisfied = requiredCurrencyTypes.every((currencyType) => {
-        const requiredMonetaryAmount = requiredMonetaryAmountByCurrencyType
-            .filter((m) => m.currency === currencyType)
-            .reduce((a, b) => a + b.value, 0);
-        let authorizedMonetaryAmount = 0;
-        authorizeMonetaryAmountActions.forEach(({ result }) => {
-            const resultAsInvoice = (Array.isArray(result))
-                // ? result.find(({ typeOf }) => typeOf === factory.action.authorize.paymentMethod.any.ResultType.Payment)
-                ? result[0]
-                : undefined;
-            if (resultAsInvoice?.totalPaymentDue?.currency === currencyType) {
-                authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;
-            }
-        });
-        return requiredMonetaryAmount === authorizedMonetaryAmount;
-    });
-    if (!requireMonetaryAmountSatisfied) {
-        throw new factory_1.factory.errors.Argument('Transaction', 'Required MonetaryAmount not satisfied');
-    }
-}
+// JPY以外の通貨決済はひとまず廃止(2026-07-06~)
+// /**
+//  * JPY以外の通貨について取引を検証する
+//  */
+// function validateMonetaryAmount(
+//     _authorizePaymentActions: IAuthorizePaymentAction[],
+//     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'result'>[]
+// ) {
+//     // PaymentCard決済を廃止したので、JPY以外の通貨に対しての承認はありえない(2026-04-18~)
+//     const authorizeMonetaryAmountActions: IAuthorizePaymentAction[] = [];
+//     const requiredMonetaryAmountByCurrencyType: {
+//         currency: string;
+//         value: number;
+//     }[] = [];
+//     authorizeEventServiceOfferActions.forEach(
+//         (a) => {
+//             const amount = a.result?.amount;
+//             if (Array.isArray(amount)) {
+//                 amount.forEach((monetaryAmount) => {
+//                     if (typeof monetaryAmount.value === 'number') {
+//                         requiredMonetaryAmountByCurrencyType.push({ currency: monetaryAmount.currency, value: monetaryAmount.value });
+//                     }
+//                 });
+//             }
+//         },
+//         0
+//     );
+//     const requiredCurrencyTypes = [...new Set(requiredMonetaryAmountByCurrencyType.map((m) => m.currency))];
+//     const authorizedCurrencyTypes = [...new Set(authorizeMonetaryAmountActions.map(({ result }) => {
+//         const resultAsInvoice = (Array.isArray(result))
+//             ? result[0]
+//             : undefined;
+//         return resultAsInvoice?.totalPaymentDue?.currency as string;
+//     }
+//     ))];
+//     if (requiredCurrencyTypes.length !== authorizedCurrencyTypes.length) {
+//         throw new factory.errors.Argument('Transaction', 'MonetaryAmount account types not matched');
+//     }
+//     const requireMonetaryAmountSatisfied = requiredCurrencyTypes.every((currencyType) => {
+//         const requiredMonetaryAmount = requiredMonetaryAmountByCurrencyType
+//             .filter((m) => m.currency === currencyType)
+//             .reduce((a, b) => a + b.value, 0);
+//         let authorizedMonetaryAmount = 0;
+//         authorizeMonetaryAmountActions.forEach(({ result }) => {
+//             const resultAsInvoice = (Array.isArray(result))
+//                 ? result[0]
+//                 : undefined;
+//             if (resultAsInvoice?.totalPaymentDue?.currency === currencyType) {
+//                 authorizedMonetaryAmount += resultAsInvoice.totalPaymentDue.value;
+//             }
+//         });
+//         return requiredMonetaryAmount === authorizedMonetaryAmount;
+//     });
+//     if (!requireMonetaryAmountSatisfied) {
+//         throw new factory.errors.Argument('Transaction', 'Required MonetaryAmount not satisfied');
+//     }
+// }
 /**
  * 注文オファー数検証
  */
@@ -257,7 +245,6 @@ function validateAcceptedOffers(params) {
     });
     if (ticketIdentifiers.length > 0) {
         ticketIdentifiers = [...new Set(ticketIdentifiers)];
-        debug('ticketIdentifiers unique?', ticketIdentifiers.join(' '), 'numAcceptedOffers:', numAcceptedOffers);
         // チケット識別子が注文内ユニークなので、注文オファー数に一致するはず
         if (ticketIdentifiers.length !== numAcceptedOffers) {
             throw new factory_1.factory.errors.Argument('Transaction', 'ticketIdentifiers must be unique');
@@ -274,7 +261,6 @@ function validateAcceptedOffers(params) {
     });
     if (ticketNumbers.length > 0) {
         ticketNumbers = [...new Set(ticketNumbers)];
-        debug('ticketNumbers unique?', ticketNumbers.join(' '), 'numAcceptedOffers:', numAcceptedOffers);
         // チケット識別子が注文内ユニークなので、注文オファー数に一致するはず
         if (ticketNumbers.length !== numAcceptedOffers) {
             throw new factory_1.factory.errors.Argument('Transaction', 'ticketNumbers must be unique');
@@ -313,6 +299,42 @@ function validatePaymentMethods(params, options) {
  * 興行オファー適用条件確認
  */
 function validateEventOffers(params) {
+    const { unitPriceOfferConditions } = params;
+    /**
+     * 以下処理で検証に使用するアクション結果リスト
+     */
+    let validatingAuthorizeOfferActions;
+    // 承認アクションと比較する
+    if (Array.isArray(unitPriceOfferConditions)) {
+        const everyActionsMatched = unitPriceOfferConditions.length === params.authorizeOfferActions.length
+            && params.authorizeOfferActions.every((authorizeEventServiceOfferAction) => {
+                const conditionExpected = unitPriceOfferConditions.find(({ id }) => id === authorizeEventServiceOfferAction.id);
+                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);
+                }
+                return resultMatched;
+            });
+        // 全アクションについて結果が一致していればunitPriceOfferConditionsを採用する(2026-07-07~)
+        if (everyActionsMatched) {
+            validatingAuthorizeOfferActions = [...unitPriceOfferConditions];
+        }
+        else {
+            validatingAuthorizeOfferActions = [...params.authorizeOfferActions];
+        }
+    }
+    else {
+        validatingAuthorizeOfferActions = [...params.authorizeOfferActions];
+    }
     const { paymentMethods } = params;
     const firstCreditCardPaymentMethodIdentifier = paymentMethods.find((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard
@@ -322,7 +344,7 @@ function validateEventOffers(params) {
         return referenceInvoice.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory_1.factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
-    params.authorizeEventServiceOfferActions.forEach((a) => {
+    validatingAuthorizeOfferActions.forEach((a) => {
         // support result.offers(2024-06-18~)
         const acceptedOffersInResult = a.result?.offers;
         if (Array.isArray(acceptedOffersInResult) && acceptedOffersInResult.length > 0) {
@@ -348,20 +370,18 @@ function validateEventOffers(params) {
                 // }
                 // 適用数量検証(全興行オファー承認アクションについて)(2023-11-15~)
                 // 適用数量要件を満たしていなければエラー
-                const numAcceptedOffersByOfferId = params.authorizeEventServiceOfferActions.reduce((previousNumOffer, { result }) => {
+                const numAcceptedOffersByOfferId = validatingAuthorizeOfferActions.reduce((previousNumOffer, { result }) => {
                     const numOfferOnCurrentAction = result?.offers?.find(({ id }) => id === offerId)?.includesObject.amountOfThisGood;
                     return previousNumOffer + ((typeof numOfferOnCurrentAction === 'number') ? numOfferOnCurrentAction : 0);
                 }, 0);
                 const eligibleQuantityMaxValue = unitPriceSpec?.eligibleQuantity?.maxValue;
                 if (typeof eligibleQuantityMaxValue === 'number') {
-                    debug('validateEventOffers: numAcceptedOffersByOfferId > eligibleQuantityMaxValue?', numAcceptedOffersByOfferId, eligibleQuantityMaxValue);
                     if (numAcceptedOffersByOfferId > eligibleQuantityMaxValue) {
                         throw new factory_1.factory.errors.Argument('Transaction', `Number of offer:${offerId} must be less than or equal to ${eligibleQuantityMaxValue}`);
                     }
                 }
                 const eligibleQuantityMinValue = unitPriceSpec?.eligibleQuantity?.minValue;
                 if (typeof eligibleQuantityMinValue === 'number') {
-                    debug('validateEventOffers: numAcceptedOffersByOfferId < eligibleQuantityMinValue?', numAcceptedOffersByOfferId, eligibleQuantityMinValue);
                     if (numAcceptedOffersByOfferId < eligibleQuantityMinValue) {
                         throw new factory_1.factory.errors.Argument('Transaction', `Number of offer:${offerId} must be more than or equal to ${eligibleQuantityMinValue}`);
                     }
@@ -372,7 +392,6 @@ function validateEventOffers(params) {
                     const satisfyAcceptedPaymentMethod = numCreditCardOrFaceToFacePaymentMethod === 1
                         && typeof firstCreditCardPaymentMethodIdentifier === 'string'
                         && acceptedPaymentMethodTypes.includes(firstCreditCardPaymentMethodIdentifier);
-                    debug('validateEventOffers: satisfyAcceptedPaymentMethod?', JSON.stringify(acceptedPaymentMethodTypes));
                     if (!satisfyAcceptedPaymentMethod) {
                         throw new factory_1.factory.errors.Argument('Transaction', `acceptedPaymentMethod requirement not satisfied`);
                     }
@@ -381,7 +400,7 @@ function validateEventOffers(params) {
         }
     });
     // check programMembershipUsed(2024-08-15~)
-    const programMembershipRequired = params.authorizeEventServiceOfferActions.reduce((a, b) => {
+    const programMembershipRequired = validatingAuthorizeOfferActions.reduce((a, b) => {
         const programMembershipUsedfromResult = b.result?.itemOffered?.serviceOutput.programMembershipUsed;
         if (Array.isArray(programMembershipUsedfromResult)) {
             a.push(...programMembershipUsedfromResult);

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

@@ -5,6 +5,7 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MessageRepo } from '../../../repo/message';
+import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
 import type { SettingRepo } from '../../../repo/setting';
@@ -19,6 +20,7 @@ interface IConfirmOperationRepos {
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
     message: MessageRepo;
+    offer: OfferRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
     orderInTransaction: OrderInTransactionRepo;
@@ -39,6 +41,11 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
+    /**
+     * 2026-07-06~
+     * 実験的に
+     */
+    usePrepareUnitPriceOfferConditions?: boolean;
 }
 type IConfirmParams = PlaceOrderFactory.IConfirmParams;
 interface IConfirmResult {

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

@@ -12,6 +12,7 @@ const factory_2 = require("../../order/placeOrder/factory");
 const orderedItem_1 = require("../../order/placeOrder/factory/orderedItem");
 const result_1 = require("./confirm/factory/result");
 const potentialActions_1 = require("./confirm/potentialActions");
+const prepareUnitPriceOfferConditions_1 = require("./confirm/prepareUnitPriceOfferConditions");
 const publishCode_1 = require("./confirm/publishCode");
 const validation_1 = require("./confirm/validation");
 const publishConfirmationNumberIfNotExist_1 = require("./publishConfirmationNumberIfNotExist");
@@ -57,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']);
@@ -81,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~)
@@ -114,6 +117,16 @@ function confirm(params, options) {
             project: { id: transaction.project.id }
         }))
             .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 });
+        }
         // authorizePaymentActionsからpayTransactionsを参照(2024-06-20~)
         let payTransactions = [];
         // 決済承認アクションのinstrument依存をobject依存へ変更(2025-12-14~)
@@ -131,25 +144,16 @@ 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,
-            // authorizeProductOfferActions,
             acceptedOffers, payTransactions, customer,
-            ...(typeof code === 'string') ? { code } : undefined
+            ...(typeof code === 'string') ? { code } : undefined,
+            ...((Array.isArray(unitPriceOfferConditions)) && { unitPriceOfferConditions }),
+            paymentMethodIdByTransaction
         }, options);
-        // 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') {
@@ -179,7 +183,8 @@ function confirm(params, options) {
                 id: transaction.id,
                 object: {
                     orderDate: params.result.order.orderDate,
-                    orderNumber
+                    orderNumber,
+                    confirmationNumber: placingOrder.confirmationNumber
                 },
                 result: result,
                 potentialActions: potentialActions
@@ -319,17 +324,20 @@ function createResult(params, options) {
         }
     });
     // 取引の確定条件が全て整っているかどうか確認
-    (0, validation_1.validateTransaction)(transaction, params.acceptPayActions, params.authorizePaymentActions, params.authorizeEventServiceOfferActions, 
-    // params.authorizeProductOfferActions,
-    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
     });
     (0, validation_1.validateEventOffers)({
+        project: { id: transaction.project.id },
         order: { price },
         paymentMethods,
-        authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
+        authorizeOfferActions: params.authorizeEventServiceOfferActions,
+        ...((Array.isArray(params.unitPriceOfferConditions)) && { unitPriceOfferConditions: params.unitPriceOfferConditions })
     });
     // 注文オファー検証
     (0, validation_1.validateAcceptedOffers)({
@@ -342,8 +350,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,
@@ -390,21 +400,6 @@ function createResult(params, options) {
 }
 function searchAcceptPayActions(params) {
     return async (repos) => {
-        // let acceptPayActions = <IAcceptPayAction[]>await repos.action.search(
-        //     {
-        //         project: { id: { $eq: params.project.id } },
-        //         typeOf: { $eq: factory.actionType.AcceptAction },
-        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-        //         purpose: {
-        //             id: { $in: [params.id] },
-        //             typeOf: { $in: [factory.transactionType.PlaceOrder] }
-        //         },
-        //         object: {
-        //             typeOf: { $eq: factory.assetTransactionType.Pay }
-        //         }
-        //     },
-        //     ['object', 'endDate', 'result']
-        // );
         let acceptPayActions = await repos.acceptPayAction.findAcceptActionsByPurpose({
             project: { id: params.project.id },
             actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
@@ -423,15 +418,6 @@ function searchAcceptPayActions(params) {
 function searchAuthorizeActions(params) {
     return async (repos) => {
         // 取引に対する全ての承認アクションをマージ
-        // let authorizeActions = <IAuthorizeOfferOrPaymentAction[]>await repos.action.searchByPurpose({
-        //     typeOf: factory.actionType.AuthorizeAction,
-        //     purpose: {
-        //         typeOf: factory.transactionType.PlaceOrder,
-        //         id: params.id
-        //     },
-        //     // Completedに絞る(2023-05-16~)
-        //     actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
-        // });
         let authorizeActions = [
             ...await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodActionsByPurpose({
                 purpose: {
@@ -458,14 +444,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/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;
     };