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

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

@@ -1,22 +1,20 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { AcceptedOfferInReserveRepo } from './acceptedOfferInReserve';
-type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
+type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project' | 'broker'> & {
     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'>;
@@ -55,6 +57,7 @@ export type IMinimizedAcceptedOffer = Pick<factory.order.IOptimizedAcceptedOffer
 export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
     private readonly orderModel;
     constructor(connection: Connection);
+    createPlaceOrderIfNotExists(params: Pick<IOrderInTransaction, 'orderNumber' | 'project' | 'identifier' | 'broker'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する
@@ -76,13 +79,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 +96,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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderInTransactionRepo = void 0;
 // import { isDeepStrictEqual } from 'util';
+const errorHandler_1 = require("../errorHandler");
 const factory_1 = require("../factory");
 const order_1 = require("./mongoose/schemas/order");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
@@ -15,6 +16,33 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
         super(connection);
         this.orderModel = connection.model(order_1.modelName, (0, order_1.createSchema)());
     }
+    async createPlaceOrderIfNotExists(params) {
+        const { orderNumber, project, identifier, broker } = params;
+        const setOnInsert = {
+            typeOf: factory_1.factory.transactionType.PlaceOrder,
+            orderDate: new Date(), // orderDate required(2024-12-09~)
+            orderNumber,
+            project,
+            identifier, // 取引ID(2026-06-22~)
+            ...((broker !== undefined) && { broker })
+        };
+        try {
+            return this.orderModel.updateOne({
+                identifier: { $eq: identifier }, // 取引IDに対してユニークネスを保証する
+            }, { $setOnInsert: setOnInsert }, { upsert: true })
+                .exec();
+        }
+        catch (error) {
+            let throwsError = true;
+            if (await (0, errorHandler_1.isMongoDuplicateError)(error)) {
+                // すでにidentifierが存在する場合ok
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+    }
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する
@@ -38,7 +66,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);
@@ -59,26 +87,6 @@ class OrderInTransactionRepo extends acceptedOfferInReserve_1.AcceptedOfferInRes
             };
         });
     }
-    // /**
-    //  * 取引進行中の注文からacceptedOffersを検索する
-    //  */
-    // public async findAcceptedOffersByOrderNumber(
-    //     params: { orderNumber: { $eq: string } }
-    // ): Promise<Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>[]> {
-    //     const doc = await this.orderModel.findOne<HydratedDocument<Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'serialNumber'>>>(
-    //         {
-    //             orderNumber: { $eq: params.orderNumber.$eq },
-    //             typeOf: { $eq: factory.transactionType.PlaceOrder }
-    //         },
-    //         { acceptedOffers: 1 }
-    //     )
-    //         .lean<Pick<IOrderInTransaction, 'acceptedOffers'>>()
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound('orderInTransaction');
-    //     }
-    //     return doc.acceptedOffers;
-    // }
     /**
      * 注文を受注する
      * typeOf: PlaceOrder -> typeOf: Order
@@ -109,7 +117,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 +132,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 +191,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;
     /**
      * 注文番号生成設定を検索する
      */