@chevre/domain 28.0.0-alpha.14 → 28.0.0-alpha.16

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

@@ -95,10 +95,6 @@ class POSRepo {
         }
         // 最大数検証(2026-09-20~)
         const { maxNumPOS } = options;
-        const { posCount } = await this.countPOS();
-        if (posCount >= maxNumPOS) {
-            throw new factory_1.factory.errors.Argument('operator.id', 'maxNumPOS exceeded');
-        }
         const creatingPOS = {
             // // 互換性維持対応としてidを保管
             // id: params.branchCode as any, // discontinue(2026-09-22~)
@@ -108,22 +104,25 @@ class POSRepo {
         const doc = await this.civicStructureModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: this.operator.id },
-            'hasPOS.branchCode': { $ne: params.branchCode }
-        }, {
-            $push: {
-                hasPOS: {
-                    $each: [creatingPOS],
-                    $slice: maxNumPOS // 最大数担保(2026-09-20~)
-                },
+            'hasPOS.branchCode': { $ne: params.branchCode },
+            // 配列の長さが上限未満であることをアトミックに確認
+            $expr: {
+                $lt: [{ $size: { $ifNull: ['$hasPOS', []] } }, maxNumPOS] // 最大数担保(2026-09-20~)
             }
         }, {
-            new: true,
+            $push: { hasPOS: creatingPOS }
+        }, {
             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']);
         }
     }

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;

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateSeller.js

@@ -21,7 +21,7 @@ function validateSeller(params) {
                 // 販売者の対応決済方法かどうか確認
                 // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
                 const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-                    seller: { id: sellerId },
+                    sellerId,
                     codeValue: paymentMethodType
                 });
                 if (paymentAccepted !== true) {
@@ -33,7 +33,7 @@ function validateSeller(params) {
             // 販売者の対応決済方法かどうか確認
             // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
             const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-                seller: { id: sellerId },
+                sellerId,
                 codeValue: paymentMethodType
             });
             if (paymentAccepted !== true) {

package/lib/chevre/service/payment/creditCard/getGMOInfoFromSeller.js

@@ -6,7 +6,7 @@ function getGMOInfoFromSeller(params) {
     return async (repos) => {
         if (params.requirePaymentAccepted) {
             const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-                seller: { id: params.seller.id },
+                sellerId: params.seller.id,
                 codeValue: params.paymentMethodType
             });
             if (paymentAccepted !== true) {

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -56,7 +56,7 @@ function checkMovieTicket(params) {
             const screeningEvent = await repos.event.projectEventFieldsById({ id: eventIds[0] }, ['typeOf', 'project', 'coaInfo', 'startDate', 'offers.offeredThrough', 'superEvent.workPerformed.identifier']);
             const sellerId = optimizedCheckObject[0]?.seller.id;
             const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-                seller: { id: sellerId },
+                sellerId,
                 codeValue: paymentMethodType
             });
             if (paymentAccepted !== true) {

package/lib/chevre/service/payment/movieTicket/payMovieTicket/payActionParams2seatInfoSyncIn.js

@@ -31,7 +31,7 @@ function payActionParams2seatInfoSyncIn(params) {
             paymentServiceId
         })(repos);
         const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-            seller: { id: sellerId },
+            sellerId,
             codeValue: paymentMethodType
         });
         if (paymentAccepted !== true) {

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -61,7 +61,7 @@ checkedAction, purpose) {
         // }
         // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
         const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-            seller: { id: sellerId },
+            sellerId,
             codeValue: paymentMethodType
         });
         if (paymentAccepted !== true) {

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.14"
+  "version": "28.0.0-alpha.16"
 }