rez_core 6.5.67 → 6.5.69

package/src/module/dashboard/entity/dashboard_page_data.entity.ts

@@ -1,12 +1,8 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_dashboard_page_data' })
 export class DashboardPageData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'DASH';
-  }
   @Column({ type: 'int', nullable: true })
   page_sequence: number;
 

package/src/module/dashboard/entity/widget_master.entity.ts

@@ -1,12 +1,9 @@
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
-import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
+import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_dashboard_widget' })
 export class WidgetMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'WIDG';
-  }
+
   @Column({ type: 'varchar', nullable: true })
   api_url: string;
 

package/src/module/entity_json/service/entity_json.service.ts

@@ -87,12 +87,13 @@ export class EntityJSONService {
 
     if (flag === 'flat_json' || flag === 'all') {
       const result: Record<string, null> = {};
-      mainAttributes.forEach(attr => {
-        if (attr.flat_json_key) result[attr.flat_json_key] = null;
-      });
-      relatedAttributes.forEach(attr => {
-        if (attr.flat_json_key) result[attr.flat_json_key] = null;
-      });
+      // FIXME:@Bhushan handling for flat json key
+      // mainAttributes.forEach(attr => {
+      //   if (attr.flat_json_key) result[attr.flat_json_key] = null;
+      // });
+      // relatedAttributes.forEach(attr => {
+      //   if (attr.flat_json_key) result[attr.flat_json_key] = null;
+      // });
       linkedAttributes.forEach(link => {
         if (link.target_attribute_key) result[link.target_attribute_key] = null;
       });
@@ -105,8 +106,9 @@ export class EntityJSONService {
     }
 
     const dropdown: any[] = [];
-    dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
-    dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
+    //Fixme: @Bhushan
+    // dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
+    // dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.flat_json_key })));
     if (linkedAttributes.length > 0) {
       dropdown.push(...linkedAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
     }
@@ -136,7 +138,9 @@ export class EntityJSONService {
     const attrMap: Record<string, string> = {};
     const allAttrs = [...safeAttributes.mainAttributes, ...safeAttributes.relatedAttributes];
     allAttrs.forEach(attr => {
-      if (attr.attribute_key) attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
+      //FIXME: @Bhushan
+      // if (attr.attribute_key) attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
+      if (attr.attribute_key) attrMap[attr.attribute_key] = attr.attribute_key;
     });
 
     const mainData = await this.entityServiceImpl.getResolvedEntityData(entityType, entityId, loggedInUser);

package/src/module/filter/entity/saved-filter-detail.entity.ts

@@ -4,10 +4,6 @@ import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_saved_filter_detail' })
 export class SavedFilterDetail extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_SAVEDFILTERDETAIL;
-  }
 
   @Column({ nullable: true })
   mapped_filter_code: string; // links to SavedFilterMaster.code (manual, not FK)

package/src/module/filter/entity/saved-filter-master.entity.ts

@@ -1,13 +1,8 @@
-import { ENTITYTYPE_SAVEDFILTERMASTER } from 'src/constant/global.constant';
 import { BaseEntity } from 'src/module/meta/entity/base-entity.entity';
 import { Column, Entity } from 'typeorm';
 
 @Entity({ name: 'frm_saved_filter_master' })
 export class SavedFilterMaster extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_SAVEDFILTERMASTER;
-  }
 
   @Column({ length: 50, type: 'varchar', nullable: true })
   mapped_entity_type: string;

package/src/module/filter/repository/saved-filter.repository.ts

@@ -99,7 +99,7 @@ export class SavedFilterRepositoryService {
         user_id: loggedInUser.id,
         mapped_entity_type: entityType,
         level_type: loggedInUser.level_type,
-        level_id: loggedInUser.level_id,
+        level_id: Number(loggedInUser.level_id),
         status: 'ACTIVE',
         is_shared: false,
       },
@@ -145,7 +145,7 @@ export class SavedFilterRepositoryService {
     const filters = await this.savedFilterMasterRepo.find({
       where: {
         level_type: loggedInUser.level_type,
-        level_id: loggedInUser.level_id,
+        level_id: Number(loggedInUser.level_id),
         mapped_entity_type: entityType,
         is_shared: true,
         status: 'ACTIVE',

package/src/module/filter/service/saved-filter.service.ts

@@ -86,7 +86,6 @@ export class SavedFilterService extends EntityServiceImpl {
 
     const nameExists = await this.savedFilterRepo.isFilterNameExists({
       name: master.name,
-      organization_id: master.organization_id,
       enterprise_id: master.enterprise_id,
       id: master.id, // Include ID to allow same-name check during update
     });

package/src/module/integration/service/integration.service.ts

@@ -827,9 +827,8 @@ export class IntegrationService {
 
           const entityMapper = this.entityMapperRepository.create({
             integration_config_id: config.id,
-            level_id: String(config.level_id),
+            level_id: config.level_id,
             level_type: config.level_type,
-            appcode: config.app_code,
             did: did,
             campaign_name: config.config_json.campaignName || null,
           });
@@ -1885,9 +1884,8 @@ export class IntegrationService {
         if (did) {
           const entityMapper = this.entityMapperRepository.create({
             integration_config_id: savedConfig.id,
-            level_id: String(levelId),
+            level_id: levelId,
             level_type: levelType,
-            appcode: app_code,
             did: did,
             campaign_name: config.campaignName || null,
           });

package/src/module/listmaster/entity/list-master-items.entity.ts

@@ -3,16 +3,9 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { ENTITYTYPE_LISTMASTERITEMS } from '../../../constant/global.constant';
 
 @Entity({ name: 'frm_list_master_items' })
-@Index('idx_list_master_items_listtype_value_org', ['listtype', 'value', 'organization_id'])
-@Index('idx_list_master_items_listtype_org', ['listtype', 'organization_id'])
+@Index('idx_list_master_items_listtype_value_org', ['listtype', 'value', 'enterprise_id'])
+@Index('idx_list_master_items_listtype_org', ['listtype', 'enterprise_id'])
 export class ListMasterItems extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_LISTMASTERITEMS;
-  }
-
-  @PrimaryGeneratedColumn()
-  id: number;
 
   @Column({ nullable: true })
   listtype: string;

package/src/module/listmaster/entity/list-master.entity.ts

@@ -3,12 +3,8 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 import { ENTITYTYPE_LISTMASTER } from '../../../constant/global.constant';
 
 @Entity({ name: 'frm_list_master' })
-@Index('idx_list_master_type_org', ['type', 'organization_id'])
+@Index('idx_list_master_type_org', ['type', 'enterprise_id'])
 export class ListMasterData extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = ENTITYTYPE_LISTMASTER;
-  }
 
   @Column({nullable: true})
   type: string;

package/src/module/listmaster/service/list-master.service.ts

@@ -68,7 +68,7 @@ export class ListMasterService {
     loggedInUser?,
     publicCall = false,
   ) {
-    const config = await this.listMasterRepo.findByType(
+    const config: any = await this.listMasterRepo.findByType(
       type,
       loggedInUser?.enterprise_id,
     );

package/src/module/mapper/entity/field-lovs.entity.ts

@@ -3,10 +3,6 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
 @Entity({ name: 'frm_mapper_field_lov' })
 export class FieldLovMapper extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'FLOV';
-  }
 
   @Column({ name: 'mapper_field_id' })
   mapper_field_id: number; //1

package/src/module/mapper/entity/field-mapper.entity.ts

@@ -3,10 +3,6 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
 @Entity({ name: 'frm_mapper_field' })
 export class FieldMapper extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'FMAP';
-  }
 
   @Column({ name: 'mapper_id', type: 'bigint', nullable: true })
   mapper_id: number;

package/src/module/mapper/entity/mapper.entity.ts

@@ -3,10 +3,6 @@ import { BaseEntity } from '../../meta/entity/base-entity.entity';
 
 @Entity({ name: 'frm_mapper_master' })
 export class Mapper extends BaseEntity {
-  constructor() {
-    super();
-    this.entity_type = 'MAP';
-  }
 
   @Column({ nullable: true, type: 'varchar', length: 100 })
   description: string;

package/src/module/mapper/service/field-mapper.service.ts

@@ -25,7 +25,6 @@ export class FieldMapperService extends EntityServiceImpl {
     if (dto.field_lovs) {
       for (const lov of dto.field_lovs) {
         lov.mapper_field_id = savedEntity.id;
-        lov.entity_type = 'FLOV';
       }
       await this.fieldLovsRepository.saveBulk(dto.field_lovs);
     }

package/src/module/master/controller/master.controller.ts

@@ -2,7 +2,6 @@ import {
   BadRequestException,
   Body,
   Controller,
-  Inject,
   Param,
   Post,
   Req,
@@ -13,18 +12,14 @@ import {
 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,
-    private readonly entityService: EntityServiceImpl,
-  ) {}
+  ) {
+  }
 
   @Post('uploadMeta')
   @UseInterceptors(FileInterceptor('file'))
@@ -36,6 +31,7 @@ export class MasterController {
   }
 
   @Post('uploadData')
+  @UseGuards(JwtAuthGuard)
   @UseInterceptors(FileInterceptor('file'))
   async uploadMasterDataXls(
     @UploadedFile() file: Express.Multer.File,
@@ -50,6 +46,7 @@ export class MasterController {
 
   @Post('uploadEntity/:entityType')
   @UseInterceptors(FileInterceptor('file'))
+  @UseGuards(JwtAuthGuard)
   async uploadEntityDataXls(
     @Param('entityType') entityType: string,
     @UploadedFile() file: Express.Multer.File,

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

@@ -33,23 +33,23 @@ export class MasterService {
   private readonly sequence = [
     {
       table: 'frm_entity_master',
-      unique_fields: ['id', 'organization_id'],
+      unique_fields: ['id', 'enterprise_id'],
     },
     {
       table: 'frm_entity_attribute',
-      unique_fields: ['mapped_entity_type', 'attribute_key', 'organization_id'],
+      unique_fields: ['mapped_entity_type', 'attribute_key', 'enterprise_id'],
     },
     {
       table: 'frm_list_master',
-      unique_fields: ['type', 'organization_id'],
+      unique_fields: ['type', 'enterprise_id'],
     },
     {
       table: 'frm_list_master_items',
-      unique_fields: ['listtype', 'code', 'organization_id'],
+      unique_fields: ['listtype', 'code', 'enterprise_id'],
     },
     {
       table: 'frm_entity_table',
-      unique_fields: ['list_type', 'mapped_entity_type', 'organization_id'],
+      unique_fields: ['list_type', 'mapped_entity_type', 'enterprise_id'],
     },
     {
       table: 'frm_entity_table_column',
@@ -57,20 +57,20 @@ export class MasterService {
         'parent_id',
         'parent_type',
         'attribute_key',
-        'organization_id',
+        'enterprise_id',
       ],
     },
     {
       table: 'frm_entity_view',
-      unique_fields: ['mapped_entity_type', 'organization_id'],
+      unique_fields: ['mapped_entity_type', 'enterprise_id'],
     },
     {
       table: 'sso_user',
-      unique_fields: ['organization_id'],
+      unique_fields: ['enterprise_id'],
     },
     {
       table: 'sso_header_items',
-      unique_fields: ['code', 'section_id', 'organization_id'],
+      unique_fields: ['code', 'section_id', 'enterprise_id'],
     },
     {
       table: 'sso_module_access',
@@ -78,27 +78,27 @@ export class MasterService {
     },
     {
       table: 'sso_module_action',
-      unique_fields: ['module_code', 'action_type', 'organization_id'],
+      unique_fields: ['module_code', 'action_type', 'enterprise_id'],
     },
     {
       table: 'sso_menu',
-      unique_fields: ['module_code', 'organization_id'],
+      unique_fields: ['module_code', 'enterprise_id'],
     },
     {
       table: 'sso_module',
-      unique_fields: ['module_code', 'organization_id'],
+      unique_fields: ['module_code', 'enterprise_id'],
     },
     {
       table: 'sso_role',
-      unique_fields: ['code', 'organization_id'],
+      unique_fields: ['code', 'enterprise_id'],
     },
     {
       table: 'sso_header_sections',
-      unique_fields: ['section_name', 'organization_id'],
+      unique_fields: ['section_name', 'enterprise_id'],
     },
     {
       table: 'sso_user_role_mapping',
-      unique_fields: ['user_id', 'role_id', 'organization_id'],
+      unique_fields: ['user_id', 'role_id', 'enterprise_id'],
     },
     {
       table: 'sso_organization',
@@ -182,9 +182,9 @@ export class MasterService {
         }
 
         for (const attribute of attributes) {
-          if (attribute.data_source_type === 'entity') {
+          if (attribute.ds_category === 'ENTITY') {
             const entityMaster = await this.entityMasterService.getEntityData(
-              attribute.datasource_list,
+              attribute.ds_category,
               loggedInUser,
             );
             const entityData = await this.entityManager.query(
@@ -229,14 +229,6 @@ export class MasterService {
         loggedInUser,
       );
 
-    const uniqueFields = attributes
-      .filter((attr) => attr.is_unique)
-      .map((attr) => attr.attribute_key);
-
-    if (uniqueFields.length === 0) {
-      throw new Error(`No unique fields found for entityType: ${entityType}`);
-    }
-
     const errors: any[] = [];
 
     // ✅ Iterate row by row
@@ -249,13 +241,13 @@ export class MasterService {
 
       // handle reference entity replacement
       for (const attr of attributes) {
-        if (attr.data_source_type === 'entity' && row[attr.attribute_key]) {
+        if (attr.ds_category === 'ENTITY' && row[attr.attribute_key]) {
           const refEntity = await this.entityMasterService.getEntityData(
-            attr.datasource_list,
+            attr.ds_category,
             loggedInUser,
           );
           const refData = await this.entityManager.query(
-            `SELECT * FROM ${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
+            `SELECT * FROM ${this.schema}.${refEntity.db_table_name} WHERE code = ? LIMIT 1`,
             [row[attr.attribute_key]],
           );
 
@@ -275,9 +267,9 @@ export class MasterService {
       }
 
       for (const attr of attributes) {
-        if (attr.data_source_type === 'master' && row[attr.attribute_key]) {
+        if (attr.ds_category === 'LIST_MASTER' && row[attr.attribute_key]) {
           const refData = await this.entityManager.query(
-            `SELECT * FROM frm_list_master_items WHERE name = ? and enterprise_id = ? LIMIT 1`,
+            `SELECT * FROM ${this.schema}.frm_list_master_items WHERE name = $1 and enterprise_id = $2 LIMIT 1`,
             [row[attr.attribute_key], loggedInUser.enterprise_id],
           );
 
@@ -320,8 +312,6 @@ export class MasterService {
     await this.upsertViaService(
       entityType,
       sheetData,
-      attributes,
-      uniqueFields,
       loggedInUser,
       duplicateHandling,
     );
@@ -411,8 +401,6 @@ export class MasterService {
   async upsertViaService(
     entityType: string,
     data: any[],
-    attributes: any[],
-    uniqueFields: string[],
     loggedInUser: any,
     duplicateHandling: 'skip_duplicates' | 'overwrite_items',
   ): Promise<void> {
@@ -431,7 +419,6 @@ export class MasterService {
 
     for (const [i, row] of data.entries()) {
       row.entity_type = entityType;
-      row.organization_id = loggedInUser.organization_id;
       row.enterprise_id = loggedInUser.enterprise_id;
 
       // 🧠 Check if this already exists
@@ -439,20 +426,7 @@ export class MasterService {
         .createQueryBuilder()
         .select('*')
         .from(`${this.schema}.${entityMaster.db_table_name}`, 't')
-        .where(
-          new Brackets((qbOr) => {
-            uniqueFields.forEach((field, index) => {
-              const condition = `t.${field} = :val${index}`;
-              const param = { [`val${index}`]: row[field] };
-              if (index === 0) {
-                qbOr.where(condition, param);
-              } else {
-                qbOr.orWhere(condition, param);
-              }
-            });
-          }),
-        )
-        .andWhere(`t.enterprise_id = :entId`, {
+        .where(`t.enterprise_id = :entId`, {
           entId: loggedInUser.enterprise_id,
         })
         .andWhere(`t.level_type = :levelType`, {

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

@@ -2,95 +2,42 @@ import { BaseEntity } from './base-entity.entity';
 import { Column, Entity, Index } from 'typeorm';
 
 @Entity({ name: 'frm_entity_attribute' })
-@Index('idx_attribute_master_key_org_entity', ['attribute_key', 'organization_id', 'mapped_entity_type'])
-@Index('idx_attribute_master_org_entity', ['organization_id', 'mapped_entity_type'])
+@Index('idx_attribute_master_key_org_entity', ['attribute_key', 'enterprise_id', 'mapped_entity_type'])
+@Index('idx_attribute_master_org_entity', ['enterprise_id', 'mapped_entity_type'])
 export class AttributeMaster extends BaseEntity {
   @Column({ name: 'mapped_entity_type', type: 'varchar', nullable: true })
   mapped_entity_type: string;
 
-  @Column({ name: 'mapped_entity_id', nullable: true })
-  mapped_entity_id: number;
+  @Column({ name: 'attribute_key', type: 'varchar', nullable: true, length: 50 })
+  attribute_key: string;
 
+  // TODO: element type enum
   @Column({ name: 'element_type', type: 'varchar', nullable: true, length: 50 })
   element_type: string;
 
-  @Column({
-    name: 'data_source_type',
-    type: 'varchar',
-    nullable: true,
-    length: 50,
-  })
-  data_source_type: string;
-
-  @Column({
-    name: 'data_type',
-    type: 'varchar',
-    nullable: true,
-    length: 50,
-  })
-  data_type: string;
-
-  @Column({ name: 'datasource_list', type: 'varchar', nullable: true })
-  datasource_list: string;
-
-  @Column({
-    name: 'custom_values',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  custom_values: string;
-
-  @Column({ name: 'max_length', nullable: true })
-  max_length: number;
-
-  @Column({ name: 'required', nullable: true })
-  required: boolean;
-
-  @Column({
-    name: 'description',
-    type: 'varchar',
-    length: 2000,
-    nullable: true,
-  })
-  description: string;
-
-  @Column({
-    name: 'attribute_key',
-    type: 'varchar',
-    nullable: true,
-    length: 50,
-  })
-  attribute_key: string;
-
+  // varchar, bigint, int, boolean, timestamp, decimal, json, text, time, date
   @Column({ name: 'db_datatype', type: 'varchar', nullable: true, length: 50 })
   db_datatype: string;
 
-  @Column({ name: 'category', type: 'varchar', nullable: true, length: 50 })
-  category: string;
-
-  @Column({ name: 'is_unique', nullable: true })
-  is_unique: boolean;
+  @Column({ name: 'db_length', type: 'int', nullable: true })
+  db_length: number;
 
-  @Column({ name: 'data_source_attribute', nullable: true })
-  data_source_attribute: string;
+  // DB_COL, EVA
+  @Column({ name: 'storage_type', type: 'varchar', nullable: true, length: 50 })
+  storage_type: string;
 
-  @Column({ name: 'regex', nullable: true })
+  @Column({ name: 'regex', type: 'varchar', nullable: true, length: 255 })
   regex: string;
 
-  @Column({ name: 'can_export', nullable: true })
-  can_export: boolean;
+  @Column({ name: 'required', type: 'boolean', nullable: true })
+  required: boolean;
 
-  @Column({ name: 'appcode', nullable: true })
-  appcode: string;
+  @Column({ name: 'can_export', type: 'boolean', nullable: true })
+  can_export: boolean;
 
-  @Column({ name: 'is_hidden', nullable: true })
+  @Column({ name: 'is_hidden', type: 'boolean', nullable: true })
   is_hidden: boolean;
 
-  @Column({ name: 'flat_json_key', nullable: true })
-  flat_json_key: string;
-
-  // Dropdown data source fields
   @Column({ name: 'ds_category', type: 'varchar', nullable: true, length: 50 })
   ds_category: string;