rez_core 1.0.47 → 1.0.48

package/src/module/meta/service/section-master.service.ts

@@ -0,0 +1,104 @@
+import { Injectable } from '@nestjs/common';
+import { EntityServiceImpl } from './entity-service-impl.service';
+import { BaseEntity } from '../entity/base-entity.entity';
+import { UserData } from '../../user/entity/user.entity';
+import { EntityManager } from 'typeorm';
+import { ViewMaster } from '../entity/view-master.entity';
+
+@Injectable()
+export class SectionMasterService extends EntityServiceImpl {
+  constructor() {
+    super();
+  }
+
+  async createEntity(
+    entityData: BaseEntity,
+    loggedInUser: UserData | null,
+    manager?: EntityManager,
+  ): Promise<BaseEntity> {
+    const entityMaster = await this.entityMasterService.getEntityData(
+      entityData.entity_type,
+    );
+    entityData.parent_id = entityMaster.id;
+    entityData.parent_type = entityMaster.entity_type;
+
+    const savedEntity = await super.createEntity(
+      entityData,
+      loggedInUser,
+      manager,
+    );
+    return savedEntity;
+  }
+
+  async updateEntity(
+    entityData: ViewMaster,
+    loggedInUserData: UserData | null,
+  ): Promise<BaseEntity> {
+    return entityData;
+  }
+
+  parseLayout(layoutJson: any) {
+    const stepsData: {
+      stepType: string;
+      stepId: string;
+      stepLabel: string;
+      stepPosition: number;
+      fieldsGroup: {
+        type: string;
+        label: string;
+        id: string;
+      }[];
+    }[] = [];
+
+    if (layoutJson?.form?.children && Array.isArray(layoutJson.form.children)) {
+      const firstChild = layoutJson.form.children[0];
+      console.log('First Child:', firstChild);
+
+      if (firstChild.type === 'wizard' && Array.isArray(firstChild.steps)) {
+        console.log('Wizard Steps:', firstChild.steps);
+        let i = 0;
+        for (const step of firstChild.steps) {
+          if (step.type === 'step') {
+            const fields = this.extractFields(step.fields);
+
+            stepsData.push({
+              stepType: step.type,
+              stepId: step.id,
+              stepLabel: step.label,
+              stepPosition: ++i,
+              fieldsGroup: fields,
+            });
+          }
+        }
+      }
+    }
+    return stepsData;
+  }
+
+  extractFields(fieldsArray: any[]): {
+    type: string;
+    label: string;
+    id: string;
+  }[] {
+    const extractedFields: { type: string; label: string; id: string }[] = [];
+
+    function traverse(fields: any[]) {
+      for (const field of fields) {
+        if (field.type === 'field-set') {
+          extractedFields.push({
+            type: field.type || 'Default Type',
+            label: field.label || 'Default Label',
+            id: field.id || 'Default ID',
+          });
+        }
+        if (Array.isArray(field.fields)) {
+          traverse(field.fields);
+        }
+      }
+    }
+
+    traverse(fieldsArray);
+
+    return extractedFields;
+  }
+}

package/src/module/meta/service/view-master.service.ts

@@ -4,10 +4,16 @@ import { BaseEntity } from '../entity/base-entity.entity';
 import { UserData } from '../../user/entity/user.entity';
 import { EntityManager } from 'typeorm';
 import { ViewMaster } from '../entity/view-master.entity';
-
+import { SectionMasterService } from './section-master.service';
+import { SectionMaster } from '../entity/section-master.entity';
+import { FieldGroup } from '../entity/field-group.entity';
+import { FieldGroupService } from './field-group.service';
 @Injectable()
 export class ViewMasterService extends EntityServiceImpl {
-  constructor() {
+  constructor(
+    private readonly sectionMasterService: SectionMasterService,
+    private readonly fieldGroupService: FieldGroupService,
+  ) {
     super();
   }
 
@@ -27,6 +33,40 @@ export class ViewMasterService extends EntityServiceImpl {
       loggedInUser,
       manager,
     );
+    let viewMaster = savedEntity as ViewMaster;
+
+    let layout = viewMaster.published_form_layout;
+
+    const stepsData = this.sectionMasterService.parseLayout(layout);
+    for (var step of stepsData) {
+      let sectionMaster = new SectionMaster();
+      sectionMaster.name = step.stepLabel;
+      sectionMaster.position = step.stepPosition;
+      sectionMaster.description = step.stepLabel;
+      sectionMaster.parent_id = viewMaster.id;
+      sectionMaster.parent_type = viewMaster.entity_type;
+
+      const savedSectionMaster = await this.sectionMasterService.createEntity(
+        sectionMaster,
+        loggedInUser,
+        manager,
+      );
+
+      const fieldGroups = step.fieldsGroup;
+      console.log('fieldGroups', fieldGroups);
+
+      for (var fieldGroup of fieldGroups) {
+        let fieldsGroup = new FieldGroup();
+        fieldsGroup.view_id = viewMaster.id;
+        fieldsGroup.parent_id = savedSectionMaster.id;
+        fieldsGroup.field_type = fieldGroup.type;
+        fieldsGroup.label = fieldGroup.label;
+        fieldsGroup.description = fieldGroup.label;
+
+        this.fieldGroupService.createEntity(fieldsGroup, loggedInUser, manager);
+      }
+    }
+
     return savedEntity;
   }
 
@@ -34,8 +74,6 @@ export class ViewMasterService extends EntityServiceImpl {
     entityData: ViewMaster,
     loggedInUserData: UserData | null,
   ): Promise<BaseEntity> {
-
     return entityData;
   }
-
 }

package/src/module/module/controller/menu.controller.ts

@@ -1,15 +1,15 @@
-import { Controller, Get, Request, UseGuards } from '@nestjs/common';
-import { MenuService } from '../service/menu.service';
-import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
-
-@Controller('menu')
-export class MenuController {
-  constructor(private readonly menuService: MenuService) {}
-
-  @UseGuards(JwtAuthGuard)
-  @Get()
-  async getMenu(@Request() req) {
-    const userId = req.user.userId;
-    return this.menuService.getUserMenu(userId);
-  }
-}
+import { Controller, Get, Request, UseGuards } from '@nestjs/common';
+import { MenuService } from '../service/menu.service';
+import { JwtAuthGuard } from 'src/module/auth/guards/jwt.guard';
+
+@Controller('menu')
+export class MenuController {
+  constructor(private readonly menuService: MenuService) {}
+
+  @UseGuards(JwtAuthGuard)
+  @Get()
+  async getMenu(@Request() req) {
+    const userId = req.user.userId;
+    return this.menuService.getUserMenu(userId);
+  }
+}

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

@@ -1,22 +1,22 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_module_access' })
-export class ModuleAccess {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({type: 'varchar', length: 100, nullable: true})
-  module_code: string;
-
-  @Column({type: 'varchar', length: 100, nullable: true })
-  role_code: string;
-
-  @Column({type: 'int', nullable: true })
-  access_flag: number;
-
-  @Column({type: 'varchar', length: 100, nullable: true })
-  action_type: string;
-
-  @Column({type: 'varchar', length: 100, nullable: true})
-  app_code: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_module_access' })
+export class ModuleAccess {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({type: 'varchar', length: 100, nullable: true})
+  module_code: string;
+
+  @Column({type: 'varchar', length: 100, nullable: true })
+  role_code: string;
+
+  @Column({type: 'int', nullable: true })
+  access_flag: number;
+
+  @Column({type: 'varchar', length: 100, nullable: true })
+  action_type: string;
+
+  @Column({type: 'varchar', length: 100, nullable: true})
+  app_code: string;
+}

package/src/module/module/entity/module-action.entity.ts

@@ -1,19 +1,19 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'module_action' })
-export class ModuleAction {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({type: 'int', nullable: true})
-  module_id: number;
-  
-  @Column({type: 'varchar', length: 100, nullable: true })
-  module_code: string;
-  
-  @Column({type: 'varchar', length: 100, nullable: true })
-  action_name:string
-
-  @Column({type: 'varchar', length: 50, nullable: true })
-  action_type: string;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'module_action' })
+export class ModuleAction {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({type: 'int', nullable: true})
+  module_id: number;
+  
+  @Column({type: 'varchar', length: 100, nullable: true })
+  module_code: string;
+  
+  @Column({type: 'varchar', length: 100, nullable: true })
+  action_name:string
+
+  @Column({type: 'varchar', length: 50, nullable: true })
+  action_type: string;
+}

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

@@ -1,10 +1,15 @@
-import { Injectable } from '@nestjs/common';
+import { BadRequestException, Inject, Injectable } from '@nestjs/common';
 import { ModuleAccessRepository } from '../repository/module-access.repository';
+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';
 
 @Injectable()
 export class ModuleAccessService {
   constructor(
     private readonly moduleAccessRepository: ModuleAccessRepository,
+    @Inject('RoleService') private readonly roleService: RoleService,
   ) {}
 
   async getRoles() {
@@ -49,16 +54,33 @@ export class ModuleAccessService {
     return this.moduleAccessRepository.createRole(body);
   }
 
-  async updateRole(id: number, body: {
-    name?: string;
-    description?: string;
-    status?: 'ACTIVE' | 'INACTIVE';
-    copyFromRoleId?: number;
-  }) {
+  async updateRole(
+    id: number,
+    body: {
+      name?: string;
+      description?: string;
+      status?: 'ACTIVE' | 'INACTIVE';
+      copyFromRoleId?: number;
+    },
+  ) {
     if (!body.name) {
-      throw new Error('Role name is required');
+      throw new BadRequestException('Role name is required');
+    }
+
+    //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');
     }
-  
+
+    //if body.status =="INACTIVE" and role.is_system==1:
+    //  throw new Error('Cannot deactivate system role');
+
     return this.moduleAccessRepository.updateRole(id, {
       name: body.name,
       description: body.description,
@@ -66,7 +88,4 @@ export class ModuleAccessService {
       copyFromRoleId: body.copyFromRoleId,
     });
   }
-  
-  
-  
-}
+}

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,21 +1,21 @@
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
-
-@Entity({ name: 'cr_user_role_mapping' })
-export class UserRoleMapping {
-  constructor(user_id: number, role_id: number) {
-    this.user_id = user_id;
-    this.role_id = role_id;
-  }
-
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  user_id: number;
-
-  @Column({ type: 'bigint', nullable: true })
-  role_id: number;
-
-  @Column({ type: 'int', nullable: true })
-  is_default: number;
-}
+import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity({ name: 'cr_user_role_mapping' })
+export class UserRoleMapping {
+  constructor(user_id: number, role_id: number) {
+    this.user_id = user_id;
+    this.role_id = role_id;
+  }
+
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  user_id: number;
+
+  @Column({ type: 'bigint', nullable: true })
+  role_id: number;
+
+  @Column({ type: 'int', nullable: true })
+  is_default: 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/resources/dev.properties.yaml

@@ -15,7 +15,7 @@ VERIFY_OTP: "false"
 DEFAULT_OTP: "123456"
 AWS:
   S3:
-    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSVJMYCJUV"
-    AWS_SECRET_KEY: "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"
+    AWS_ACCESS_KEY_ID: "AKIAYYKIBDDSQF3KILGE"
+    AWS_SECRET_KEY: "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"
     AWS_REGION: "ap-south-1"
     BUCKET_NAME: "testether"