@chevre/domain 22.2.0-alpha.9 → 22.3.0-alpha.0

package/lib/chevre/repo/product.js

@@ -24,6 +24,18 @@ exports.ProductRepo = void 0;
 const product_1 = require("./mongoose/schemas/product");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'additionalProperty',
+    'availableChannel',
+    'description',
+    'hasOfferCatalog',
+    'name',
+    'productID',
+    'serviceOutput',
+    'serviceType'
+];
 /**
  * プロダクトリポジトリ
  */
@@ -33,7 +45,7 @@ class ProductRepo {
     }
     // 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;
         // 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;
@@ -144,38 +156,46 @@ class ProductRepo {
                 ]
             });
         }
-        // プロバイダー条件を追加(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;
-        if (typeof providerIdEq === 'string') {
-            andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
-        }
+        // const providerIdEq = params.provider?.id?.$eq;
+        // if (typeof providerIdEq === 'string') {
+        //     andConditions.push({ 'provider.id': { $exists: true, $eq: providerIdEq } });
+        // }
         return andConditions;
     }
     /**
      * プロダクトを検索する
      */
-    searchProducts(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProductRepo.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
-                };
                 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
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.productModel.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;
@@ -188,13 +208,13 @@ class ProductRepo {
                 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();
         });
     }
     deleteProductById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.productModel.findOneAndDelete({ _id: params.id })
+            yield this.productModel.findOneAndDelete({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }
@@ -202,11 +222,13 @@ class ProductRepo {
      * プロダクトを保管する
      */
     saveProduct(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, offers } = _a, setFields = __rest(_a, ["id", "productID", "project", "typeOf", "offers"]);
+                const _c = params.$set, { id, productID, project, typeOf, offers } = _c, setFields = __rest(_c, ["id", "productID", "project", "typeOf", "offers"]);
                 switch (typeOf) {
                     case factory.product.ProductType.EventService:
                     case factory.product.ProductType.MembershipService:
@@ -219,30 +241,43 @@ class ProductRepo {
                         }, {
                             $set: setFields,
                             $unset: params.$unset
-                        }, { upsert: false, new: true, projection: { _id: 1 } })
+                        }, { upsert: false, new: true, projection: { _id: 1, id: { $toString: '$_id' } } })
+                            .lean()
                             .exec();
+                        if (doc === null) {
+                            throw new factory.errors.NotFound(this.productModel.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.productModel.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.productModel.modelName);
+                    }
+                    savedId = doc.id;
                 }
                 else {
-                    doc = yield this.productModel.create(createParams);
+                    // doc = await this.productModel.create(createParams);
+                    const result = yield this.productModel.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(`product not saved unexpectedly. result:${JSON.stringify(result)}`);
+                    }
+                    savedId = insertedId;
                 }
             }
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.productModel.modelName);
-            }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
@@ -297,8 +332,7 @@ class ProductRepo {
      */
     findAvailableChannel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            let paymentService;
-            paymentService = (yield this.searchProducts({
+            const paymentService = (yield this.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },

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

@@ -1,27 +1,6 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-interface IProductModel {
-    id?: string;
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'ProductModel';
-    category: Pick<factory.categoryCode.ICategoryCode, 'codeValue' | 'inCodeSet'> & {
-        /**
-         * 区分ID
-         * 削除時同期に必要
-         */
-        id: string;
-    };
-    name: factory.multilingualString;
-    offers: {
-        typeOf: factory.offerType.Offer;
-        eligibleCustomerType?: {
-            codeValue: string;
-        }[];
-    }[];
-}
+import { IProductModel } from './mongoose/schemas/productModel';
 type IKeyOfProjection = keyof IProductModel | '_id';
 type ISearchConditions = Pick<factory.product.ISearchConditions, 'id' | 'limit' | 'page' | 'project'> & {
     category?: {

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

@@ -24,7 +24,7 @@
 /// <reference types="mongoose/types/inferschematype" />
 import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type IKeyOfProjection = keyof factory.project.IProject | '_id';
+type IKeyOfProjection = keyof factory.project.IProject;
 /**
  * プロジェクトリポジトリ
  * makesOfferについてはsee ProjectMakesOfferRepo
@@ -44,9 +44,9 @@ export declare class ProjectRepo {
     /**
      * プロジェクト検索
      */
-    search(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
-    createById(params: factory.project.IProject): Promise<factory.project.IProject>;
-    findByIdAndIUpdate(params: {
+    projectFields(conditions: factory.project.ISearchConditions, inclusion: IKeyOfProjection[], exclusion: IKeyOfProjection[]): Promise<factory.project.IProject[]>;
+    createById(params: factory.project.IProject): Promise<Pick<factory.project.IProject, 'id'>>;
+    updateById(params: {
         id: string;
         alternateName?: string;
         logo?: string;
@@ -68,7 +68,27 @@ export declare class ProjectRepo {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<factory.project.IProject>, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<factory.project.IProject, "id"> & {
+        _id: string;
+        aggregateReservation?: any;
+        makesOffer?: factory.project.IMakesOffer[] | undefined;
+    }> & Omit<Omit<factory.project.IProject, "id"> & {
+        _id: string;
+        aggregateReservation?: any;
+        makesOffer?: factory.project.IMakesOffer[] | undefined;
+    } & Required<{
+        _id: string;
+    }>, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, Omit<factory.project.IProject, "id"> & {
+        _id: string;
+        aggregateReservation?: any;
+        makesOffer?: factory.project.IMakesOffer[] | undefined;
+    }> & Omit<Omit<factory.project.IProject, "id"> & {
+        _id: string;
+        aggregateReservation?: any;
+        makesOffer?: factory.project.IMakesOffer[] | undefined;
+    } & Required<{
+        _id: string;
+    }>, never>>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/project.js

@@ -8,11 +8,33 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectRepo = void 0;
 const project_1 = require("./mongoose/schemas/project");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const AVAILABLE_PROJECT_FIELDS = [
+    // 'aggregateReservation',
+    'alternateName',
+    'logo',
+    'hasMerchantReturnPolicy',
+    // 'makesOffer',
+    'name',
+    'settings',
+    'subscription',
+    'typeOf'
+];
 /**
  * プロジェクトリポジトリ
  * makesOfferについてはsee ProjectMakesOfferRepo
@@ -43,7 +65,7 @@ class ProjectRepo {
     }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const project = (yield this.search({
+            const project = (yield this.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: params.id }
@@ -56,42 +78,52 @@ class ProjectRepo {
     }
     findAlternateNameById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, { alternateName: 1 })
+            const doc = yield this.projectModel.findOne({ _id: { $eq: params.id } }, { alternateName: 1, _id: 0 })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.projectModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     /**
      * プロジェクト検索
      */
-    search(conditions, inclusion, exclusion) {
+    projectFields(conditions, inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const andConditions = ProjectRepo.CREATE_MONGO_CONDITIONS(conditions);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    if (String(field) !== 'makesOffer') {
-                        projection[field] = 1;
-                    }
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0,
-                    makesOffer: 0
-                };
                 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) => {
+            //         if (String(field) !== 'makesOffer') {
+            //             projection[field] = 1;
+            //         }
+            //     });
+            // } else {
+            //     projection = {
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0,
+            //         makesOffer: 0
+            //     };
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         exclusion.forEach((field) => {
+            //             projection[field] = 0;
+            //         });
+            //     }
+            // }
             const query = this.projectModel.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;
@@ -102,17 +134,28 @@ class ProjectRepo {
                 query.sort({ _id: conditions.sort._id });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-22~
+                .exec();
         });
     }
     createById(params) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.projectModel.create(Object.assign(Object.assign({}, params), { _id: params.id }))
-                .then((doc) => doc.toObject());
+            // return this.projectModel.create({ ...params, _id: params.id })
+            //     .then((doc) => doc.toObject());
+            const { id } = params, createParams = __rest(params, ["id"]);
+            if (typeof id !== 'string' || id === '') {
+                throw new factory.errors.ArgumentNull('id');
+            }
+            const result = yield this.projectModel.insertMany(Object.assign(Object.assign({}, createParams), { typeOf: factory.organizationType.Project, _id: id }), { rawResult: true });
+            const insertedId = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0];
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`project not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            return { id: insertedId };
         });
     }
-    findByIdAndIUpdate(params) {
+    updateById(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h;
         return __awaiter(this, void 0, void 0, function* () {
             let hasMerchantReturnPolicy;
@@ -136,7 +179,7 @@ class ProjectRepo {
                 ? { 'subscription.useEventServiceAsProduct': params.subscription.useEventServiceAsProduct }
                 : undefined), (hasMerchantReturnPolicy !== undefined) ? { hasMerchantReturnPolicy } : undefined), { $unset: {
                     'settings.cognito': 1 // 廃止(2023-11-10~)
-                } }))
+                } }), { projection: { _id: 1 } })
                 .exec();
         });
     }
@@ -153,9 +196,7 @@ class ProjectRepo {
     }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.projectModel.deleteOne({
-                _id: { $eq: params.id }
-            })
+            yield this.projectModel.deleteOne({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -29,9 +29,9 @@ export interface IUpdatePartiallyParams {
     additionalTicketText?: string;
 }
 export type ICancelResult = UpdateWriteOpResult;
-export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.BusReservation ? (factory.reservation.busReservation.IReservation) & {
+export type ICreatingReservation<T extends factory.reservationType> = T extends factory.reservationType.BusReservation ? (Omit<factory.reservation.busReservation.IReservation, 'id'>) & {
     _id: string;
-} : T extends factory.reservationType.EventReservation ? (factory.reservation.eventReservation.IReservation) & {
+} : T extends factory.reservationType.EventReservation ? (Omit<factory.reservation.eventReservation.IReservation, 'id'>) & {
     _id: string;
 } : never;
 type IKeyOfProjection = keyof factory.reservation.IReservation<factory.reservationType.BusReservation | factory.reservationType.EventReservation> | 'reservedTicket.dateUsed' | 'reservationFor.id' | 'reservationFor.typeOf';
@@ -151,7 +151,39 @@ export declare class ReservationRepo {
             $in: string[];
         };
     }): Promise<string[]>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, (Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> | Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id">) & {
+        _id: string;
+        bookingAgent?: any;
+        previousReservationStatus?: factory.reservationStatusType | undefined;
+    }> & Omit<(Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> & {
+        _id: string;
+        bookingAgent?: any;
+        previousReservationStatus?: factory.reservationStatusType | undefined;
+    } & Required<{
+        _id: string;
+    }>) | (Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
+        _id: string;
+        bookingAgent?: any;
+        previousReservationStatus?: factory.reservationStatusType | undefined;
+    } & Required<{
+        _id: string;
+    }>), never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, (Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> | Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id">) & {
+        _id: string;
+        bookingAgent?: any;
+        previousReservationStatus?: factory.reservationStatusType | undefined;
+    }> & Omit<(Omit<import("@chevre/factory/lib/reservation/busReservation").IReservation, "id"> & {
+        _id: string;
+        bookingAgent?: any;
+        previousReservationStatus?: factory.reservationStatusType | undefined;
+    } & Required<{
+        _id: string;
+    }>) | (Omit<import("@chevre/factory/lib/reservation/event").IReservation, "id"> & {
+        _id: string;
+        bookingAgent?: any;
+        previousReservationStatus?: factory.reservationStatusType | undefined;
+    } & Required<{
+        _id: string;
+    }>), never>>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;

package/lib/chevre/repo/reservation.js

@@ -970,7 +970,7 @@ class ReservationRepo {
                     }
                     bulkWriteOps.push({
                         updateOne: {
-                            filter: { _id: { $eq: setOnInsert.id } },
+                            filter: { _id: { $eq: subReservation.id } },
                             update: {
                                 $setOnInsert: setOnInsert
                             },

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

@@ -1,13 +1,6 @@
 import type { Connection } from 'mongoose';
 import * as factory from '../factory';
-export declare enum RoleType {
-    OrganizationRole = "OrganizationRole"
-}
-export interface IRole {
-    typeOf: RoleType;
-    roleName: string;
-    permissions: string[];
-}
+import { IRole } from './mongoose/schemas/role';
 /**
  * IAMロールリポジトリ
  */
@@ -15,7 +8,7 @@ export declare class RoleRepo {
     private readonly roleModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.iam.IRoleSearchConditions): any[];
-    search(params: factory.iam.IRoleSearchConditions): Promise<IRole[]>;
+    projectFields(params: factory.iam.IRoleSearchConditions): Promise<IRole[]>;
     aggregatePermissions(params: {
         roleName: {
             $in: string[];

package/lib/chevre/repo/role.js

@@ -9,13 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RoleRepo = exports.RoleType = void 0;
-const role_1 = require("./mongoose/schemas/role");
+exports.RoleRepo = void 0;
 const settings_1 = require("../settings");
-var RoleType;
-(function (RoleType) {
-    RoleType["OrganizationRole"] = "OrganizationRole";
-})(RoleType = exports.RoleType || (exports.RoleType = {}));
+const role_1 = require("./mongoose/schemas/role");
+const AVAILABLE_PROJECT_FIELDS = [
+    'typeOf',
+    'permissions',
+    'roleName'
+];
 /**
  * IAMロールリポジトリ
  */
@@ -39,10 +40,19 @@ class RoleRepo {
         }
         return andConditions;
     }
-    search(params) {
+    projectFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = RoleRepo.CREATE_MONGO_CONDITIONS(params);
-            const query = this.roleModel.find((conditions.length > 0) ? { $and: conditions } : {}, {});
+            const positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            // if (Array.isArray(inclusion) && inclusion.length > 0) {
+            //     positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            // } else {
+            //     if (Array.isArray(exclusion) && exclusion.length > 0) {
+            //         positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
+            //     }
+            // }
+            const projection = Object.assign({ _id: 0 }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.roleModel.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)
@@ -56,8 +66,8 @@ class RoleRepo {
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-23~
+                .exec();
         });
     }
     aggregatePermissions(params) {