rez_core 1.0.62 → 1.0.63

package/dist/module/user/service/role.service.js

@@ -8,6 +8,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
+var __param = (this && this.__param) || function (paramIndex, decorator) {
+    return function (target, key) { decorator(target, key, paramIndex); }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleService = void 0;
 const common_1 = require("@nestjs/common");
@@ -15,52 +18,96 @@ const entity_service_impl_service_1 = require("../../meta/service/entity-service
 const global_constant_1 = require("../../../constant/global.constant");
 const role_repository_1 = require("../repository/role.repository");
 const typeorm_1 = require("typeorm");
+const typeorm_2 = require("@nestjs/typeorm");
+const module_access_entity_1 = require("../../module/entity/module-access.entity");
 let RoleService = class RoleService extends entity_service_impl_service_1.EntityServiceImpl {
-    constructor(roleRepository, entityManager) {
+    constructor(roleRepository, entityManager, moduleAccessRepo) {
         super();
         this.roleRepository = roleRepository;
         this.entityManager = entityManager;
+        this.moduleAccessRepo = moduleAccessRepo;
     }
     async createEntity(entityData, loggedInUser) {
         let role = entityData;
-        return await super.createEntity(role, loggedInUser);
-    }
-    async createRole(body, loggedInUser) {
-        return this.roleRepository.createRole(body, loggedInUser);
+        if (await this.roleRepository.isRoleNameExists(role.name)) {
+            throw new common_1.BadRequestException('Role name already exists.');
+        }
+        const sourceRole = role.copy_from_role_id
+            ? await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id)
+            : null;
+        if (role.copy_from_role_id && !sourceRole) {
+            throw new common_1.BadRequestException('Source role not found.');
+        }
+        const savedRole = await super.createEntity(role, loggedInUser);
+        if (sourceRole) {
+            const sourcePermissions = await this.moduleAccessRepo.find({
+                where: { role_code: sourceRole.code },
+            });
+            const clonedPermissions = sourcePermissions.map((perm) => this.moduleAccessRepo.create({
+                role_code: savedRole.code,
+                module_code: perm.module_code,
+                action_type: perm.action_type,
+                access_flag: perm.access_flag,
+                app_code: perm.app_code,
+            }));
+            await this.moduleAccessRepo.save(clonedPermissions);
+        }
+        return savedRole;
     }
-    async updateRole(id, body, loggedInUser) {
-        if (!body.name) {
+    async updateEntity(entityData, loggedInUser) {
+        if (!entityData.name) {
             throw new common_1.BadRequestException('Role name is required');
         }
-        if (body.status === 'INACTIVE') {
-            const entityData = await super.getEntityData(global_constant_1.ENTITYTYPE_ROLE, id);
-            const associatedUsers = await this.entityManager.query(`SELECT 	map.* 
-      FROM 	cr_user_role_mapping map 
-		  JOIN cr_user usr ON map.user_id = usr.id
-      WHERE usr.status = 'ACTIVE' and map.role_id = ${entityData?.id}`);
+        const role = entityData;
+        if (entityData.status === 'INACTIVE') {
+            const existingRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, entityData.id);
+            if (!existingRole) {
+                throw new common_1.BadRequestException('Role not found');
+            }
+            const associatedUsers = await this.entityManager.query(`SELECT map.*
+                                                              FROM cr_user_role_mapping map
+                                                                     JOIN cr_user usr ON map.user_id = usr.id
+                                                              WHERE usr.status = 'ACTIVE'
+                                                                and map.role_id = ${existingRole?.id}`);
             if (associatedUsers.length > 0) {
                 throw new common_1.BadRequestException('Cannot deactivate role as it is associated with active users');
             }
-            if (!entityData) {
-                throw new common_1.BadRequestException('Role not found');
-            }
-            const role = entityData;
             if (role.is_system === 1) {
                 throw new common_1.BadRequestException('Cannot deactivate system role');
             }
         }
-        return this.roleRepository.updateRole(id, {
-            name: body.name,
-            description: body.description,
-            status: body.status,
-            copyFromRoleId: body.copyFromRoleId,
-        }, loggedInUser);
+        if (await this.roleRepository.isRoleNameExists(entityData.name, entityData.id)) {
+            throw new common_1.BadRequestException('Role name already exists.');
+        }
+        const { copy_from_role_id, ...persistableData } = role;
+        const updatedRole = await super.updateEntity(persistableData, loggedInUser);
+        if (role.copy_from_role_id) {
+            const sourceRole = await this.getEntityData(global_constant_1.ENTITYTYPE_ROLE, role.copy_from_role_id);
+            if (!sourceRole) {
+                throw new common_1.BadRequestException('Source role not found');
+            }
+            await this.moduleAccessRepo.delete({ role_code: role.code });
+            const sourcePermissions = await this.moduleAccessRepo.find({
+                where: { role_code: sourceRole.code },
+            });
+            const clonedPermissions = sourcePermissions.map((perm) => this.moduleAccessRepo.create({
+                role_code: role.code,
+                module_code: perm.module_code,
+                action_type: perm.action_type,
+                access_flag: perm.access_flag,
+                app_code: perm.app_code,
+            }));
+            await this.moduleAccessRepo.save(clonedPermissions);
+        }
+        return updatedRole;
     }
 };
 exports.RoleService = RoleService;
 exports.RoleService = RoleService = __decorate([
     (0, common_1.Injectable)(),
+    __param(2, (0, typeorm_2.InjectRepository)(module_access_entity_1.ModuleAccess)),
     __metadata("design:paramtypes", [role_repository_1.RoleRepository,
-        typeorm_1.EntityManager])
+        typeorm_1.EntityManager,
+        typeorm_1.Repository])
 ], RoleService);
 //# sourceMappingURL=role.service.js.map

package/dist/module/user/service/role.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AAInF,uEAA+D;AAC/D,mEAA+D;AAC/D,qCAAwC;AAGjC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACmB,cAA8B,EAC9B,aAA4B;QAG7C,KAAK,EAAE,CAAC;QAJS,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;IAI/C,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B;QAE7B,IAAI,IAAI,GAAG,UAAkB,CAAC;QAE9B,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,UAAU,CACd,IAKC,EACD,YAAsB;QAEtB,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,UAAU,CACd,EAAU,EACV,IAKC,EACD,YAAsB;QAEtB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;YAE/B,MAAM,UAAU,GAAG,MAAM,KAAK,CAAC,aAAa,CAC1C,iCAAe,EACf,EAAE,CACH,CAAC;YAEF,MAAM,eAAe,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC;;;sDAGP,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;YAElE,IAAI,eAAe,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC/B,MAAM,IAAI,4BAAmB,CAC3B,8DAA8D,CAC/D,CAAC;YACJ,CAAC;YAED,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChB,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;YAClD,CAAC;YACD,MAAM,IAAI,GAAG,UAAkB,CAAC;YAChC,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;gBACzB,MAAM,IAAI,4BAAmB,CAAC,+BAA+B,CAAC,CAAC;YACjE,CAAC;QACH,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE,EAAE;YACxC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,EAAE,YAAY,CAAC,CAAC;IACnB,CAAC;CACF,CAAA;AA9EY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAGwB,gCAAc;QACf,uBAAa;GAHpC,WAAW,CA8EvB"}
+{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}

package/dist/module/user/user.module.js

@@ -29,14 +29,19 @@ const user_role_mapping_repository_1 = require("./repository/user-role-mapping.r
 const user_role_mapping_service_1 = require("./service/user-role-mapping.service");
 const role_repository_1 = require("./repository/role.repository");
 const module_access_entity_1 = require("../module/entity/module-access.entity");
-const role_controller_1 = require("./controller/role.controller");
 let UserModule = class UserModule {
 };
 exports.UserModule = UserModule;
 exports.UserModule = UserModule = __decorate([
     (0, common_1.Module)({
         imports: [
-            typeorm_1.TypeOrmModule.forFeature([user_entity_1.UserData, user_session_entity_1.UserSession, role_entity_1.Role, user_role_mapping_entity_1.UserRoleMapping, module_access_entity_1.ModuleAccess]),
+            typeorm_1.TypeOrmModule.forFeature([
+                user_entity_1.UserData,
+                user_session_entity_1.UserSession,
+                role_entity_1.Role,
+                user_role_mapping_entity_1.UserRoleMapping,
+                module_access_entity_1.ModuleAccess,
+            ]),
             entity_module_1.EntityModule,
             utils_module_1.UtilsModule,
             auth_module_1.AuthModule,
@@ -61,7 +66,7 @@ exports.UserModule = UserModule = __decorate([
             role_repository_1.RoleRepository,
             login_service_1.LoginService,
         ],
-        controllers: [login_controller_1.LoginController, user_controller_1.UserController, role_controller_1.RoleController],
+        controllers: [login_controller_1.LoginController, user_controller_1.UserController],
     })
 ], UserModule);
 //# sourceMappingURL=user.module.js.map

package/dist/module/user/user.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/module/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,sDAAgD;AAChD,yDAAqD;AACrD,2DAAuD;AACvD,yDAAqD;AACrD,kEAA8D;AAC9D,yEAAoE;AACpE,sEAA2D;AAC3D,oEAAgE;AAChE,2DAAuD;AACvD,gFAA4E;AAC5E,qCAAyC;AACzC,qDAAiD;AACjD,kEAA8D;AAC9D,sDAA4C;AAC5C,yDAAqD;AACrD,gFAAoE;AACpE,4FAAsF;AACtF,mFAA6E;AAC7E,kEAA8D;AAC9D,gFAAqE;AACrE,kEAA8D;AA+BvD,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IA7BtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC,CAAC,sBAAQ,EAAE,iCAAW,EAAE,kBAAI,EAAE,0CAAe,EAAC,mCAAY,CAAC,CAAC;YACrF,4BAAY;YACZ,0BAAW;YACX,wBAAU;SACX;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,gCAAc;YACd,yCAAkB;YAClB,4BAAY;YACZ,8CAAqB;YACrB,gBAAU;YACV,wDAAyB;YACzB,kDAAsB;YACtB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,aAAa;YACb,yCAAkB;YAClB,aAAa;YACb,kDAAsB;YACtB,gCAAc;YACd,4BAAY;SACb;QACD,WAAW,EAAE,CAAC,kCAAe,EAAE,gCAAc,EAAC,gCAAc,CAAC;KAC9D,CAAC;GACW,UAAU,CAAG"}
+{"version":3,"file":"user.module.js","sourceRoot":"","sources":["../../../src/module/user/user.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,6CAAgD;AAChD,sDAAgD;AAChD,yDAAqD;AACrD,2DAAuD;AACvD,yDAAqD;AACrD,kEAA8D;AAC9D,yEAAoE;AACpE,sEAA2D;AAC3D,oEAAgE;AAChE,2DAAuD;AACvD,gFAA4E;AAC5E,qCAAyC;AACzC,qDAAiD;AACjD,kEAA8D;AAC9D,sDAA4C;AAC5C,yDAAqD;AACrD,gFAAoE;AACpE,4FAAsF;AACtF,mFAA6E;AAC7E,kEAA8D;AAC9D,gFAAqE;AAqC9D,IAAM,UAAU,GAAhB,MAAM,UAAU;CAAG,CAAA;AAAb,gCAAU;qBAAV,UAAU;IAnCtB,IAAA,eAAM,EAAC;QACN,OAAO,EAAE;YACP,uBAAa,CAAC,UAAU,CAAC;gBACvB,sBAAQ;gBACR,iCAAW;gBACX,kBAAI;gBACJ,0CAAe;gBACf,mCAAY;aACb,CAAC;YACF,4BAAY;YACZ,0BAAW;YACX,wBAAU;SACX;QACD,SAAS,EAAE;YACT,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,EAAE,0BAAW,EAAE;YACjD,gCAAc;YACd,yCAAkB;YAClB,4BAAY;YACZ,8CAAqB;YACrB,gBAAU;YACV,wDAAyB;YACzB,kDAAsB;YACtB,gCAAc;SACf;QACD,OAAO,EAAE;YACP,aAAa;YACb,yCAAkB;YAClB,aAAa;YACb,kDAAsB;YACtB,gCAAc;YACd,4BAAY;SACb;QACD,WAAW,EAAE,CAAC,kCAAe,EAAE,gCAAc,CAAC;KAC/C,CAAC;GACW,UAAU,CAAG"}