@chevre/domain 22.2.0-alpha.2 → 22.2.0-alpha.21

package/lib/chevre/repo/ownershipInfo.js

@@ -233,11 +233,14 @@ class OwnershipInfoRepo {
                     new: true,
                     upsert: true,
                     projection: {
-                        __v: 0,
-                        createdAt: 0,
-                        updatedAt: 0
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                        // __v: 0,
+                        // createdAt: 0,
+                        // updatedAt: 0
                     }
                 })
+                    .lean()
                     .exec();
             }
             catch (error) {
@@ -254,36 +257,76 @@ class OwnershipInfoRepo {
             if (duplicate) {
                 // 重複の場合、再度取得
                 doc = yield this.ownershipInfoModel.findOne({ identifier: { $eq: ownershipInfo.identifier } }, {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
+                    _id: 0,
+                    id: { $toString: '$_id' }
+                    // __v: 0,
+                    // createdAt: 0,
+                    // updatedAt: 0
                 })
+                    .lean()
                     .exec();
             }
             if (doc === undefined || doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return { id: doc.id };
         });
     }
-    findById(params, projection) {
+    projectFieldsById(params, inclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.ownershipInfoModel.findById(params.id, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection))
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const doc = yield this.ownershipInfoModel.findOne({ _id: { $eq: params.id } }, projection)
+                .lean() // lean(2024-08-15~)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**
      * 所有権を検索する
      */
-    search(params, projection) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = OwnershipInfoRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.ownershipInfoModel.find((conditions.length > 0) ? { $and: conditions } : {}, Object.assign({ __v: 0, createdAt: 0, updatedAt: 0 }, projection));
+            let projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                project: 1,
+                typeOf: 1,
+                identifier: 1,
+                ownedBy: 1,
+                acquiredFrom: 1,
+                ownedFrom: 1,
+                ownedThrough: 1,
+                typeOfGood: 1
+            };
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && String(key) !== '_id')
+                : undefined;
+            if (Array.isArray(positiveProjectionFields)) {
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            }
+            const query = this.ownershipInfoModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -295,8 +338,8 @@ class OwnershipInfoRepo {
                 query.sort({ ownedFrom: params.sort.ownedFrom });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // lean(2024-08-19~)
+                .exec();
         });
     }
     /**
@@ -308,8 +351,15 @@ class OwnershipInfoRepo {
             return this.ownershipInfoModel.findOneAndUpdate({
                 'project.id': { $eq: params.project.id },
                 identifier: { $eq: String(params.identifier) }
-            }, { ownedThrough: params.ownedThrough }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
+            }, { ownedThrough: params.ownedThrough }, {
+                new: true,
+                projection: {
+                    _id: 0,
+                    id: { $toString: '$_id' },
+                    identifier: 1
+                }
+            })
+                .lean()
                 .exec()
                 .then((doc) => {
                 // 存在しない場合も正常にハンドルする
@@ -317,7 +367,7 @@ class OwnershipInfoRepo {
                     return;
                 }
                 else {
-                    return doc.toObject();
+                    return doc;
                 }
             });
         });
@@ -404,7 +454,10 @@ class OwnershipInfoRepo {
                 };
             }
             if (newOwner !== undefined) {
-                const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, { new: true })
+                const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $addToSet: { ownedBy: newOwner } }, {
+                    new: true,
+                    projection: { _id: 1 }
+                })
                     .exec();
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);
@@ -420,7 +473,10 @@ class OwnershipInfoRepo {
             if (typeof params.ownedBy.id !== 'string' || params.ownedBy.id.length === 0) {
                 throw new factory.errors.ArgumentNull('ownedBy.id');
             }
-            const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, { new: true })
+            const doc = yield this.ownershipInfoModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $pull: { ownedBy: { id: params.ownedBy.id } } }, {
+                new: true,
+                projection: { _id: 1 }
+            })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.ownershipInfoModel.modelName);

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

@@ -1,7 +1,7 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IUnsetKey = keyof Pick<factory.service.paymentService.IService, 'additionalProperty' | 'availableChannel' | 'serviceOutput' | 'serviceType'>;
-type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService | '_id';
+type IKeyOfProjection4paymentService = keyof factory.service.paymentService.IService;
 /**
  * 決済サービス検索条件
  */
@@ -37,7 +37,7 @@ export declare class PaymentServiceRepo {
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
+    projectFields(conditions: ISearchConditions4paymentService, inclusion: IKeyOfProjection4paymentService[], exclusion: IKeyOfProjection4paymentService[]): Promise<(factory.service.paymentService.IService & {
         id: string;
     })[]>;
     deletePaymentServiceById(params: {

package/lib/chevre/repo/paymentService.js

@@ -24,6 +24,17 @@ exports.PaymentServiceRepo = void 0;
 const factory = require("../factory");
 const settings_1 = require("../settings");
 const paymentService_1 = require("./mongoose/schemas/paymentService");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'additionalProperty',
+    'availableChannel',
+    'description',
+    'name',
+    'productID',
+    'serviceOutput',
+    'serviceType'
+];
 /**
  * 決済サービスリポジトリ
  */
@@ -33,7 +44,7 @@ class PaymentServiceRepo {
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -54,68 +65,80 @@ class PaymentServiceRepo {
                 typeOf: { $in: typeOfIn }
             });
         }
-        const hasOfferCatalogIdEq = (_f = (_e = params.hasOfferCatalog) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
-        if (typeof hasOfferCatalogIdEq === 'string') {
-            andConditions.push({
-                'hasOfferCatalog.id': {
-                    $exists: true,
-                    $eq: hasOfferCatalogIdEq
-                }
-            });
-        }
-        const idEq = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$eq;
+        // discontinue(2024-08-20~)
+        // const hasOfferCatalogIdEq = params.hasOfferCatalog?.id?.$eq;
+        // if (typeof hasOfferCatalogIdEq === 'string') {
+        //     andConditions.push({
+        //         'hasOfferCatalog.id': {
+        //             $exists: true,
+        //             $eq: hasOfferCatalogIdEq
+        //         }
+        //     });
+        // }
+        const idEq = (_e = params.id) === null || _e === void 0 ? void 0 : _e.$eq;
         if (typeof idEq === 'string') {
             andConditions.push({ _id: { $eq: idEq } });
         }
-        const idIn = (_h = params.id) === null || _h === void 0 ? void 0 : _h.$in;
+        const idIn = (_f = params.id) === null || _f === void 0 ? void 0 : _f.$in;
         if (Array.isArray(idIn)) {
             andConditions.push({ _id: { $in: idIn } });
         }
-        const productIDEq = (_j = params.productID) === null || _j === void 0 ? void 0 : _j.$eq;
+        const productIDEq = (_g = params.productID) === null || _g === void 0 ? void 0 : _g.$eq;
         if (typeof productIDEq === 'string') {
             andConditions.push({
                 productID: { $eq: productIDEq }
             });
         }
-        const productIDIn = (_k = params.productID) === null || _k === void 0 ? void 0 : _k.$in;
+        const productIDIn = (_h = params.productID) === null || _h === void 0 ? void 0 : _h.$in;
         if (Array.isArray(productIDIn)) {
             andConditions.push({
                 productID: { $in: productIDIn }
             });
         }
-        const productIDRegex = (_l = params.productID) === null || _l === void 0 ? void 0 : _l.$regex;
+        const productIDRegex = (_j = params.productID) === null || _j === void 0 ? void 0 : _j.$regex;
         if (typeof productIDRegex === 'string' && productIDRegex.length > 0) {
             andConditions.push({
                 productID: { $regex: new RegExp(productIDRegex) }
             });
         }
-        const offersElemMatch = (_m = params.offers) === null || _m === void 0 ? void 0 : _m.$elemMatch;
-        if (offersElemMatch !== undefined && offersElemMatch !== null) {
+        // discontinue(2024-08-20~)
+        // const offersElemMatch = params.offers?.$elemMatch;
+        // if (offersElemMatch !== undefined && offersElemMatch !== null) {
+        //     andConditions.push({
+        //         offers: {
+        //             $elemMatch: offersElemMatch
+        //         }
+        //     });
+        // }
+        const serviceOutputTypeOfEq = (_l = (_k = params.serviceOutput) === null || _k === void 0 ? void 0 : _k.typeOf) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof serviceOutputTypeOfEq === 'string') {
             andConditions.push({
-                offers: {
-                    $elemMatch: offersElemMatch
+                'serviceOutput.typeOf': {
+                    $exists: true,
+                    $eq: serviceOutputTypeOfEq
                 }
             });
         }
-        const serviceOutputTypeOfEq = (_p = (_o = params.serviceOutput) === null || _o === void 0 ? void 0 : _o.typeOf) === null || _p === void 0 ? void 0 : _p.$eq;
-        if (typeof serviceOutputTypeOfEq === 'string') {
+        const serviceOutputPaymentMethodAmountCurrencyEq = (_q = (_p = (_o = (_m = params.serviceOutput) === null || _m === void 0 ? void 0 : _m.paymentMethod) === null || _o === void 0 ? void 0 : _o.amount) === null || _p === void 0 ? void 0 : _p.currency) === null || _q === void 0 ? void 0 : _q.$eq;
+        if (typeof serviceOutputPaymentMethodAmountCurrencyEq === 'string') {
             andConditions.push({
-                'serviceOutput.typeOf': {
+                'serviceOutput.paymentMethod.amount.currency': {
                     $exists: true,
-                    $eq: serviceOutputTypeOfEq
+                    $eq: serviceOutputPaymentMethodAmountCurrencyEq
                 }
             });
         }
-        const serviceOutputAmountCurrencyEq = (_s = (_r = (_q = params.serviceOutput) === null || _q === void 0 ? void 0 : _q.amount) === null || _r === void 0 ? void 0 : _r.currency) === null || _s === void 0 ? void 0 : _s.$eq;
-        if (typeof serviceOutputAmountCurrencyEq === 'string') {
+        // extend(2024-08-20~)
+        const serviceOutputIssuedThroughServiceTypeCodeValueEq = (_u = (_t = (_s = (_r = params.serviceOutput) === null || _r === void 0 ? void 0 : _r.issuedThrough) === null || _s === void 0 ? void 0 : _s.serviceType) === null || _t === void 0 ? void 0 : _t.codeValue) === null || _u === void 0 ? void 0 : _u.$eq;
+        if (typeof serviceOutputIssuedThroughServiceTypeCodeValueEq === 'string') {
             andConditions.push({
-                'serviceOutput.amount.currency': {
+                'serviceOutput.issuedThrough.serviceType.codeValue': {
                     $exists: true,
-                    $eq: serviceOutputAmountCurrencyEq
+                    $eq: serviceOutputIssuedThroughServiceTypeCodeValueEq
                 }
             });
         }
-        const serviceTypeCodeValueEq = (_u = (_t = params.serviceType) === null || _t === void 0 ? void 0 : _t.codeValue) === null || _u === void 0 ? void 0 : _u.$eq;
+        const serviceTypeCodeValueEq = (_w = (_v = params.serviceType) === null || _v === void 0 ? void 0 : _v.codeValue) === null || _w === void 0 ? void 0 : _w.$eq;
         if (typeof serviceTypeCodeValueEq === 'string') {
             andConditions.push({
                 'serviceType.codeValue': {
@@ -124,7 +147,7 @@ class PaymentServiceRepo {
                 }
             });
         }
-        const nameRegex = (_v = params.name) === null || _v === void 0 ? void 0 : _v.$regex;
+        const nameRegex = (_x = params.name) === null || _x === void 0 ? void 0 : _x.$regex;
         if (typeof nameRegex === 'string' && nameRegex.length > 0) {
             const nameRegexExp = new RegExp(nameRegex);
             andConditions.push({
@@ -145,7 +168,7 @@ class PaymentServiceRepo {
             });
         }
         // プロバイダー条件を追加(2023-06-21~)
-        const providerIdEq = (_x = (_w = params.provider) === null || _w === void 0 ? void 0 : _w.id) === null || _x === void 0 ? void 0 : _x.$eq;
+        const providerIdEq = (_z = (_y = params.provider) === null || _y === void 0 ? void 0 : _y.id) === null || _z === void 0 ? void 0 : _z.$eq;
         if (typeof providerIdEq === 'string') {
             andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
         }
@@ -155,70 +178,97 @@ class PaymentServiceRepo {
      * 決済サービスを保管する
      */
     savePaymentService(params) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
+            let savedId;
             if (typeof params.id === 'string') {
                 // 上書き禁止属性を除外
-                const _a = params.$set, { id, productID, project, typeOf, provider } = _a, setFields = __rest(_a, ["id", "productID", "project", "typeOf", "provider"]);
+                const _c = params.$set, { id, productID, project, typeOf, provider } = _c, setFields = __rest(_c, ["id", "productID", "project", "typeOf", "provider"]);
                 switch (typeOf) {
                     case factory.service.paymentService.PaymentServiceType.CreditCard:
                     case factory.service.paymentService.PaymentServiceType.MovieTicket:
                         doc = yield this.paymentServiceModel.findOneAndUpdate({
                             _id: { $eq: params.id },
                             typeOf: { $eq: typeOf }
-                        }, { $set: setFields }, { upsert: false, new: true, projection: { _id: 1 } })
+                        }, {
+                            $set: setFields,
+                            $unset: params.$unset
+                        }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                            .lean()
                             .exec();
+                        if (doc === null) {
+                            throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+                        }
                         break;
                     default:
                         throw new factory.errors.NotImplemented(`${typeOf} not implemented`);
                 }
+                savedId = params.id;
             }
             else {
-                const _b = params.$set, { id } = _b, createParams = __rest(_b, ["id"]);
+                const _d = params.$set, { id } = _d, createParams = __rest(_d, ["id"]);
                 if (params.createIfNotExist === true) {
                     doc = yield this.paymentServiceModel.findOneAndUpdate({
                         'project.id': { $eq: createParams.project.id },
                         typeOf: { $eq: createParams.typeOf }
-                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1 } })
+                    }, { $setOnInsert: createParams }, { new: true, upsert: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                        .lean()
                         .exec();
+                    if (doc === null) {
+                        throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
+                    }
+                    savedId = doc.id;
                 }
                 else {
-                    doc = yield this.paymentServiceModel.create(createParams);
+                    // doc = await this.paymentServiceModel.create(createParams);
+                    const result = yield this.paymentServiceModel.insertMany(createParams, { rawResult: true });
+                    const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+                    if (typeof insertedId !== 'string') {
+                        throw new factory.errors.Internal(`paymentService not saved unexpectedly. result:${JSON.stringify(result)}`);
+                    }
+                    savedId = insertedId;
                 }
             }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.paymentServiceModel.modelName);
-            }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
      * 決済サービスを検索する
      */
-    searchPaymentServices(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = PaymentServiceRepo.CREATE_MONGO_CONDITIONS(conditions);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0,
-                    offers: 0,
-                    provider: 0 // paymentServiceProviderRepoへの完全移行につき除外(2023-12-20~)
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     inclusion.forEach((field) => {
+            //         projection[field] = 1;
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0,
+            //         offers: 0,
+            //         provider: 0 // paymentServiceProviderRepoへの完全移行につき除外(2023-12-20~)
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.paymentServiceModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
             if (typeof conditions.limit === 'number' && conditions.limit > 0) {
                 const page = (typeof conditions.page === 'number' && conditions.page > 0) ? conditions.page : 1;
@@ -231,13 +281,13 @@ class PaymentServiceRepo {
                 query.sort({ productID: conditions.sort.productID });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-20~
+                .exec();
         });
     }
     deletePaymentServiceById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.paymentServiceModel.findOneAndDelete({ _id: params.id })
+            yield this.paymentServiceModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }
@@ -247,7 +297,7 @@ class PaymentServiceRepo {
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let paymentService;
-            paymentService = (yield this.searchPaymentServices({
+            paymentService = (yield this.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },

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

@@ -1,15 +1,6 @@
 import { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 type IAvailablePaymentServiceType = factory.service.paymentService.PaymentServiceType.CreditCard | factory.service.paymentService.PaymentServiceType.MovieTicket;
-/**
- * 決済サービス検索条件
- */
-type ISearchConditions4paymentService = factory.product.ISearchConditions & {
-    typeOf?: {
-        $eq?: factory.service.paymentService.PaymentServiceType;
-        $in?: factory.service.paymentService.PaymentServiceType[];
-    };
-};
 export type IPublicPaymentServiceByProvider = Pick<factory.service.paymentService.IService, 'name' | 'description' | 'typeOf' | 'id' | 'productID' | 'serviceType' | 'serviceOutput' | 'additionalProperty'> & {
     provider?: {
         credentials?: Pick<factory.service.paymentService.IProviderCredentials, 'shopId' | 'paymentUrl' | 'tokenizationCode'>;
@@ -46,7 +37,7 @@ export declare class PaymentServiceProviderRepo {
     /**
      * 販売者の提供決済サービス(公開情報のみ)検索
      */
-    searchPublicPaymentServicesByProvider(params: Pick<ISearchConditions4paymentService, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPublicPaymentServiceByProvider[]>;
+    searchPublicPaymentServicesByProvider(params: Pick<factory.service.paymentService.ISearchConditions, 'limit' | 'page' | 'sort' | 'project' | 'provider' | 'typeOf'>): Promise<IPublicPaymentServiceByProvider[]>;
     create(params: factory.service.paymentService.IProvider & {
         project: {
             id: string;

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

@@ -25,7 +25,7 @@
 import type { BulkWriteResult } from 'mongodb';
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection4product = keyof factory.product.IProduct | '_id';
+type IKeyOfProjection = keyof factory.product.IProduct;
 /**
  * プロダクト検索条件
  */
@@ -41,7 +41,7 @@ export declare class ProductRepo {
     /**
      * プロダクトを検索する
      */
-    searchProducts(conditions: ISearchConditions4product, inclusion: IKeyOfProjection4product[], exclusion: IKeyOfProjection4product[]): Promise<(factory.product.IProduct & {
+    projectFields(conditions: ISearchConditions4product, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<(factory.product.IProduct & {
         id: string;
     })[]>;
     deleteProductById(params: {