@chevre/domain 25.0.0-alpha.1 → 25.0.0-alpha.11

package/lib/chevre/repo/orderNumber.js

@@ -17,36 +17,25 @@ const ORDER_NUMBER_SEPARATOR = '-';
 class OrderNumberRepo {
     counterRepo;
     settingModel;
+    // static にすることで、クラスが何回 new されてもメモリ上で1つだけ保持される
+    static cachedSettings;
+    static cacheExpiry = 0;
+    static CACHE_TTL_MS = 10 * 60 * 1000; // 10分
     constructor(params) {
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
         this.settingModel = params.connection.model(setting_1.modelName, (0, setting_1.createSchema)());
     }
-    // public static GENERATE_VERSION0(timestamp: string, seq: number): string {
-    //     let orderNumber = `${timestamp}${seq}`;
-    //     // checkdigit
-    //     const cd = cdigit.luhn.compute(orderNumber);
-    //     orderNumber = fpe({ password: cd })
-    //         .encrypt(orderNumber);
-    //     orderNumber = `${cd}${orderNumber}`;
-    //     return orderNumber;
-    // }
     /**
      * 注文日時から新しい注文番号を発行する
      * グローバルユニークである前提
      */
     async issueOrderNumber(params) {
-        const { fpeSecret, version, validFrom
-        // versioningForceProjects
-        // versioningExceptionProjects
-         } = await this.findSetting();
+        const { fpeSecret, version } = await this.findSetting();
         const timestamp = (0, moment_timezone_1.default)(params.orderDate)
             .valueOf()
             .toString();
-        // const projectPrefix = params.project.alternateName
-        //     .toUpperCase();
         const projectPrefix = params.project.alternateName
             .toUpperCase().at(0);
-        // const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
         const dataFeedIdentifier = timestamp; // reconsider increment scope(2026-02-21~)
         const dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
             .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
@@ -57,32 +46,16 @@ class OrderNumberRepo {
             expires: dataFeedExpires
         });
         let orderNumber;
-        const useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
-            .isSameOrBefore(params.orderDate));
-        if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
-            const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
-            orderNumber = transactionFactory.generate(timestamp, incrReply);
-            orderNumber = `${projectPrefix}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
-            orderNumber = `${[
-                orderNumber.slice(0, 4),
-                orderNumber.slice(4, 11),
-                orderNumber.slice(11)
-            ].join(ORDER_NUMBER_SEPARATOR)}`;
-        }
-        else {
-            // discontinue version0(2026-02-13~)
-            throw new factory_1.factory.errors.NotImplemented('orderNumber with no version discontinued');
-            // orderNumber = OrderNumberRepo.GENERATE_VERSION0(timestamp, incrReply);
-            // orderNumber = `${projectPrefix}${orderNumber}`;
-            // orderNumber = `${[
-            //     // tslint:disable-next-line:no-magic-numbers
-            //     orderNumber.slice(0, 4),
-            //     // tslint:disable-next-line:no-magic-numbers
-            //     orderNumber.slice(4, 11),
-            //     // tslint:disable-next-line:no-magic-numbers
-            //     orderNumber.slice(11)
-            // ].join(ORDER_NUMBER_SEPARATOR)}`;
-        }
+        // const useVersioning: boolean = (validFrom instanceof Date && moment(validFrom)
+        //     .isSameOrBefore(params.orderDate));
+        const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
+        orderNumber = transactionFactory.generate(timestamp, incrReply);
+        orderNumber = `${projectPrefix}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
+        orderNumber = `${[
+            orderNumber.slice(0, 4),
+            orderNumber.slice(4, 11),
+            orderNumber.slice(11)
+        ].join(ORDER_NUMBER_SEPARATOR)}`;
         return orderNumber;
     }
     async decrypt(id) {
@@ -97,41 +70,40 @@ class OrderNumberRepo {
             throw new factory_1.factory.errors.NotImplemented('no version not implemented');
         }
     }
+    clearSettingCache() {
+        OrderNumberRepo.cacheExpiry = 0;
+        OrderNumberRepo.cachedSettings = undefined;
+    }
     /**
      * 注文番号生成設定を検索する
      */
     async findSetting() {
+        const now = Date.now();
+        // キャッシュ参照(2026-06-22~)
+        if (OrderNumberRepo.cachedSettings !== undefined && now < OrderNumberRepo.cacheExpiry) {
+            return OrderNumberRepo.cachedSettings;
+        }
         const filterQuery = { 'project.id': { $eq: '*' } };
-        const projection = {
+        const setting = await this.settingModel.findOne(filterQuery, {
             _id: 0,
             orderNumber: 1
-        };
-        const setting = await this.settingModel.findOne(filterQuery, projection)
+        })
             .lean()
             .exec();
         if (setting === null || setting.orderNumber === undefined) {
-            return {
-            // versioningForceProjects: []
-            // versioningExceptionProjects: []
-            };
+            throw new factory_1.factory.errors.NotFound('setting.orderNumber');
         }
-        const { fpeSecret, version, validFrom } = setting.orderNumber;
+        const { fpeSecret, version } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
             throw new factory_1.factory.errors.NotFound('setting.orderNumber.secret');
         }
         if (typeof version !== 'string' || version === '') {
             throw new factory_1.factory.errors.NotFound('setting.orderNumber.version');
         }
-        if (!(validFrom instanceof Date)) {
-            throw new factory_1.factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
-        }
-        return {
-            fpeSecret, version, validFrom
-            // versioningForceProjects: [
-            //     ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
-            // ]
-            // versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
-        };
+        // キャッシュを更新
+        OrderNumberRepo.cachedSettings = { fpeSecret, version };
+        OrderNumberRepo.cacheExpiry = now + OrderNumberRepo.CACHE_TTL_MS;
+        return OrderNumberRepo.cachedSettings;
     }
 }
 exports.OrderNumberRepo = OrderNumberRepo;

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

@@ -1,4 +1,4 @@
-import type { Connection } from 'mongoose';
+import type { Connection, UpdateQuery } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/transaction';
 interface IAggregationByStatus {
@@ -116,6 +116,10 @@ export declare class TransactionRepo {
         filter: any;
         $unset: any;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    updateById4migration(params: {
+        id: string;
+        update: UpdateQuery<IDocType>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     /**
      * 終了日時を一定期間過ぎたアクションを削除する
      */

package/lib/chevre/repo/transaction.js

@@ -297,6 +297,10 @@ class TransactionRepo {
         return this.transactionModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();
     }
+    async updateById4migration(params) {
+        return this.transactionModel.updateOne({ _id: { $eq: params.id } }, params.update)
+            .exec();
+    }
     /**
      * 終了日時を一定期間過ぎたアクションを削除する
      */

package/lib/chevre/service/offer/any.d.ts

@@ -10,12 +10,9 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
-    acceptedOffers: IMinimizedAcceptedOffer[] | (Omit<factory.order.IAcceptedOffer, 'priceSpecification'> & {
-        /**
-         * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
-         */
-        priceSpecification?: factory.order.ITicketPriceSpecification;
-    })[];
+    placeOrderId: string;
+    acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
+    broker?: factory.order.IBroker;
 }): IAcceptOfferOperation<void>;
 export declare function voidAcceptedOffer(params: {
     /**

package/lib/chevre/service/offer/any.js

@@ -13,7 +13,9 @@ function acceptOffer(params) {
         await repos.orderInTransaction.acceptOffer({
             orderNumber: params.orderNumber,
             project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
-            acceptedOffers: params.acceptedOffers
+            identifier: params.placeOrderId,
+            acceptedOffers: params.acceptedOffers,
+            ...((params.broker !== undefined) && { broker: params.broker })
         });
     };
 }

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

@@ -66,7 +66,9 @@ function authorize(params, options) {
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
-                    acceptedOffers: minimizedAcceptedOffers
+                    placeOrderId: transaction.id,
+                    acceptedOffers: minimizedAcceptedOffers,
+                    ...((typeof params.object.broker?.typeOf === 'string') && { broker: params.object.broker })
                 })(repos);
             }
         }

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

@@ -119,6 +119,7 @@ function authorize(params) {
             await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
+                placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
             // }

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -154,6 +154,7 @@ function changeOffers(params) {
             await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
+                placeOrderId: params.transaction.id,
                 acceptedOffers: acceptedOffers4result
             })(repos);
             // }

package/lib/chevre/service/order/deleteOrder.js

@@ -93,7 +93,7 @@ function deleteReservationsByOrder(order) {
         const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
             orderNumber: { $eq: order.orderNumber },
             project: { id: { $eq: order.project.id } },
-        }, { noName: true });
+        });
         const reservationIds = acceptedOffers.map((o) => String(o.itemOffered.id));
         if (reservationIds.length > 0) {
             await repos.reservation.deleteByIds({ project: { id: order.project.id }, ids: reservationIds });

package/lib/chevre/service/order/placeOrder/factory.js

@@ -95,7 +95,9 @@ function createPlacingOrder(params) {
     // discontinue(2026-06-11~)
     // const name: string | undefined =
     //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
-    const broker = (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
+    // discontinue(2026-06-22~)
+    // const broker: factory.order.IBroker | undefined =
+    //     (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
@@ -125,6 +127,6 @@ function createPlacingOrder(params) {
             .toDate(),
         orderedItem, // 2024-06-18~
         // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)
-        ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // 2024-06-17~
+        // ...(typeof broker?.typeOf === 'string') ? { broker } : undefined // discontinue(2026-06-22~)
     };
 }

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

@@ -6,5 +6,4 @@ import { paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
 import { processOrder } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
 import { placeOrder } from './order/placeOrder';
-import { placeOrderWithoutTransaction } from './order/placeOrderWithoutTransaction';
-export { confirmPayTransaction, onOrderUpdated, paymentDue2Processing, placeOrder, placeOrderWithoutTransaction, processOrder, };
+export { confirmPayTransaction, onOrderUpdated, paymentDue2Processing, placeOrder, processOrder, };

package/lib/chevre/service/order.js

@@ -1,20 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.confirmPayTransaction = void 0;
+exports.processOrder = exports.placeOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
 const confirmPayTransaction_1 = require("./order/confirmPayTransaction");
 Object.defineProperty(exports, "confirmPayTransaction", { enumerable: true, get: function () { return confirmPayTransaction_1.confirmPayTransaction; } });
-// import { deleteOrder } from './order/deleteOrder';
 const onAssetTransactionStatusChanged_1 = require("./order/onAssetTransactionStatusChanged");
 Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return onOrderStatusChanged_1.processOrder; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");
 Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
-// import { payOrder } from './order/payOrder';
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
-const placeOrderWithoutTransaction_1 = require("./order/placeOrderWithoutTransaction");
-Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrderWithoutTransaction_1.placeOrderWithoutTransaction; } });

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

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

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

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

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

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

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

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

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

@@ -12,7 +12,6 @@ export declare function createSendEmailMessageActions(params: {
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     emailMessages: factory.action.transfer.send.message.email.IObjectAsEmailMessage[];
     sendEmailMessageActions: factory.transaction.placeOrder.IPotentialSendEmailMessageAction[];

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

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

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

@@ -15,7 +15,6 @@ export declare function createPotentialActions(params: {
     seller: factory.order.ISeller;
     paymentMethods: factory.order.IReferencedInvoice[];
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
-    emailMessage?: factory.creativeWork.message.email.ICreativeWork;
 }, setting: Pick<ISetting, 'defaultSenderEmail'>): Promise<{
     potentialActions: factory.transaction.placeOrder.IPotentialActions;
     emailMessages: factory.creativeWork.message.email.ICreativeWork[];

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

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

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

@@ -4,7 +4,6 @@ import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOff
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
-import type { EmailMessageRepo } from '../../../repo/emailMessage';
 import type { MessageRepo } from '../../../repo/message';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { ProjectRepo } from '../../../repo/project';
@@ -18,7 +17,6 @@ interface IConfirmOperationRepos {
     authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
-    emailMessage?: EmailMessageRepo;
     message: MessageRepo;
     project: ProjectRepo;
     placeOrder: PlaceOrderRepo;
@@ -41,7 +39,7 @@ interface IConfirmOptions {
      */
     maxNumCreditCardPaymentMethod: number;
     /**
-     * 取引ドキュメントのresult.orderを保管しないオプション(2026-06-15~)
+     * 取引ドキュメントのresult.order,result,numAcceptedOffersを保管しないオプション(2026-06-15~)
      */
     disableResultOrder: boolean;
 }

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

@@ -136,17 +136,18 @@ function confirm(params, options) {
             acceptedOffers, payTransactions, customer,
             ...(typeof code === 'string') ? { code } : undefined
         }, options);
-        // デフォルトEメールメッセージを検索
-        let emailMessageOnOrderSent;
-        if (repos.emailMessage !== undefined) {
-            const searchEmailMessagesResult = await repos.emailMessage.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: transaction.project.id } },
-                about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
-            });
-            emailMessageOnOrderSent = searchEmailMessagesResult.shift();
-        }
+        // discontinue emailMessageRepo
+        // // デフォルトEメールメッセージを検索
+        // let emailMessageOnOrderSent: factory.creativeWork.message.email.ICreativeWork | undefined;
+        // if (repos.emailMessage !== undefined) {
+        //     const searchEmailMessagesResult = await repos.emailMessage.search({
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: transaction.project.id } },
+        //         about: { identifier: { $eq: factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } }
+        //     });
+        //     emailMessageOnOrderSent = searchEmailMessagesResult.shift();
+        // }
         // ポストアクションを作成
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['defaultSenderEmail']);
         if (typeof setting?.defaultSenderEmail !== 'string') {
@@ -160,7 +161,7 @@ function confirm(params, options) {
             // order: orderWithAcceptedOffers, // 現時点でcreateEmailMessageでorder.acceptedOffersを使用している(2024-02-06~)
             // transaction: transaction,
             ...(params.potentialActions !== undefined) ? { potentialActions: params.potentialActions } : undefined,
-            ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
+            // ...(emailMessageOnOrderSent !== undefined) ? { emailMessage: emailMessageOnOrderSent } : undefined
         }, 
         // settings
         setting);
@@ -372,9 +373,11 @@ function createResult(params, options) {
         placingOrder,
         result: {
             authorizeActions, // 追加(2024-01-17~)
-            numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
             ...(typeof params.code === 'string') ? { code: params.code } : undefined,
-            ...((!options.disableResultOrder) && { order: orderAsResult }) // support disableResultOrder(2026-06-15~)
+            ...((!options.disableResultOrder) && { order: orderAsResult }), // support disableResultOrder(2026-06-15~)
+            ...((!options.disableResultOrder) && {
+                numAcceptedOffers: params.acceptedOffers.length, // 追加(2024-01-17~)
+            }) // support disableResultOrder(2026-06-17~)
         },
         ...(typeof eventId === 'string') ? { eventId } : undefined,
         ...(Array.isArray(reservationIds)) ? { reservationIds } : undefined

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

@@ -13,7 +13,6 @@ type IStartPlaceOrderParams = factory.transaction.placeOrder.IStartParamsWithout
          */
         clientUser: factory.transaction.placeOrder.IClientUserBeforeStart;
     };
-    broker?: factory.order.IBroker;
 };
 declare function createStartParams(params: IStartPlaceOrderParams, expiresInSeconds: number, passport: IVerifiedPassport | undefined, seller: Pick<factory.seller.ISeller, 'id' | 'name' | 'typeOf' | 'project' | 'additionalProperty'>, customerType?: string): factory.transaction.placeOrder.IStartParams;
 export { AGENT_IDENTIFIER_NAME_PASSPORT, createStartParams, IStartPlaceOrderParams };

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

@@ -5,10 +5,8 @@ exports.createStartParams = createStartParams;
 const factory_1 = require("../../../../factory");
 const AGENT_IDENTIFIER_NAME_PASSPORT = 'passport';
 exports.AGENT_IDENTIFIER_NAME_PASSPORT = AGENT_IDENTIFIER_NAME_PASSPORT;
-function createStartParams(params, expiresInSeconds, passport, seller, 
-// broker?: factory.order.IBroker,
-customerType) {
-    const { broker } = params;
+function createStartParams(params, expiresInSeconds, passport, seller, customerType) {
+    // const { broker } = params;
     // let clientUser: Omit<factory.clientUser.IClientUser, 'scope' | 'scopes'> | undefined;
     let instrument;
     if (typeof params.object.clientUser?.client_id === 'string') {
@@ -21,7 +19,7 @@ customerType) {
         // ...(typeof passport?.scope === 'string') ? { passport } : undefined, // discontinue(2026-06-10~)
         // ...(typeof clientUser?.client_id === 'string') ? { clientUser } : undefined, // discontinue(2026-06-10~)
         // ...(typeof params.object?.name === 'string') ? { name: params.object?.name } : undefined, // discontinue(2026-06-11~)
-        ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined,
+        // ...(typeof broker?.typeOf === 'string') ? { broker: broker } : undefined, // discontinue(2026-06-22~)
         ...(typeof params.object.customer?.typeOf === 'string') ? { customer: params.object.customer } : undefined,
         ...(typeof customerType === 'string') ? { customerType } : undefined
     };

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

@@ -94,6 +94,7 @@ function updateAgent(params) {
             await repos.orderInTransaction.setCustomer({
                 orderNumber,
                 project: transaction.project,
+                identifier: params.id,
                 customer: customerInOrder
             });
         }

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

@@ -1,9 +1,9 @@
 /**
  * 注文取引サービス
  */
-import { POINT_AWARD_IDENTIFIER_NAME } from '../../factory/order';
 import { confirm } from './placeOrder/confirm';
 import { exportTasksById } from './placeOrder/exportTasksById';
 import { start, IStartPlaceOrderParams } from './placeOrder/start';
 import { updateAgent } from './placeOrder/updateAgent';
-export { confirm, POINT_AWARD_IDENTIFIER_NAME, start, IStartPlaceOrderParams, exportTasksById, updateAgent };
+import { issueOrderNumberIfNotExist } from './placeOrder/issueOrderNumberIfNotExist';
+export { confirm, start, IStartPlaceOrderParams, exportTasksById, updateAgent, issueOrderNumberIfNotExist };

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

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.updateAgent = exports.exportTasksById = exports.start = exports.POINT_AWARD_IDENTIFIER_NAME = exports.confirm = void 0;
+exports.issueOrderNumberIfNotExist = exports.updateAgent = exports.exportTasksById = exports.start = exports.confirm = void 0;
 /**
  * 注文取引サービス
  */
-const order_1 = require("../../factory/order");
-Object.defineProperty(exports, "POINT_AWARD_IDENTIFIER_NAME", { enumerable: true, get: function () { return order_1.POINT_AWARD_IDENTIFIER_NAME; } });
 const confirm_1 = require("./placeOrder/confirm");
 Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return confirm_1.confirm; } });
 const exportTasksById_1 = require("./placeOrder/exportTasksById");
@@ -14,3 +12,5 @@ const start_1 = require("./placeOrder/start");
 Object.defineProperty(exports, "start", { enumerable: true, get: function () { return start_1.start; } });
 const updateAgent_1 = require("./placeOrder/updateAgent");
 Object.defineProperty(exports, "updateAgent", { enumerable: true, get: function () { return updateAgent_1.updateAgent; } });
+const issueOrderNumberIfNotExist_1 = require("./placeOrder/issueOrderNumberIfNotExist");
+Object.defineProperty(exports, "issueOrderNumberIfNotExist", { enumerable: true, get: function () { return issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist; } });