@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.63

package/lib/chevre/repo/reserveInterface.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReserveInterfaceRepo = void 0;
 const reserveInterface_1 = require("./mongoose/schemas/reserveInterface");
@@ -15,46 +6,44 @@ const reserveInterface_1 = require("./mongoose/schemas/reserveInterface");
  * ReserveIFリポジトリ
  */
 class ReserveInterfaceRepo {
+    reserveInterface;
     constructor(connection) {
         this.reserveInterface = connection.model(reserveInterface_1.modelName, (0, reserveInterface_1.createSchema)());
     }
     // public async saveOne(params: factory.service.webAPI.IServiceWithChannel): Promise<void> {
     //     await this.reserveInterface.create(params);
     // }
-    findOne(filter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const andQuery = [];
-            const idEq = (_a = filter.id) === null || _a === void 0 ? void 0 : _a.$eq;
-            if (typeof idEq === 'string') {
-                andQuery.push({ _id: { $eq: idEq } });
-            }
-            const projectIdEq = (_c = (_b = filter.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof projectIdEq === 'string') {
-                andQuery.push({ 'project.id': { $eq: projectIdEq } });
-            }
-            const filterQuery = Object.assign({}, (andQuery.length > 0) ? { $and: andQuery } : undefined);
-            return this.reserveInterface.findOne(filterQuery, {
-                _id: 0,
-                id: { $toString: '$_id' },
-                project: '$project',
-                availableChannel: '$availableChannel',
-                typeOf: '$typeOf'
-            })
-                .lean()
-                .exec();
-        });
+    async findOne(filter) {
+        const andQuery = [];
+        const idEq = filter.id?.$eq;
+        if (typeof idEq === 'string') {
+            andQuery.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = filter.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            andQuery.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const filterQuery = {
+            ...(andQuery.length > 0) ? { $and: andQuery } : undefined
+        };
+        return this.reserveInterface.findOne(filterQuery, {
+            _id: 0,
+            id: { $toString: '$_id' },
+            project: '$project',
+            availableChannel: '$availableChannel',
+            typeOf: '$typeOf'
+        })
+            .lean()
+            .exec();
     }
-    findOneId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.reserveInterface.findOne({}, {
-                _id: 0,
-                id: { $toString: '$_id' },
-                project: '$project'
-            })
-                .lean()
-                .exec();
-        });
+    async findOneId() {
+        return this.reserveInterface.findOne({}, {
+            _id: 0,
+            id: { $toString: '$_id' },
+            project: '$project'
+        })
+            .lean()
+            .exec();
     }
 }
 exports.ReserveInterfaceRepo = ReserveInterfaceRepo;

package/lib/chevre/repo/role.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleRepo = void 0;
 const factory = require("../factory");
@@ -24,58 +15,59 @@ const AVAILABLE_PROJECT_FIELDS = [
  * IAMロールリポジトリ
  */
 class RoleRepo {
+    roleModel;
     constructor(connection) {
         this.roleModel = connection.model(role_1.modelName, (0, role_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g;
         const andConditions = [];
-        if (typeof ((_a = params.roleName) === null || _a === void 0 ? void 0 : _a.$eq) === 'string') {
+        if (typeof params.roleName?.$eq === 'string') {
             andConditions.push({ roleName: { $eq: params.roleName.$eq } });
         }
-        const roleNameIn = (_b = params.roleName) === null || _b === void 0 ? void 0 : _b.$in;
+        const roleNameIn = params.roleName?.$in;
         if (Array.isArray(roleNameIn)) {
             andConditions.push({ roleName: { $in: roleNameIn } });
         }
-        const permissionsEq = (_c = params.permissions) === null || _c === void 0 ? void 0 : _c.$eq;
+        const permissionsEq = params.permissions?.$eq;
         if (typeof permissionsEq === 'string') {
             andConditions.push({ permissions: { $exists: true, $eq: permissionsEq } });
         }
-        const memberTypeOfEq = (_e = (_d = params.member) === null || _d === void 0 ? void 0 : _d.typeOf) === null || _e === void 0 ? void 0 : _e.$eq;
+        const memberTypeOfEq = params.member?.typeOf?.$eq;
         if (typeof memberTypeOfEq === 'string') {
             andConditions.push({ 'member.typeOf': { $eq: memberTypeOfEq } });
         }
-        const memberOfTypeOfEq = (_g = (_f = params.memberOf) === null || _f === void 0 ? void 0 : _f.typeOf) === null || _g === void 0 ? void 0 : _g.$eq;
+        const memberOfTypeOfEq = params.memberOf?.typeOf?.$eq;
         if (typeof memberOfTypeOfEq === 'string') {
             andConditions.push({ 'memberOf.typeOf': { $eq: memberOfTypeOfEq } });
         }
         return andConditions;
     }
-    projectFields(params, inclusion) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const conditions = RoleRepo.CREATE_MONGO_CONDITIONS(params);
-            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
-            if (Array.isArray(inclusion) && inclusion.length > 0) {
-                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.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)
-                    .skip(params.limit * (page - 1));
-            }
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (params.sort !== undefined) {
-                query.sort(params.sort);
-            }
-            // 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 })
-                .lean() // 2024-08-23~
-                .exec();
-        });
+    async projectFields(params, inclusion) {
+        const conditions = RoleRepo.CREATE_MONGO_CONDITIONS(params);
+        let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+        if (Array.isArray(inclusion) && inclusion.length > 0) {
+            positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+        }
+        const projection = {
+            _id: 0,
+            // id: { $toString: '$_id' },
+            ...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)
+                .skip(params.limit * (page - 1));
+        }
+        /* istanbul ignore else */
+        if (params.sort !== undefined) {
+            query.sort(params.sort);
+        }
+        // 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 })
+            .lean() // 2024-08-23~
+            .exec();
     }
     // migrate to findDistinctPermissionsByRoleName(2025-07-21~)
     // public async aggregatePermissions(params: {
@@ -109,83 +101,72 @@ class RoleRepo {
     /**
      * distinctコマンドを使用して、ロールから権限を検索する
      */
-    findUniquePermissionsByRoleName(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.roleModel.distinct('permissions', { roleName: { $in: params.roleName.$in } })
-                .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec();
-        });
+    async findUniquePermissionsByRoleName(params) {
+        return this.roleModel.distinct('permissions', { roleName: { $in: params.roleName.$in } })
+            .setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+            .exec();
     }
-    addPermissionIfNotExists(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.roleModel.findOneAndUpdate({
-                roleName: { $eq: params.roleName.$eq },
-                permissions: { $ne: params.permission }
-            }, {
-                $push: {
-                    permissions: {
-                        $each: [params.permission],
-                        $sort: 1
-                    }
+    async addPermissionIfNotExists(params) {
+        return this.roleModel.findOneAndUpdate({
+            roleName: { $eq: params.roleName.$eq },
+            permissions: { $ne: params.permission }
+        }, {
+            $push: {
+                permissions: {
+                    $each: [params.permission],
+                    $sort: 1
                 }
-            }, {
-                new: true,
-                projection: { _id: 1 }
-            })
-                .lean()
-                .exec();
-        });
+            }
+        }, {
+            new: true,
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec();
     }
-    removePermissionIfExists(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.roleModel.findOneAndUpdate({
-                roleName: { $eq: params.roleName.$eq },
-                permissions: { $eq: params.permission }
-            }, {
-                $pull: {
-                    permissions: params.permission
-                }
-            }, {
-                new: true,
-                projection: { _id: 1 }
-            })
-                .lean()
-                .exec();
-        });
+    async removePermissionIfExists(params) {
+        return this.roleModel.findOneAndUpdate({
+            roleName: { $eq: params.roleName.$eq },
+            permissions: { $eq: params.permission }
+        }, {
+            $pull: {
+                permissions: params.permission
+            }
+        }, {
+            new: true,
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec();
     }
-    addMember(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { roleName, member, memberOf } = params;
-            return this.roleModel.findOneAndUpdate({
-                roleName: { $eq: roleName },
-                'member.typeOf': { $ne: member.typeOf }
-            }, {
-                $set: { member, memberOf }
-            }, {
-                new: true,
-                projection: { _id: 1 }
-            })
-                .lean()
-                .exec();
-        });
+    async addMember(params) {
+        const { roleName, member, memberOf } = params;
+        return this.roleModel.findOneAndUpdate({
+            roleName: { $eq: roleName },
+            'member.typeOf': { $ne: member.typeOf }
+        }, {
+            $set: { member, memberOf }
+        }, {
+            new: true,
+            projection: { _id: 1 }
+        })
+            .lean()
+            .exec();
     }
-    create(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            let savedId;
-            const { member, memberOf, permissions, roleName } = params;
-            const creatingRole = {
-                member, memberOf, permissions, roleName,
-                typeOf: factory.role.RoleType.OrganizationRole
-            };
-            const result = yield this.roleModel.insertMany(creatingRole, { 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(`role not saved unexpectedly. result:${JSON.stringify(result)}`);
-            }
-            savedId = insertedId;
-            return { id: savedId };
-        });
+    async create(params) {
+        let savedId;
+        const { member, memberOf, permissions, roleName } = params;
+        const creatingRole = {
+            member, memberOf, permissions, roleName,
+            typeOf: factory.role.RoleType.OrganizationRole
+        };
+        const result = await this.roleModel.insertMany(creatingRole, { rawResult: true });
+        const insertedId = result.insertedIds?.[0]?.toHexString();
+        if (typeof insertedId !== 'string') {
+            throw new factory.errors.Internal(`role not saved unexpectedly. result:${JSON.stringify(result)}`);
+        }
+        savedId = insertedId;
+        return { id: savedId };
     }
 }
 exports.RoleRepo = RoleRepo;

package/lib/chevre/repo/schedule.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScheduleRepo = void 0;
 const schedule_1 = require("./mongoose/schemas/schedule");
@@ -15,40 +6,38 @@ const schedule_1 = require("./mongoose/schemas/schedule");
  * スケジュールリポジトリ
  */
 class ScheduleRepo {
+    scheduleModel;
     constructor(connection) {
         this.scheduleModel = connection.model(schedule_1.modelName, (0, schedule_1.createSchema)());
     }
     // public async saveOne(params: factory.schedule.IEventWithSchedule): Promise<void> {
     //     await this.scheduleModel.create(params);
     // }
-    findOne(filter) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            const andQuery = [];
-            const idEq = (_a = filter.id) === null || _a === void 0 ? void 0 : _a.$eq;
-            if (typeof idEq === 'string') {
-                andQuery.push({ _id: { $eq: idEq } });
-            }
-            const projectIdEq = (_c = (_b = filter.project) === null || _b === void 0 ? void 0 : _b.id) === null || _c === void 0 ? void 0 : _c.$eq;
-            if (typeof projectIdEq === 'string') {
-                andQuery.push({ 'project.id': { $eq: projectIdEq } });
-            }
-            const filterQuery = Object.assign({}, (andQuery.length > 0) ? { $and: andQuery } : undefined);
-            return this.scheduleModel.findOne(filterQuery)
-                .lean()
-                .exec();
-        });
+    async findOne(filter) {
+        const andQuery = [];
+        const idEq = filter.id?.$eq;
+        if (typeof idEq === 'string') {
+            andQuery.push({ _id: { $eq: idEq } });
+        }
+        const projectIdEq = filter.project?.id?.$eq;
+        if (typeof projectIdEq === 'string') {
+            andQuery.push({ 'project.id': { $eq: projectIdEq } });
+        }
+        const filterQuery = {
+            ...(andQuery.length > 0) ? { $and: andQuery } : undefined
+        };
+        return this.scheduleModel.findOne(filterQuery)
+            .lean()
+            .exec();
     }
-    findOneId() {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.scheduleModel.findOne({}, {
-                _id: 0,
-                id: { $toString: '$_id' },
-                project: '$project'
-            })
-                .lean()
-                .exec();
-        });
+    async findOneId() {
+        return this.scheduleModel.findOne({}, {
+            _id: 0,
+            id: { $toString: '$_id' },
+            project: '$project'
+        })
+            .lean()
+            .exec();
     }
 }
 exports.ScheduleRepo = ScheduleRepo;