@chevre/domain 24.0.0-alpha.4 → 24.0.0-alpha.41

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

@@ -1,10 +1,13 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
-type IDocType = factory.transaction.ITransaction<factory.transactionType>;
-type IModel = Model<IDocType>;
+type IPlaceOrder = Omit<factory.transaction.placeOrder.ITransaction, 'id'>;
+type IReturnOrder = Omit<factory.transaction.returnOrder.ITransaction, 'id'>;
+type IDocType = IPlaceOrder | IReturnOrder;
+type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;
 declare const modelName = "Transaction";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -163,6 +163,37 @@ const indexes = [
             }
         }
     ],
+    [
+        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+        {
+            typeOf: 1,
+            'object.orderNumber': 1
+        },
+        {
+            name: 'uniquePlacingOrderNumber20260221',
+            unique: true,
+            partialFilterExpression: {
+                typeOf: factory.transactionType.PlaceOrder,
+                'object.orderNumber': { $exists: true },
+                startDate: { $gte: new Date('2026-02-21T11:00:00Z') }
+            }
+        }
+    ],
+    [
+        // 注文取引のobject.orderNumberも発行されている場合ユニークなはず(2026-02-21~)
+        {
+            typeOf: 1,
+            'object.orderNumber': 1
+        },
+        {
+            name: 'uniquePlacingOrderNumber',
+            unique: true,
+            partialFilterExpression: {
+                typeOf: factory.transactionType.PlaceOrder,
+                'object.orderNumber': { $exists: true }
+            }
+        }
+    ],
     [
         // ひとつの注文取引に対する確定返品取引はユニークなはず
         { 'object.order.orderNumber': 1 },

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

@@ -1,4 +1,5 @@
 import { Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 declare enum DataCatalogIdentifier {
     confirmationNumber = "confirmationNumber",
@@ -31,9 +32,9 @@ interface IDataFeed {
     };
 }
 type IDocType = IDataFeed;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;
 declare const modelName = "TransactionNumber";
 declare function createSchema(): ISchema;
 export { createSchema, IDocType, IModel, modelName, DataCatalogIdentifier };

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

@@ -1,10 +1,11 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 type IDocType = Omit<factory.trip.ITrip<factory.tripType>, 'id'>;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;
 declare const modelName = "Trip";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -1,10 +1,11 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+import { IVirtuals } from '../virtuals';
 import * as factory from '../../../factory';
 type IDocType = Omit<factory.creativeWork.certification.webSite.ICertification, 'id'>;
-type IModel = Model<IDocType>;
+type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
-type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;
 declare const modelName = "WebSite";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/virtuals.d.ts

@@ -0,0 +1,3 @@
+export interface IVirtuals {
+    id: string;
+}

package/lib/chevre/repo/mongoose/virtuals.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

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

@@ -4,7 +4,7 @@ import * as factory from '../factory';
 type IUnset = {
     [key in keyof Pick<IDocType, 'color' | 'image'>]?: 1;
 };
-type IKeyOfProjection = keyof IDocType;
+type IKeyOfProjection = keyof IDocType | 'id';
 /**
  * 決済カード区分リポジトリ
  */
@@ -12,9 +12,7 @@ export declare class MovieTicketTypeRepo {
     private readonly categoryCodeModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.movieTicketType.ISearchConditions): FilterQuery<IDocType>[];
-    static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): {
-        [field: string]: AnyExpression;
-    };
+    static CREATE_AGGREGATE_PROJECTION(inclusion: IKeyOfProjection[]): Record<string, AnyExpression>;
     /**
      * 決済カード区分検索
      */
@@ -35,6 +33,7 @@ export declare class MovieTicketTypeRepo {
         id?: string;
         attributes: IDocType & {
             $unset?: IUnset;
+            id?: string;
         };
     }): Promise<{
         id: string;

package/lib/chevre/repo/movieTicketType.js

@@ -203,7 +203,7 @@ class MovieTicketTypeRepo {
         let savedId;
         // let doc: HydratedDocument<{ _id: Types.ObjectId }> | null;
         if (typeof params.id !== 'string') {
-            const { id, $unset, ...creatingDoc } = params.attributes;
+            const { id, $unset, ...creatingDoc } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const createResult = await this.categoryCodeModel.create(creatingDoc);
             // doc = createResult;
             if (typeof createResult.id !== 'string') {
@@ -213,7 +213,7 @@ class MovieTicketTypeRepo {
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
-            const { id, codeValue, inCodeSet, project, typeOf, $unset, ...updateFields } = params.attributes;
+            const { id, codeValue, inCodeSet, project, typeOf, $unset, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const doc = await this.categoryCodeModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...($unset !== undefined) ? { $unset } : undefined

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

@@ -29,11 +29,11 @@ export declare class NoteRepo {
          */
         update: boolean;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedNotes: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedNotes?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 主題リソースから全メモを削除する
      */

package/lib/chevre/repo/note.js

@@ -234,6 +234,7 @@ class NoteRepo {
                 .exec();
             return { bulkWriteResult, modifiedNotes };
         }
+        return {};
     }
     // /**
     //  * 既知のメモIDリストからメモを削除する

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

@@ -21,7 +21,7 @@ export declare class NoteAboutOrderRepo {
      */
     upsertOrderNoteByIdentifier(params: Pick<INoteAboutOrder, 'about' | 'creator' | 'identifier' | 'project' | 'provider' | 'text' | 'version'>[], options: {
         overwrite: boolean;
-    }): Promise<BulkWriteResult | void>;
+    }): Promise<BulkWriteResult | undefined>;
     updateById(params: {
         id: string;
         attributes: Pick<INoteAboutOrder, 'text' | 'editor'>;

package/lib/chevre/repo/noteAboutOrder.js

@@ -173,6 +173,7 @@ class NoteAboutOrderRepo {
         if (bulkWriteOps.length > 0) {
             return this.noteModel.bulkWrite(bulkWriteOps, { ordered: false });
         }
+        return;
     }
     async updateById(params) {
         const updateFields = {

package/lib/chevre/repo/offer/offerInCatalogReadOnly.d.ts

@@ -1,8 +1,6 @@
 import * as factory from '../../factory';
 type KeyOfOffer = keyof Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
-type IProjection = {
-    [key in KeyOfOffer]?: 0 | 1;
-};
+type IProjection = Partial<Record<KeyOfOffer, 0 | 1>>;
 type IOfferInCatalog = factory.unitPriceOffer.IUnitPriceOffer & {
     /**
      * 集計オファー内インデックス

package/lib/chevre/repo/offer/unitPriceInCatalog.d.ts

@@ -10,9 +10,7 @@ export declare class OfferRepo implements OfferInCatalogReadOnlyRepo {
     private readonly offerCatalogModel;
     private readonly offerCatalogItemModel;
     constructor(connection: Connection);
-    static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): {
-        [field: string]: AnyExpression;
-    };
+    static CREATE_AGGREGATE_OFFERS_PROJECTION(params: IProjection): Record<string, AnyExpression>;
     /**
      * カタログIDで単価オファーを全て検索する
      * 必ずカタログデータから単価オファーIDを参照する

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

@@ -1,5 +1,5 @@
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection, Document, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import { IDocType } from './mongoose/schemas/offerCatalog';
 export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
@@ -49,11 +49,11 @@ export declare class OfferCatalogRepo {
          */
         itemListElementType: factory.offerCatalog.IItemListElement['typeOf'];
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedCatalogs: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedCatalogs?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 同期日時を更新する
      */
@@ -169,19 +169,23 @@ export declare class OfferCatalogRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & factory.offerCatalog.IOfferCatalog & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
         _id: string;
         alternateName?: any;
         dateSynced?: Date;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & factory.offerCatalog.IOfferCatalog & {
+    }> & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
         _id: string;
         alternateName?: any;
         dateSynced?: Date;
     } & Required<{
         _id: string;
-    }>>>;
+    }> & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.offerCatalog.IOfferCatalog>;
         $unset: any;

package/lib/chevre/repo/offerCatalog.js

@@ -153,12 +153,13 @@ class OfferCatalogRepo {
         if (typeof params.id !== 'string' || params.id === '') {
             const { default: uniqid } = await Promise.resolve().then(() => __importStar(require('uniqid')));
             const newId = uniqid();
-            const { id, $unset, ...creatingDoc } = params;
+            const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogModel.create({ ...creatingDoc, _id: newId });
             savedId = newId;
         }
         else {
-            const { id, identifier, itemOffered, project, typeOf, $unset, ...updateFields } = params; // 上書き禁止属性を除外
+            // 上書き禁止属性を除外
+            const { id, identifier, itemOffered, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
@@ -177,7 +178,7 @@ class OfferCatalogRepo {
     async saveByIdentifier(params) {
         const { default: uniqid } = await Promise.resolve().then(() => __importStar(require('uniqid')));
         const newId = uniqid();
-        const { id, identifier, itemOffered, project, typeOf, ...updateFields } = params;
+        const { id, identifier, itemOffered, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const doc = await this.offerCatalogModel.findOneAndUpdate({
             identifier: { $eq: params.identifier },
             'project.id': { $eq: params.project.id }
@@ -203,7 +204,7 @@ class OfferCatalogRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { id, identifier, project, typeOf, ...setFields } = $set;
+                const { id, identifier, project, typeOf, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
                 if (typeof identifier !== 'string' || identifier.length === 0) {
                     throw new factory.errors.ArgumentNull('identifier');
                 }
@@ -270,6 +271,7 @@ class OfferCatalogRepo {
                 .exec();
             return { bulkWriteResult, modifiedCatalogs };
         }
+        return {};
     }
     /**
      * 同期日時を更新する

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

@@ -42,11 +42,11 @@ export declare class OfferCatalogItemRepo {
          */
         productType: factory.product.ProductType;
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedCatalogs: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedCatalogs?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * 同期日時を更新する
      */

package/lib/chevre/repo/offerCatalogItem.js

@@ -126,11 +126,11 @@ class OfferCatalogItemRepo {
     async save(params) {
         let doc;
         if (typeof params.id !== 'string' || params.id.length === 0) {
-            const { id, $unset, ...creatingDoc } = params;
+            const { id, $unset, ...creatingDoc } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogItemModel.create(creatingDoc);
         }
         else {
-            const { id, identifier, project, typeOf, $unset, ...updateFields } = params;
+            const { id, identifier, project, typeOf, $unset, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerCatalogItemModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields,
                 ...(params.$unset !== undefined) ? { $unset: params.$unset } : undefined
@@ -146,7 +146,7 @@ class OfferCatalogItemRepo {
      * プロジェクトとコードから冪等保管
      */
     async saveByIdentifier(params) {
-        const { id, identifier, project, typeOf, ...updateFields } = params;
+        const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const doc = await this.offerCatalogItemModel.findOneAndUpdate({
             identifier: { $eq: params.identifier },
             'project.id': { $eq: params.project.id }
@@ -166,7 +166,7 @@ class OfferCatalogItemRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { id, identifier, project, typeOf, ...setFields } = $set;
+                const { id, identifier, project, typeOf, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
                 if (typeof identifier !== 'string' || identifier.length === 0) {
                     throw new factory.errors.ArgumentNull('identifier');
                 }
@@ -223,6 +223,7 @@ class OfferCatalogItemRepo {
                 .exec();
             return { bulkWriteResult, modifiedCatalogs };
         }
+        return {};
     }
     /**
      * 同期日時を更新する

package/lib/chevre/repo/offerItemCondition.js

@@ -103,12 +103,12 @@ class OfferItemConditionRepo {
         let savedId;
         let doc;
         if (typeof params.id !== 'string' || params.id === '') {
-            const { id, ...creatingParams } = params; // omit id(2024-09-12~)
+            const { id, ...creatingParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerItemConditionModel.create(creatingParams);
             savedId = doc.id;
         }
         else {
-            const { id, identifier, project, typeOf, ...updateFields } = params;
+            const { id, identifier, project, typeOf, ...updateFields } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
             doc = await this.offerItemConditionModel.findOneAndUpdate({ _id: { $eq: id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
             savedId = id;

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

@@ -1,5 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/order';
 type IOrderWithoutAcceptedOffers = factory.order.IOrder;
 type IKeyOfProjection = Extract<keyof IOrderWithoutAcceptedOffers, 'broker' | 'confirmationNumber' | 'customer' | 'dateReturned' | 'identifier' | 'name' | 'orderDate' | 'orderNumber' | 'orderStatus' | 'orderedItem' | 'paymentMethods' | 'previousOrderStatus' | 'price' | 'priceCurrency' | 'project' | 'returner' | 'seller' | 'typeOf' | 'url'> | 'paymentMethods.accountId' | 'paymentMethods.name' | 'paymentMethods.paymentMethod' | 'paymentMethods.paymentMethodId' | 'paymentMethods.totalPaymentDue' | 'paymentMethods.additionalProperty' | 'paymentMethods.issuedThrough' | 'customer.id' | 'customer.typeOf';
 export type IReturnedOrder = Pick<IOrderWithoutAcceptedOffers, 'project' | 'typeOf' | 'orderNumber' | 'dateReturned' | 'id' | 'customer' | 'returner' | 'seller' | 'price' | 'priceCurrency' | 'orderDate'> & {
@@ -142,19 +143,19 @@ export declare class OrderRepo {
     }): Promise<(IOrderWithoutAcceptedOffers & {
         id: string;
     })[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }> & Omit<factory.order.IOrder, "id"> & {
+    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<factory.order.IItemOffered>[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<factory.order.IOrder, "id"> & {
-        acceptedOffers?: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
-    }> & Omit<factory.order.IOrder, "id"> & {
+    } & {
+        __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<factory.order.IItemOffered>[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.order.IOrder>;
         $unset: any;

package/lib/chevre/repo/order.js

@@ -853,6 +853,7 @@ class OrderRepo {
         }, {
             $set: {
                 'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier,
+                // eslint-disable-next-line no-warning-comments
                 // TODO 互換性維持対応としてtypeOfも変更しているが、そのうち廃止(2023-08-30)
                 'paymentMethods.$[invoice].typeOf': params.invoice.paymentMethod.identifier
             }
@@ -949,7 +950,8 @@ class OrderRepo {
             typeOf: { $eq: factory.order.OrderType.Order },
             acceptedOffers: {
                 $elemMatch: {
-                    'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                    // 'itemOffered.typeOf': { $in: [factory.reservationType.BusReservation, factory.reservationType.EventReservation] },
+                    'itemOffered.typeOf': { $in: [factory.reservationType.EventReservation] },
                     'itemOffered.id': { $eq: params.reservationId }
                 }
             },

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

@@ -28,6 +28,10 @@ export declare class OrderInTransactionRepo {
      * 注文を受注する
      */
     placeOrder(order: IPlacingOrder): Promise<void>;
+    /**
+     * 注文documentがなければ作成し、受け入れられたオファーを追加する
+     * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
+     */
     acceptOffer(params: Pick<IOrderInTransaction, 'acceptedOffers' | 'orderNumber' | 'project'>): Promise<import("mongoose").UpdateWriteOpResult | undefined>;
     /**
      * serialNumberからオファーを除外する
@@ -45,6 +49,10 @@ export declare class OrderInTransactionRepo {
     setCustomer(params: Pick<IOrderInTransaction, 'orderNumber' | 'project'> & {
         customer: factory.order.ICustomer;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
+    /**
+     * 注文ドキュメントからcustomer属性を参照する
+     * customer未設定であれば、NotFound
+     */
     findCustomerByOrderNumber(params: {
         orderNumber: {
             $eq: string;

package/lib/chevre/repo/orderInTransaction.js

@@ -66,6 +66,10 @@ class OrderInTransactionRepo {
         }, { $set: setFields }, {})
             .exec();
     }
+    /**
+     * 注文documentがなければ作成し、受け入れられたオファーを追加する
+     * このメソッドでdocumentが初めて生成される(typeOf:PlaceOrderとして)
+     */
     async acceptOffer(params) {
         if (!Array.isArray(params.acceptedOffers) || params.acceptedOffers.length === 0) {
             return;
@@ -78,7 +82,10 @@ class OrderInTransactionRepo {
         };
         return this.orderModel.updateOne({
             typeOf: { $eq: factory.transactionType.PlaceOrder },
-            orderNumber: { $eq: params.orderNumber }
+            orderNumber: { $eq: params.orderNumber },
+            // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
+            // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
+            'project.id': { $eq: params.project.id }
         }, {
             $setOnInsert: setOnInsert,
             $push: {
@@ -130,7 +137,10 @@ class OrderInTransactionRepo {
         const { customer, orderNumber, project } = params;
         const filter = {
             typeOf: { $eq: factory.transactionType.PlaceOrder },
-            orderNumber: { $eq: orderNumber }
+            orderNumber: { $eq: orderNumber },
+            // プロジェクトでもフィルター(注文番号重複バグがあったため)(2026-02-21~)
+            // 万が一異なるプロジェクトで同じ注文番号でオファーを受け入れようとしても、DBにインデックスによってDuplicateKey
+            'project.id': { $eq: project.id }
         };
         const setOnInsert = {
             typeOf: factory.transactionType.PlaceOrder,
@@ -145,6 +155,10 @@ class OrderInTransactionRepo {
         }, { upsert: true })
             .exec();
     }
+    /**
+     * 注文ドキュメントからcustomer属性を参照する
+     * customer未設定であれば、NotFound
+     */
     async findCustomerByOrderNumber(params) {
         const doc = await this.orderModel.findOne({
             orderNumber: { $eq: params.orderNumber.$eq }

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

@@ -9,9 +9,10 @@ export declare class OrderNumberRepo {
         connection: Connection;
     });
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    publishByTimestamp(params: {
+    issueOrderNumber(params: {
         project: {
             alternateName: string;
         };

package/lib/chevre/repo/orderNumber.js

@@ -34,11 +34,6 @@ const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
-const defaultVersioningForceProjects = [
-    'HMX',
-    'SMT',
-    'KOJ'
-];
 /**
  * 注文番号リポジトリ
  */
@@ -59,16 +54,23 @@ class OrderNumberRepo {
     //     return orderNumber;
     // }
     /**
-     * タイムスタンプから発行する
+     * 注文日時から新しい注文番号を発行する
+     * グローバルユニークである前提
      */
-    async publishByTimestamp(params) {
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = await this.findSetting();
+    async issueOrderNumber(params) {
+        const { fpeSecret, version, validFrom
+        // versioningForceProjects
+        // versioningExceptionProjects
+         } = 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();
-        const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
+            .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分で十分
             .toDate();
@@ -78,18 +80,12 @@ class OrderNumberRepo {
             expires: dataFeedExpires
         });
         let orderNumber;
-        let useVersioning = (validFrom instanceof Date && (0, moment_timezone_1.default)(validFrom)
-            .isSameOrBefore(params.orderDate))
-            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
-            || versioningForceProjects.includes(projectPrefix);
-        // versioningExceptionProjectsであれば強制的にversioning不使用(2026-02-10~)
-        if (versioningExceptionProjects.includes(projectPrefix)) {
-            useVersioning = false;
-        }
+        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.at(0)}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
+            orderNumber = `${projectPrefix}${orderNumber}`; // 桁数をversion0に合わせるためにエイリアスの1文字目のみを採用
             orderNumber = `${[
                 orderNumber.slice(0, 4),
                 orderNumber.slice(4, 11),
@@ -138,11 +134,11 @@ class OrderNumberRepo {
             .exec();
         if (setting === null || setting.orderNumber === undefined) {
             return {
-                versioningForceProjects: [],
-                versioningExceptionProjects: []
+            // versioningForceProjects: []
+            // versioningExceptionProjects: []
             };
         }
-        const { fpeSecret, version, validFrom, versioningForceProjects, versioningExceptionProjects } = setting.orderNumber;
+        const { fpeSecret, version, validFrom } = setting.orderNumber;
         if (typeof fpeSecret !== 'string' || fpeSecret === '') {
             throw new factory.errors.NotFound('setting.orderNumber.secret');
         }
@@ -153,12 +149,11 @@ class OrderNumberRepo {
             throw new factory.errors.NotFound('setting.orderNumber.validFrom must be Date');
         }
         return {
-            fpeSecret, version, validFrom,
-            versioningForceProjects: [
-                ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : [],
-                ...defaultVersioningForceProjects
-            ],
-            versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
+            fpeSecret, version, validFrom
+            // versioningForceProjects: [
+            //     ...(Array.isArray(versioningForceProjects)) ? versioningForceProjects : []
+            // ]
+            // versioningExceptionProjects: (Array.isArray(versioningExceptionProjects)) ? versioningExceptionProjects : []
         };
     }
 }