From 16e242e636a4451bd8548033beb53cca808d3981 Mon Sep 17 00:00:00 2001
From: shobhit upadhyay <shobhit.upadhyay112@gmail.com>
Date: Thu, 20 Nov 2025 11:40:49 +0530
Subject: [PATCH] Refactor AEM service field processing to utilize actual UIDs
 for object keys, improving data integrity and consistency in field value
 assignments.

---
 api/src/services/aem.service.ts | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/api/src/services/aem.service.ts b/api/src/services/aem.service.ts
index f3776074..9892c48f 100644
--- a/api/src/services/aem.service.ts
+++ b/api/src/services/aem.service.ts
@@ -932,22 +932,25 @@ function processFieldsRecursive(
         let value = getFieldValue(items, aemFieldName);
         const uid = getLastKey(field?.contentstackFieldUid);
 
+        const actualUid = getActualFieldUid(uid, field?.uid);
         if (value && typeof value === 'string' && /<[^>]+>/.test(value)) {
           value = stripHtmlTags(value);
         }
 
-        obj[uid] = value !== null && value !== undefined ? String(value) : "";
+        obj[actualUid] = value !== null && value !== undefined ? String(value) : "";
         break;
       }
 
       case 'text': {
         const uid = getLastKey(field?.contentstackFieldUid);
-        obj[uid] = title ?? '';
+        const actualUid = getActualFieldUid(uid, field?.uid);
+        obj[actualUid] = title ?? '';
         break;
       }
       case 'url': {
         const uid = getLastKey(field?.contentstackFieldUid);
-        obj[uid] = `/${slugify(title)}`;
+        const actualUid = getActualFieldUid(uid, field?.uid);
+        obj[actualUid] = `/${slugify(title)}`;
         break;
       }
       case 'reference': {