@chevre/domain 28.0.0-alpha.13 → 28.0.0-alpha.15

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

@@ -24,11 +24,6 @@ export declare class POSRepo {
             $eq?: string;
             $regex?: string;
         };
-    }, options: {
-        /**
-         * 2026-09-18~
-         */
-        excludePOSId: boolean;
     }): Promise<Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'>[]>;
     private countPOS;
     addPOSByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'> & {
@@ -37,22 +32,16 @@ export declare class POSRepo {
         };
     }, options: {
         maxNumPOS: number;
-    }): Promise<{
-        id: string;
-    }>;
-    updateByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'> & {
+    }): Promise<void>;
+    updatePOSByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode' | 'name'> & {
         project: {
             id: string;
         };
-    }): Promise<{
-        id: string;
-    }>;
-    deleteByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode'> & {
+    }): Promise<void>;
+    deletePOSByBranchCode(params: Pick<factory.place.movieTheater.IPOS, 'branchCode'> & {
         project: {
             id: string;
         };
-    }): Promise<{
-        id: string;
-    }>;
+    }): Promise<void>;
 }
 export {};

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

@@ -15,7 +15,7 @@ class POSRepo {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.operator = operater;
     }
-    async findPOS(params, options) {
+    async findPOS(params) {
         const matchStages = [];
         const branchCodeEq = params.branchCode?.$eq;
         if (typeof branchCodeEq === 'string') {
@@ -25,7 +25,6 @@ class POSRepo {
         if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
             matchStages.push({ $match: { 'hasPOS.branchCode': { $regex: new RegExp(branchCodeRegex) } } });
         }
-        const { excludePOSId } = options;
         const aggregate = this.civicStructureModel.aggregate([
             // まず施設ドキュメントで絞る
             {
@@ -46,7 +45,7 @@ class POSRepo {
                     _id: 0,
                     branchCode: '$hasPOS.branchCode',
                     name: '$hasPOS.name',
-                    ...((!excludePOSId) && { id: '$hasPOS.branchCode' })
+                    // ...((!excludePOSId) && { id: '$hasPOS.branchCode' }) // discontinue(2026-09-22~)
                 }
             }
         ]);
@@ -85,12 +84,13 @@ class POSRepo {
     }
     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~)
@@ -100,12 +100,12 @@ class POSRepo {
             throw new factory_1.factory.errors.Argument('operator.id', 'maxNumPOS exceeded');
         }
         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 }
@@ -120,14 +120,14 @@ class POSRepo {
             new: true,
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         // 存在しなければID重複
         if (doc === null) {
             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 },
@@ -145,13 +145,13 @@ class POSRepo {
             ],
             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 },
@@ -161,11 +161,11 @@ class POSRepo {
         }, {
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound('hasPOS');
         }
-        return doc.toObject({ virtuals: true });
     }
 }
 exports.POSRepo = POSRepo;

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;

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,82 @@ 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 { 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
         };
-        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 }
         }, {
-            $push: { paymentAccepted: creatingPaymentAccepted }
+            // $push: { paymentAccepted: creatingPaymentAccepted }
+            $push: {
+                paymentAccepted: {
+                    $each: [creatingPaymentAccepted],
+                    $slice: maxNumSellerPaymentAccepted // 最大数担保(2026-09-22~)
+                },
+            }
         }, {
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
             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,6 +124,7 @@ class SellerPaymentAcceptedRepo {
         }, {
             projection: { _id: 1 }
         })
+            .lean()
             .exec();
         if (doc === null) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.organizationType.Corporation);
@@ -94,10 +132,11 @@ 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: { _id: { $eq: new mongoose_1.Types.ObjectId(params.seller.id) } } },
             { $match: { 'paymentAccepted.paymentMethodType': { $exists: true, $eq: params.codeValue } } },
             {
                 $project: {
@@ -106,8 +145,8 @@ class SellerPaymentAcceptedRepo {
                 }
             }
         ])
-            .limit(1)
-            .skip(0);
+            .skip(0)
+            .limit(1);
         return (await aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec()).length > 0;
     }

package/lib/chevre/service/task/onResourceUpdated/onHasPOSUpdated.js

@@ -28,7 +28,7 @@ function createInformHasPOSTasks(params) {
         repos.pos.operator.id = movieTheater.id;
         const hasPOS = await repos.pos.findPOS({
             projectId: params.project.id
-        }, { excludePOSId: true }); // pos.idを除外(2026-09-18~)
+        }); // pos.idを除外(2026-09-18~)
         const movieTheaters4inform = [{
                 hasPOS: (Array.isArray(hasPOS)) ? hasPOS : [],
                 id: movieTheater.id,

package/package.json

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