rez_core 4.0.227 → 4.0.230

package/package.json

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

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

@@ -103,6 +103,7 @@ export class EntityJSONService extends EntityServiceImpl {
         'attr.id',
         'attr.name',
         'attr.attribute_key',
+        'fla.saved_filter_code',
       ])
       .where('attr.organization_id = :orgId', { orgId })
       .getRawMany();
@@ -211,27 +212,33 @@ export class EntityJSONService extends EntityServiceImpl {
     }
   
     // 5. Merge linked attributes using saved filters
-    for (const linkAttr of safeAttributes.linkedAttributes) {
-      if (!linkAttr.applicable_entity_type || !linkAttr.applicable_attribute_key) continue;
-  
-      const mappingValue = mainData?.[linkAttr.parent_attribute_key || ''] ?? null;
-      const value = await this.applyLinkedFilterUsingSavedFilter(
-        linkAttr.applicable_entity_type,
-        linkAttr.saved_filter_code,
-        linkAttr.applicable_attribute_key,
-        mappingValue,
-        linkAttr.target_attribute_key || linkAttr.applicable_attribute_key,
-        loggedInUser,
-        entityId,
-      );
-  
-      if (value !== null && value !== undefined) {
-        const flatKey = attrMap[linkAttr.target_attribute_key || linkAttr.applicable_attribute_key]
-          || (linkAttr.target_attribute_key || linkAttr.applicable_attribute_key);
-        flatJson[flatKey] = value;
-      }
-    }
-  
+// 5. Merge linked attributes using saved filters
+for (const linkAttr of safeAttributes.linkedAttributes) {
+  const childEntityType = linkAttr.fla_applicable_entity_type;
+  const childAttributeKey = linkAttr.attr_attribute_key;
+
+  if (!childEntityType || !childAttributeKey) continue;
+
+  // mappingValue can come from mainData or relatedData if you have parent key
+  const mappingValue = mainData?.[childAttributeKey] ?? null;
+
+  const value = await this.applyLinkedFilterUsingSavedFilter(
+    childEntityType,
+    linkAttr.fla_saved_filter_code,   // make sure this column exists in your query
+    childAttributeKey,
+    mappingValue,
+    childAttributeKey, // target attribute in flatJson
+    loggedInUser,
+    entityId
+  );
+
+  if (value !== null && value !== undefined) {
+    // Use attrMap if flat_json_key exists
+    const flatKey = attrMap[childAttributeKey] || childAttributeKey;
+    flatJson[flatKey] = value;
+  }
+}
+
     // 6. Save JSON
     await this.dataSource.query(
       `INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)
@@ -307,7 +314,7 @@ export class EntityJSONService extends EntityServiceImpl {
       {
         filter_attribute: 'parent_id',
         filter_operator: 'equal',
-        filter_value: entity_id,
+        filter_value: [entity_id],
       },
     ];