@chevre/domain 25.0.0-alpha.7 → 25.0.0-alpha.9

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,
@@ -69,6 +70,14 @@ const indexes = [
     //         }
     //     }
     // ],
+    [
+        // 注文取引IDはユニークなはず
+        { identifier: 1 },
+        {
+            unique: true,
+            name: 'uniqueIdentifier'
+        }
+    ],
     [
         // 注文番号はユニークなはず
         { orderNumber: 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

@@ -140,12 +140,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;
     } & {

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

@@ -4,13 +4,17 @@ import { AcceptedOfferInReserveRepo } from './acceptedOfferInReserve';
 type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
     typeOf: factory.transactionType.PlaceOrder;
     orderDate: Date;
+    /**
+     * 注文取引IDとして再定義(2026-06-22~)
+     */
+    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;
@@ -22,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'>;
@@ -70,7 +78,7 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
      * 注文documentがなければ作成し、受け入れられたオファーを追加する
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
-    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
+    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier'> & {
         acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
         broker?: factory.order.IBroker;
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
@@ -87,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

@@ -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 },
@@ -182,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/service/offer/any.d.ts

@@ -10,6 +10,7 @@ export declare function acceptOffer(params: {
     project: {
         id: string;
     };
+    placeOrderId: string;
     acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
     broker?: factory.order.IBroker;
 }): IAcceptOfferOperation<void>;

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

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

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

@@ -66,6 +66,7 @@ function authorize(params, options) {
                 await (0, any_1.acceptOffer)({
                     orderNumber,
                     project: transaction.project,
+                    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/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/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/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "9.0.0-alpha.2",
+    "@chevre/factory": "9.0.0-alpha.3",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -91,5 +91,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "25.0.0-alpha.7"
+  "version": "25.0.0-alpha.9"
 }