@chevre/domain 25.2.0-alpha.32 → 25.2.0-alpha.34

package/lib/chevre/repo/order.js

@@ -848,19 +848,26 @@ class OrderRepo {
         })
             .exec();
     }
-    async savePaymentMethodId4migaration(params) {
-        const { paymentMethodId } = params.paymentMethod;
-        if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
-            throw new factory_1.factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
-        }
-        // 注文ドキュメントにも保管する(2026-07-12~)
-        return this.orderModel.findOneAndUpdate({
-            identifier: { $eq: params.id },
-            paymentMethodId: { $exists: false }
-        }, { $set: { paymentMethodId } }, { projection: { _id: 1 } })
-            .lean()
-            .exec();
-    }
+    // public async savePaymentMethodId4migaration(params: {
+    //     id: string;
+    //     paymentMethod: IPaymentMethodByPaymentUrl;
+    // }) {
+    //     const { paymentMethodId } = params.paymentMethod;
+    //     if (typeof paymentMethodId !== 'string' || paymentMethodId === '') {
+    //         throw new factory.errors.ArgumentNull('paymentMethod.paymentMethodId');
+    //     }
+    //     // 注文ドキュメントにも保管する(2026-07-12~)
+    //     return this.orderModel.findOneAndUpdate(
+    //         {
+    //             identifier: { $eq: params.id },
+    //             paymentMethodId: { $exists: false }
+    //         },
+    //         { $set: { paymentMethodId } },
+    //         { projection: { _id: 1 } }
+    //     )
+    //         .lean()
+    //         .exec();
+    // }
     async aggregateOrder(params) {
         const matchConditions = {
             orderDate: {

package/lib/chevre/repo/orderInTransaction.d.ts

@@ -57,6 +57,13 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
     priceSpecification?: never;
     name?: never;
 };
+export interface IPaymentMethodByPaymentUrl {
+    /**
+     * 決済採用時に発行済の決済方法ID
+     * 決済承認時に指定が可能
+     */
+    paymentMethodId: string;
+}
 /**
  * 取引中注文リポジトリ
  */
@@ -154,7 +161,7 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
      */
     savePaymentMethodId(params: {
         id: string;
-        paymentMethod: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
+        paymentMethod: IPaymentMethodByPaymentUrl;
     }, options: {
         savePaymentMethodIdInTransaction: boolean;
     }): Promise<void>;

package/lib/chevre/repo/transaction.d.ts

@@ -144,7 +144,7 @@ export declare class TransactionRepo {
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -182,7 +182,7 @@ export declare class TransactionRepo {
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
         status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
-        potentialActions?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IPotentialActions | undefined;
+        potentialActions?: undefined;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -27,8 +27,6 @@ declare function acceptedOffers2authorizeResult(params: {
     acceptedOffers4result: IResultAcceptedOffer[];
     noOfferSpecified: boolean;
     ticketOffers: factory.product.ITicketOffer[];
-}, options: {
-    useLegacyAuthorizeOfferResult: boolean;
 }): factory.action.authorize.offer.eventService.IResult & {
     onlyPrice?: boolean;
 };

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -144,93 +144,101 @@ function acceptedOffers2amount(params) {
     });
     return amount;
 }
-function acceptedOffers2programMembershipUsed(params) {
-    const programMembershipUsed = [];
-    const permitIdentifiers = [];
-    params.acceptedOffers.forEach(({ itemOffered }) => {
-        if (itemOffered.programMembershipUsed?.typeOf === factory_1.factory.programMembership.ProgramMembershipType.ProgramMembership) {
-            // メンバーシップコードに対してユニークに集計
-            if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
-                permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
-                const issuedThroughTypeOf = itemOffered.programMembershipUsed.issuedThrough.typeOf;
-                if (issuedThroughTypeOf === factory_1.factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                    programMembershipUsed.push({
-                        typeOf: factory_1.factory.permit.PermitType.Permit,
-                        identifier: itemOffered.programMembershipUsed.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf }
-                    });
-                }
-                else {
-                    programMembershipUsed.push({
-                        typeOf: factory_1.factory.permit.PermitType.Permit,
-                        identifier: itemOffered.programMembershipUsed.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf, id: itemOffered.programMembershipUsed.issuedThrough.id }
-                    });
-                }
-            }
-        }
-    });
-    return programMembershipUsed;
-}
-function acceptedOffers2authorizeResult(params, options) {
-    const { useLegacyAuthorizeOfferResult } = options;
-    const { acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
-    // const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
-    let offers;
+// function acceptedOffers2programMembershipUsed(params: {
+//     acceptedOffers: IResultAcceptedOffer[];
+// }): factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed {
+//     const programMembershipUsed: factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed = [];
+//     const permitIdentifiers: string[] = [];
+//     params.acceptedOffers.forEach(
+//         ({ itemOffered }) => {
+//             if (itemOffered.programMembershipUsed?.typeOf === factory.programMembership.ProgramMembershipType.ProgramMembership) {
+//                 // メンバーシップコードに対してユニークに集計
+//                 if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
+//                     permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
+//                     const issuedThroughTypeOf = itemOffered.programMembershipUsed.issuedThrough.typeOf;
+//                     if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+//                         programMembershipUsed.push({
+//                             typeOf: factory.permit.PermitType.Permit,
+//                             identifier: itemOffered.programMembershipUsed.identifier,
+//                             issuedThrough: { typeOf: issuedThroughTypeOf }
+//                         });
+//                     } else {
+//                         programMembershipUsed.push({
+//                             typeOf: factory.permit.PermitType.Permit,
+//                             identifier: itemOffered.programMembershipUsed.identifier,
+//                             issuedThrough: { typeOf: issuedThroughTypeOf, id: itemOffered.programMembershipUsed.issuedThrough.id }
+//                         });
+//                     }
+//                 }
+//             }
+//         }
+//     );
+//     return programMembershipUsed;
+// }
+function acceptedOffers2authorizeResult(params) {
+    const { acceptedOffers4result, noOfferSpecified,
+    // ticketOffers
+     } = params;
+    // let offers: factory.action.authorize.offer.eventService.IAcceptedOfferInResult[] | undefined;
     let price;
-    let programMembershipUsed = [];
+    // let programMembershipUsed: factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed = [];
     if (!noOfferSpecified) {
         price = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result }); // オファー指定の場合のみ金額計算(2023-11-27~)
-        programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
+        // programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
         // オファーIDごとに集計
-        const offerIds = [...new Set(acceptedOffers4result.map((o) => String(o.id)))];
-        // const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
-        offers = offerIds.map((offerId) => {
-            const acceptedOffer = ticketOffers.find(({ id }) => id === offerId);
-            if (acceptedOffer === undefined) {
-                throw new factory_1.factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
-            }
-            const amountOfThisGood = acceptedOffers4result.filter(({ id }) => id === offerId).length;
-            // const amountOfThisGood: number = acceptedOffers.filter(({ id }) => id === offerId).length;
-            const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
-            const unitPriceSpec = priceSpecification.priceComponent.find((spec) => spec.typeOf === factory_1.factory.priceSpecificationType.UnitPriceSpecification
-                && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
-            );
-            if (unitPriceSpec === undefined) {
-                throw new factory_1.factory.errors.Internal(`unitPriceSpec not found [id:${offerId}]`);
-            }
-            const { eligibleQuantity } = unitPriceSpec;
-            return {
-                id: offerId,
-                includesObject: { amountOfThisGood },
-                typeOf: factory_1.factory.offerType.Offer,
-                priceSpecification: {
-                    ...(eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined,
-                    // ...(eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined // discontinue(2026-07-05~)
-                },
-                ...(acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined
-            };
-        });
-    }
-    if (useLegacyAuthorizeOfferResult) {
-        return {
-            typeOf: factory_1.factory.offerType.AggregateOffer,
-            // priceCurrency, // discontinue(2026-07-06~)
-            // amount: [], // discontinue(2026-07-06~)
-            itemOffered: {
-                serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
-            },
-            ...(typeof price === 'number') ? { price } : undefined,
-            ...(Array.isArray(offers)) ? { offers } : undefined
-        };
-    }
-    else {
-        return {
-            typeOf: factory_1.factory.offerType.AggregateOffer,
-            onlyPrice: true,
-            ...(typeof price === 'number') ? { price } : undefined,
-        };
+        // const offerIds = [...new Set(acceptedOffers4result.map((o) => String(o.id)))];
+        // offers = offerIds.map<factory.action.authorize.offer.eventService.IAcceptedOfferInResult>((offerId) => {
+        //     const acceptedOffer = ticketOffers.find(({ id }) => id === offerId);
+        //     if (acceptedOffer === undefined) {
+        //         throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
+        //     }
+        //     const amountOfThisGood: number = acceptedOffers4result.filter(({ id }) => id === offerId).length;
+        //     // const amountOfThisGood: number = acceptedOffers.filter(({ id }) => id === offerId).length;
+        //     const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
+        //     const unitPriceSpec = priceSpecification.priceComponent.find(
+        //         (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+        //             && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
+        //     ) as IUnitPriceSpecification | undefined;
+        //     if (unitPriceSpec === undefined) {
+        //         throw new factory.errors.Internal(`unitPriceSpec not found [id:${offerId}]`);
+        //     }
+        //     const { eligibleQuantity } = unitPriceSpec;
+        //     return {
+        //         id: offerId,
+        //         includesObject: { amountOfThisGood },
+        //         typeOf: factory.offerType.Offer,
+        //         priceSpecification: {
+        //             ...(eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined,
+        //             // ...(eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined // discontinue(2026-07-05~)
+        //         },
+        //         ...(acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined
+        //     };
+        // });
     }
+    // discontinue useLegacyAuthorizeOfferResult(2026-07-18~)
+    // if (useLegacyAuthorizeOfferResult) {
+    //     return {
+    //         typeOf: factory.offerType.AggregateOffer,
+    //         // priceCurrency, // discontinue(2026-07-06~)
+    //         // amount: [], // discontinue(2026-07-06~)
+    //         itemOffered: {
+    //             serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
+    //         },
+    //         ...(typeof price === 'number') ? { price } : undefined,
+    //         ...(Array.isArray(offers)) ? { offers } : undefined
+    //     };
+    // } else {
+    //     return {
+    //         typeOf: factory.offerType.AggregateOffer,
+    //         onlyPrice: true,
+    //         ...(typeof price === 'number') ? { price } : undefined,
+    //     };
+    // }
+    return {
+        typeOf: factory_1.factory.offerType.AggregateOffer,
+        onlyPrice: true,
+        ...(typeof price === 'number') ? { price } : undefined,
+    };
 }
 function responseBody2acceptedOffers4result(params) {
     let acceptedOffers4result = [];

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

@@ -63,10 +63,6 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
-    /**
-     * 2026-07-10~
-     */
-    useLegacyAuthorizeOfferResult: boolean;
 }
 /**
  * 興行オファー承認

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

@@ -78,7 +78,7 @@ function authorize(params, options) {
             }
             throw error;
         }
-        const result = (0, factory_2.acceptedOffers2authorizeResult)({ acceptedOffers4result, noOfferSpecified, ticketOffers }, options);
+        const result = (0, factory_2.acceptedOffers2authorizeResult)({ acceptedOffers4result, noOfferSpecified, ticketOffers });
         await repos.authorizeOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
     };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -23,7 +23,8 @@ function onOrderProcessing(params) {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         let creatingCheckResourceTask;
-        const sendEmailMessageByOnOrderProcessing = params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
+        // const sendEmailMessageByOnOrderProcessing =
+        //     params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
         switch (params.order.orderStatus) {
             case factory_1.factory.orderStatus.OrderProcessing:
                 tasks = (0, factory_2.createInformProcessingOrderTasks)(params.order, setting);
@@ -49,7 +50,7 @@ function onOrderProcessing(params) {
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 await (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
-                        ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
+                    // ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
                     ],
                     order: params.order
                 })(repos);

package/lib/chevre/service/reserve/adminFindReservations.d.ts

@@ -0,0 +1,15 @@
+import { factory } from '../../factory';
+import type { IKeyOfProjection, ReservationRepo } from '../../repo/reservation';
+/**
+ * 予約検索レスポンスとしての予約
+ */
+type IReservationAsFindResult = Pick<factory.reservation.eventReservation.IReservation, 'additionalTicketText' | 'attended' | 'bookingTime' | 'checkedIn' | 'id' | 'reservationFor' | 'reservationNumber' | 'reservationStatus' | 'reservedTicket'>;
+/**
+ * 管理者による予約検索
+ */
+export declare function adminFindReservations(params: factory.reservation.eventReservation.ISearchConditions, options: {
+    inclusion: Partial<Record<IKeyOfProjection, 1>>;
+}): (repos: {
+    reservation: ReservationRepo;
+}) => Promise<IReservationAsFindResult[]>;
+export {};

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

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.adminFindReservations = adminFindReservations;
+/**
+ * 管理者による予約検索
+ */
+function adminFindReservations(params, options) {
+    return async (repos) => {
+        const { inclusion } = options;
+        const rawReservations = await repos.reservation.findReservations(params, inclusion);
+        if (rawReservations.length === 0) {
+            return [];
+        }
+        else {
+            // const requireUnderName = Object.keys(inclusion).includes('underName');
+            // const requireReservedTicket = Object.keys(inclusion).includes('reservedTicket');
+            // const requireReservationFor = Object.keys(inclusion).includes('reservationFor');
+            // const reservationIds = rawReservations.map(({ id }) => id);
+            // const subReservations = await repos.assetTransaction.reserve.findSubReservationsById({
+            //     ids: reservationIds
+            // });
+            return rawReservations.map((reservation) => {
+                // const subReservationByTransaction = subReservations.find((s) => s.id === reservation.id);
+                // const underNameByTransaction = subReservationByTransaction?.underName;
+                const { reservationFor, issuedThrough: _issuedThrough, priceCurrency: _priceCurrency, numSeats: _numSeats, reservedTicket, ...rawReservation4result } = reservation;
+                return {
+                    ...rawReservation4result, // 予約ドキュメントはそのまま返す
+                    reservedTicket, // 予約検索レスポンスからticketTypeは廃止(2026-06-01~)
+                    reservationFor // 予約検索レスポンスのreservationForはそのまま返す(2026-06-01~)
+                    // ...(requireUnderName && underNameByTransaction !== undefined) ? { underName: underNameByTransaction } : undefined, // underNameがあれば上書き
+                };
+            });
+        }
+    };
+}

package/lib/chevre/service/reserve.d.ts

@@ -5,7 +5,7 @@ import { cancelPendingReservation, cancelReservation } from './reserve/cancelRes
 import { checkInReservation } from './reserve/checkInReservation';
 import { confirmReservation } from './reserve/confirmReservation';
 import { findByCode } from './reserve/findByCode';
-import { findReservations } from './reserve/findReservations';
+import { adminFindReservations } from './reserve/adminFindReservations';
 import { searchByOrder } from './reserve/searchByOrder';
 import { verifyToken4reservation } from './reserve/verifyToken4reservation';
-export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, findReservations, searchByOrder, verifyToken4reservation };
+export { cancelPendingReservation, cancelReservation, checkInReservation, confirmReservation, findByCode, adminFindReservations, searchByOrder, verifyToken4reservation };

package/lib/chevre/service/reserve.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyToken4reservation = exports.searchByOrder = exports.findReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
+exports.verifyToken4reservation = exports.searchByOrder = exports.adminFindReservations = exports.findByCode = exports.confirmReservation = exports.checkInReservation = exports.cancelReservation = exports.cancelPendingReservation = void 0;
 /**
  * 予約サービス
  */
@@ -13,8 +13,8 @@ const confirmReservation_1 = require("./reserve/confirmReservation");
 Object.defineProperty(exports, "confirmReservation", { enumerable: true, get: function () { return confirmReservation_1.confirmReservation; } });
 const findByCode_1 = require("./reserve/findByCode");
 Object.defineProperty(exports, "findByCode", { enumerable: true, get: function () { return findByCode_1.findByCode; } });
-const findReservations_1 = require("./reserve/findReservations");
-Object.defineProperty(exports, "findReservations", { enumerable: true, get: function () { return findReservations_1.findReservations; } });
+const adminFindReservations_1 = require("./reserve/adminFindReservations");
+Object.defineProperty(exports, "adminFindReservations", { enumerable: true, get: function () { return adminFindReservations_1.adminFindReservations; } });
 const searchByOrder_1 = require("./reserve/searchByOrder");
 Object.defineProperty(exports, "searchByOrder", { enumerable: true, get: function () { return searchByOrder_1.searchByOrder; } });
 const verifyToken4reservation_1 = require("./reserve/verifyToken4reservation");

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,13 +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: {
+        //     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.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,12 +42,13 @@ interface IConfirmOptions {
      * 注文における最大CreditCardIF決済方法数
      */
     maxNumCreditCardPaymentMethod: number;
+}
+type IConfirmParams = PlaceOrderFactory.IConfirmParams & {
     /**
-     * 取引のpotentialActionsにメッセージ識別子を保管するかどうか
+     * 取引確定後アクション
      */
-    useTransactionPotentialActions: 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

@@ -155,7 +155,7 @@ function confirm(params, options) {
         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,
@@ -178,7 +178,7 @@ function confirm(params, options) {
                     confirmationNumber: placingOrder.confirmationNumber
                 },
                 result: result,
-                ...((options.useTransactionPotentialActions) && { potentialActions }) // support undefined(2026-07-17~)
+                // ...((options.useTransactionPotentialActions) && { potentialActions }) // support undefined(2026-07-17~)
             });
         }
         catch (error) {