@chevre/domain 24.0.0-alpha.5 → 24.0.0-alpha.52

package/lib/chevre/repo/place/movieTheater.d.ts

@@ -95,15 +95,19 @@ export declare class MovieTheaterRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
+    } & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/place/movieTheater").IPlace, "id"> & {
         hasPOS?: factory.place.movieTheater.IPOS[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

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

@@ -103,14 +103,18 @@ class MovieTheaterRepo {
         let savedId;
         let doc;
         if (params.id === '') {
-            const { id, hasEntranceGate, // 入場ゲートを保管しない(2026-01-11~)
+            const { 
+            // 入場ゲートを保管しない(2026-01-11~)
+            id, hasEntranceGate, // eslint-disable-line @typescript-eslint/no-unused-vars
             ...creatingParams } = params; // omit id(2024-09-12~)
             doc = await this.civicStructureModel.create(creatingParams);
             savedId = doc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
-            const { id, branchCode, project, typeOf, hasEntranceGate, // 入場ゲートを保管しない(2026-01-11~)
+            const { 
+            // 入場ゲートを保管しない(2026-01-11~)
+            id, branchCode, project, typeOf, hasEntranceGate, // eslint-disable-line @typescript-eslint/no-unused-vars
             ...updateFields } = params;
             doc = await this.civicStructureModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
                 .exec();
@@ -122,7 +126,7 @@ class MovieTheaterRepo {
         return { id: savedId };
     }
     async saveMovieTheaterByBranchCode4coa(params) {
-        const { containsPlace, ...movieTheater4update } = params;
+        const { containsPlace, ...movieTheater4update } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const movieTheaterDoc = await this.civicStructureModel.findOneAndUpdate({
             typeOf: { $eq: factory.placeType.MovieTheater },
             'project.id': { $eq: params.project.id },
@@ -146,7 +150,9 @@ class MovieTheaterRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { branchCode, hasEntranceGate, hasPOS, // 入場ゲート,POSを決して編集しないように
+                const { 
+                // 入場ゲート,POSを決して編集しないように
+                branchCode, hasEntranceGate, hasPOS, // eslint-disable-line @typescript-eslint/no-unused-vars
                 ...setFields } = $set;
                 if (typeof branchCode !== 'string' || branchCode === '') {
                     throw new factory.errors.ArgumentNull('branchCode');

package/lib/chevre/repo/place/screeningRoom.d.ts

@@ -124,7 +124,7 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
@@ -133,7 +133,9 @@ export declare class ScreeningRoomRepo {
         })[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
+    } & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("../mongoose/virtuals").IVirtuals, {}> & Omit<import("@chevre/factory/lib/place/screeningRoom").IPlace, "containsPlace"> & {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
@@ -142,6 +144,8 @@ export declare class ScreeningRoomRepo {
         })[];
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
 }
 export {};

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

@@ -151,7 +151,7 @@ class ScreeningRoomRepo {
         return matchStages;
     }
     async saveScreeningRooms4coa(params) {
-        const { containsPlace, ...movieTheater4update } = params;
+        const { containsPlace, ...movieTheater4update } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const movieTheater = await this.civicStructureModel.findOne({
             typeOf: { $eq: factory.placeType.MovieTheater },
             'project.id': { $eq: params.project.id },
@@ -176,7 +176,7 @@ class ScreeningRoomRepo {
             };
         });
         await Promise.all(creatingScreeningRooms.map(async (createScreeningRoom) => {
-            const { typeOf, project, branchCode, ...setFields } = createScreeningRoom;
+            const { typeOf, project, branchCode, ...setFields } = createScreeningRoom; // eslint-disable-line @typescript-eslint/no-unused-vars
             if (typeof branchCode === 'string' && branchCode.length > 0) {
                 await this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.ScreeningRoom },

package/lib/chevre/repo/place/seat.d.ts

@@ -26,7 +26,7 @@ interface IUpdateSeatResult {
     };
     typeOf: factory.placeType.ScreeningRoom;
 }
-export declare const DEFAULT_ROOM_MAXIMUM_CAPACITY: number;
+export declare const DEFAULT_ROOM_MAXIMUM_CAPACITY = 10000;
 /**
  * 座席リポジトリ
  */
@@ -34,9 +34,7 @@ export declare class SeatRepo {
     private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
-    static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {
-        [field: string]: AnyExpression;
-    };
+    static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): Record<string, AnyExpression>;
     static CREATE_MATCH_STAGES(params: factory.place.seat.ISearchConditions, options: {
         filterTypeOf: boolean;
     }): IMatchStage[];
@@ -47,8 +45,8 @@ export declare class SeatRepo {
     addSeatsByBranchCodeIfNotExist(params: {
         $set: ICreatingSeat;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     /**
      * コードをキーにして冪等編集
      */
@@ -58,8 +56,8 @@ export declare class SeatRepo {
             [key in keyof ICreatingSeat]?: 1;
         };
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     updateSeatByBranchCode(seat: ICreatingSeat, $unset: any, options: IUpdateOptions): Promise<IUpdateSeatResult>;
     searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
     projectSeatsByScreeningRoom(params: Pick<factory.place.seat.ISearchConditions, '$projection' | 'additionalProperty' | 'branchCode' | 'seatingType' | 'name' | 'limit' | 'page'> & {
@@ -130,23 +128,29 @@ export declare class SeatRepo {
         /**
          * 座席コード
          */
-        branchCode?: {
-            $in?: string[];
+        branchCode: {
+            $in: string[];
         };
-        containedInPlace?: {
+        containedInPlace: {
             /**
              * セクションコード
              */
-            branchCode?: {
-                $in?: string[];
+            branchCode: {
+                $in: string[];
             };
-            containedInPlace?: {
-                branchCode?: {
-                    $eq?: string;
+            containedInPlace: {
+                /**
+                 * ルームコード
+                 */
+                branchCode: {
+                    $eq: string;
                 };
-                containedInPlace?: {
-                    branchCode?: {
-                        $eq?: string;
+                containedInPlace: {
+                    /**
+                     * 施設コード
+                     */
+                    branchCode: {
+                        $eq: string;
                     };
                 };
             };
@@ -161,8 +165,8 @@ export declare class SeatRepo {
          */
         branchCode: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     deleteSeatByBranchCode(seat: {
         /**
          * 座席コード

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

@@ -356,6 +356,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     /**
      * コードをキーにして冪等編集
@@ -432,6 +433,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async updateSeatByBranchCode(seat, $unset, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
@@ -540,6 +542,12 @@ class SeatRepo {
     // ルーム指定の座席検索として再定義(2025-04-28~)
     async projectSeatsByScreeningRoom(params) {
         const { limit, page, project, containedInPlace, screeningRoom, $projection, ...searchSeatsConditions } = params;
+        if (typeof screeningRoom.branchCode.$eq !== 'string' || screeningRoom.branchCode.$eq === '') {
+            throw new factory.errors.ArgumentNull('screeningRoom.branchCode.$eq');
+        }
+        if (typeof screeningRoom.containedInPlace.branchCode.$eq !== 'string' || screeningRoom.containedInPlace.branchCode.$eq === '') {
+            throw new factory.errors.ArgumentNull('screeningRoom.containedInPlace.branchCode.$eq');
+        }
         // まずルーム検索
         const screeningRoomDoc = await this.placeModel.findOne({
             typeOf: { $eq: factory.placeType.ScreeningRoom },
@@ -704,10 +712,16 @@ class SeatRepo {
             matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
         }
         const branchCodeEq = params.containedInPlace?.containedInPlace?.branchCode?.$eq;
+        if (typeof branchCodeEq !== 'string' || branchCodeEq === '') {
+            throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode.$eq');
+        }
         if (typeof branchCodeEq === 'string') {
             matchStages.push({ $match: { branchCode: { $eq: branchCodeEq } } });
         }
         const containedInPlaceBranchCodeEq = params.containedInPlace?.containedInPlace?.containedInPlace?.branchCode?.$eq;
+        if (typeof containedInPlaceBranchCodeEq !== 'string' || containedInPlaceBranchCodeEq === '') {
+            throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode.$eq');
+        }
         if (typeof containedInPlaceBranchCodeEq === 'string') {
             matchStages.push({
                 $match: { 'containedInPlace.branchCode': { $exists: true, $eq: containedInPlaceBranchCodeEq } }
@@ -788,6 +802,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async deleteSeatByBranchCode(seat, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;

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

@@ -520,6 +520,12 @@ class SectionRepo {
     // >
     ) {
         const { limit, page, projectId, sellerId, movieTheaterCode, roomCode } = params;
+        if (typeof movieTheaterCode !== 'string' || movieTheaterCode === '') {
+            throw new factory.errors.ArgumentNull('movieTheaterCode');
+        }
+        if (typeof roomCode !== 'string' || roomCode === '') {
+            throw new factory.errors.ArgumentNull('roomCode');
+        }
         const matchStageBeforeUnwind = {
             $match: {
                 'project.id': { $eq: projectId },

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

@@ -1,12 +1,11 @@
 import { Connection, FilterQuery, QueryOptions } from 'mongoose';
 import * as factory from '../factory';
+import { IDocType } from './mongoose/schemas/potentialAction';
 export type ISavingPotentialAction = Pick<factory.potentialAction.IPotentialAction, 'target' | 'project' | 'typeOf' | 'identifier'> & {
     id?: never;
 };
 interface IUnset {
-    $unset?: {
-        [key: string]: 1;
-    };
+    $unset?: Record<string, 1>;
 }
 type IKeyOfProjection = keyof factory.potentialAction.IPotentialAction;
 /**
@@ -23,34 +22,14 @@ export declare class PotentialActionRepo {
         id: string;
     }>;
     projectFields(conditions: factory.potentialAction.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.potentialAction.IPotentialAction[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
-    } & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
         _id: import("mongoose").Types.ObjectId;
-    }, QueryOptions<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        identifier: string;
-        typeOf: factory.actionType.InformAction;
-        recipient: factory.potentialAction.IInformRecipient;
-        target: factory.entryPoint.IEntryPoint;
     } & {
+        __v: number;
+    }, QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
 }
 export {};

package/lib/chevre/repo/potentialAction.js

@@ -74,7 +74,7 @@ class PotentialActionRepo {
             if (savingId === '') {
                 throw new factory.errors.ArgumentNull('id');
             }
-            const { id, project, typeOf, identifier, $unset, ...updateFields } = params.attributes;
+            const { id, project, typeOf, identifier, $unset, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const filter = {
                 _id: { $eq: savingId },
                 'project.id': { $eq: project.id }
@@ -97,7 +97,7 @@ class PotentialActionRepo {
             savedId = savingId;
         }
         else {
-            const { $unset, id, ...createParams } = params.attributes;
+            const { $unset, id, ...createParams } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
             const result = await this.potentialActionModel.insertMany(createParams, { rawResult: true });
             const insertedId = result.insertedIds?.[0]?.toHexString();
             if (typeof insertedId !== 'string') {

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

@@ -13,13 +13,15 @@ export declare class PriceSpecificationRepo {
     findById<T extends factory.priceSpecificationType>(params: {
         id: string;
     }): Promise<factory.priceSpecification.IPriceSpecification<T>>;
-    save<T extends factory.priceSpecificationType>(params: {
+    save<T extends factory.priceSpecificationType.CategoryCodeChargeSpecification | factory.priceSpecificationType.MovieTicketTypeChargeSpecification>(params: {
         id?: string;
         attributes: factory.priceSpecification.IPriceSpecification<T> & {
             id?: never;
             $unset?: never;
         };
-    }): Promise<Pick<factory.priceSpecification.IPriceSpecification<T>, 'id'>>;
+    }): Promise<{
+        id: string;
+    }>;
     /**
      * 削除する
      */
@@ -34,48 +36,73 @@ export declare class PriceSpecificationRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IPriceSpecification & {
-        validFrom?: Date;
-        validThrough?: Date;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToCategoryCode: import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IAppliesToCategoryCode[];
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IPriceSpecification & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/unitPriceSpecification").IPriceSpecification & {
-        validFrom?: Date;
-        validThrough?: Date;
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification").IPriceSpecification<factory.priceSpecificationType> & {
-        validFrom?: Date;
-        validThrough?: Date;
+        __v: number;
+    }) | ({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToMovieTicket: import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;
+        appliesToVideoFormat: string;
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    })), import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IPriceSpecification & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IPriceSpecification & {
-        validFrom?: Date;
-        validThrough?: Date;
     } & {
-        _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification/unitPriceSpecification").IPriceSpecification & {
+        __v: number;
+    })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToCategoryCode: import("@chevre/factory/lib/priceSpecification/categoryCodeChargeSpecification").IAppliesToCategoryCode[];
+    } & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }) | (import("@chevre/factory/lib/priceSpecification").IPriceSpecification<factory.priceSpecificationType> & {
+    } & {
+        __v: number;
+    }) | ({
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
+        name?: (string | import("@chevre/factory/lib/multilingualString").IMultilingualString) | undefined;
+        price: number;
+        priceCurrency: factory.priceCurrency;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        valueAddedTaxIncluded: boolean;
+        accounting?: never | undefined;
+        appliesToMovieTicket: import("@chevre/factory/lib/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;
+        appliesToVideoFormat: string;
+    } & {
         validFrom?: Date;
         validThrough?: Date;
     } & {
         _id: import("mongoose").Types.ObjectId;
-    }))>>;
-    reIndex(): Promise<import("bson").Document>;
+    } & {
+        __v: number;
+    }))) | null>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/priceSpecification.js

@@ -220,24 +220,26 @@ class PriceSpecificationRepo {
         return doc;
     }
     async save(params) {
-        let doc;
+        let savedId;
         if (typeof params.id !== 'string') {
-            const { $unset, id, ...creatingDoc } = params.attributes;
-            doc = await this.priceSpecificationModel.create(creatingDoc);
+            const { $unset, id, ...creatingDoc } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const createdDoc = await this.priceSpecificationModel.create(creatingDoc);
+            savedId = createdDoc.id;
         }
         else {
             // 上書き禁止属性を除外(2022-08-24~)
-            const { $unset, id, project, typeOf, ...updateFields } = params.attributes;
-            doc = await this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            const { $unset, id, project, typeOf, ...updateFields } = params.attributes; // eslint-disable-line @typescript-eslint/no-unused-vars
+            const updatedDoc = await this.priceSpecificationModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
                 $set: updateFields
             }, { upsert: false, new: true, projection: { _id: 1 } })
                 .lean() // lean(2024-08-06~)
                 .exec();
+            if (updatedDoc === null) {
+                throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
+            }
+            savedId = updatedDoc._id.toString();
         }
-        if (doc === null) {
-            throw new factory.errors.NotFound(this.priceSpecificationModel.modelName);
-        }
-        return { id: doc._id?.toString() };
+        return { id: savedId };
     }
     /**
      * 削除する
@@ -260,12 +262,6 @@ class PriceSpecificationRepo {
             .sort({ price: factory.sortType.Ascending })
             .cursor();
     }
-    async reIndex() {
-        // return this.priceSpecificationModel.collection.name;
-        return this.priceSpecificationModel.db.db.command({
-            reIndex: this.priceSpecificationModel.collection.name
-        });
-    }
     async unsetUnnecessaryFields(params) {
         return this.priceSpecificationModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
             .exec();

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

@@ -1,7 +1,7 @@
 import type { BulkWriteResult } from 'mongodb';
 import { Connection, FilterQuery, Types } from 'mongoose';
 import * as factory from '../factory';
-import { IDocTypeAsProduct } from './mongoose/schemas/product';
+import { IDocType, IDocTypeAsProduct } from './mongoose/schemas/product';
 type IKeyOfProjection = keyof factory.product.IProduct | 'hasOfferCatalog.id';
 /**
  * プロダクト検索条件
@@ -48,9 +48,7 @@ export declare class ProductRepo {
         $set: factory.product.IProduct & {
             offers?: never;
         };
-        $unset: {
-            [key in IUnsetKey]?: 1;
-        };
+        $unset: Partial<Record<IUnsetKey, 1>>;
         /**
          * 指定プロジェクトの指定プロダクトタイプが存在しなければ作成する
          */
@@ -65,15 +63,13 @@ export declare class ProductRepo {
         $set: factory.product.IProduct & {
             offers?: never;
         };
-        $unset?: {
-            [key in IUnsetKey]?: 1;
-        };
+        $unset?: Partial<Record<IUnsetKey, 1>>;
     }[]): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProducts: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedProducts?: {
             id: string;
         }[];
-    } | void>;
+    }>;
     /**
      * プロダクトIDからavailableChannelを取得する
      */
@@ -103,11 +99,15 @@ export declare class ProductRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
         _id: Types.ObjectId;
-    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
+    } & {
+        __v: number;
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocTypeAsProduct & import("./mongoose/schemas/product").IDocTypeAsProductOffer & {
         _id: Types.ObjectId;
-    }>>;
+    } & {
+        __v: number;
+    }) | null>;
     unsetUnnecessaryFields(params: {
         filter: FilterQuery<factory.product.IProduct>;
         $unset: any;

package/lib/chevre/repo/product.js

@@ -239,7 +239,7 @@ class ProductRepo {
         let savedId;
         if (typeof params.id === 'string') {
             // 上書き禁止属性を除外
-            const { id, productID, project, typeOf, offers, ...setFields } = params.$set;
+            const { id, productID, project, typeOf, offers, ...setFields } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
             switch (typeOf) {
                 case factory.product.ProductType.EventService:
                 case factory.product.ProductType.MembershipService:
@@ -265,7 +265,7 @@ class ProductRepo {
             savedId = params.id;
         }
         else {
-            const { id, ...createParams } = params.$set;
+            const { id, ...createParams } = params.$set; // eslint-disable-line @typescript-eslint/no-unused-vars
             if (params.createIfNotExist === true) {
                 doc = await this.productModel.findOneAndUpdate({
                     'project.id': { $eq: createParams.project.id },
@@ -301,7 +301,7 @@ class ProductRepo {
         const queryFilters = [];
         if (Array.isArray(params)) {
             params.forEach(({ $set, $unset }) => {
-                const { id, productID, project, typeOf, offers, ...setFields } = $set;
+                const { id, productID, project, typeOf, offers, ...setFields } = $set; // eslint-disable-line @typescript-eslint/no-unused-vars
                 if (typeof productID !== 'string' || productID.length === 0) {
                     throw new factory.errors.ArgumentNull('productID');
                 }
@@ -338,6 +338,7 @@ class ProductRepo {
                 .exec();
             return { bulkWriteResult, modifiedProducts };
         }
+        return {};
     }
     /**
      * プロダクトIDからavailableChannelを取得する

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

@@ -33,7 +33,9 @@ export declare class ProductModelRepo {
          * idを指定すれば更新
          */
         id?: string;
-        $set: IProductModel;
+        $set: Omit<IProductModel, 'id'> & {
+            id?: never;
+        };
     }): Promise<{
         id: string;
     }>;