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

package/lib/chevre/repo/acceptedPaymentMethod.js

@@ -95,7 +95,7 @@ class AcceptedPaymentMethodRepo {
     }
     async findAcceptedPaymentMethods(params, inclusion) {
         const conditions = AcceptedPaymentMethodRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/additionalProperty.js

@@ -84,7 +84,7 @@ class AdditionalPropertyRepo {
      */
     async projectFields(params, inclusion) {
         const conditions = AdditionalPropertyRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/aggregateOffer.js

@@ -443,7 +443,7 @@ class AggregateOfferRepo {
         else if (negativeProjectionFields.length > 0) {
             negativeProjectionFields.forEach((field) => {
                 if (typeof projectStage[field] === 'string') {
-                    delete projectStage[field];
+                    delete projectStage[field]; // eslint-disable-line @typescript-eslint/no-dynamic-delete
                 }
             });
         }

package/lib/chevre/repo/confirmationNumber.js

@@ -61,16 +61,14 @@ class ConfirmationNumberRepo {
      * 発行する
      */
     async publish(params) {
-        let dataFeedExpires;
         const dataFeedIdentifier = ConfirmationNumberRepo.createDataFeedIdentifier({ orderDate: params.orderDate });
-        let incrReply;
         // support publishByMongo(2025-05-23~)
         // const useMongoBySettings = await this.useMongoBySettings(params);
         // データ保管期間はとりあえず2 months
-        dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
+        const dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
             .add(2, 'months')
             .toDate();
-        incrReply = await this.counterRepo.incrementByMongo({
+        const incrReply = await this.counterRepo.incrementByMongo({
             identifier: dataFeedIdentifier,
             includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
             expires: dataFeedExpires

package/lib/chevre/repo/creativeWork.js

@@ -253,7 +253,7 @@ class CreativeWorkRepo {
      */
     async projectFields(params, inclusion) {
         const conditions = CreativeWorkRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/eventOffer.js

@@ -96,7 +96,7 @@ class EventOfferRepo {
     }
     async findEventOffers(params, inclusion) {
         const conditions = EventOfferRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/eventSeries.js

@@ -481,7 +481,7 @@ class EventSeriesRepo {
      */
     async projectEventSeriesFields(params, inclusion) {
         const conditions = EventSeriesRepo.CREATE_MONGO_CONDITIONS(params);
-        let projection = {};
+        let projection;
         const positiveProjectionFields = (Array.isArray(inclusion))
             ? inclusion.filter((key) => key !== 'id' && key !== '_id')
             : [];

package/lib/chevre/repo/identity.js

@@ -148,7 +148,6 @@ class IdentityRepo {
             .cursor();
     }
     async updateIssuedBy2array(params) {
-        let doc;
         const { id, issuedBy } = params;
         const filter = {
             _id: { $eq: id }
@@ -163,7 +162,7 @@ class IdentityRepo {
             new: true,
             projection: { _id: 1, id: { $toString: '$_id' } }
         };
-        doc = await this.identityModel.findOneAndUpdate(filter, update, options)
+        const doc = await this.identityModel.findOneAndUpdate(filter, update, options)
             .lean()
             .exec();
         if (doc === null) {

package/lib/chevre/repo/issuer.js

@@ -75,12 +75,10 @@ class IssuerRepo {
         return { id: savedId };
     }
     async renameIssuerIdentifier(params) {
-        let savedId;
-        let doc;
         const { id, ...updateFields } = params;
-        doc = await this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
+        const doc = await this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
             .exec();
-        savedId = params.id;
+        const savedId = params.id;
         if (doc === null) {
             throw new factory.errors.NotFound(this.issuerModel.modelName);
         }

package/lib/chevre/repo/message.js

@@ -78,7 +78,7 @@ class MessageRepo {
      */
     async projectFields(params, inclusion) {
         const conditions = MessageRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

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/note.js

@@ -99,7 +99,7 @@ class NoteRepo {
     }
     async findNotes(params, inclusion) {
         const conditions = NoteRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/noteAboutOrder.js

@@ -95,7 +95,7 @@ class NoteAboutOrderRepo {
      */
     async findOrderNotes(params, inclusion) {
         const conditions = NoteAboutOrderRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/offer/unitPriceInCatalog.js

@@ -113,7 +113,7 @@ class OfferRepo {
                 // idは除外しない(2023-12-14~)
                 if (field !== 'id') {
                     if (typeof projectStage[field] === 'string') {
-                        delete projectStage[field];
+                        delete projectStage[field]; // eslint-disable-line @typescript-eslint/no-dynamic-delete
                     }
                 }
             });

package/lib/chevre/repo/offerItemCondition.js

@@ -74,7 +74,7 @@ class OfferItemConditionRepo {
         //     ? Object.values(projection)
         //         .some((value) => value !== 0)
         //     : false;
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/order.js

@@ -988,7 +988,7 @@ class OrderRepo {
     async projectFields(params, options) {
         const { inclusion } = options;
         const conditions = OrderRepo.CREATE_MONGO_CONDITIONS(params);
-        let projectStage = {};
+        let projectStage;
         const positiveProjectionFields = (Array.isArray(inclusion))
             ? inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key))
             : [];

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

@@ -56,10 +56,9 @@ class OrderInTransactionRepo {
         if (!(order.orderDate instanceof Date)) {
             throw new factory.errors.Argument('orderDate', 'must be Date');
         }
-        let setFields;
         // acceptedOffersを上書きしない
         // const { acceptedOffers, ...orderWithoutAcceptedOffers } = order;
-        setFields = order;
+        const setFields = order;
         // typeOf:PlaceOrderのドキュメントが存在すれば、typeOf:Orderに変更する
         await this.orderModel.updateOne({
             orderNumber: { $eq: order.orderNumber },
@@ -67,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;
@@ -79,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: {
@@ -131,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,
@@ -146,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,39 +54,38 @@ 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();
-        let dataFeedExpires;
-        const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
-        let incrReply;
-        dataFeedExpires = (0, moment_timezone_1.default)(params.orderDate)
+            .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();
-        incrReply = await this.counterRepo.incrementByMongo({
+        const incrReply = await this.counterRepo.incrementByMongo({
             identifier: dataFeedIdentifier,
             includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.orderNumber },
             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),
@@ -140,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');
         }
@@ -155,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 : []
         };
     }
 }

package/lib/chevre/repo/place/movieTheater.js

@@ -240,7 +240,7 @@ class MovieTheaterRepo {
      */
     async projectFields(params, inclusion) {
         const conditions = MovieTheaterRepo.CREATE_MOVIE_THEATER_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/place/seat.js

@@ -84,7 +84,7 @@ class SeatRepo {
         Object.keys(params)
             .forEach((field) => {
             if (typeof projectStage[field] === 'string') {
-                delete projectStage[field];
+                delete projectStage[field]; // eslint-disable-line @typescript-eslint/no-dynamic-delete
             }
         });
         return projectStage;

package/lib/chevre/repo/product.js

@@ -175,7 +175,7 @@ class ProductRepo {
      */
     async projectFields(conditions, inclusion) {
         const andConditions = ProductRepo.CREATE_MONGO_CONDITIONS(conditions);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/productOffer.js

@@ -97,7 +97,7 @@ class ProductOfferRepo {
     }
     async findProductOffers(params, inclusion) {
         const conditions = ProductOfferRepo.CREATE_MONGO_CONDITIONS(params);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/project.js

@@ -91,7 +91,7 @@ class ProjectRepo {
      */
     async projectFields(conditions, inclusion) {
         const andConditions = ProjectRepo.CREATE_MONGO_CONDITIONS(conditions);
-        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        let positiveProjectionFields;
         if (Array.isArray(inclusion) && inclusion.length > 0) {
             positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
         }

package/lib/chevre/repo/reservation.js

@@ -789,7 +789,7 @@ class ReservationRepo {
      */
     async projectFields(params, inclusion) {
         const conditions = ReservationRepo.CREATE_MONGO_CONDITIONS(params);
-        let projection = {};
+        let projection;
         if (inclusion !== undefined && inclusion !== null) {
             projection = {
                 _id: 0, // hide _id(2024-08-08~)

package/lib/chevre/repo/role.js

@@ -177,7 +177,6 @@ class RoleRepo {
             .exec();
     }
     async create(params) {
-        let savedId;
         const { member, memberOf, permissions, roleName } = params;
         const creatingRole = {
             member, memberOf, permissions, roleName,
@@ -188,7 +187,7 @@ class RoleRepo {
         if (typeof insertedId !== 'string') {
             throw new factory.errors.Internal(`role not saved unexpectedly. result:${JSON.stringify(result)}`);
         }
-        savedId = insertedId;
+        const savedId = insertedId;
         return { id: savedId };
     }
 }

package/lib/chevre/repo/seller.js

@@ -201,7 +201,7 @@ class SellerRepo {
         if (exclusion.length > 0) {
             exclusion.forEach((field) => {
                 if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
-                    delete projectStage[field];
+                    delete projectStage[field]; // eslint-disable-line @typescript-eslint/no-dynamic-delete
                 }
             });
         }

package/lib/chevre/repo/serviceOutputIdentifier.js

@@ -53,13 +53,11 @@ class ServiceOutputIdentifierRepo {
         const timestamp = (0, moment_timezone_1.default)(params.startDate)
             .valueOf()
             .toString();
-        let dataFeedExpires;
         const dataFeedIdentifier = timestamp;
-        let incrReply;
-        dataFeedExpires = (0, moment_timezone_1.default)(params.startDate)
+        const dataFeedExpires = (0, moment_timezone_1.default)(params.startDate)
             .add(1, 'minute') // ミリ秒でカウントしていくので、予約日時後1分で十分
             .toDate();
-        incrReply = await this.counterRepo.incrementByMongo({
+        const incrReply = await this.counterRepo.incrementByMongo({
             identifier: dataFeedIdentifier,
             includedInDataCatalog: { identifier: transactionNumber_2.DataCatalogIdentifier.serviceOutputIdentifier },
             expires: dataFeedExpires