@chevre/domain 25.0.0-alpha.2 → 25.0.0-alpha.21

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

@@ -12,7 +12,7 @@ const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     typeOf: { type: String, required: true },
     name: String,
-    seller: mongoose_1.SchemaTypes.Mixed,
+    seller: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     customer: mongoose_1.SchemaTypes.Mixed,
     returner: mongoose_1.SchemaTypes.Mixed,
     confirmationNumber: String,
@@ -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: { type: String, required: true }, // 注文取引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

@@ -26,7 +26,7 @@ interface IAggregateOrder {
 export type IOrderOnStatusChanged = Pick<IOrderWithoutAcceptedOffers & {
     id: string;
 }, 'id' | 'orderNumber' | 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'name' | 'orderDate' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf'>;
-type ISearchConditions = Pick<factory.order.ISearchConditions, 'acceptedOffers' | 'broker' | 'confirmationNumbers' | 'customer' | 'name' | 'orderDate' | 'orderNumbers' | 'orderStatuses' | 'paymentMethods' | 'project' | 'provider' | 'seller'>;
+type ISearchConditions = Pick<factory.order.ISearchConditions, 'acceptedOffers' | 'broker' | 'confirmationNumbers' | 'customer' | 'name' | 'orderDate' | 'orderNumbers' | 'orderStatuses' | 'paymentMethods' | 'project' | 'provider' | 'seller' | 'identifier'>;
 /**
  * 注文リポジトリ
  */
@@ -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;
     } & {

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フィールドを厳密に定義する
@@ -239,6 +239,10 @@ class OrderRepo {
                 }
             });
         }
+        const identifierEq = params.identifier?.$eq;
+        if (typeof identifierEq === 'string') {
+            andConditions.push({ identifier: { $eq: identifierEq } });
+        }
         if (Array.isArray(params.orderNumbers)) {
             if (params.orderNumbers.length === 1) {
                 // use $eq(2025-04-01~)
@@ -483,31 +487,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 +848,26 @@ class OrderRepo {
         })
             .exec();
     }
+    // public async updateIdentifier4migration(params: {
+    //     project: { id: string };
+    //     orderNumber: string;
+    //     identifier: string;
+    // }) {
+    //     const { orderNumber, project, identifier } = params;
+    //     return this.orderModel.updateOne(
+    //         {
+    //             orderNumber: { $eq: orderNumber },
+    //             'project.id': { $eq: project.id },
+    //             typeOf: { $eq: 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,21 @@
 import type { Connection } from 'mongoose';
 import { factory } from '../factory';
 import { AcceptedOfferInReserveRepo } from './acceptedOfferInReserve';
-type IOrderInTransaction = Pick<factory.order.IOrder, 'orderNumber' | 'project'> & {
+export 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;
+    seller?: factory.order.ISeller;
 };
 /**
  * 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' | 'typeOf'> & {
     url?: never;
     identifier?: never;
     name?: never;
@@ -28,6 +27,14 @@ export type IPlacingOrder = Pick<factory.order.IOrder, 'broker' | 'confirmationN
      * 上書きしてはいけない
      */
     customer?: never;
+    /**
+     * 上書きしてはいけない
+     */
+    broker?: never;
+    /**
+     * 上書きしてはいけない
+     */
+    seller?: never;
 };
 export type IMinimizedReservationFor = Pick<factory.order.IEventAsReservationFor, 'endDate' | 'id' | 'startDate' | 'typeOf'> & {
     location: Pick<factory.order.IEventAsReservationFor['location'], 'branchCode' | 'typeOf'>;
@@ -55,12 +62,35 @@ 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' | 'seller' | 'customer'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
+    /**
+     * 注文取引から注文番号を参照する
+     * 存在しなければNotFoundError
+     */
+    findOrderNumberByIdentifier(params: {
+        identifier: string;
+        project: {
+            id: string;
+        };
+    }, options: {
+        /**
+         * 注文取引タイプのドキュメントのみを参照対象にするかどうか
+         */
+        onlyPlaceOrder: boolean;
+    }): Promise<string>;
+    /**
+     * 注文ドキュメントからcustomer属性を参照する
+     * customer未設定であれば、NotFound
+     */
+    findCustomerByOrderIdentifier(params: {
+        identifier: string;
+    }): Promise<factory.order.ICustomer>;
     /**
      * 取引進行中の注文からacceptedOffersを検索する
      * 予約取引から予約ごとの価格仕様も参照する
      */
-    findAcceptedOffersWithPriceByOrderNumber(params: {
-        orderNumber: string;
+    findAcceptedOffersWithPriceByIdentifier(params: {
+        identifier: string;
         project: {
             id: string;
         };
@@ -71,25 +101,22 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
      * 注文を受注する
      * typeOf: PlaceOrder -> typeOf: Order
      */
-    placeOrder(order: IPlacingOrder): Promise<void>;
+    placeOrderByIdentifier(filter: {
+        identifier: string;
+    }, order: IPlacingOrder): Promise<void>;
     /**
      * 注文documentがなければ作成し、受け入れられたオファーを追加する
      * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
      */
-    acceptOffer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
-        acceptedOffers: IMinimizedAcceptedOffer[] | (Omit<IAcceptedOffer, 'priceSpecification'> & {
-            /**
-             * COA以外では注文ドキュメントにpriceSpecificationが存在しないのでIFを補完
-             */
-            priceSpecification?: factory.order.ITicketPriceSpecification;
-        })[];
+    acceptOfferByIdentifier(params: Pick<IOrderInTransaction, 'project' | 'identifier'> & {
+        acceptedOffers: IMinimizedAcceptedOffer[] | factory.order.ICOAAcceptedOffer[];
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する
      * ホワイトリストとブラックリスト両方に対応
      */
-    voidAcceptedOfferBySerialNumber(params: {
-        orderNumber: string;
+    voidAcceptedOfferByIdentifier(params: {
+        identifier: string;
         acceptedOffers: {
             serialNumber: {
                 $in?: string[];
@@ -97,20 +124,10 @@ export declare class OrderInTransactionRepo extends AcceptedOfferInReserveRepo {
             };
         };
     }): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
-    setCustomer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
+    setCustomerByIdentifier(params: Pick<IOrderInTransaction, 'project' | 'identifier'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
-    /**
-     * 注文ドキュメントからcustomer属性を参照する
-     * customer未設定であれば、NotFound
-     */
-    findCustomerByOrderNumber(params: {
-        orderNumber: {
-            $eq: string;
-        };
-    }): Promise<factory.order.ICustomer>;
-    deleteByOrderNumber(params: {
-        orderNumber: string;
+    deleteByIdentifier(params: {
+        identifier: string;
     }): Promise<import("mongodb").DeleteResult>;
 }
-export {};