rez_core 1.0.64 → 1.0.65

package/package.json

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

package/src/app.controller.ts

@@ -1,12 +1,12 @@
-import { Controller, Get } from '@nestjs/common';
-import { AppService } from './app.service';
-
-@Controller()
-export class AppController {
-  constructor(private readonly appService: AppService) {}
-
-  @Get()
-  getHello(): string {
-    return this.appService.getHello();
-  }
-}
+import { Controller, Get } from '@nestjs/common';
+import { AppService } from './app.service';
+
+@Controller()
+export class AppController {
+  constructor(private readonly appService: AppService) {}
+
+  @Get()
+  getHello(): string {
+    return this.appService.getHello();
+  }
+}

package/src/app.service.ts

@@ -1,8 +1,8 @@
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class AppService {
-  getHello(): string {
-    return 'Hello World!';
-  }
-}
+import { Injectable } from '@nestjs/common';
+
+@Injectable()
+export class AppService {
+  getHello(): string {
+    return 'Hello World!';
+  }
+}

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/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/controller/master.controller.ts

@@ -1,34 +1,58 @@
 import {
   BadRequestException,
   Controller,
+  Inject,
+  Param,
   Post,
+  Req,
   UploadedFile,
+  UseGuards,
   UseInterceptors,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
 import { MasterService } from '../service/master.service';
 import { Express } from 'express';
+import { UserService } from 'src/module/user/service/user.service';
+import { ENTITYTYPE_USER } from 'src/constant/global.constant';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
 
 @Controller('master')
+@UseGuards(JwtAuthGuard)
 export class MasterController {
-  constructor(private readonly masterService: MasterService) {}
+  constructor(private readonly masterService: MasterService,
+   private readonly entityService: EntityServiceImpl,
+  ) {}
 
-  // @Post('upload')
-  // @UseInterceptors(FileInterceptor('file'))
-  // async uploadFile(@UploadedFile() file) {
-  //   if (!file) {
-  //     throw new Error('File is required');
-  //   }
-  //   return this.masterService.processExcel(file);
-  // }
+  @Post('uploadMeta')
+  @UseInterceptors(FileInterceptor('file'))
 
-  @Post('uploadMasterData')
+  async uploadMasterMetaXls(@UploadedFile() file: Express.Multer.File) {
+    if (!file) {
+      throw new BadRequestException('File is required');
+    }
+    return await this.masterService.uploadMeta(file.buffer);
+  }
+
+  @Post('uploadData')
   @UseInterceptors(FileInterceptor('file'))
 
   async uploadMasterDataXls(@UploadedFile() file: Express.Multer.File) {
     if (!file) {
       throw new BadRequestException('File is required');
     }
-    return await this.masterService.uploadMasterData(file.buffer);
+    return await this.masterService.uploadData(file.buffer);
+  }
+
+  @Post('uploadEntity/:entityType')
+  @UseInterceptors(FileInterceptor('file'))
+
+  async uploadEntityDataXls(@Param('entityType') entityType: string, @UploadedFile() file: Express.Multer.File,@Req() req: Request & { user: any }) {
+    let requestedUser = req.user;
+    let loggedInUser = await this.entityService.getEntityData(ENTITYTYPE_USER,requestedUser.id);
+    if (!file) {
+      throw new BadRequestException('File is required');
+    }
+    return await this.masterService.uploadEntityData(file.buffer,entityType,loggedInUser);
   }
 }