rez_core 4.0.232 → 4.0.235

package/package.json

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

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

@@ -99,12 +99,13 @@ export class EntityJSONService extends EntityServiceImpl {
         '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',
-        'fla.saved_filter_code',
-      ])
+        'fla.applicable_entity_type AS applicable_entity_type',
+        'fla.applicable_attribute_key AS applicable_attribute_key',  // SOURCE KEY (middle_name)
+        'fla.attribute_key AS target_attribute_key',                 // TARGET KEY (father_middle_name)
+        'fla.saved_filter_code AS saved_filter_code',
+        'attr.name AS name',
+        'attr.id AS id'
+      ])      
       .where('attr.organization_id = :orgId', { orgId })
       .getRawMany();
     await this.loggerService.log(
@@ -123,14 +124,20 @@ export class EntityJSONService extends EntityServiceImpl {
         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;
+        // Use target_attribute_key instead of applicable_attribute_key
+        if (link.target_attribute_key) result[link.target_attribute_key] = null;
       });
-      if(flag === 'all')
-        return {flat_json: result,attributes: {mainAttributes,relatedAttributes,linkedAttributes}};
-
-        return result;
+    
+      if(flag === 'all') {
+        return { 
+          flat_json: result, 
+          attributes: { mainAttributes, relatedAttributes, linkedAttributes } 
+        };
+      }
+    
+      return result;
     }
+    
 
     const dropdown: any[] = [];
     dropdown.push(