rez_core 4.0.199 → 4.0.202

package/package.json

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

package/src/core.module.ts

@@ -17,6 +17,7 @@ import { WorkflowModule } from './module/workflow/workflow.module';
 import { WorkflowAutomationModule } from './module/workflow-automation/workflow-automation.module';
 import { MapperModule } from './module/mapper/mapper.module';
 import { WorkflowScheduleModule } from './module/workflow-schedule/workflow-schedule.module';
+import { EntityJSONModule } from './module/entity_json/entity_json.module';
 
 @Global()
 @Module({})
@@ -45,6 +46,7 @@ export class CoreModule {
       WorkflowAutomationModule,
       WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
       MapperModule,
+      EntityJSONModule
     ];
 
     const exportsArray = [
@@ -62,6 +64,7 @@ export class CoreModule {
       WorkflowModule,
       WorkflowAutomationModule,
       WorkflowScheduleModule.forRoot({ is_workflow: isWorkflow }),
+      EntityJSONModule
     ];
 
     if (isSso) {

package/src/module/entity_json/controller/entity_json.controller.ts

@@ -29,19 +29,19 @@ export class EntityJSONController {
     );
   }
 
-  // @Post('/update-json/:entityId')
-  // @UseGuards(JwtAuthGuard)
-  // async updateEntityJson(
-  //   @Param('entityId') entityId: string,
-  //   @Query('entityType') entityType: string,
-  //   @Req() req: Request & { user: any },
-  // ) {
-  //   const loggedInUser = req.user?.userData;
+  @Post('/update-json/:entityId')
+  @UseGuards(JwtAuthGuard)
+  async updateEntityJson(
+    @Param('entityId') entityId: string,
+    @Query('entityType') entityType: string,
+    @Req() req: Request & { user: any },
+  ) {
+    const loggedInUser = req.user?.userData;
 
-  //   return this.entityJSONService.updateEntityJSON(
-  //     entityType,
-  //     Number(entityId),
-  //     loggedInUser,
-  //   );
-  // }
+    return this.entityJSONService.updateEntityJSON(
+      entityType,
+      Number(entityId),
+      loggedInUser,
+    );
+  }
 }

package/src/module/entity_json/entity/entityJson.entity.ts

@@ -0,0 +1,39 @@
+import {
+  Entity,
+  PrimaryGeneratedColumn,
+  Column,
+  CreateDateColumn,
+  UpdateDateColumn,
+  Unique,
+  Index,
+} from 'typeorm';
+
+@Entity('frm_entity_json')
+@Unique(['entity_type', 'entity_id'])
+export class EntityJson {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Index()
+  @Column({ type: 'varchar', length: 100 })
+  entity_type: string;
+
+  @Index()
+  @Column({ type: 'int' })
+  entity_id: number;
+
+  @Column({ type: 'json', nullable: false })
+  json_data: Record<string, any>;
+
+  @Column({ type: 'int', nullable: true })
+  created_by: number;
+
+  @Column({ type: 'int', nullable: true })
+  updated_by: number;
+
+  @CreateDateColumn({ type: 'timestamp', nullable: true })
+  created_at: Date;
+
+  @UpdateDateColumn({ type: 'timestamp', nullable: true })
+  updated_at: Date;
+}

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

@@ -5,9 +5,10 @@ import { EntityJSONService } from './service/entity_json.service';
 import { EntityJSONController } from './controller/entity_json.controller';
 import { FilterModule } from '../filter/filter.module';
 import { UtilsModule } from 'src/utils/utils.module';
+import { EntityJson } from './entity/entityJson.entity';
 
 @Module({
-  imports: [EntityModule, TypeOrmModule.forFeature([]),FilterModule,UtilsModule],
+  imports: [EntityModule, TypeOrmModule.forFeature([EntityJson]),FilterModule,UtilsModule],
   controllers: [EntityJSONController],
   providers: [EntityJSONService],
   exports: [],

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

@@ -19,7 +19,7 @@ export class EntityJSONService extends EntityServiceImpl {
   async getAttributeForFlatJSON(
     entityType: string,
     loggedInUser: any,
-    flag?: 'flat_json' | 'dropdown',
+    flag?: 'flat_json' | 'dropdown' | 'all',
   ) {
     const orgId = loggedInUser.organization_id;
     await this.loggerService.log(
@@ -32,7 +32,7 @@ export class EntityJSONService extends EntityServiceImpl {
     const mainAttributes = await this.dataSource
       .getRepository(AttributeMaster)
       .createQueryBuilder('attr')
-      .select(['attr.id', 'attr.name', 'attr.attribute_key'])
+      .select(['attr.id', 'attr.name', 'attr.flat_json_key','attr.attribute_key'])
       .where('attr.mapped_entity_type = :entityType', { entityType })
       .andWhere('attr.organization_id = :orgId', { orgId })
       .getMany();
@@ -50,10 +50,14 @@ export class EntityJSONService extends EntityServiceImpl {
       .select(['rel.target_entity_type'])
       .where('rel.source_entity_type = :entityType', { entityType })
       .andWhere('rel.organization_id = :orgId', { orgId })
-      .andWhere('rel.relation_type = :relationType', { relationType: 'ONE_TO_ONE' })
+      .andWhere('rel.relation_type = :relationType', {
+        relationType: 'ONE_TO_ONE',
+      })
       .getRawMany();
 
-    const relatedTypesList = relatedEntityTypes.map(x => x.rel_target_entity_type);
+    const relatedTypesList = relatedEntityTypes.map(
+      (x) => x.rel_target_entity_type,
+    );
     await this.loggerService.log(
       'debug',
       'EntityJSONService',
@@ -65,8 +69,16 @@ export class EntityJSONService extends EntityServiceImpl {
       ? await this.dataSource
           .getRepository(AttributeMaster)
           .createQueryBuilder('attr')
-          .select(['attr.id', 'attr.name', 'attr.attribute_key', 'attr.mapped_entity_type'])
-          .where('attr.mapped_entity_type IN (:...types)', { types: relatedTypesList })
+          .select([
+            'attr.id',
+            'attr.name',
+            'attr.flat_json_key',
+            'attr.mapped_entity_type',
+            'attr.attribute_key',
+          ])
+          .where('attr.mapped_entity_type IN (:...types)', {
+            types: relatedTypesList,
+          })
           .andWhere('attr.organization_id = :orgId', { orgId })
           .getMany()
       : [];
@@ -100,36 +112,78 @@ export class EntityJSONService extends EntityServiceImpl {
       `Loaded ${linkedAttributes.length} linked attributes`,
     );
 
-    if (flag === 'flat_json') {
+    if (flag === 'flat_json' || flag === 'all') {
       const result: Record<string, null> = {};
-      mainAttributes.forEach(attr => { if (attr.attribute_key) result[attr.attribute_key] = null; });
-      relatedAttributes.forEach(attr => { if (attr.attribute_key) result[attr.attribute_key] = null; });
-      linkedAttributes.forEach(link => { if (link.applicable_attribute_key) result[link.applicable_attribute_key] = null; });
-      return result;
+      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.applicable_attribute_key)
+          result[link.applicable_attribute_key] = null;
+      });
+      if(flag === 'all')
+        return {flat_json: result,attributes: {mainAttributes,relatedAttributes,linkedAttributes}};
+
+        return result;
     }
 
     const dropdown: any[] = [];
-    dropdown.push(...mainAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
-    dropdown.push(...relatedAttributes.map(a => ({ label: a.name, value: a.attribute_key })));
-    dropdown.push({
-      linked_attributes: linkedAttributes.map(a => ({ label: a.attr_name, value: a.attr_attribute_key })),
-    });
+    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,
+        })),
+      });
+    }
     return dropdown;
   }
 
-  async updateEntityJSON(
-    entityType: string,
-    entityId: number,
-    loggedInUser,
-  ) {
+  async updateEntityJSON(entityType: string, entityId: number, loggedInUser) {
     await this.loggerService.log(
       'info',
       'EntityJSONService',
       'updateEntityJSON',
       `Building flat JSON for entity: ${entityType}#${entityId}`,
     );
-
-    const flatJson = await this.getAttributeForFlatJSON(entityType, loggedInUser, 'flat_json');
+  
+    // 1. Load flat JSON template + attributes
+    const response = await this.getAttributeForFlatJSON(
+      entityType,
+      loggedInUser,
+      'all',
+    );
+  
+    // ---- Structural validation ----
+    if (
+      !response ||
+      !('flat_json' in response) ||
+      !('attributes' in response) ||
+      !response.attributes
+    ) {
+      await this.loggerService.log(
+        'error',
+        'EntityJSONService',
+        'updateEntityJSON',
+        `getAttributeForFlatJSON() did not return expected structure`,
+      );
+      return null;
+    }
+  
+    const { flat_json: flatJson, attributes } = response;
+  
     if (!flatJson) {
       await this.loggerService.log(
         'error',
@@ -137,98 +191,88 @@ export class EntityJSONService extends EntityServiceImpl {
         'updateEntityJSON',
         `Flat JSON template not found for entity: ${entityType}`,
       );
-      throw new Error(`Flat JSON template not found for ${entityType}`);
+      return null;
     }
-
-    const mainData = await this.getResolvedEntityData(entityType, entityId, loggedInUser);
-    this.mergeIntoFlatJson(flatJson, mainData);
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'updateEntityJSON',
-      'Merged main entity data into flat JSON',
+  
+    // ---- Strong safety fix for TS ----
+    const safeAttributes = {
+      mainAttributes: attributes.mainAttributes || [],
+      relatedAttributes: attributes.relatedAttributes || [],
+      linkedAttributes: attributes.linkedAttributes || [],
+    };
+    // ----------------------------------
+  
+    // 2. Build attribute_key → flat_json_key map
+    const attrMap: Record<string, string> = {};
+    const allAttrs = [
+      ...safeAttributes.mainAttributes,
+      ...safeAttributes.relatedAttributes,
+      ...safeAttributes.linkedAttributes,
+    ];
+  
+    allAttrs.forEach(attr => {
+      if (attr.attribute_key) {
+        attrMap[attr.attribute_key] = attr.flat_json_key || attr.attribute_key;
+      }
+    });
+  
+    // 3. Merge main entity data
+    const mainData = await this.getResolvedEntityData(
+      entityType,
+      entityId,
+      loggedInUser,
     );
-
+    this.mergeEntityDataIntoFlatJson(flatJson, mainData, attrMap);
+  
+    // 4. Merge ONE-TO-ONE related entities
     const relations = await this.dataSource
       .getRepository('frm_entity_relation_data')
       .createQueryBuilder('erd')
-      .select(['erd.target_entity_id AS target_entity_id', 'erd.target_entity_type AS target_entity_type'])
+      .select([
+        'erd.target_entity_id AS target_entity_id',
+        'erd.target_entity_type AS target_entity_type',
+      ])
       .where('erd.source_entity_type = :entityType', { entityType })
       .andWhere('erd.source_entity_id = :entityId', { entityId })
       .andWhere('erd.relation_type = :rt', { rt: 'ONE_TO_ONE' })
       .getRawMany();
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'updateEntityJSON',
-      `Found ${relations.length} ONE-TO-ONE relations`,
-    );
-
+  
     for (const rel of relations) {
-      const related = await this.getResolvedEntityData(rel.target_entity_type, rel.target_entity_id, loggedInUser);
-      this.mergeIntoFlatJson(flatJson, related);
-      await this.loggerService.log(
-        'debug',
-        'EntityJSONService',
-        'updateEntityJSON',
-        `Merged related entity ${rel.target_entity_type}#${rel.target_entity_id}`,
-      );
-    }
-
-    const linkedAttrs = await this.dataSource
-      .getRepository('frm_linked_attributes_table')
-      .createQueryBuilder('la')
-      .where('la.entity_type = :entityType', { entityType })
-      .getMany();
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'updateEntityJSON',
-      `Found ${linkedAttrs.length} linked attributes`,
-    );
-
-    for (const la of linkedAttrs) {
-      const mappingValue = flatJson[la.mapping_attribute];
-      const result = await this.applyLinkedFilterUsingSavedFilter(
-        la.child_entity_type,
-        la.saved_filter_code,
-        la.filter_attribute,
-        mappingValue,
-        la.target_attribute,
-        loggedInUser
-      );
-      flatJson[la.target_attribute] = result;
-      await this.loggerService.log(
-        'debug',
-        'EntityJSONService',
-        'updateEntityJSON',
-        `Linked attribute ${la.target_attribute} set from child entity ${la.child_entity_type}`,
+      const relatedData = await this.getResolvedEntityData(
+        rel.target_entity_type,
+        rel.target_entity_id,
+        loggedInUser,
       );
+      this.mergeEntityDataIntoFlatJson(flatJson, relatedData, attrMap);
     }
-
+  
+    // 5. Save JSON
     await this.dataSource.query(
       `INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)
-       VALUES (?, ?, ?, ?)
-       ON DUPLICATE KEY UPDATE json_data = VALUES(json_data), updated_by = VALUES(created_by)`,
-      [entityType, entityId, JSON.stringify(flatJson), loggedInUser.id]
-    );
-    await this.loggerService.log(
-      'info',
-      'EntityJSONService',
-      'updateEntityJSON',
-      `Flat JSON saved for entity: ${entityType}#${entityId}`,
+        VALUES (?, ?, ?, ?)
+        ON DUPLICATE KEY UPDATE json_data = VALUES(json_data), updated_by = VALUES(created_by)`,
+      [entityType, entityId, JSON.stringify(flatJson), loggedInUser.id],
     );
-
+  
     return flatJson;
   }
-
-  private mergeIntoFlatJson(flatJson, entityData) {
-    for (const key of Object.keys(entityData)) {
-      if (flatJson.hasOwnProperty(key)) {
-        flatJson[key] = entityData[key];
+  
+  // Helper: Merge entity data using attribute_key → flat_json_key mapping
+  private mergeEntityDataIntoFlatJson(
+    flatJson: Record<string, any>,
+    entityData: any[],
+    attrMap: Record<string, string>,
+  ) {
+    for (const record of entityData) {
+      for (const key of Object.keys(record)) {
+        const flatKey = attrMap[key] || key; // map to flat_json_key if exists
+        if (flatJson.hasOwnProperty(flatKey)) {
+          flatJson[flatKey] = record[key];
+        }
       }
     }
   }
+  
 
   private async applyLinkedFilterUsingSavedFilter(
     childEntityType: string,
@@ -238,7 +282,11 @@ export class EntityJSONService extends EntityServiceImpl {
     targetAttribute: string,
     loggedInUser,
   ) {
-    if (!savedFilterCode && (mappingValue === null || mappingValue === undefined)) return null;
+    if (
+      !savedFilterCode &&
+      (mappingValue === null || mappingValue === undefined)
+    )
+      return null;
 
     const dto: any = {
       entity_type: childEntityType,
@@ -248,18 +296,22 @@ export class EntityJSONService extends EntityServiceImpl {
       size: 1,
     };
 
-    if (mappingValue !== null && mappingValue !== undefined && mappingValue !== '') {
+    if (
+      mappingValue !== null &&
+      mappingValue !== undefined &&
+      mappingValue !== ''
+    ) {
       dto.quickFilter = [
         {
           filter_attribute: childFilterAttribute,
           filter_operator: 'equal',
           filter_value: mappingValue,
-        }
+        },
       ];
     }
 
     const result = await this.filterService.applyFilter(dto);
     const rows = result?.data?.entity_list || [];
-    return rows.length ? rows[0][targetAttribute] ?? null : null;
+    return rows.length ? (rows[0][targetAttribute] ?? null) : null;
   }
 }

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

@@ -26,17 +26,14 @@ export class AttributeMasterController {
     @Req() req: Request & { user: any },
   ) {
     const loggedInUser = req.user.userData;
-    return await this.attributeMasterService.createAttribute(
-      attributeData,
-      loggedInUser,
-    );
+    // return await this.attributeMasterService.createAttribute(
+    //   attributeData,
+    //   loggedInUser,
+    // );
+    return true
   }
 
-@Post('/updateAttributeValue')
- async entityAttributeUpdate (@Body() payload:{}){
-  return this.entityUpdateService.execute(payload);
 
- }
  
   @Post('update/:id')
   async updateAttribute(
@@ -45,11 +42,12 @@ export class AttributeMasterController {
     @Req() req: Request & { user: any },
   ) {
     const loggedInUser = req.user.userData;
-    return await this.attributeMasterService.updateAttribute(
-      attributeData,
-      id,
-      loggedInUser,
-    );
+    // return await this.attributeMasterService.updateAttribute(
+    //   attributeData,
+    //   id,
+    //   loggedInUser,
+    // );
+    return true
   }
 
   @Get('getById/:id')

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

@@ -86,4 +86,7 @@ export class AttributeMaster extends BaseEntity {
 
   @Column({ name: 'is_hidden', nullable: true })
   is_hidden: boolean;
+
+  @Column({ name: 'flat_json_key', nullable: true })
+  flat_json_key: string;
 }

package/src/resources/dev.properties.yaml

@@ -4,7 +4,7 @@ DB_HOST: '13.234.25.234'
 DB_PORT: '3306'
 DB_USER: 'root'
 DB_PASS: 'Rezolut@123'
-DB_NAME: 'ether_rez_crm'
+DB_NAME: 'ether_package_db'
 MASTER_KEY: '0QZ2eRJv5oVILYnyBlC+FbSGVQiWKReh'
 MASTER_IV: 'heuUQf5uPVtkotrFAOKUVw=='
 SECRET_KEY: '1hard_to_guess_secret7890a'

package/src/table.config.ts

@@ -3,6 +3,7 @@ import { WidgetMaster } from "./module/dashboard/entity/widget_master.entity";
 import { EnterpriseData } from "./module/enterprise/entity/enterprise.entity";
 import { OrganizationAppMapping } from "./module/enterprise/entity/organization-app-mapping.entity";
 import { OrganizationData } from "./module/enterprise/entity/organization.entity";
+import { EntityJson } from "./module/entity_json/entity/entityJson.entity";
 import { SavedFilterDetail } from "./module/filter/entity/saved-filter-detail.entity";
 import { SavedFilterMaster } from "./module/filter/entity/saved-filter-master.entity";
 import { IntegrationConfig } from "./module/integration/entity/integration-config.entity";
@@ -39,8 +40,6 @@ import { UserSession } from "./module/user/entity/user-session.entity";
 import { UserData } from "./module/user/entity/user.entity";
 import { WorkflowAutomationActionEntity } from "./module/workflow-automation/entity/workflow-automation-action.entity";
 import { WorkflowAutomation } from "./module/workflow-automation/entity/workflow-automation.entity";
-import { ScheduledWorkflow } from "./module/workflow-schedule/entities/scheduled-workflow.entity";
-import { WorkflowExecutionLog } from "./module/workflow-schedule/entities/workflow-execution-log.entity";
 import { ActionCategory } from "./module/workflow/entity/action-category.entity";
 import { ActionDataEntity } from "./module/workflow/entity/action-data.entity";
 import { ActionResourcesMapping } from "./module/workflow/entity/action-resources-mapping.entity";
@@ -84,7 +83,8 @@ export const frameworkTables = [
     SavedFilterDetail,
     SavedFilterMaster,
     UserIntegration,
-    ViewMaster
+    ViewMaster,
+    EntityJson
 ]
 
 export const workflowTables = [
@@ -107,9 +107,7 @@ export const workflowTables = [
     WorkflowAutomation,
     WorkflowAutomationActionEntity,
     WorkflowLevelMappingEntity,
-    WorkFlowData,
-    WorkflowExecutionLog,
-    ScheduledWorkflow
+    WorkFlowData
 ]
 
 export const SSOTables = [

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "dbaeumer.vscode-eslint"
-    ]
-}