rez_core 4.0.230 → 4.0.234

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rez_core",
-  "version": "4.0.230",
+  "version": "4.0.234",
   "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(
@@ -215,30 +216,31 @@ export class EntityJSONService extends EntityServiceImpl {
 // 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;
+  const sourceKey = linkAttr.applicable_attribute_key;    // source column = middle_name
+  const targetKey = linkAttr.attribute_key;               // final JSON key = father_middle_name
 
-  if (!childEntityType || !childAttributeKey) continue;
+  if (!childEntityType || !sourceKey || !targetKey) continue;
 
-  // mappingValue can come from mainData or relatedData if you have parent key
-  const mappingValue = mainData?.[childAttributeKey] ?? null;
+  // value must be taken from applicable_attribute_key
+  const mappingValue = mainData?.[sourceKey] ?? null;
 
   const value = await this.applyLinkedFilterUsingSavedFilter(
     childEntityType,
-    linkAttr.fla_saved_filter_code,   // make sure this column exists in your query
-    childAttributeKey,
+    linkAttr.fla_saved_filter_code,
+    sourceKey,
     mappingValue,
-    childAttributeKey, // target attribute in flatJson
+    targetKey, // IMPORTANT → write to father_middle_name
     loggedInUser,
     entityId
   );
 
   if (value !== null && value !== undefined) {
-    // Use attrMap if flat_json_key exists
-    const flatKey = attrMap[childAttributeKey] || childAttributeKey;
+    const flatKey = targetKey; // do NOT use childAttributeKey
     flatJson[flatKey] = value;
   }
 }
 
+
     // 6. Save JSON
     await this.dataSource.query(
       `INSERT INTO frm_entity_json (entity_type, entity_id, json_data, created_by)