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

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

@@ -1,7 +1,9 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-type IDocType = Omit<factory.seller.ISeller, 'id'>;
+type IDocType = Pick<factory.seller.ISeller, 'additionalProperty' | 'branchCode' | 'hasMerchantReturnPolicy' | 'makesOffer' | 'name' | 'project' | 'telephone' | 'typeOf' | 'url'> & {
+    paymentAccepted?: factory.seller.IPaymentAccepted[];
+};
 type IModel = Model<IDocType, Record<string, never>, Record<string, never>, IVirtuals>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, Record<string, never>, Record<string, never>, IVirtuals, Record<string, never>, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/seller.js

@@ -9,12 +9,10 @@ const modelName = 'Seller';
 exports.modelName = modelName;
 const schemaDefinition = {
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    // areaServed: [SchemaTypes.Mixed],
     branchCode: String,
     hasMerchantReturnPolicy: [mongoose_1.SchemaTypes.Mixed],
     makesOffer: [mongoose_1.SchemaTypes.Mixed],
     name: mongoose_1.SchemaTypes.Mixed,
-    // parentOrganization: SchemaTypes.Mixed,
     paymentAccepted: [mongoose_1.SchemaTypes.Mixed],
     project: mongoose_1.SchemaTypes.Mixed,
     typeOf: {

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/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, "project" | "name" | "typeOf" | "url" | "additionalProperty" | "telephone" | "branchCode" | "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, "project" | "name" | "typeOf" | "url" | "additionalProperty" | "telephone" | "branchCode" | "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

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

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.0.0-alpha.4",
+    "@chevre/factory": "11.0.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
@@ -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.17"
 }