rez_core 1.0.59 → 1.0.61

package/src/module/user/service/role.service.ts

@@ -1,12 +1,19 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Injectable } from '@nestjs/common';
 import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { UserData } from '../entity/user.entity';
 import { Role } from '../entity/role.entity';
+import { ENTITYTYPE_ROLE } from 'src/constant/global.constant';
+import { RoleRepository } from '../repository/role.repository';
+import { EntityManager } from 'typeorm';
 
 @Injectable()
 export class RoleService extends EntityServiceImpl {
-  constructor() {
+  constructor(
+    private readonly roleRepository: RoleRepository,
+    private readonly entityManager: EntityManager,
+    
+  ) {
     super();
   }
 
@@ -18,4 +25,65 @@ export class RoleService extends EntityServiceImpl {
 
     return await super.createEntity(role, loggedInUser);
   }
+
+  async createRole(
+    body: {
+      name: string;
+      description?: string;
+      status?: 'ACTIVE' | 'INACTIVE';
+      copyFromRoleId?: number;
+    },
+    loggedInUser: UserData,
+  ) {
+    return this.roleRepository.createRole(body, loggedInUser);
+  }
+
+  async updateRole(
+    id: number,
+    body: {
+      name?: string;
+      description?: string;
+      status?: 'ACTIVE' | 'INACTIVE';
+      copyFromRoleId?: number;
+    },
+    loggedInUser: UserData,
+  ) {
+    if (!body.name) {
+      throw new BadRequestException('Role name is required');
+    }
+
+    if (body.status === 'INACTIVE') {
+      //get role by id
+      const entityData = await super.getEntityData(
+        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 BadRequestException(
+          'Cannot deactivate role as it is associated with active users',
+        );
+      }
+
+      if (!entityData) {
+        throw new BadRequestException('Role not found');
+      }
+      const role = entityData as Role;
+      if (role.is_system === 1) {
+        throw new BadRequestException('Cannot deactivate system role');
+      }
+    }
+
+    return this.roleRepository.updateRole(id, {
+      name: body.name,
+      description: body.description,
+      status: body.status,
+      copyFromRoleId: body.copyFromRoleId,
+    }, loggedInUser);
+  }
 }

package/src/module/user/user.module.ts

@@ -19,10 +19,12 @@ import { UserRoleMapping } from './entity/user-role-mapping.entity';
 import { UserRoleMappingRepository } from './repository/user-role-mapping.repository';
 import { UserRoleMappingService } from './service/user-role-mapping.service';
 import { RoleRepository } from './repository/role.repository';
+import { ModuleAccess } from '../module/entity/module-access.entity';
+import { RoleController } from './controller/role.controller';
 
 @Module({
   imports: [
-    TypeOrmModule.forFeature([UserData, UserSession, Role, UserRoleMapping]),
+    TypeOrmModule.forFeature([UserData, UserSession, Role, UserRoleMapping,ModuleAccess]),
     EntityModule,
     UtilsModule,
     AuthModule,
@@ -47,6 +49,6 @@ import { RoleRepository } from './repository/role.repository';
     RoleRepository,
     LoginService,
   ],
-  controllers: [LoginController, UserController],
+  controllers: [LoginController, UserController,RoleController],
 })
 export class UserModule {}

package/dist/resources/dev.properties.yaml

@@ -1,21 +0,0 @@
-DB_HOST: "13.234.25.234"
-DB_PORT: "3306"
-DB_USER: "root"
-DB_PASS: "Rezolut@123"
-DB_NAME: "core"
-MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
-MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
-SECRET_KEY: "1hard_to_guess_secret7890a"
-CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
-CLIENT_SECRET: "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"
-CALLBACK_URL: "http://localhost:3000/auth/google/callback"
-OTP_EXPIRY: "10"
-OTP_LENGTH: "6"
-VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"
-AWS:
-  S3:
-    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
-    AWS_SECRET_KEY: "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"
-    AWS_REGION: "ap-south-1"
-    BUCKET_NAME: "testether"

package/dist/resources/uat.properties.yaml

@@ -1,15 +0,0 @@
-DB_HOST: "13.234.25.234"
-DB_PORT: "3306"
-DB_USER: "root"
-DB_PASS: "Rezolut@123"
-DB_NAME: "ether_core"
-MASTER_KEY: "0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh"
-MASTER_IV: "heuUQf5uPVtkotrFAOKUVw=="
-SECRET_KEY: "1hard_to_guess_secret7890a"
-CLIENT_ID: "324529881356-596sc8ksrb9lg01i7sktofqqqf0fv2ug.apps.googleusercontent.com"
-CLIENT_SECRET: "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"
-CALLBACK_URL: "http://localhost:3000/auth/google/callback"
-OTP_EXPIRY: "10"
-OTP_LENGTH: "6"
-VERIFY_OTP: "false"
-DEFAULT_OTP: "123456"