@chevre/domain 28.0.0-alpha.15 → 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

@@ -38,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

@@ -86,31 +86,30 @@ class SellerPaymentAcceptedRepo {
         }
         // 最大数検証(2026-09-20~)
         const { maxNumSellerPaymentAccepted } = options;
-        const { paymentAcceptedCount } = await this.countSellerPaymentAccepted({ seller: params.seller });
-        if (paymentAcceptedCount >= maxNumSellerPaymentAccepted) {
-            throw new factory_1.factory.errors.Argument('seller.id', 'maxNumSellerPaymentAccepted exceeded');
-        }
         const creatingPaymentAccepted = {
             paymentMethodType: params.codeValue
         };
         const doc = await this.sellerModel.findOneAndUpdate({
             'project.id': { $eq: params.project.id },
             _id: { $eq: params.seller.id },
-            'paymentAccepted.paymentMethodType': { $ne: params.codeValue }
-        }, {
-            // $push: { paymentAccepted: creatingPaymentAccepted }
-            $push: {
-                paymentAccepted: {
-                    $each: [creatingPaymentAccepted],
-                    $slice: maxNumSellerPaymentAccepted // 最大数担保(2026-09-22~)
-                },
+            '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']);
         }
     }
@@ -131,24 +130,13 @@ class SellerPaymentAcceptedRepo {
         }
     }
     async isAcceptedBySeller(params) {
-        const aggregate = this.sellerModel.aggregate([
-            // まず販売者ドキュメントで絞る
-            { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) } } },
-            {
-                $unwind: { path: '$paymentAccepted' }
-            },
-            { $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue } } },
-            {
-                $project: {
-                    _id: 0,
-                    codeValue: '$paymentAccepted.paymentMethodType'
-                }
-            }
-        ])
-            .skip(0)
-            .limit(1);
-        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.15"
+  "version": "28.0.0-alpha.16"
 }