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

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

@@ -40,24 +40,18 @@ export declare class ProjectRepo {
         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',
@@ -157,17 +156,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;

package/lib/chevre/repo/seller.js

@@ -125,63 +125,38 @@ class SellerRepo {
                 'hasMerchantReturnPolicy.identifier': { $exists: true, $eq: hasMerchantReturnPolicyIdentifierEq }
             });
         }
-        // discontinue(2025-01-22~)
-        // const hasMerchantReturnApplicablePaymentMethodEq = params.hasMerchantReturnPolicy?.applicablePaymentMethod?.$eq;
-        // if (typeof hasMerchantReturnApplicablePaymentMethodEq === 'string') {
-        //     andConditions.push({
-        //         'hasMerchantReturnPolicy.applicablePaymentMethod': { $exists: true, $eq: hasMerchantReturnApplicablePaymentMethodEq }
-        //     });
-        // }
-        // discontinue(2025-01-22~)
-        // const hasMerchantReturnPolicyItemConditionIdEq = params.hasMerchantReturnPolicy?.itemCondition?.id?.$eq;
-        // if (typeof hasMerchantReturnPolicyItemConditionIdEq === 'string') {
-        //     andConditions.push({
-        //         'hasMerchantReturnPolicy.itemCondition.id': {
-        //             $exists: true,
-        //             $eq: hasMerchantReturnPolicyItemConditionIdEq
-        //         }
-        //     });
-        // }
         return andConditions;
     }
-    static CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion) {
+    static CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions) {
+        const inclusionMap = new Map(inclusions.map(inclusion => [inclusion, 1]));
         const projectStage = {
             _id: 0,
             id: { $toString: '$_id' },
-            additionalProperty: '$additionalProperty',
-            branchCode: '$branchCode',
-            hasMerchantReturnPolicy: {
-                $cond: {
-                    if: { $isArray: '$hasMerchantReturnPolicy' },
-                    then: {
-                        $cond: {
-                            if: { $eq: [{ $size: '$hasMerchantReturnPolicy' }, 0] },
-                            then: [],
-                            else: [{
-                                    url: { $first: '$hasMerchantReturnPolicy.url' }
-                                    // typeOf: { $first: '$hasMerchantReturnPolicy.typeOf' }
-                                }]
-                        }
-                    },
-                    else: []
+            ...((inclusionMap.get('additionalProperty') === 1) && { additionalProperty: '$additionalProperty' }),
+            ...((inclusionMap.get('branchCode') === 1) && { branchCode: '$branchCode' }),
+            ...((inclusionMap.get('name') === 1) && { name: '$name' }),
+            ...((inclusionMap.get('project') === 1) && { project: '$project' }),
+            ...((inclusionMap.get('typeOf') === 1) && { typeOf: '$typeOf' }),
+            ...((inclusionMap.get('url') === 1) && { url: '$url' }),
+            ...((inclusionMap.get('telephone') === 1) && { telephone: '$telephone' }),
+            ...((inclusionMap.get('hasMerchantReturnPolicy') === 1) && {
+                hasMerchantReturnPolicy: {
+                    $cond: {
+                        if: { $isArray: '$hasMerchantReturnPolicy' },
+                        then: {
+                            $cond: {
+                                if: { $eq: [{ $size: '$hasMerchantReturnPolicy' }, 0] },
+                                then: [],
+                                else: [{
+                                        url: { $first: '$hasMerchantReturnPolicy.url' }
+                                    }]
+                            }
+                        },
+                        else: []
+                    }
                 }
-            },
-            name: '$name',
-            project: '$project',
-            typeOf: '$typeOf',
-            url: '$url',
-            telephone: '$telephone'
+            }),
         };
-        // if (inclusion.length > 0) {
-        //     // no op
-        // } else
-        if (exclusion.length > 0) {
-            exclusion.forEach((field) => {
-                if (typeof projectStage[field] === 'string' || typeof projectStage[field] === 'object') {
-                    delete projectStage[field]; // eslint-disable-line @typescript-eslint/no-dynamic-delete
-                }
-            });
-        }
         return projectStage;
     }
     /**
@@ -233,10 +208,10 @@ class SellerRepo {
     /**
      * 集計検索(publicな属性検索が目的)
      */
-    async searchByAggregate(conditions, exclusion) {
+    async findSellersPublicFields(conditions, inclusions) {
         const matchStages = SellerRepo.CREATE_MONGO_CONDITIONS(conditions)
             .map((c) => ({ $match: c }));
-        const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(exclusion);
+        const projectStage = SellerRepo.CREATE_AGGREGATE_SELLERS_PROJECTION(inclusions);
         const sortByBranchCode = conditions.sort?.branchCode;
         const aggregate = this.sellerModel.aggregate([
             ...matchStages,
@@ -245,12 +220,10 @@ class SellerRepo {
                 : [],
             { $project: projectStage }
         ]);
-        /* istanbul ignore else */
-        if (typeof conditions.limit === 'number' && conditions.limit > 0) {
-            const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
-            aggregate.limit(conditions.limit * page)
-                .skip(conditions.limit * (page - 1));
-        }
+        const { limit, page } = conditions;
+        const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+        aggregate.skip(limit * (pageMustBePositive - 1))
+            .limit(limit);
         return aggregate.exec();
     }
     /**

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

@@ -5,29 +5,19 @@ import { Connection } from 'mongoose';
 export declare class SellerPaymentAcceptedRepo {
     private readonly sellerModel;
     constructor(connection: Connection);
-    search(params: {
-        limit?: number;
-        page?: number;
-        seller?: {
-            id?: {
-                $eq?: string;
-            };
-        };
-        project?: {
-            id?: {
-                $eq?: string;
-            };
-        };
+    findSellerPaymentAccepted(params: {
+        sellerId: string;
+        projectId: string;
+        limit: number;
+        page: number;
         codeValue?: {
             $eq?: string;
         };
     }): Promise<{
         codeValue: string;
-        seller: {
-            id: string;
-        };
     }[]>;
-    create(params: {
+    private countSellerPaymentAccepted;
+    addSellerPaymentAccepted(params: {
         codeValue: string;
         project: {
             id: string;
@@ -35,8 +25,10 @@ export declare class SellerPaymentAcceptedRepo {
         seller: {
             id: string;
         };
+    }, options: {
+        maxNumSellerPaymentAccepted: number;
     }): Promise<void>;
-    deleteOne(params: {
+    deleteSellerPaymentAccepted(params: {
         codeValue: string;
         project: {
             id: string;
@@ -46,9 +38,10 @@ export declare class SellerPaymentAcceptedRepo {
         };
     }): Promise<void>;
     isAcceptedBySeller(params: {
-        seller: {
-            id: string;
-        };
+        sellerId: string;
+        /**
+         * 決済方法区分
+         */
         codeValue: string;
     }): Promise<boolean>;
 }

package/lib/chevre/repo/sellerPaymentAccepted.js

@@ -13,21 +13,21 @@ class SellerPaymentAcceptedRepo {
     constructor(connection) {
         this.sellerModel = connection.model(seller_1.modelName, (0, seller_1.createSchema)());
     }
-    async search(params) {
+    async findSellerPaymentAccepted(params) {
+        const { sellerId, projectId } = params;
         const matchStages = [];
-        const projectIdEq = params.project?.id?.$eq;
-        if (typeof projectIdEq === 'string') {
-            matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
-        }
-        const sellerIdEq = params.seller?.id?.$eq;
-        if (typeof sellerIdEq === 'string') {
-            matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(sellerIdEq) } } });
-        }
         const codeValueEq = params.codeValue?.$eq;
         if (typeof codeValueEq === 'string') {
             matchStages.push({ $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: codeValueEq } } });
         }
         const aggregate = this.sellerModel.aggregate([
+            // まず販売者ドキュメントで絞る
+            {
+                $match: {
+                    _id: { $eq: new mongoose_1.Types.ObjectId(sellerId) },
+                    'project.id': { $eq: projectId }
+                }
+            },
             {
                 $unwind: {
                     path: '$paymentAccepted'
@@ -39,45 +39,81 @@ class SellerPaymentAcceptedRepo {
                 $project: {
                     _id: 0,
                     codeValue: '$paymentAccepted.paymentMethodType',
-                    seller: { id: { $toString: '$_id' } }
                 }
             }
         ]);
-        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));
-        }
+        const { limit, page } = params;
+        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();
     }
-    async create(params) {
-        let doc = await this.sellerModel.findOne({
+    async countSellerPaymentAccepted(params) {
+        const paymentAcceptedCount = (await this.sellerModel.aggregate([
+            {
+                $match: {
+                    _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) },
+                }
+            },
+            {
+                $project: {
+                    paymentAcceptedCount: {
+                        $cond: {
+                            if: { $isArray: '$paymentAccepted' },
+                            then: { $size: '$paymentAccepted' },
+                            else: 0
+                        }
+                    }
+                }
+            }
+        ]).option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec()).at(0)?.paymentAcceptedCount;
+        if (typeof paymentAcceptedCount !== 'number') {
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Corporation);
+        }
+        return { paymentAcceptedCount };
+    }
+    async addSellerPaymentAccepted(params, options) {
+        const sellerDoc = await this.sellerModel.findOne({
             'project.id': { $eq: params.project.id },
             _id: { $eq: params.seller.id }
         }, { _id: 1 })
+            .lean()
             .exec();
-        if (doc === null) {
+        if (sellerDoc === null) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Corporation);
         }
+        // 最大数検証(2026-09-20~)
+        const { maxNumSellerPaymentAccepted } = options;
         const creatingPaymentAccepted = {
             paymentMethodType: params.codeValue
         };
-        doc = await this.sellerModel.findOneAndUpdate({
+        const doc = await this.sellerModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: params.seller.id },
-            'paymentAccepted.paymentMethodType': { $ne: params.codeValue }
+            'paymentAccepted.paymentMethodType': { $ne: params.codeValue },
+            // 配列の長さが上限未満であることをアトミックに確認
+            $expr: {
+                $lt: [{ $size: { $ifNull: ['$paymentAccepted', []] } }, maxNumSellerPaymentAccepted] // 最大数担保(2026-09-22~)
+            }
         }, {
             $push: { paymentAccepted: creatingPaymentAccepted }
         }, {
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
+            const { paymentAcceptedCount } = await this.countSellerPaymentAccepted({ seller: params.seller });
+            if (paymentAcceptedCount >= maxNumSellerPaymentAccepted) {
+                throw new factory_1.factory.errors.Argument('seller.id', 'maxNumSellerPaymentAccepted exceeded');
+            }
+            // 上限以下で追加できない場合は「すでに登録済み」
             throw new factory_1.factory.errors.AlreadyInUse('paymentAccepted', ['paymentMethodType']);
         }
     }
-    async deleteOne(params) {
+    async deleteSellerPaymentAccepted(params) {
         const doc = await this.sellerModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: params.seller.id },
@@ -87,29 +123,20 @@ class SellerPaymentAcceptedRepo {
         }, {
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Corporation);
         }
     }
     async isAcceptedBySeller(params) {
-        const aggregate = this.sellerModel.aggregate([
-            {
-                $unwind: { path: '$paymentAccepted' }
-            },
-            { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) } } },
-            { $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue } } },
-            {
-                $project: {
-                    _id: 0,
-                    codeValue: '$paymentAccepted.paymentMethodType'
-                }
-            }
-        ])
-            .limit(1)
-            .skip(0);
-        return (await aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-            .exec()).length > 0;
+        const { sellerId, codeValue } = params;
+        const doc = await this.sellerModel.exists({
+            _id: { $eq: new mongoose_1.Types.ObjectId(sellerId) },
+            'paymentAccepted.paymentMethodType': { $exists: true, $eq: codeValue }
+        })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS });
+        return doc !== null;
     }
 }
 exports.SellerPaymentAcceptedRepo = SellerPaymentAcceptedRepo;