rez_core 1.0.61 → 1.0.63

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

@@ -0,0 +1,48 @@
+import {
+    Controller,
+    Get,
+    Query,
+    Res,
+    HttpStatus,
+    UseGuards,
+    Inject,
+  } from '@nestjs/common';
+  import { JwtAuthGuard } from '../../auth/guards/jwt.guard';
+  import { Response } from 'express';
+import { ViewMasterService } from '../service/view-master.service';
+  
+  @Controller('entity')
+  @UseGuards(JwtAuthGuard)
+  export class ViewMasterController {
+    constructor(@Inject("ViewMasterService") private  readonly viewMaster: ViewMasterService) {}
+  
+    @Get('viewMaster')
+    async getEntityJsonByType(
+      @Query('entity_type') entityType: string,
+      @Query('type') type:string,
+      @Res() res: Response,
+    ) {
+      try {
+        if (!entityType || !type) {
+          return res.status(HttpStatus.BAD_REQUEST).json({
+            success: false,
+            message: 'Missing entity_type or type query parameter',
+          });
+        }
+  
+        const result = await this.viewMaster.getEntityJson(entityType, type);
+  
+        return res.status(HttpStatus.OK).json({
+          success: true,
+          message: 'Entity data fetched successfully',
+          data: result,
+        });
+      } catch (error) {
+        return res.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
+          success: false,
+          message: error.message || 'Error fetching entity data',
+        });
+      }
+    }
+  }
+  

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[];
+}

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

@@ -1,65 +1,65 @@
-import { BaseEntity } from './base-entity.entity';
-import { Column, Entity } from 'typeorm';
-import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
-
-@Entity({ name: 'cr_preference_master' })
-export class PreferenceMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
-  }
-
-  @Column({ name: 'appcode', type: 'varchar', length: 200, nullable: true })
-  appCode: string;
-
-  @Column({
-    name: 'display_name',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  display_name: string;
-
-  @Column({
-    name: 'preference_key',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  preference_key: string;
-
-  @Column({
-    name: 'preference_value',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  preference_value: string;
-
-  @Column({
-    name: 'description',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  description: string;
-
-  @Column({ name: 'reflect_on', type: 'varchar', length: 200, nullable: true })
-  reflect_on: string;
-
-  @Column({
-    name: 'default_value',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  default_value: string;
-
-  @Column({
-    name: 'possible_values',
-    type: 'varchar',
-    length: 200,
-    nullable: true,
-  })
-  possible_values: string;
-}
+import { BaseEntity } from './base-entity.entity';
+import { Column, Entity } from 'typeorm';
+import { ENTITYTYPE_PREFERENCEMASTER } from '../../../constant/global.constant';
+
+@Entity({ name: 'cr_preference_master' })
+export class PreferenceMaster extends BaseEntity {
+  constructor() {
+    super();
+    this.entity_type = ENTITYTYPE_PREFERENCEMASTER;
+  }
+
+  @Column({ name: 'appcode', type: 'varchar', length: 200, nullable: true })
+  appCode: string;
+
+  @Column({
+    name: 'display_name',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  display_name: string;
+
+  @Column({
+    name: 'preference_key',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  preference_key: string;
+
+  @Column({
+    name: 'preference_value',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  preference_value: string;
+
+  @Column({
+    name: 'description',
+    type: 'varchar',
+    length: 2000,
+    nullable: true,
+  })
+  description: string;
+
+  @Column({ name: 'reflect_on', type: 'varchar', length: 200, nullable: true })
+  reflect_on: string;
+
+  @Column({
+    name: 'default_value',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  default_value: string;
+
+  @Column({
+    name: 'possible_values',
+    type: 'varchar',
+    length: 200,
+    nullable: true,
+  })
+  possible_values: string;
+}

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

@@ -24,6 +24,12 @@ export class ViewMaster extends BaseEntity {
   @Column({type: 'json', nullable: true})
   published_form_fields: string;
 
+  @Column({type: 'json',nullable:true})
+  meta_json:string;
+
+  @Column({ nullable:true})
+  type: string;
+
   @Column({type: 'int'})
   is_default: number;
 }

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

@@ -32,6 +32,8 @@ import { SectionMaster } from './entity/section-master.entity';
 import { FieldGroup } from './entity/field-group.entity';
 import { FieldGroupService } from './service/field-group.service';
 import { ViewMasterService } from './service/view-master.service';
+import { ViewMasterController } from './controller/view-master.controller';
+import { ViewMaterRespository } from './repository/view-master.repository';
 
 @Module({
   imports: [
@@ -67,6 +69,7 @@ import { ViewMasterService } from './service/view-master.service';
     AttributeMasterService,
     SectionMasterService,
     FieldGroupService,
+    ViewMaterRespository,
     { provide: 'ViewMasterService', useClass: ViewMasterService },
   ],
   exports: [
@@ -81,6 +84,6 @@ import { ViewMasterService } from './service/view-master.service';
     FieldGroupService,
     'ViewMasterService',
   ],
-  controllers: [EntityController, MasterController, MediaController],
+  controllers: [EntityController, MasterController, MediaController, ViewMasterController],
 })
 export class EntityModule {}

package/src/module/meta/repository/preference.repository.ts

@@ -1,20 +1,20 @@
-import { Injectable } from '@nestjs/common';
-import { InjectRepository } from '@nestjs/typeorm';
-import { PreferenceMaster } from '../entity/preference.entity';
-import { Repository } from 'typeorm';
-
-@Injectable()
-export class PreferenceRepository {
-  constructor(
-    @InjectRepository(PreferenceMaster)
-    private readonly preferenceRepository: Repository<PreferenceMaster>,
-  ) {}
-
-  async findByPreferenceKey(
-    preferenceKey: string,
-  ): Promise<PreferenceMaster | null> {
-    return await this.preferenceRepository.findOne({
-      where: { preference_key: preferenceKey },
-    });
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { PreferenceMaster } from '../entity/preference.entity';
+import { Repository } from 'typeorm';
+
+@Injectable()
+export class PreferenceRepository {
+  constructor(
+    @InjectRepository(PreferenceMaster)
+    private readonly preferenceRepository: Repository<PreferenceMaster>,
+  ) {}
+
+  async findByPreferenceKey(
+    preferenceKey: string,
+  ): Promise<PreferenceMaster | null> {
+    return await this.preferenceRepository.findOne({
+      where: { preference_key: preferenceKey },
+    });
+  }
+}

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

@@ -0,0 +1,24 @@
+import { Injectable } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { BaseEntity, Repository } from 'typeorm';
+import { ViewMaster } from '../entity/view-master.entity';
+
+@Injectable()
+export class ViewMaterRespository {
+  constructor(
+    @InjectRepository(ViewMaster)
+    private readonly viewMasterRepository: Repository<ViewMaster>,
+  ) {}
+
+  async getEntityJson(
+    entityType: string,
+    type: string,
+  ): Promise<ViewMaster | null> {
+    const viewMaster = await this.viewMasterRepository.findOneBy({
+      mapped_entity_type: entityType,
+      type: type,
+    });
+  
+    return viewMaster;
+  }
+}

package/src/module/meta/service/entity-list.service.ts

@@ -148,8 +148,8 @@ export class EntityListService {
 
   public async getMaxSequenceNumber(
     tableName: string,
-    parentType: string,
-    parentId: number,
+    parentType: string | null,
+    parentId: number | null,
   ) {
     let query = `SELECT COUNT(1) seq_no
                  FROM ${tableName} WHERE 1=1 `;

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

@@ -10,18 +10,22 @@ export class EntityMasterService {
     private entityMasterRepository: Repository<EntityMaster>,
   ) {}
 
-  async getEntityData(mappedEntityType: string): Promise<EntityMaster> {
-    const entityMaster = await this.entityMasterRepository.findOne({
-      where: { mapped_entity_type: mappedEntityType },
-    });
-
-    if (!entityMaster) {
-      throw new Error(
-        `Entity with mappedEntityType "${mappedEntityType}" not found.`,
-      );
+  async getEntityData(mappedEntityType: string|null): Promise<EntityMaster> {
+    if (mappedEntityType) {
+      const entityMaster = await this.entityMasterRepository.findOne({
+        where: { mapped_entity_type: mappedEntityType },
+      });
+
+      if (!entityMaster) {
+        throw new Error(
+          `Entity with mappedEntityType "${mappedEntityType}" not found.`,
+        );
+      }
+
+      return entityMaster;
+    } else {
+      throw new Error();
     }
-
-    return entityMaster;
   }
 
   async getEntityByTableName(tableName: string) {

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

@@ -8,17 +8,19 @@ 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';
+import { ViewMaterRespository } from '../repository/view-master.repository';
 @Injectable()
 export class ViewMasterService extends EntityServiceImpl {
   constructor(
     private readonly sectionMasterService: SectionMasterService,
     private readonly fieldGroupService: FieldGroupService,
+    private readonly viewMasterRepoService: ViewMaterRespository
   ) {
     super();
   }
 
   async createEntity(
-    entityData: BaseEntity,
+    entityData: ViewMaster,
     loggedInUser: UserData | null,
     manager?: EntityManager,
   ): Promise<BaseEntity> {
@@ -33,40 +35,45 @@ export class ViewMasterService extends EntityServiceImpl {
       loggedInUser,
       manager,
     );
-    let viewMaster = savedEntity as ViewMaster;
 
-    let layout = viewMaster.published_form_layout;
+    let viewMaster = savedEntity as ViewMaster;
+    if (entityData.type === 'form') {
+      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 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 savedSectionMaster = await this.sectionMasterService.createEntity(
+          sectionMaster,
+          loggedInUser,
+          manager,
+        );
 
-      const fieldGroups = step.fieldsGroup;
-      console.log('fieldGroups', fieldGroups);
+        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;
+        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);
+          this.fieldGroupService.createEntity(
+            fieldsGroup,
+            loggedInUser,
+            manager,
+          );
+        }
       }
-    }
-
+    } 
     return savedEntity;
   }
 
@@ -76,4 +83,20 @@ export class ViewMasterService extends EntityServiceImpl {
   ): Promise<BaseEntity> {
     return entityData;
   }
+
+  async getEntityJson(entityType: string, type: string) {
+
+    const res=  await this.viewMasterRepoService.getEntityJson(entityType,type)
+    
+    if(type=="form"){
+      return {
+        formLayoutJson:res?.published_form_layout,
+        formFieldJson:res?.published_form_fields
+      }
+    }else{
+      return {
+        metaJson:res?.meta_json
+      }
+    }
+  }
 }

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/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/role.entity.ts

@@ -1,6 +1,7 @@
 import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { ENTITYTYPE_ROLE } from '../../../constant/global.constant';
 import { Column, Entity } from 'typeorm';
+import { Exclude } from 'class-transformer';
 
 @Entity({ name: 'cr_role' })
 export class Role extends BaseEntity {
@@ -17,4 +18,7 @@ export class Role extends BaseEntity {
 
   @Column({ type: 'varchar', length: 250, nullable: true })
   description: string;
+
+  @Exclude()
+  copy_from_role_id: number;
 }