rez_core 1.0.48 → 1.0.50

package/dist/module/module/service/module-access.service.js

@@ -17,10 +17,12 @@ const common_1 = require("@nestjs/common");
 const module_access_repository_1 = require("../repository/module-access.repository");
 const role_service_1 = require("../../user/service/role.service");
 const global_constant_1 = require("../../../constant/global.constant");
+const typeorm_1 = require("typeorm");
 let ModuleAccessService = class ModuleAccessService {
-    constructor(moduleAccessRepository, roleService) {
+    constructor(moduleAccessRepository, roleService, entityManager) {
         this.moduleAccessRepository = moduleAccessRepository;
         this.roleService = roleService;
+        this.entityManager = entityManager;
     }
     async getRoles() {
         return this.moduleAccessRepository.getRoles();
@@ -46,27 +48,36 @@ let ModuleAccessService = class ModuleAccessService {
             return { success: false, msg: 'Failed to update module access' };
         }
     }
-    async createRole(body) {
-        return this.moduleAccessRepository.createRole(body);
+    async createRole(body, loggedInUser) {
+        return this.moduleAccessRepository.createRole(body, loggedInUser);
     }
-    async updateRole(id, body) {
+    async updateRole(id, body, loggedInUser) {
         if (!body.name) {
             throw new common_1.BadRequestException('Role name is required');
         }
-        const entityData = await this.roleService.getEntityData(global_constant_1.ENTITYTYPE_ROLE, id);
-        if (!entityData) {
-            throw new common_1.BadRequestException('Role not found');
-        }
-        const role = entityData;
-        if (body.status === 'INACTIVE' && role.is_system === 1) {
-            throw new common_1.BadRequestException('Cannot deactivate system role');
+        if (body.status === 'INACTIVE') {
+            const entityData = await this.roleService.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}`);
+            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.moduleAccessRepository.updateRole(id, {
             name: body.name,
             description: body.description,
             status: body.status,
             copyFromRoleId: body.copyFromRoleId,
-        });
+        }, loggedInUser);
     }
 };
 exports.ModuleAccessService = ModuleAccessService;
@@ -74,6 +85,7 @@ exports.ModuleAccessService = ModuleAccessService = __decorate([
     (0, common_1.Injectable)(),
     __param(1, (0, common_1.Inject)('RoleService')),
     __metadata("design:paramtypes", [module_access_repository_1.ModuleAccessRepository,
-        role_service_1.RoleService])
+        role_service_1.RoleService,
+        typeorm_1.EntityManager])
 ], ModuleAccessService);
 //# sourceMappingURL=module-access.service.js.map

package/dist/module/module/service/module-access.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AAEhF,kEAA8D;AAC9D,uEAAoE;AAI7D,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C,EACvB,WAAwB;QAD/C,2BAAsB,GAAtB,sBAAsB,CAAwB;QACvB,gBAAW,GAAX,WAAW,CAAa;IAC/D,CAAC;IAEJ,KAAK,CAAC,QAAQ;QACZ,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,UAAU;QACd,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,EAAE,CAAC;IAClD,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAiB;QACtC,OAAO,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAoB;QACvC,OAAO,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,gBAAuB;QAEvB,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GACV,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAC;QAEzE,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,oCAAoC,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAKhB;QACC,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAED,KAAK,CAAC,UAAU,CACd,EAAU,EACV,IAKC;QAED,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,4BAAmB,CAAC,uBAAuB,CAAC,CAAC;QACzD,CAAC;QAGD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,iCAAe,EAAC,EAAE,CAAC,CAAC;QAE5E,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,4BAAmB,CAAC,gBAAgB,CAAC,CAAC;QAClD,CAAC;QACD,MAAM,IAAI,GAAG,UAAkB,CAAC;QAChC,IAAI,IAAI,CAAC,MAAM,KAAK,UAAU,IAAI,IAAI,CAAC,SAAS,KAAK,CAAC,EAAE,CAAC;YACvD,MAAM,IAAI,4BAAmB,CAAC,+BAA+B,CAAC,CAAC;QACjE,CAAC;QAKD,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC,EAAE,EAAE;YAChD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,cAAc,EAAE,IAAI,CAAC,cAAc;SACpC,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAlFY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;IAIR,WAAA,IAAA,eAAM,EAAC,aAAa,CAAC,CAAA;qCADmB,iDAAsB;QACV,0BAAW;GAHvD,mBAAmB,CAkF/B"}
+{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":"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"}

package/dist/module/user/entity/user-role-mapping.entity.d.ts

@@ -1,6 +1,7 @@
 export declare class UserRoleMapping {
     constructor(user_id: number, role_id: number);
     id: number;
+    entity_type: string;
     user_id: number;
     role_id: number;
     is_default: number;

package/dist/module/user/entity/user-role-mapping.entity.js

@@ -10,11 +10,13 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserRoleMapping = void 0;
+const global_constant_1 = require("../../../constant/global.constant");
 const typeorm_1 = require("typeorm");
 let UserRoleMapping = class UserRoleMapping {
     constructor(user_id, role_id) {
         this.user_id = user_id;
         this.role_id = role_id;
+        this.entity_type = global_constant_1.ENTITYTYPE_USRROLMAP;
     }
 };
 exports.UserRoleMapping = UserRoleMapping;
@@ -22,6 +24,10 @@ __decorate([
     (0, typeorm_1.PrimaryGeneratedColumn)(),
     __metadata("design:type", Number)
 ], UserRoleMapping.prototype, "id", void 0);
+__decorate([
+    (0, typeorm_1.Column)({ type: 'varchar' }),
+    __metadata("design:type", String)
+], UserRoleMapping.prototype, "entity_type", void 0);
 __decorate([
     (0, typeorm_1.Column)({ type: 'bigint', nullable: true }),
     __metadata("design:type", Number)

package/dist/module/user/entity/user-role-mapping.entity.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-role-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-role-mapping.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AAG1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAY,OAAe,EAAE,OAAe;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;CAaF,CAAA;AAjBY,0CAAe;AAO1B;IADC,IAAA,gCAAsB,GAAE;;2CACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrB;0BAhBR,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;;GAC5B,eAAe,CAiB3B"}
+{"version":3,"file":"user-role-mapping.entity.js","sourceRoot":"","sources":["../../../../src/module/user/entity/user-role-mapping.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uEAAoE;AACpE,qCAAiE;AAG1D,IAAM,eAAe,GAArB,MAAM,eAAe;IAC1B,YAAY,OAAe,EAAE,OAAe;QAC1C,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,WAAW,GAAG,sCAAoB,CAAC;IAC1C,CAAC;CAgBF,CAAA;AArBY,0CAAe;AAQ1B;IADC,IAAA,gCAAsB,GAAE;;2CACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC;;oDACN;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;gDAC3B;AAGhB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACrB;0BApBR,eAAe;IAD3B,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,sBAAsB,EAAE,CAAC;;GAC5B,eAAe,CAqB3B"}

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,2CAA4C;AAC5C,gGAAmF;AAM5E,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD;QACE,KAAK,EAAE,CAAC;IACV,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B;QAE7B,IAAI,IAAI,GAAG,UAAkB,CAAC;QAC9B,OAAO,MAAM,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IACtD,CAAC;CACF,CAAA;AAZY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;;GACA,WAAW,CAYvB"}
+{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,gGAAmF;AAM5E,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD;QACE,KAAK,EAAE,CAAC;IACV,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;CACF,CAAA;AAbY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;;GACA,WAAW,CAavB"}