rez_core 1.0.48 → 1.0.49

package/src/module/module/service/module-access.service.ts

@@ -4,12 +4,15 @@ import { RoleRepository } from 'src/module/user/repository/role.repository';
 import { RoleService } from '../../user/service/role.service';
 import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
 import { Role } from '../../user/entity/role.entity';
+import { EntityManager } from 'typeorm';
+import { UserData } from 'src/module/user/entity/user.entity';
 
 @Injectable()
 export class ModuleAccessService {
   constructor(
     private readonly moduleAccessRepository: ModuleAccessRepository,
     @Inject('RoleService') private readonly roleService: RoleService,
+    private readonly entityManager: EntityManager,
   ) {}
 
   async getRoles() {
@@ -45,13 +48,16 @@ export class ModuleAccessService {
     }
   }
 
-  async createRole(body: {
-    name: string;
-    description?: string;
-    status?: 'ACTIVE' | 'INACTIVE';
-    copyFromRoleId?: number;
-  }) {
-    return this.moduleAccessRepository.createRole(body);
+  async createRole(
+    body: {
+      name: string;
+      description?: string;
+      status?: 'ACTIVE' | 'INACTIVE';
+      copyFromRoleId?: number;
+    },
+    loggedInUser: UserData,
+  ) {
+    return this.moduleAccessRepository.createRole(body, loggedInUser);
   }
 
   async updateRole(
@@ -62,30 +68,44 @@ export class ModuleAccessService {
       status?: 'ACTIVE' | 'INACTIVE';
       copyFromRoleId?: number;
     },
+    loggedInUser: UserData,
   ) {
     if (!body.name) {
       throw new BadRequestException('Role name is required');
     }
 
-    //get role by id
-    const entityData = await this.roleService.getEntityData(ENTITYTYPE_ROLE,id);
+    if (body.status === 'INACTIVE') {
+      //get role by id
+      const entityData = await this.roleService.getEntityData(
+        ENTITYTYPE_ROLE,
+        id,
+      );
 
-    if (!entityData) {
-      throw new BadRequestException('Role not found');
-    }
-    const role = entityData as Role;
-    if (body.status === 'INACTIVE' && role.is_system === 1) {
-      throw new BadRequestException('Cannot deactivate system role');
-    }
+      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 body.status =="INACTIVE" and role.is_system==1:
-    //  throw new Error('Cannot deactivate system role');
+      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.moduleAccessRepository.updateRole(id, {
       name: body.name,
       description: body.description,
       status: body.status,
       copyFromRoleId: body.copyFromRoleId,
-    });
+    }, loggedInUser);
   }
 }

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

@@ -1,28 +1,28 @@
-import {
-  Body,
-  Controller,
-  HttpStatus,
-  Inject,
-  Post,
-  Res,
-  ValidationPipe,
-} from '@nestjs/common';
-import { UserService } from '../service/user.service';
-import { CreateUserDto } from '../dto/create-user.dto';
-import { Response } from 'express';
-
-@Controller('user')
-export class UserController {
-  constructor(
-    @Inject('UserService') private readonly userService: UserService,
-  ) {}
-
-  @Post('signup')
-  async signup(
-    @Body(new ValidationPipe()) createUserDto: CreateUserDto,
-    @Res() res: Response,
-  ) {
-    const result = await this.userService.createEntity(createUserDto, null);
-    res.status(HttpStatus.OK).json(result);
-  }
-}
+import {
+  Body,
+  Controller,
+  HttpStatus,
+  Inject,
+  Post,
+  Res,
+  ValidationPipe,
+} from '@nestjs/common';
+import { UserService } from '../service/user.service';
+import { CreateUserDto } from '../dto/create-user.dto';
+import { Response } from 'express';
+
+@Controller('user')
+export class UserController {
+  constructor(
+    @Inject('UserService') private readonly userService: UserService,
+  ) {}
+
+  @Post('signup')
+  async signup(
+    @Body(new ValidationPipe()) createUserDto: CreateUserDto,
+    @Res() res: Response,
+  ) {
+    const result = await this.userService.createEntity(createUserDto, null);
+    res.status(HttpStatus.OK).json(result);
+  }
+}

package/src/module/user/dto/update-user.dto.ts

@@ -1,4 +1,4 @@
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateUserDto } from './create-user.dto';
-
-export class UpdateUserDto extends PartialType(CreateUserDto) {}
+import { PartialType } from '@nestjs/mapped-types';
+import { CreateUserDto } from './create-user.dto';
+
+export class UpdateUserDto extends PartialType(CreateUserDto) {}

package/src/module/user/entity/user-role-mapping.entity.ts

@@ -1,3 +1,4 @@
+import { ENTITYTYPE_USRROLMAP } from 'src/constant/global.constant';
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity({ name: 'cr_user_role_mapping' })
@@ -5,11 +6,15 @@ export class UserRoleMapping {
   constructor(user_id: number, role_id: number) {
     this.user_id = user_id;
     this.role_id = role_id;
+    this.entity_type = ENTITYTYPE_USRROLMAP;
   }
 
   @PrimaryGeneratedColumn()
   id: number;
 
+  @Column({type: 'varchar'})
+  entity_type: string;
+
   @Column({ type: 'bigint', nullable: true })
   user_id: number;
 

package/src/module/user/entity/user-session.entity.ts

@@ -1,61 +1,61 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_session' })
-export class UserSession {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({
-    name: 'is_session_loggedout',
-    nullable: true,
-    type: 'int',
-  })
-  is_session_loggedout: number;
-
-  @Column({
-    name: 'login_id',
-    nullable: true,
-    length: 50,
-  })
-  login_id: string;
-
-  @Column({
-    name: 'login_time',
-    nullable: true,
-  })
-  login_time: Date;
-
-  @Column({
-    name: 'logout_time',
-    nullable: true,
-  })
-  logout_time: Date;
-
-  @Column({
-    name: 'session_key',
-    nullable: true,
-    length: 100,
-  })
-  session_key: string;
-
-  @Column({
-    name: 'user_id',
-    nullable: true,
-    type: 'bigint',
-  })
-  user_id: number;
-
-  @Column({
-    name: 'access_token',
-    nullable: true,
-    type: 'varchar',
-    length: 5000,
-  })
-  access_token: string;
-
-  @Column({
-    name: 'expiry_date',
-    nullable: true,
-  })
-  expiry_date: Date;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_session' })
+export class UserSession {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({
+    name: 'is_session_loggedout',
+    nullable: true,
+    type: 'int',
+  })
+  is_session_loggedout: number;
+
+  @Column({
+    name: 'login_id',
+    nullable: true,
+    length: 50,
+  })
+  login_id: string;
+
+  @Column({
+    name: 'login_time',
+    nullable: true,
+  })
+  login_time: Date;
+
+  @Column({
+    name: 'logout_time',
+    nullable: true,
+  })
+  logout_time: Date;
+
+  @Column({
+    name: 'session_key',
+    nullable: true,
+    length: 100,
+  })
+  session_key: string;
+
+  @Column({
+    name: 'user_id',
+    nullable: true,
+    type: 'bigint',
+  })
+  user_id: number;
+
+  @Column({
+    name: 'access_token',
+    nullable: true,
+    type: 'varchar',
+    length: 5000,
+  })
+  access_token: string;
+
+  @Column({
+    name: 'expiry_date',
+    nullable: true,
+  })
+  expiry_date: Date;
+}

package/src/module/user/repository/userSession.repository.ts

@@ -1,33 +1,33 @@
-import { Repository } from 'typeorm';
-import { UserSession } from '../entity/user-session.entity';
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-
-@Injectable()
-export class UserSessionRepository {
-  constructor(
-    @InjectRepository(UserSession)
-    private userSessionRepo: Repository<UserSession>,
-  ) {}
-
-  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
-  }
-
-  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
-    return this.userSessionRepo.findOne({
-      where: { user_id: userId, is_session_loggedout: 0 },
-    });
-  }
-
-  async saveSession(session: UserSession): Promise<UserSession> {
-    return this.userSessionRepo.save(session);
-  }
-
-  async logoutSession(sessionKey: string): Promise<void> {
-    await this.userSessionRepo.update(
-      { session_key: sessionKey },
-      { is_session_loggedout: 1, logout_time: new Date() },
-    );
-  }
-}
+import { Repository } from 'typeorm';
+import { UserSession } from '../entity/user-session.entity';
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+
+@Injectable()
+export class UserSessionRepository {
+  constructor(
+    @InjectRepository(UserSession)
+    private userSessionRepo: Repository<UserSession>,
+  ) {}
+
+  async findBySessionKey(sessionKey: string): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({ where: { session_key: sessionKey } });
+  }
+
+  async findActiveSessionByUserId(userId: number): Promise<UserSession | null> {
+    return this.userSessionRepo.findOne({
+      where: { user_id: userId, is_session_loggedout: 0 },
+    });
+  }
+
+  async saveSession(session: UserSession): Promise<UserSession> {
+    return this.userSessionRepo.save(session);
+  }
+
+  async logoutSession(sessionKey: string): Promise<void> {
+    await this.userSessionRepo.update(
+      { session_key: sessionKey },
+      { is_session_loggedout: 1, logout_time: new Date() },
+    );
+  }
+}

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

@@ -15,6 +15,7 @@ export class RoleService extends EntityServiceImpl {
     loggedInUser: UserData | null,
   ): Promise<BaseEntity> {
     let role = entityData as Role;
+
     return await super.createEntity(role, loggedInUser);
   }
 }

package/src/resources/dev.properties.yaml

@@ -13,9 +13,9 @@ 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"
+#AWS:
+#  S3:
+#    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
+#    AWS_SECRET_KEY: "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"
+#    AWS_REGION: "ap-south-1"
+#    BUCKET_NAME: "testether"

package/src/utils/service/encryptUtil.service.ts

@@ -1,97 +1,97 @@
-import { Injectable, InternalServerErrorException } from '@nestjs/common';
-import * as crypto from 'crypto';
-
-const CryptoJS = require('crypto-js');
-const encryptionType = 'aes-256-cbc';
-
-@Injectable()
-export class EncryptUtilService {
-  constructor() {}
-
-  static encryptGCM(data: any, Datakey: string, Dataiv: string) {
-    try {
-      const cipher = crypto.createCipheriv('aes-256-gcm', Datakey, Dataiv);
-      let encrypted = Buffer.concat([
-        cipher.update(data, 'utf8'),
-        cipher.final(),
-      ]);
-      const tag = cipher.getAuthTag();
-      return Buffer.concat([encrypted, tag]).toString('base64');
-    } catch (error) {
-      throw new InternalServerErrorException('Encryption process failed');
-    }
-  }
-
-  static decryptGCM(data: any, Datakey: any, Dataiv: any) {
-    try {
-      data = Buffer.from(data, 'base64');
-      const decipher = crypto.createDecipheriv('aes-256-gcm', Datakey, Dataiv);
-      const tag = data.slice(data.length - 16);
-      decipher.setAuthTag(tag);
-      data = data.slice(0, data.length - 16);
-      let decrypted = decipher.update(data, 'utf8') + decipher.final('utf8');
-      return decrypted;
-    } catch (error) {
-      throw new InternalServerErrorException('Encryption process failed');
-    }
-  }
-
-  static encryptCBC(data: any, Datakey: any, Dataiv: any) {
-    let encryptedRequest;
-    try {
-      let cipher = CryptoJS.AES.encrypt(data, Datakey, {
-        iv: Dataiv,
-        mode: CryptoJS.mode.CBC,
-      });
-      encryptedRequest = cipher.toString();
-    } catch (error) {
-      console.log(error);
-      throw new InternalServerErrorException('Encryption process failed');
-    }
-    return encryptedRequest;
-  }
-
-  static decryptCBC(data: any, Datakey: any, Dataiv: any) {
-    let decryptRequest;
-    try {
-      let cipher = CryptoJS.AES.decrypt(data, Datakey, {
-        iv: Dataiv,
-        mode: CryptoJS.mode.CBC,
-      });
-      decryptRequest = cipher.toString(CryptoJS.enc.Utf8);
-    } catch (error) {
-      throw new InternalServerErrorException('Encryption process failed');
-    }
-    return decryptRequest;
-  }
-
-  static encryptRequest(data: any, Datakey: any, Dataiv: any, type?: any) {
-    try {
-      switch (type) {
-        case 'GCM':
-          return this.encryptGCM(data, Datakey, Dataiv);
-        case 'CBC':
-          return this.encryptCBC(data, Datakey, Dataiv);
-        default:
-          return this.encryptCBC(data, Datakey, Dataiv);
-      }
-    } catch (error) {
-      throw new InternalServerErrorException('Encryption process failed');
-    }
-  }
-
-  static decryptRequest(data: any, Datakey: any, Dataiv: any, type?: any) {
-    try {
-      switch (type) {
-        case 'GCM':
-          return this.decryptGCM(data, Datakey, Dataiv);
-        case 'CBC':
-          return this.decryptCBC(data, Datakey, Dataiv);
-        default:
-          return this.decryptCBC(data, Datakey, Dataiv);
-      }
-    } catch (error) {
-      throw new InternalServerErrorException('Encryption process failed');
-    }
-  }
-}
+import { Injectable, InternalServerErrorException } from '@nestjs/common';
+import * as crypto from 'crypto';
+
+const CryptoJS = require('crypto-js');
+const encryptionType = 'aes-256-cbc';
+
+@Injectable()
+export class EncryptUtilService {
+  constructor() {}
+
+  static encryptGCM(data: any, Datakey: string, Dataiv: string) {
+    try {
+      const cipher = crypto.createCipheriv('aes-256-gcm', Datakey, Dataiv);
+      let encrypted = Buffer.concat([
+        cipher.update(data, 'utf8'),
+        cipher.final(),
+      ]);
+      const tag = cipher.getAuthTag();
+      return Buffer.concat([encrypted, tag]).toString('base64');
+    } catch (error) {
+      throw new InternalServerErrorException('Encryption process failed');
+    }
+  }
+
+  static decryptGCM(data: any, Datakey: any, Dataiv: any) {
+    try {
+      data = Buffer.from(data, 'base64');
+      const decipher = crypto.createDecipheriv('aes-256-gcm', Datakey, Dataiv);
+      const tag = data.slice(data.length - 16);
+      decipher.setAuthTag(tag);
+      data = data.slice(0, data.length - 16);
+      let decrypted = decipher.update(data, 'utf8') + decipher.final('utf8');
+      return decrypted;
+    } catch (error) {
+      throw new InternalServerErrorException('Encryption process failed');
+    }
+  }
+
+  static encryptCBC(data: any, Datakey: any, Dataiv: any) {
+    let encryptedRequest;
+    try {
+      let cipher = CryptoJS.AES.encrypt(data, Datakey, {
+        iv: Dataiv,
+        mode: CryptoJS.mode.CBC,
+      });
+      encryptedRequest = cipher.toString();
+    } catch (error) {
+      console.log(error);
+      throw new InternalServerErrorException('Encryption process failed');
+    }
+    return encryptedRequest;
+  }
+
+  static decryptCBC(data: any, Datakey: any, Dataiv: any) {
+    let decryptRequest;
+    try {
+      let cipher = CryptoJS.AES.decrypt(data, Datakey, {
+        iv: Dataiv,
+        mode: CryptoJS.mode.CBC,
+      });
+      decryptRequest = cipher.toString(CryptoJS.enc.Utf8);
+    } catch (error) {
+      throw new InternalServerErrorException('Encryption process failed');
+    }
+    return decryptRequest;
+  }
+
+  static encryptRequest(data: any, Datakey: any, Dataiv: any, type?: any) {
+    try {
+      switch (type) {
+        case 'GCM':
+          return this.encryptGCM(data, Datakey, Dataiv);
+        case 'CBC':
+          return this.encryptCBC(data, Datakey, Dataiv);
+        default:
+          return this.encryptCBC(data, Datakey, Dataiv);
+      }
+    } catch (error) {
+      throw new InternalServerErrorException('Encryption process failed');
+    }
+  }
+
+  static decryptRequest(data: any, Datakey: any, Dataiv: any, type?: any) {
+    try {
+      switch (type) {
+        case 'GCM':
+          return this.decryptGCM(data, Datakey, Dataiv);
+        case 'CBC':
+          return this.decryptCBC(data, Datakey, Dataiv);
+        default:
+          return this.decryptCBC(data, Datakey, Dataiv);
+      }
+    } catch (error) {
+      throw new InternalServerErrorException('Encryption process failed');
+    }
+  }
+}

package/src/utils/service/excelUtil.service.ts

@@ -1,15 +1,15 @@
-import * as xlsx from 'xlsx';
-
-export class ExcelUtil {
-  static readExcel(fileBuffer: Buffer): Record<string, any[]> {
-    const workbook = xlsx.read(fileBuffer, { type: 'buffer' });
-    const data: Record<string, any[]> = {};
-
-    workbook.SheetNames.forEach((sheetName) => {
-      const sheet = workbook.Sheets[sheetName];
-      data[sheetName] = xlsx.utils.sheet_to_json(sheet);
-    });
-
-    return data;
-  }
-}
+import * as xlsx from 'xlsx';
+
+export class ExcelUtil {
+  static readExcel(fileBuffer: Buffer): Record<string, any[]> {
+    const workbook = xlsx.read(fileBuffer, { type: 'buffer' });
+    const data: Record<string, any[]> = {};
+
+    workbook.SheetNames.forEach((sheetName) => {
+      const sheet = workbook.Sheets[sheetName];
+      data[sheetName] = xlsx.utils.sheet_to_json(sheet);
+    });
+
+    return data;
+  }
+}