rez_core 4.0.206 → 4.0.208

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

@@ -1,323 +1,265 @@
-import { Injectable } from '@nestjs/common';
-import { FilterService } from 'src/module/filter/service/filter.service';
-import { LinkedAttributes } from 'src/module/linked_attributes/entity/linked_attribute.entity';
-import { AttributeMaster } from 'src/module/meta/entity/attribute-master.entity';
-import { EntityRelation } from 'src/module/meta/entity/entity-relation.entity';
-import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
-import { LoggingService } from 'src/utils/service/loggingUtil.service';
-import { DataSource } from 'typeorm';
-
-@Injectable()
-export class EntityJSONService extends EntityServiceImpl {
-  constructor(
-    private readonly dataSource: DataSource,
-    private readonly filterService: FilterService,
-    private readonly loggerService: LoggingService, // <-- inject logging service
-  ) {
-    super();
-  }
-
-  async getAttributeForFlatJSON(
-    entityType: string,
-    loggedInUser: any,
-    flag?: 'flat_json' | 'dropdown' | 'all',
-  ) {
-    const orgId = loggedInUser.organization_id;
-    await this.loggerService.log(
-      'info',
-      'EntityJSONService',
-      'getAttributeForFlatJSON',
-      `Loading attributes for entity: ${entityType}, org: ${orgId}`,
-    );
-
-    const mainAttributes = await this.dataSource
-      .getRepository(AttributeMaster)
-      .createQueryBuilder('attr')
-      .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();
-
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'getAttributeForFlatJSON',
-      `Loaded ${mainAttributes.length} main attributes`,
-    );
-
-    const relatedEntityTypes = await this.dataSource
-      .getRepository(EntityRelation)
-      .createQueryBuilder('rel')
-      .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',
-      })
-      .getRawMany();
-
-    const relatedTypesList = relatedEntityTypes.map(
-      (x) => x.rel_target_entity_type,
-    );
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'getAttributeForFlatJSON',
-      `Found ${relatedTypesList.length} ONE-TO-ONE related entity types`,
-    );
-
-    const relatedAttributes = relatedTypesList.length
-      ? await this.dataSource
-          .getRepository(AttributeMaster)
-          .createQueryBuilder('attr')
-          .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()
-      : [];
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'getAttributeForFlatJSON',
-      `Loaded ${relatedAttributes.length} related attributes`,
-    );
-
-    const linkedAttributes = await this.dataSource
-      .getRepository(LinkedAttributes)
-      .createQueryBuilder('fla')
-      .innerJoin(
-        AttributeMaster,
-        'attr',
-        'fla.applicable_entity_type = attr.mapped_entity_type AND fla.applicable_attribute_key = attr.attribute_key',
-      )
-      .select([
-        'fla.applicable_entity_type',
-        'attr.id',
-        'attr.name',
-        'attr.attribute_key',
-      ])
-      .where('attr.organization_id = :orgId', { orgId })
-      .getRawMany();
-    await this.loggerService.log(
-      'debug',
-      'EntityJSONService',
-      'getAttributeForFlatJSON',
-      `Loaded ${linkedAttributes.length} linked attributes`,
-    );
-
-    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;
-      });
-      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.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) {
-    await this.loggerService.log(
-      'info',
-      'EntityJSONService',
-      'updateEntityJSON',
-      `Building flat JSON for entity: ${entityType}#${entityId}`,
-    );
-  
-    // 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',
-        'EntityJSONService',
-        'updateEntityJSON',
-        `Flat JSON template not found for entity: ${entityType}`,
-      );
-      return null;
-    }
-  
-    // ---- 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',
-      ])
-      .where('erd.source_entity_type = :entityType', { entityType })
-      .andWhere('erd.source_entity_id = :entityId', { entityId })
-      .andWhere('erd.relation_type = :rt', { rt: 'ONE_TO_ONE' })
-      .getRawMany();
-  
-    for (const rel of relations) {
-      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],
-    );
-  
-    return flatJson;
-  }
-  
-  // Helper: Merge entity data using attribute_key → flat_json_key mapping
-  private mergeEntityDataIntoFlatJson(
-    flatJson: Record<string, any>,
-    entityData: any | any[], // accept both object or array
-    attrMap: Record<string, string>,
-  ) {
-    const records = Array.isArray(entityData) ? entityData : [entityData];
-  
-    for (const record of records) {
-      if (!record || typeof record !== 'object') continue;
-  
-      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,
-    savedFilterCode: string,
-    childFilterAttribute: string,
-    mappingValue: any,
-    targetAttribute: string,
-    loggedInUser,
-  ) {
-    if (
-      !savedFilterCode &&
-      (mappingValue === null || mappingValue === undefined)
-    )
-      return null;
-
-    const dto: any = {
-      entity_type: childEntityType,
-      loggedInUser,
-      savedFilterCode,
-      page: 1,
-      size: 1,
-    };
-
-    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;
-  }
-}
+import { Injectable } from '@nestjs/common';
+import { FilterService } from 'src/module/filter/service/filter.service';
+import { AttributeMaster } from 'src/module/meta/entity/attribute-master.entity';
+import { EntityRelation } from 'src/module/meta/entity/entity-relation.entity';
+import { EntityServiceImpl } from 'src/module/meta/service/entity-service-impl.service';
+import { LoggingService } from 'src/utils/service/loggingUtil.service';
+import { DataSource } from 'typeorm';
+
+@Injectable()
+export class EntityJSONService extends EntityServiceImpl {
+  constructor(
+    private readonly dataSource: DataSource,
+    private readonly filterService: FilterService,
+    private readonly loggerService: LoggingService, // <-- inject logging service
+  ) {
+    super();
+  }
+
+  async getAttributeForFlatJSON(
+    entityType: string,
+    loggedInUser: any,
+    flag?: 'flat_json' | 'dropdown',
+  ) {
+    const orgId = loggedInUser.organization_id;
+    await this.loggerService.log(
+      'info',
+      'EntityJSONService',
+      'getAttributeForFlatJSON',
+      `Loading attributes for entity: ${entityType}, org: ${orgId}`,
+    );
+
+    const mainAttributes = await this.dataSource
+      .getRepository(AttributeMaster)
+      .createQueryBuilder('attr')
+      .select(['attr.id', 'attr.name', 'attr.attribute_key'])
+      .where('attr.mapped_entity_type = :entityType', { entityType })
+      .andWhere('attr.organization_id = :orgId', { orgId })
+      .getMany();
+
+    await this.loggerService.log(
+      'debug',
+      'EntityJSONService',
+      'getAttributeForFlatJSON',
+      `Loaded ${mainAttributes.length} main attributes`,
+    );
+
+    const relatedEntityTypes = await this.dataSource
+      .getRepository(EntityRelation)
+      .createQueryBuilder('rel')
+      .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' })
+      .getRawMany();
+
+    const relatedTypesList = relatedEntityTypes.map(x => x.rel_target_entity_type);
+    await this.loggerService.log(
+      'debug',
+      'EntityJSONService',
+      'getAttributeForFlatJSON',
+      `Found ${relatedTypesList.length} ONE-TO-ONE related entity types`,
+    );
+
+    const relatedAttributes = relatedTypesList.length
+      ? 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 })
+          .andWhere('attr.organization_id = :orgId', { orgId })
+          .getMany()
+      : [];
+    await this.loggerService.log(
+      'debug',
+      'EntityJSONService',
+      'getAttributeForFlatJSON',
+      `Loaded ${relatedAttributes.length} related attributes`,
+    );
+
+    const linkedAttributes = await this.dataSource
+      .getRepository('frm_linked_attribute')
+      .createQueryBuilder('fla')
+      .innerJoin(
+        AttributeMaster,
+        'attr',
+        'fla.applicable_entity_type = attr.mapped_entity_type AND fla.applicable_attribute_key = attr.attribute_key',
+      )
+      .select([
+        'fla.applicable_entity_type',
+        'attr.id',
+        'attr.name',
+        'attr.attribute_key',
+      ])
+      .where('attr.organization_id = :orgId', { orgId })
+      .getRawMany();
+    await this.loggerService.log(
+      'debug',
+      'EntityJSONService',
+      'getAttributeForFlatJSON',
+      `Loaded ${linkedAttributes.length} linked attributes`,
+    );
+
+    if (flag === 'flat_json') {
+      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;
+    }
+
+    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 })),
+    });
+    return dropdown;
+  }
+
+  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');
+    if (!flatJson) {
+      await this.loggerService.log(
+        'error',
+        'EntityJSONService',
+        'updateEntityJSON',
+        `Flat JSON template not found for entity: ${entityType}`,
+      );
+      throw new Error(`Flat JSON template not found for ${entityType}`);
+    }
+
+    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',
+    );
+
+    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'])
+      .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}`,
+      );
+    }
+
+    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}`,
+    );
+
+    return flatJson;
+  }
+
+  private mergeIntoFlatJson(flatJson, entityData) {
+    for (const key of Object.keys(entityData)) {
+      if (flatJson.hasOwnProperty(key)) {
+        flatJson[key] = entityData[key];
+      }
+    }
+  }
+
+  private async applyLinkedFilterUsingSavedFilter(
+    childEntityType: string,
+    savedFilterCode: string,
+    childFilterAttribute: string,
+    mappingValue: any,
+    targetAttribute: string,
+    loggedInUser,
+  ) {
+    if (!savedFilterCode && (mappingValue === null || mappingValue === undefined)) return null;
+
+    const dto: any = {
+      entity_type: childEntityType,
+      loggedInUser,
+      savedFilterCode,
+      page: 1,
+      size: 1,
+    };
+
+    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;
+  }
+}