rez_core 1.0.48 → 1.0.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "1.0.48",
+  "version": "1.0.49",
   "description": "",
   "author": "",
   "private": false,

package/src/constant/global.constant.ts

@@ -11,6 +11,8 @@ export const ENTITYTYPE_LISTMASTER = 'LMS';
 export const ENTITYTYPE_LISTMASTERITEMS = 'LMI';
 export const ENTITYTYPE_SECTIONMASTER = 'SEC';
 export const ENTITYTYPE_FIELDMASTER = 'FLD';
+export const ENTITYTYPE_USRROLMAP = 'URM';
+
 
 export const STORAGETYPE_SINGLEJSON = 'singlejson';
 export const STORAGETYPE_COLUMN = 'column';

package/src/module/auth/guards/jwt.guard.ts

@@ -1,22 +1,22 @@
-import { ExecutionContext, Injectable } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-import { Reflector } from '@nestjs/core';
-import { Observable } from 'rxjs';
-
-@Injectable()
-export class JwtAuthGuard extends AuthGuard('jwt') {
-  constructor(private reflector: Reflector) {
-    super();
-  }
-
-  canActivate(
-    context: ExecutionContext,
-  ): Promise<boolean> | boolean | Observable<boolean> {
-    const isPublic = this.reflector.getAllAndOverride('isPublic', [
-      context.getHandler(),
-      context.getClass(),
-    ]);
-    if (isPublic) return true;
-    return super.canActivate(context);
-  }
-}
+import { ExecutionContext, Injectable } from '@nestjs/common';
+import { AuthGuard } from '@nestjs/passport';
+import { Reflector } from '@nestjs/core';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class JwtAuthGuard extends AuthGuard('jwt') {
+  constructor(private reflector: Reflector) {
+    super();
+  }
+
+  canActivate(
+    context: ExecutionContext,
+  ): Promise<boolean> | boolean | Observable<boolean> {
+    const isPublic = this.reflector.getAllAndOverride('isPublic', [
+      context.getHandler(),
+      context.getClass(),
+    ]);
+    if (isPublic) return true;
+    return super.canActivate(context);
+  }
+}

package/src/module/auth/guards/role.guard.ts

@@ -1,68 +1,68 @@
-import {
-  CanActivate,
-  ExecutionContext,
-  ForbiddenException,
-  Injectable,
-  UnauthorizedException,
-} from '@nestjs/common';
-import { Reflector } from '@nestjs/core';
-import { UserData } from '../../user/entity/user.entity';
-import { InjectEntityManager } from '@nestjs/typeorm';
-import { EntityManager } from 'typeorm';
-
-@Injectable()
-export class RolesGuard implements CanActivate {
-  constructor(
-    private reflector: Reflector,
-    @InjectEntityManager() private entityManager: EntityManager,
-  ) {}
-
-  async canActivate(context: ExecutionContext) {
-    const request = context
-      .switchToHttp()
-      .getRequest<Request & { user: any }>();
-    const object = request.user;
-
-    const users: UserData = await this.entityManager.query(
-      `SELECT * FROM cr_user WHERE id = ${object.userId} LIMIT 1`,
-    );
-
-    const user = users[0];
-    if (!user || !user['role_id']) {
-      throw new UnauthorizedException('User not authorized');
-    }
-
-    const requiredModule = this.reflector.get<string>(
-      'moduleCode',
-      context.getHandler(),
-    );
-    const requiredActions = this.reflector.get<string>(
-      'actions',
-      context.getHandler(),
-    );
-
-    const roleAccess = await this.entityManager.query(
-      `SELECT *
-             FROM cr_module_access
-             WHERE role_id = ${user['role_id']}
-               AND module_code = '${requiredModule}'`,
-    );
-
-    if (!roleAccess || roleAccess.length === 0) {
-      throw new ForbiddenException(
-        'Access denied: No permissions found for this module',
-      );
-    }
-
-    const hasAccess = roleAccess.some(
-      (access) =>
-        requiredActions.includes(access.action_type) &&
-        access.access_flag === 1,
-    );
-
-    if (!hasAccess) {
-      throw new ForbiddenException('Access denied: Insufficient permissions.');
-    }
-    return true;
-  }
-}
+import {
+  CanActivate,
+  ExecutionContext,
+  ForbiddenException,
+  Injectable,
+  UnauthorizedException,
+} from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { UserData } from '../../user/entity/user.entity';
+import { InjectEntityManager } from '@nestjs/typeorm';
+import { EntityManager } from 'typeorm';
+
+@Injectable()
+export class RolesGuard implements CanActivate {
+  constructor(
+    private reflector: Reflector,
+    @InjectEntityManager() private entityManager: EntityManager,
+  ) {}
+
+  async canActivate(context: ExecutionContext) {
+    const request = context
+      .switchToHttp()
+      .getRequest<Request & { user: any }>();
+    const object = request.user;
+
+    const users: UserData = await this.entityManager.query(
+      `SELECT * FROM cr_user WHERE id = ${object.userId} LIMIT 1`,
+    );
+
+    const user = users[0];
+    if (!user || !user['role_id']) {
+      throw new UnauthorizedException('User not authorized');
+    }
+
+    const requiredModule = this.reflector.get<string>(
+      'moduleCode',
+      context.getHandler(),
+    );
+    const requiredActions = this.reflector.get<string>(
+      'actions',
+      context.getHandler(),
+    );
+
+    const roleAccess = await this.entityManager.query(
+      `SELECT *
+             FROM cr_module_access
+             WHERE role_id = ${user['role_id']}
+               AND module_code = '${requiredModule}'`,
+    );
+
+    if (!roleAccess || roleAccess.length === 0) {
+      throw new ForbiddenException(
+        'Access denied: No permissions found for this module',
+      );
+    }
+
+    const hasAccess = roleAccess.some(
+      (access) =>
+        requiredActions.includes(access.action_type) &&
+        access.access_flag === 1,
+    );
+
+    if (!hasAccess) {
+      throw new ForbiddenException('Access denied: Insufficient permissions.');
+    }
+    return true;
+  }
+}

package/src/module/auth/services/jwt.service.ts

@@ -1,11 +1,11 @@
-import { Injectable } from '@nestjs/common';
-import { JwtService } from '@nestjs/jwt';
-
-@Injectable()
-export class JwtAuthService {
-  constructor(private readonly jwtService: JwtService) {}
-
-  generateJwt(payload: any): string {
-    return this.jwtService.sign(payload);
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { JwtService } from '@nestjs/jwt';
+
+@Injectable()
+export class JwtAuthService {
+  constructor(private readonly jwtService: JwtService) {}
+
+  generateJwt(payload: any): string {
+    return this.jwtService.sign(payload);
+  }
+}

package/src/module/auth/strategies/local.strategy.ts

@@ -1,13 +1,13 @@
-import { PassportStrategy } from '@nestjs/passport';
-import { AuthService } from '../services/auth.service';
-import { Injectable } from '@nestjs/common';
-import { Strategy } from 'passport-jwt';
-
-@Injectable()
-export class LocalStrategy extends PassportStrategy(Strategy) {
-  constructor(private authService: AuthService) {
-    super({
-      usernameField: 'email',
-    });
-  }
-}
+import { PassportStrategy } from '@nestjs/passport';
+import { AuthService } from '../services/auth.service';
+import { Injectable } from '@nestjs/common';
+import { Strategy } from 'passport-jwt';
+
+@Injectable()
+export class LocalStrategy extends PassportStrategy(Strategy) {
+  constructor(private authService: AuthService) {
+    super({
+      usernameField: 'email',
+    });
+  }
+}

package/src/module/dev/dev.module.ts

@@ -1,12 +1,12 @@
-import { Module } from '@nestjs/common';
-import { EntityModule } from '../meta/entity.module';
-import { UserModule } from '../user/user.module';
-import { ModuleModule } from '../module/module.module';
-import { DevService } from './service/dev.service';
-
-@Module({
-  imports: [EntityModule, UserModule, ModuleModule],
-  controllers: [],
-  providers: [DevService],
-})
-export class DevModule {}
+import { Module } from '@nestjs/common';
+import { EntityModule } from '../meta/entity.module';
+import { UserModule } from '../user/user.module';
+import { ModuleModule } from '../module/module.module';
+import { DevService } from './service/dev.service';
+
+@Module({
+  imports: [EntityModule, UserModule, ModuleModule],
+  controllers: [],
+  providers: [DevService],
+})
+export class DevModule {}

package/src/module/dev/service/dev.service.ts

@@ -1,7 +1,7 @@
-import { Injectable } from '@nestjs/common';
-import { UserService } from '../../user/service/user.service';
-
-@Injectable()
-export class DevService {
-  constructor(private readonly userService: UserService) {}
-}
+import { Injectable } from '@nestjs/common';
+import { UserService } from '../../user/service/user.service';
+
+@Injectable()
+export class DevService {
+  constructor(private readonly userService: UserService) {}
+}

package/src/module/enterprise/entity/enterprise.entity.ts

@@ -1,37 +1,37 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_enterprise' })
-export class EnterpriseData {
-  @PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
-  id: number;
-
-  @Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
-  entityType: string;
-
-  @Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
-  code: string;
-
-  @Column({ name: 'name', type: 'varchar', nullable: true, length: 50 })
-  name: string;
-
-  @Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
-  status: string;
-
-  @Column({ name: 'created_by', type: 'int', nullable: true })
-  createdBy: number;
-
-  @Column({ name: 'modified_by', type: 'int', nullable: true })
-  modifiedBy: number;
-
-  @Column({ name: 'created_date', type: 'datetime', nullable: true })
-  createdDate: Date;
-
-  @Column({ name: 'modified_date', type: 'datetime', nullable: true })
-  modifiedDate: Date;
-
-  @Column({ name: 'app_code', type: 'varchar', nullable: true, length: 50 })
-  appCode: string;
-
-  @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
-  appUrlName: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_enterprise' })
+export class EnterpriseData {
+  @PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
+  id: number;
+
+  @Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
+  entityType: string;
+
+  @Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
+  code: string;
+
+  @Column({ name: 'name', type: 'varchar', nullable: true, length: 50 })
+  name: string;
+
+  @Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
+  status: string;
+
+  @Column({ name: 'created_by', type: 'int', nullable: true })
+  createdBy: number;
+
+  @Column({ name: 'modified_by', type: 'int', nullable: true })
+  modifiedBy: number;
+
+  @Column({ name: 'created_date', type: 'datetime', nullable: true })
+  createdDate: Date;
+
+  @Column({ name: 'modified_date', type: 'datetime', nullable: true })
+  modifiedDate: Date;
+
+  @Column({ name: 'app_code', type: 'varchar', nullable: true, length: 50 })
+  appCode: string;
+
+  @Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
+  appUrlName: string;
+}

package/src/module/enterprise/entity/organization.entity.ts

@@ -1,80 +1,80 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_organization' })
-export class OrganizationData {
-  @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
-  id: number;
-
-  @Column({ name: 'enterprise_id', type: 'int' })
-  enterprise_id: number;
-
-  @Column({ name: 'code', nullable: true })
-  code: string;
-
-  @Column({ name: 'app_code', nullable: true })
-  appCode: string;
-
-  @Column({ name: 'name', nullable: true })
-  name: string;
-
-  @Column({ name: 'status', type: 'varchar', nullable: true })
-  status: string;
-
-  @Column({ name: 'seq_no', nullable: true })
-  seq_no: number;
-
-  @Column({ name: 'created_by', nullable: true })
-  created_by: number;
-
-  @Column({ name: 'modified_by', nullable: true })
-  modified_by: number;
-
-  @Column({ name: 'created_date', nullable: true })
-  created_date: Date;
-
-  @Column({ name: 'parent_id', nullable: true })
-  parent_id: number;
-
-  @Column({ name: 'modified_date', nullable: true })
-  modified_date: Date;
-
-  @Column({ name: 'contact_number', nullable: true })
-  contact_number: string;
-
-  @Column({ name: 'email', nullable: true })
-  emailId: string;
-
-  @Column({ name: 'entity_type', nullable: true })
-  entity_type: string;
-
-  @Column({ name: 'primary_contact_name', nullable: true })
-  primary_contact_name: string;
-
-  @Column({ name: 'address', nullable: true })
-  address: string;
-
-  @Column({ name: 'gstin', nullable: true })
-  gstin: string;
-
-  @Column({ name: 'company_pan_number', nullable: true })
-  company_pan_number: string;
-
-  @Column({ name: 'bankacc_benef_name', nullable: true })
-  bankacc_benef_name: string;
-
-  @Column({ name: 'bankacc_bank_name', nullable: true })
-  bankacc_bank_name: string;
-
-  @Column({ name: 'bankacc_account_number', nullable: true })
-  bankaccAccountNumber: string;
-
-  @Column({ name: 'bankacc_branch_IFSC', nullable: true })
-  bankacc_account_number: string;
-
-  @Column({
-    name: 'organization_type',
-    type: 'varchar',
-    nullable: true,
-  })
-  organization_type: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_organization' })
+export class OrganizationData {
+  @PrimaryGeneratedColumn({ name: 'id', type: 'int' })
+  id: number;
+
+  @Column({ name: 'enterprise_id', type: 'int' })
+  enterprise_id: number;
+
+  @Column({ name: 'code', nullable: true })
+  code: string;
+
+  @Column({ name: 'app_code', nullable: true })
+  appCode: string;
+
+  @Column({ name: 'name', nullable: true })
+  name: string;
+
+  @Column({ name: 'status', type: 'varchar', nullable: true })
+  status: string;
+
+  @Column({ name: 'seq_no', nullable: true })
+  seq_no: number;
+
+  @Column({ name: 'created_by', nullable: true })
+  created_by: number;
+
+  @Column({ name: 'modified_by', nullable: true })
+  modified_by: number;
+
+  @Column({ name: 'created_date', nullable: true })
+  created_date: Date;
+
+  @Column({ name: 'parent_id', nullable: true })
+  parent_id: number;
+
+  @Column({ name: 'modified_date', nullable: true })
+  modified_date: Date;
+
+  @Column({ name: 'contact_number', nullable: true })
+  contact_number: string;
+
+  @Column({ name: 'email', nullable: true })
+  emailId: string;
+
+  @Column({ name: 'entity_type', nullable: true })
+  entity_type: string;
+
+  @Column({ name: 'primary_contact_name', nullable: true })
+  primary_contact_name: string;
+
+  @Column({ name: 'address', nullable: true })
+  address: string;
+
+  @Column({ name: 'gstin', nullable: true })
+  gstin: string;
+
+  @Column({ name: 'company_pan_number', nullable: true })
+  company_pan_number: string;
+
+  @Column({ name: 'bankacc_benef_name', nullable: true })
+  bankacc_benef_name: string;
+
+  @Column({ name: 'bankacc_bank_name', nullable: true })
+  bankacc_bank_name: string;
+
+  @Column({ name: 'bankacc_account_number', nullable: true })
+  bankaccAccountNumber: string;
+
+  @Column({ name: 'bankacc_branch_IFSC', nullable: true })
+  bankacc_account_number: string;
+
+  @Column({
+    name: 'organization_type',
+    type: 'varchar',
+    nullable: true,
+  })
+  organization_type: string;
+}

package/src/module/master/service/master.service.ts

@@ -48,6 +48,18 @@ export class MasterService {
   ];
 
   private readonly dataSequence = [
+    {
+      table: 'cr_user',
+      unique_fields: ['code'],
+    },
+    {
+      table: 'cr_role',
+      unique_fields: ['code'],
+    },
+    {
+      table: 'cr_user_role_mapping',
+      unique_fields: ['user_id', 'role_id'],
+    },
     {
       table: 'eth_school',
       unique_fields: ['code'],
@@ -127,6 +139,7 @@ export class MasterService {
           entityMasterData?.mapped_entity_type,
         );
 
+        console.log(attributes,"((((((((((((((((((((((((((")
       for (const row of sheetData) {
         if (row.parent_type !== undefined && row.parent_id !== undefined) {
           this.resolveParent(row);
@@ -134,6 +147,7 @@ export class MasterService {
 
         for (const attribute of attributes) {
           if (attribute.data_source_type === 'entity') {
+            console.log(attribute.data_source_type)
             let entityMaster = await this.entityMasterService.getEntityData(
               attribute.datasource_list,
             );

package/src/module/meta/controller/entity.controller.ts

@@ -8,7 +8,8 @@ import {
   Post,
   Query,
   Res,
-  UseGuards,
+  Req,
+  UseGuards, Inject,
 } from '@nestjs/common';
 import { EntityServiceImpl } from '../service/entity-service-impl.service';
 import { ReflectionHelper } from '../../../utils/service/reflection-helper.service';
@@ -18,6 +19,9 @@ import { BaseEntity } from '../entity/base-entity.entity';
 import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
 import * as fs from 'fs';
 import * as path from 'path';
+import { UserService } from '../../user/service/user.service';
+import { ENTITYTYPE_USER } from '../../../constant/global.constant';
+import { UserData } from '../../user/entity/user.entity';
 
 @UseGuards(JwtAuthGuard)
 @Controller('entity')
@@ -58,7 +62,11 @@ export class EntityController {
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
     @Res() res: Response,
+    @Req() req: Request & {user: any}
   ) {
+    let requestedUser = req.user;
+    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.id);
+
     if (!entityType) {
       throw new BadRequestException(
         'Query parameter "entity_type" is required',
@@ -75,7 +83,7 @@ export class EntityController {
     if (entityService) {
       return res
         .status(HttpStatus.OK)
-        .json(await entityService.createEntity(entityData, null));
+        .json(await entityService.createEntity(entityData, loggedInUser as UserData));
     }
   }
 
@@ -85,7 +93,10 @@ export class EntityController {
     @Body() entityData: BaseEntity,
     @Query('entity_type') entityType: string,
     @Res() response: Response,
+    @Req() req: Request & {user: any}
   ) {
+    let requestedUser = req.user;
+    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.id);
     if (!entityType) {
       throw new BadRequestException(
         'Query parameter "entity_type" is required',
@@ -106,7 +117,7 @@ export class EntityController {
       }
       // let mergeEntity = JsonUtil.merge(existingEntity, entityData);
 
-      entityData = await entityService.updateEntity(entityData, null);
+      entityData = await entityService.updateEntity(entityData, loggedInUser as UserData);
       return response.status(HttpStatus.OK).json(entityData);
     }
   }

package/src/module/meta/dto/entity-list-data.dto.ts

@@ -1,6 +1,6 @@
-import { EntityTab } from './entity-tab.dto';
-
-export class EntityListData {
-  entity_list: any;
-  entity_tabs: EntityTab[];
-}
+import { EntityTab } from './entity-tab.dto';
+
+export class EntityListData {
+  entity_list: any;
+  entity_tabs: EntityTab[];
+}