@chevre/domain 25.0.0-alpha.0 → 25.0.0-alpha.10

package/lib/chevre/repo/mongoose/schemas/order.d.ts

@@ -3,6 +3,10 @@ import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
 type IDocType = Omit<factory.order.IOrder, 'id'> & {
     acceptedOffers?: factory.order.IAcceptedOffer[];
+    /**
+     * 注文取引IDとして再定義(2026-06-22~)
+     */
+    identifier?: string;
 };
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;

package/lib/chevre/repo/mongoose/schemas/order.js

@@ -25,7 +25,8 @@ const schemaDefinition = {
     previousOrderStatus: String,
     orderDate: { type: Date, required: true },
     dateReturned: Date,
-    orderedItem: [mongoose_1.SchemaTypes.Mixed]
+    orderedItem: [mongoose_1.SchemaTypes.Mixed],
+    identifier: String, // 注文取引IDとして再定義(2026-06-22~)
     // 以下廃止(2026-06-13~)
     // identifier: SchemaTypes.Mixed, // 廃止するためにMixed化(2026-06-12~)
     // isGift: Boolean,
@@ -60,15 +61,14 @@ const indexes = [
         { 'project.id': 1, orderDate: -1 },
         { name: 'searchByProjectId-v20220721' }
     ],
-    // [
-    //     { identifier: 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByIdentifier',
-    //         partialFilterExpression: {
-    //             identifier: { $exists: true }
-    //         }
-    //     }
-    // ],
+    [
+        // 注文取引IDはユニークなはず
+        { identifier: 1 },
+        {
+            unique: true,
+            name: 'uniqueIdentifier'
+        }
+    ],
     [
         // 注文番号はユニークなはず
         { orderNumber: 1 },
@@ -77,15 +77,6 @@ const indexes = [
             name: 'uniqueOrderNumber'
         }
     ],
-    // [
-    //     { 'seller.typeOf': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchBySellerTypeOf',
-    //         partialFilterExpression: {
-    //             'seller.typeOf': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'seller.id': 1, orderDate: -1 },
         {
@@ -152,24 +143,6 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { 'customer.additionalProperty': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByCustomerAdditionalProperty',
-    //         partialFilterExpression: {
-    //             'customer.additionalProperty': { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { 'customer.memberOf.membershipNumber': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByCustomerMemberhipNumberAndOrderDate',
-    //         partialFilterExpression: {
-    //             'customer.memberOf.membershipNumber': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'customer.givenName': 1, orderDate: -1 },
         {
@@ -233,15 +206,6 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { 'paymentMethods.typeOf': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByPaymentMethodTypeAndOrderDate',
-    //         partialFilterExpression: {
-    //             'paymentMethods.typeOf': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'paymentMethods.paymentMethod.identifier': 1, orderDate: -1 },
         {
@@ -269,15 +233,6 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { 'acceptedOffers.itemOffered.identifier': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedIdentifier',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.identifier': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'acceptedOffers.itemOffered.id': 1, orderDate: -1 },
         {
@@ -287,42 +242,6 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { 'acceptedOffers.itemOffered.issuedThrough.typeOf': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedIssuedThroughTypeOf',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.issuedThrough.typeOf': { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { 'acceptedOffers.itemOffered.issuedThrough.id': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedIssuedThroughId',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.issuedThrough.id': { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { 'acceptedOffers.itemOffered.programMembershipUsed.identifier': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedProgramMembershipUsedIdentifier',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.programMembershipUsed.identifier': { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { 'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedMembershipUsedServiceType',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.programMembershipUsed.issuedThrough.serviceType.codeValue': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'acceptedOffers.itemOffered.reservationNumber': 1, orderDate: -1 },
         {
@@ -341,24 +260,6 @@ const indexes = [
             }
         }
     ],
-    // [
-    //     { 'acceptedOffers.itemOffered.reservationFor.identifier': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedReservationForIdentifierAndOrderDate',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.reservationFor.identifier': { $exists: true }
-    //         }
-    //     }
-    // ],
-    // [
-    //     { 'acceptedOffers.itemOffered.reservationFor.name': 1, orderDate: -1 },
-    //     {
-    //         name: 'searchByItemOfferedReservationForNameAndOrderDate',
-    //         partialFilterExpression: {
-    //             'acceptedOffers.itemOffered.reservationFor.name': { $exists: true }
-    //         }
-    //     }
-    // ],
     [
         { 'acceptedOffers.itemOffered.reservationFor.endDate': 1, orderDate: -1 },
         {

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -111,7 +111,6 @@ export interface IJWTSetting {
     algorithm: Algorithm;
 }
 export interface IOrderNumberSetting {
-    validFrom: Date;
     /**
      * fpe暗号鍵
      */
@@ -120,11 +119,6 @@ export interface IOrderNumberSetting {
      * "A"
      */
     version: string;
-    versioningForceProjects?: string[];
-    /**
-     * 強制的にバージョニング不使用のプロジェクト
-     */
-    versioningExceptionProjects?: string[];
 }
 export interface ITransactionNumberSetting {
     validFrom: Date;

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

@@ -34,12 +34,6 @@ export declare class OrderRepo {
     private readonly orderModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: ISearchConditions): FilterQuery<factory.order.IOrder>[];
-    /**
-     * なければ作成する
-     */
-    createIfNotExist(order: IOrderWithoutAcceptedOffers & {
-        acceptedOffers: factory.order.IAcceptedOffer[];
-    }): Promise<void>;
     /**
      * 注文ステータスを変更する
      */
@@ -140,12 +134,14 @@ export declare class OrderRepo {
     })[]>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer[];
+        identifier?: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
         __v: number;
     }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.order.IOrder, "id"> & {
         acceptedOffers?: factory.order.IAcceptedOffer[];
+        identifier?: string;
     } & {
         _id: import("mongoose").Types.ObjectId;
     } & {
@@ -156,6 +152,13 @@ export declare class OrderRepo {
         $unset: any;
         arrayFilters?: any[];
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    updateIdentifier4migration(params: {
+        project: {
+            id: string;
+        };
+        orderNumber: string;
+        identifier: string;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateOrder(params: {
         project?: {
             id?: {

package/lib/chevre/repo/order.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderRepo = void 0;
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
-const errorHandler_1 = require("../errorHandler");
+// import { isMongoDuplicateError } from '../errorHandler';
 const settings_1 = require("../settings");
 /**
  * ドキュメント検索時に指定可能なprojectionフィールドを厳密に定義する
@@ -483,31 +483,37 @@ class OrderRepo {
         }
         return andConditions;
     }
-    /**
-     * なければ作成する
-     */
-    async createIfNotExist(order) {
-        try {
-            // 存在しなければ上書き
-            // updateOneに変更(2024-01-14~)
-            // await this.orderModel.findOneAndUpdate(
-            await this.orderModel.updateOne({ orderNumber: order.orderNumber }, { $setOnInsert: order }, {
-                // new: true,
-                upsert: true
-            })
-                .exec();
-        }
-        catch (error) {
-            let throwsError = true;
-            if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
-                // すでにorderNumberが存在する場合ok
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-    }
+    // OrderInTransactionリポジトリにて注文ドキュメントが生成されるように変更したのでもう不要
+    // /**
+    //  * なければ作成する
+    //  */
+    // public async createIfNotExist(order: IOrderWithoutAcceptedOffers & {
+    //     acceptedOffers: factory.order.IAcceptedOffer[];
+    // }): Promise<void> {
+    //     try {
+    //         // 存在しなければ上書き
+    //         // updateOneに変更(2024-01-14~)
+    //         // await this.orderModel.findOneAndUpdate(
+    //         await this.orderModel.updateOne(
+    //             { orderNumber: order.orderNumber },
+    //             { $setOnInsert: order },
+    //             {
+    //                 // new: true,
+    //                 upsert: true
+    //             }
+    //         )
+    //             .exec();
+    //     } catch (error) {
+    //         let throwsError = true;
+    //         if (await isMongoDuplicateError(error)) {
+    //             // すでにorderNumberが存在する場合ok
+    //             throwsError = false;
+    //         }
+    //         if (throwsError) {
+    //             throw error;
+    //         }
+    //     }
+    // }
     /**
      * 注文ステータスを変更する
      */
@@ -838,6 +844,19 @@ class OrderRepo {
         })
             .exec();
     }
+    async updateIdentifier4migration(params) {
+        const { orderNumber, project, identifier } = params;
+        return this.orderModel.updateOne({
+            orderNumber: { $eq: orderNumber },
+            'project.id': { $eq: project.id },
+            typeOf: { $eq: factory_1.factory.order.OrderType.Order }
+        }, {
+            $set: {
+                ...(typeof identifier === 'string') ? { identifier } : undefined
+            }
+        })
+            .exec();
+    }
     async aggregateOrder(params) {
         const matchConditions = {
             orderDate: {

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

@@ -4,19 +4,17 @@ import { AcceptedOfferInReserveRepo } from './acceptedOfferInReserve';
 type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
     typeOf: factory.transactionType.PlaceOrder;
     orderDate: Date;
-    acceptedOffers: factory.order.IAcceptedOffer[];
-    customer?: factory.order.ICustomer;
-};
-type IAcceptedOffer = factory.order.IAcceptedOffer & {
     /**
-     * 受け入れ時に指定必須
+     * 注文取引IDとして再定義(2026-06-22~)
      */
-    offeredThrough: factory.offer.IOfferedThrough;
+    identifier: string;
+    acceptedOffers: factory.order.IAcceptedOffer[];
+    customer?: factory.order.ICustomer;
 };
 /**
  * typeOf: Orderへドキュメント変換時の編集フィールド
  */
-export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
+export type IPlacingOrder = Pick<factory.order.IOrder, 'confirmationNumber' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'price' | 'priceCurrency' | 'seller' | 'typeOf'> & {
     url?: never;
     identifier?: never;
     name?: never;
@@ -28,6 +26,10 @@ export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationN
      * 上書きしてはいけない
      */
     customer?: never;
+    /**
+     * 上書きしてはいけない
+     */
+    broker?: never;
 };
 export type IMinimizedReservationFor = Pick<factory.order.IEventAsReservationFor, 'endDate' | 'id' | 'startDate' | 'typeOf'> & {
     location: Pick<factory.order.IEventAsReservationFor['location'], 'branchCode' | 'typeOf'>;
@@ -76,13 +78,9 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
      * 注文documentがなければ作成し、受け入れられたオファーを追加する
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
-    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
-        acceptedOffers: IMinimizedAcceptedOffer[] | (Omit<IAcceptedOffer, 'priceSpecification'> & {
-            /**
-             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
-             */
-            priceSpecification?: factory.order.ITicketPriceSpecification;
-        })[];
+    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier'> & {
+        acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
+        broker?: factory.order.IBroker;
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する
@@ -97,7 +95,7 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
             };
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
-    setCustomer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
+    setCustomer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     /**

package/lib/chevre/repo/orderInTransaction.js

@@ -38,7 +38,7 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         let acceptedOffersByReserveTransaction = [];
         const reservationNumbers = [...new Set(doc.acceptedOffers.map((aceptedOffer) => aceptedOffer.itemOffered.reservationNumber))];
         if (reservationNumbers.length > 0) {
-            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers }, { noName: true });
+            acceptedOffersByReserveTransaction = await this.findAcceptedOffersByReservationNumbers({ reservationNumbers });
         }
         return doc.acceptedOffers.map((acceptedOffer) => {
             const acceptedOfferByReserve = acceptedOffersByReserveTransaction.find((acceptedOfferByReserveTransaction) => acceptedOfferByReserveTransaction.itemOffered.id === acceptedOffer.itemOffered.id);
@@ -109,7 +109,8 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             orderDate: new Date(), // orderDate required(2024-12-09~)
             orderNumber: params.orderNumber,
-            project: params.project
+            project: params.project,
+            identifier: params.identifier // 取引ID(2026-06-22~)
         };
         return this.orderModel.updateOne({
             typeOf: { $eq: factory_1.factory.transactionType.PlaceOrder },
@@ -123,6 +124,11 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
                 acceptedOffers: {
                     $each: params.acceptedOffers
                 }
+            },
+            $set: {
+                ...((params.broker !== undefined) && {
+                    broker: { id: params.broker.id, typeOf: params.broker.typeOf }
+                }) // set broker(2026-06-21~)
             }
         }, { upsert: true })
             .exec();
@@ -177,7 +183,8 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             typeOf: factory_1.factory.transactionType.PlaceOrder,
             orderDate: new Date(), // orderDate required(2024-12-09~)
             orderNumber,
-            project
+            project,
+            identifier: params.identifier // 取引ID(2026-06-22~)
         };
         const setKeys = { customer };
         return this.orderModel.updateOne(filter, {

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

@@ -5,6 +5,9 @@ import type { Connection } from 'mongoose';
 export declare class OrderNumberRepo {
     private readonly counterRepo;
     private readonly settingModel;
+    private static cachedSettings;
+    private static cacheExpiry;
+    private static readonly CACHE_TTL_MS;
     constructor(params: {
         connection: Connection;
     });
@@ -22,6 +25,7 @@ export declare class OrderNumberRepo {
         orderDate: Date;
     }): Promise<string>;
     decrypt(id: string): Promise<string>;
+    clearSettingCache(): void;
     /**
      * 注文番号生成設定を検索する
      */

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 })
         });
     };
 }