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

package/lib/chevre/repo/place/{hasPOS.js → pos.js}

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HasPOSRepo = void 0;
+exports.POSRepo = void 0;
 const mongoose_1 = require("mongoose");
 const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
@@ -8,21 +8,15 @@ const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 /**
  * 施設のPOSリポジトリ
  */
-class HasPOSRepo {
+class POSRepo {
     operator;
     civicStructureModel;
     constructor(connection, operater) {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
     }
-    async search(params) {
-        const matchStages = [
-            { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
-        ];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-        }
+    async findPOS(params) {
+        const matchStages = [];
         const branchCodeEq = params.branchCode?.$eq;
         if (typeof branchCodeEq === 'string') {
             matchStages.push({ $match: { 'hasPOS.branchCode': { $eq: branchCodeEq } } });
@@ -32,6 +26,13 @@ class HasPOSRepo {
             matchStages.push({ $match: { 'hasPOS.branchCode': { $regex: new RegExp(branchCodeRegex) } } });
         }
         const aggregate = this.civicStructureModel.aggregate([
+            // まず施設ドキュメントで絞る
+            {
+                $match: {
+                    _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) },
+                    'project.id': { $eq: params.projectId }
+                }
+            },
             {
                 $unwind: {
                     path: '$hasPOS'
@@ -42,54 +43,90 @@ class HasPOSRepo {
             {
                 $project: {
                     _id: 0,
-                    id: '$hasPOS.branchCode',
                     branchCode: '$hasPOS.branchCode',
-                    name: '$hasPOS.name'
+                    name: '$hasPOS.name',
+                    // ...((!excludePOSId) && { id: '$hasPOS.branchCode' }) // discontinue(2026-09-22~)
                 }
             }
         ]);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.limit(params.limit * page)
-                .skip(params.limit * (page - 1));
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
         return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
     }
-    async createByBranchCode(params) {
+    async countPOS() {
+        const posCount = (await this.civicStructureModel.aggregate([
+            {
+                $match: {
+                    _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) },
+                }
+            },
+            {
+                $project: {
+                    posCount: {
+                        $cond: {
+                            if: { $isArray: '$hasPOS' },
+                            then: { $size: '$hasPOS' },
+                            else: 0
+                        }
+                    }
+                }
+            }
+        ]).option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec()).at(0)?.posCount;
+        if (typeof posCount !== 'number') {
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
+        }
+        return { posCount };
+    }
+    async addPOSByBranchCode(params, options) {
         // 施設存在確認
-        let doc = await this.civicStructureModel.findOne({
+        const movieTheaterDoc = await this.civicStructureModel.findOne({
             'project.id': { $eq: params.project.id },
             _id: { $eq: this.operator.id }
-        }, { _id: 1, typeOf: 1 })
+        }, { _id: 1 })
+            .lean()
             .exec();
-        if (doc === null) {
+        if (movieTheaterDoc === null) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
+        // 最大数検証(2026-09-20~)
+        const { maxNumPOS } = options;
         const creatingPOS = {
-            // 互換性維持対応としてidを保管
-            id: params.branchCode, // eslint-disable-line @typescript-eslint/no-explicit-any
+            // // 互換性維持対応としてidを保管
+            // id: params.branchCode as any, // discontinue(2026-09-22~)
             branchCode: params.branchCode,
             name: params.name
         };
-        doc = await this.civicStructureModel.findOneAndUpdate({
+        const doc = await this.civicStructureModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: this.operator.id },
-            'hasPOS.branchCode': { $ne: params.branchCode }
+            'hasPOS.branchCode': { $ne: params.branchCode },
+            // 配列の長さが上限未満であることをアトミックに確認
+            $expr: {
+                $lt: [{ $size: { $ifNull: ['$hasPOS', []] } }, maxNumPOS] // 最大数担保(2026-09-20~)
+            }
         }, {
             $push: { hasPOS: creatingPOS }
         }, {
-            new: true,
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         // 存在しなければID重複
         if (doc === null) {
+            const { posCount } = await this.countPOS();
+            if (posCount >= maxNumPOS) {
+                throw new factory_1.factory.errors.Argument('operator.id', 'maxNumPOS exceeded');
+            }
+            // 上限以下で追加できない場合は「すでに登録済み」
             throw new factory_1.factory.errors.AlreadyInUse('hasPOS', ['id']);
         }
-        return doc.toObject({ virtuals: true });
     }
-    async updateByBranchCode(params) {
+    async updatePOSByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: this.operator.id },
@@ -107,13 +144,13 @@ class HasPOSRepo {
             ],
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject({ virtuals: true });
     }
-    async deleteByBranchCode(params) {
+    async deletePOSByBranchCode(params) {
         const doc = await this.civicStructureModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: this.operator.id },
@@ -123,11 +160,11 @@ class HasPOSRepo {
         }, {
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject({ virtuals: true });
     }
 }
-exports.HasPOSRepo = HasPOSRepo;
+exports.POSRepo = POSRepo;

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

@@ -84,7 +84,28 @@ export declare class ScreeningRoomRepo {
             id: string;
         };
     }): Promise<mongo.DeleteResult>;
-    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    projectRoomFields(params: Pick<factory.place.screeningRoom.ISearchConditions, '$projection' | 'branchCode' | 'containedInPlace' | 'parentOrganization'> & {
+        /**
+         * プロジェクト指定は必須
+         */
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        limit: number;
+        page: number;
+    }, options: {
+        /**
+         * 将来的にcontainedInPlace最小化のためオプション採用(2026-09-17~)
+         */
+        minimizeContainedInPlace: boolean;
+    }): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'containedInPlace' | 'maximumAttendeeCapacity' | 'name' | 'openSeatingAllowed' | 'typeOf' | 'seatCount' | 'sectionCount'>[]>;
     findRooms(params: Omit<factory.place.screeningRoom.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed' | 'maximumAttendeeCapacity'>[]>;
     /**
      * セクションと座席も含めたひとつのルームを取得する
@@ -128,7 +149,7 @@ export declare class ScreeningRoomRepo {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
-        containsPlace: (Pick<import("@chevre/factory/lib/chevre/place/screeningRoomSection").IPlace, "name" | "typeOf" | "additionalProperty" | "branchCode"> & {
+        containsPlace: (Pick<import("@chevre/factory/lib/chevre/place/screeningRoomSection").IPlace, "name" | "typeOf" | "branchCode" | "additionalProperty"> & {
             containsPlace?: factory.place.seat.IPlace[];
         })[];
     } & {
@@ -139,7 +160,7 @@ export declare class ScreeningRoomRepo {
         description?: any;
         openingHoursSpecification?: any;
         smokingAllowed?: boolean;
-        containsPlace: (Pick<import("@chevre/factory/lib/chevre/place/screeningRoomSection").IPlace, "name" | "typeOf" | "additionalProperty" | "branchCode"> & {
+        containsPlace: (Pick<import("@chevre/factory/lib/chevre/place/screeningRoomSection").IPlace, "name" | "typeOf" | "branchCode" | "additionalProperty"> & {
             containsPlace?: factory.place.seat.IPlace[];
         })[];
     } & {

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

@@ -379,10 +379,15 @@ class ScreeningRoomRepo {
         })
             .exec();
     }
-    async searchScreeningRooms(searchConditions) {
+    /**
+     * ルーム検索
+     * sectionCount,seatCountのprojectが可能
+     * sortはbranchCode: factory.sortType.Ascendingで固定
+     */
+    async projectRoomFields(params, options) {
+        const { minimizeContainedInPlace } = options;
         const aggregate = this.placeModel.aggregate([
-            { $sort: { branchCode: factory_1.factory.sortType.Ascending } },
-            ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(searchConditions),
+            ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(params),
             {
                 $project: {
                     _id: 0,
@@ -390,16 +395,20 @@ class ScreeningRoomRepo {
                     branchCode: '$branchCode',
                     name: '$name',
                     address: '$address',
-                    containedInPlace: {
-                        id: '$containedInPlace.id',
-                        typeOf: '$containedInPlace.typeOf',
-                        branchCode: '$containedInPlace.branchCode',
-                        name: '$containedInPlace.name'
-                    },
+                    containedInPlace: (minimizeContainedInPlace)
+                        ? {
+                            branchCode: '$containedInPlace.branchCode',
+                        }
+                        : {
+                            id: '$containedInPlace.id',
+                            typeOf: '$containedInPlace.typeOf',
+                            branchCode: '$containedInPlace.branchCode',
+                            name: '$containedInPlace.name'
+                        },
                     openSeatingAllowed: '$openSeatingAllowed',
                     additionalProperty: '$additionalProperty',
                     maximumAttendeeCapacity: '$maximumAttendeeCapacity',
-                    ...(searchConditions.$projection?.sectionCount === 1)
+                    ...(params.$projection?.sectionCount === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -410,7 +419,7 @@ class ScreeningRoomRepo {
                             }
                         }
                         : undefined,
-                    ...(searchConditions.$projection?.seatCount === 1)
+                    ...(params.$projection?.seatCount === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -429,14 +438,16 @@ class ScreeningRoomRepo {
                         }
                         : undefined
                 }
-            }
+            },
+            { $sort: { branchCode: factory_1.factory.sortType.Ascending } }
         ]);
-        /* istanbul ignore else */
-        if (typeof searchConditions.limit === 'number' && searchConditions.limit > 0) {
-            const page = (typeof searchConditions.page === 'number' && searchConditions.page > 0) ? searchConditions.page : 1;
-            aggregate.limit(searchConditions.limit * page)
-                .skip(searchConditions.limit * (page - 1));
+        const { limit, page } = params;
+        if (typeof limit !== 'number' || limit === 0) {
+            throw new factory_1.factory.errors.ArgumentNull('limit', 'must be number > 0');
         }
+        const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+        aggregate.skip(limit * (pageMustBePositive - 1))
+            .limit(limit);
         return aggregate
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();

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

@@ -37,11 +37,11 @@ export declare class PriceSpecificationRepo {
         };
     }): Promise<void>;
     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/chevre/multilingualString").IMultilingualString) | undefined;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
-        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
         valueAddedTaxIncluded: boolean;
         accounting?: never | undefined;
         appliesToCategoryCode: import("@chevre/factory/lib/chevre/priceSpecification/categoryCodeChargeSpecification").IAppliesToCategoryCode[];
@@ -53,11 +53,11 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
-        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
         valueAddedTaxIncluded: boolean;
         accounting?: never | undefined;
         appliesToMovieTicket: import("@chevre/factory/lib/chevre/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;
@@ -70,11 +70,11 @@ export declare class PriceSpecificationRepo {
     } & {
         __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/chevre/multilingualString").IMultilingualString) | undefined;
+        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
-        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification;
         valueAddedTaxIncluded: boolean;
         accounting?: never | undefined;
         appliesToCategoryCode: import("@chevre/factory/lib/chevre/priceSpecification/categoryCodeChargeSpecification").IAppliesToCategoryCode[];
@@ -86,11 +86,11 @@ export declare class PriceSpecificationRepo {
     } & {
         __v: number;
     }) | ({
-        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         name?: (string | import("@chevre/factory/lib/chevre/multilingualString").IMultilingualString) | undefined;
+        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
+        project?: Pick<factory.project.IProject, "id" | "typeOf"> | undefined;
         price: number;
         priceCurrency: factory.priceCurrency;
-        typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification;
         valueAddedTaxIncluded: boolean;
         accounting?: never | undefined;
         appliesToMovieTicket: import("@chevre/factory/lib/chevre/priceSpecification/movieTicketTypeChargeSpecification").IAppliesToMovieTicket;

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

@@ -22,42 +22,36 @@ export declare class ProjectRepo {
      */
     projectFields(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
     createById(params: factory.project.IProject): Promise<Pick<factory.project.IProject, 'id'>>;
-    updateById(params: {
+    updateProjectById(params: {
         id: string;
-        alternateName?: string;
-        logo?: string;
-        hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
-        name?: string;
-        settings?: Pick<factory.project.ISettings, 'includeCustomerAsFindByConfirmationNumberResult'> & {
-            sendEmailMessage?: factory.project.ISendEmailMessageSettings;
-            sendgridApiKey?: string;
-        };
-        subscription?: {
-            useEventServiceAsProduct?: boolean;
+        $set: {
+            alternateName?: string;
+            logo?: string;
+            hasMerchantReturnPolicy?: Pick<factory.project.IHasMerchantReturnPolicy, 'sameAs' | 'identifier'>;
+            name?: string;
+            settings?: {
+                sendEmailMessage?: factory.project.ISendEmailMessageSettings;
+                sendgridApiKey?: string;
+            };
         };
+        $unset: Record<string, 1>;
     }): Promise<void>;
     updateMakesOfferById(params: {
         id: string;
         makesOffer: factory.project.IMakesOffer[];
     }): Promise<void>;
-    updateAggregateReservation(params: {
-        id: string;
-        aggregateReservation?: any;
-    }): Promise<void>;
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.project.IProject, "id"> & {
+    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
         _id: string;
-        aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{
         _id: string;
     }> & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.project.IProject, "id"> & {
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.project.IProject, "name" | "typeOf" | "logo" | "alternateName" | "hasMerchantReturnPolicy" | "settings" | "subscription"> & {
         _id: string;
-        aggregateReservation?: any;
         makesOffer?: factory.project.IMakesOffer[];
     } & Required<{
         _id: string;

package/lib/chevre/repo/project.js

@@ -5,7 +5,6 @@ const project_1 = require("./mongoose/schemas/project");
 const factory_1 = require("../factory");
 const settings_1 = require("../settings");
 const AVAILABLE_PROJECT_FIELDS = [
-    // 'aggregateReservation',
     'alternateName',
     'logo',
     'hasMerchantReturnPolicy',
@@ -110,45 +109,41 @@ class ProjectRepo {
         }
         return { id: insertedId };
     }
-    async updateById(params) {
+    async updateProjectById(params) {
+        const { $set, $unset, id } = params;
         let hasMerchantReturnPolicy;
-        if (typeof params.hasMerchantReturnPolicy?.sameAs === 'string') {
+        if (typeof $set.hasMerchantReturnPolicy?.sameAs === 'string') {
             hasMerchantReturnPolicy = {
-                sameAs: params.hasMerchantReturnPolicy.sameAs,
+                sameAs: $set.hasMerchantReturnPolicy.sameAs,
                 typeOf: 'MerchantReturnPolicy',
-                ...(typeof params.hasMerchantReturnPolicy.identifier === 'string')
-                    ? { identifier: params.hasMerchantReturnPolicy.identifier } : undefined
+                ...(typeof $set.hasMerchantReturnPolicy.identifier === 'string')
+                    ? { identifier: $set.hasMerchantReturnPolicy.identifier } : undefined
             };
         }
-        const includeCustomerAsFindByConfirmationNumberResult = params.settings?.includeCustomerAsFindByConfirmationNumberResult;
-        await this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            // updatedAt: new Date(),
-            ...(typeof params.alternateName === 'string' && params.alternateName.length > 0)
-                ? { alternateName: params.alternateName }
-                : undefined,
-            ...(typeof params.name === 'string' && params.name.length > 0) ? { name: params.name } : undefined,
-            ...(typeof params.logo === 'string' && params.logo.length > 0) ? { logo: params.logo } : undefined,
-            ...(typeof params.settings?.sendEmailMessage?.sender?.email === 'string')
-                ? {
-                    'settings.sendEmailMessage': {
-                        sender: { email: params.settings.sendEmailMessage.sender.email }
+        await this.projectModel.updateOne({ _id: { $eq: id } }, {
+            $set: {
+                ...(typeof $set.alternateName === 'string' && $set.alternateName.length > 0)
+                    ? { alternateName: $set.alternateName }
+                    : undefined,
+                ...(typeof $set.name === 'string' && $set.name.length > 0) ? { name: $set.name } : undefined,
+                ...(typeof $set.logo === 'string' && $set.logo.length > 0) ? { logo: $set.logo } : undefined,
+                ...(typeof $set.settings?.sendEmailMessage?.sender?.email === 'string')
+                    ? {
+                        'settings.sendEmailMessage': {
+                            sender: { email: $set.settings.sendEmailMessage.sender.email }
+                        }
                     }
-                }
-                : undefined,
-            ...(typeof params.settings?.sendgridApiKey === 'string')
-                ? { 'settings.sendgridApiKey': params.settings.sendgridApiKey }
-                : undefined,
-            ...(typeof includeCustomerAsFindByConfirmationNumberResult === 'boolean')
-                ? { 'settings.includeCustomerAsFindByConfirmationNumberResult': includeCustomerAsFindByConfirmationNumberResult }
-                : undefined,
-            ...(typeof params.subscription?.useEventServiceAsProduct === 'boolean')
-                ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
-                : undefined,
-            ...(hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined,
+                    : undefined,
+                ...(typeof $set.settings?.sendgridApiKey === 'string')
+                    ? { 'settings.sendgridApiKey': $set.settings.sendgridApiKey }
+                    : undefined,
+                ...(hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined,
+            },
             $unset: {
-                'settings.cognito': 1 // 廃止(2023-11-10~)
+                ...$unset,
+                'settings.cognito': 1, // 廃止(2023-11-10~)
             }
-        }, { projection: { _id: 1 } })
+        })
             .exec();
     }
     async updateMakesOfferById(params) {
@@ -157,17 +152,6 @@ class ProjectRepo {
         }, { projection: { _id: 1 } })
             .exec();
     }
-    async updateAggregateReservation(params) {
-        await this.projectModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-            $set: {
-                ...(params.aggregateReservation !== undefined) ? { aggregateReservation: params.aggregateReservation } : undefined
-            }
-            // $unset: {
-            //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
-            // }
-        }, { new: true, projection: { _id: 1 } })
-            .exec();
-    }
     async deleteById(params) {
         await this.projectModel.deleteOne({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
             .exec();

package/lib/chevre/repo/projectMakesOffer.js

@@ -42,8 +42,8 @@ class ProjectMakesOfferRepo {
         ]);
         if (typeof params.limit === 'number' && params.limit > 0) {
             const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-            aggregate.limit(params.limit * page)
-                .skip(params.limit * (page - 1));
+            aggregate.skip(params.limit * (page - 1))
+                .limit(params.limit);
         }
         return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();

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

@@ -59,7 +59,7 @@ export declare class RoleRepo {
     } & {
         __v: number;
     }) | null>;
-    create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
+    addRole(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
         id: string;
     }>;
     deleteByRoleName(params: Pick<IRole, 'roleName'>): Promise<import("mongodb").DeleteResult>;

package/lib/chevre/repo/role.js

@@ -69,35 +69,6 @@ class RoleRepo {
             .lean() // 2024-08-23~
             .exec();
     }
-    // migrate to findDistinctPermissionsByRoleName(2025-07-21~)
-    // public async aggregatePermissions(params: {
-    //     roleName: { $in: string[] };
-    // }): Promise<{ _id: string }[]> {
-    //     const matchStages: IMatchStage[] = [
-    //         { $match: { roleName: { $in: params.roleName.$in } } }
-    //     ];
-    //     const aggregate = this.roleModel.aggregate([
-    //         ...matchStages,
-    //         {
-    //             $unwind: {
-    //                 path: '$permissions'
-    //             }
-    //         },
-    //         {
-    //             $project: {
-    //                 _id: 0,
-    //                 permission: '$permissions'
-    //             }
-    //         },
-    //         {
-    //             $group: {
-    //                 _id: '$permission'
-    //             }
-    //         }
-    //     ]);
-    //     return aggregate.option({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * distinctコマンドを使用して、ロールから権限を検索する
      */
@@ -139,7 +110,7 @@ class RoleRepo {
             .lean()
             .exec();
     }
-    async create(params) {
+    async addRole(params) {
         const { member, memberOf, permissions, roleName } = params;
         const creatingRole = {
             member, memberOf, permissions, roleName,

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

@@ -33,7 +33,7 @@ export declare class SellerRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.seller.ISearchConditions & IMemberSearchConditions): FilterQuery<factory.seller.ISeller>[];
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion: (keyof ISellerByAggregate)[]): Record<string, AnyExpression>;
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions: (Exclude<keyof ISellerByAggregate, 'id'>)[]): Record<string, AnyExpression>;
     /**
      * 販売者を保管する
      */
@@ -46,7 +46,10 @@ export declare class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    searchByAggregate(conditions: factory.seller.ISearchConditions & IMemberSearchConditions, exclusion: (keyof ISellerByAggregate)[]): Promise<ISellerByAggregate[]>;
+    findSellersPublicFields(conditions: factory.seller.ISearchConditions & IMemberSearchConditions & {
+        limit: number;
+        page: number;
+    }, inclusions: (Exclude<keyof ISellerByAggregate, 'id'>)[]): Promise<ISellerByAggregate[]>;
     /**
      * 販売者検索
      */
@@ -72,11 +75,15 @@ export declare class SellerRepo {
         id: string;
         makesOffer: factory.seller.IMakesOffer;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
+    getCursor(conditions: FilterQuery<factory.seller.ISeller>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "name" | "typeOf" | "branchCode" | "additionalProperty" | "project" | "url" | "telephone" | "makesOffer" | "hasMerchantReturnPolicy"> & {
+        paymentAccepted?: factory.seller.IPaymentAccepted[];
+    } & {
         _id: Types.ObjectId;
     } & {
         __v: number;
-    }, QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & IDocType & {
+    }, QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.seller.ISeller, "name" | "typeOf" | "branchCode" | "additionalProperty" | "project" | "url" | "telephone" | "makesOffer" | "hasMerchantReturnPolicy"> & {
+        paymentAccepted?: factory.seller.IPaymentAccepted[];
+    } & {
         _id: Types.ObjectId;
     } & {
         __v: number;