From baf366cf14294282c70d9c2ec81bafd19d2f82ab Mon Sep 17 00:00:00 2001
From: poornima-metron <poornima@metronlabs.com>
Date: Thu, 11 Jul 2024 12:41:21 +0530
Subject: [PATCH] resolved PR comments

---
 src/converters/IssueEntityConverter.ts | 44 ++++++++++----------------
 src/steps/issues.ts                    | 13 ++------
 2 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/src/converters/IssueEntityConverter.ts b/src/converters/IssueEntityConverter.ts
index 7359317..d42f8d7 100644
--- a/src/converters/IssueEntityConverter.ts
+++ b/src/converters/IssueEntityConverter.ts
@@ -1,5 +1,5 @@
 import camelCase from 'lodash/camelCase';
-
+import get from 'lodash/get';
 import {
   IntegrationLogger,
   parseTimePropertyValue,
@@ -101,7 +101,7 @@ export function createIssueEntity({
   const issueType = issue.fields.issuetype && issue.fields.issuetype.name;
   const customFields: { [key: string]: any } = {};
 
-  // Extract simple custom fields
+  // Extract custom fields (simple and complex)
   for (const [key, value] of Object.entries(issue.fields)) {
     if (
       key.startsWith('customfield_') &&
@@ -121,35 +121,23 @@ export function createIssueEntity({
           customFields[fieldName] = extractedValue;
         }
       }
-    }
-  }
-
-  // Handle complex custom fields
-  complexCustomFieldsToInclude.forEach((path) => {
-    const [baseFieldId, ...nestedPathParts] = path.split('.');
-    if (issue.fields[baseFieldId] !== undefined) {
-      const nestedPath = nestedPathParts.join('.');
-      const fieldValue = getNestedValue(issue.fields[baseFieldId], nestedPath);
-      if (fieldValue !== undefined) {
-        if (fieldsById && fieldsById[baseFieldId]) {
-          const baseFieldName = camelCase(fieldsById[baseFieldId].name);
-          const formattedPathParts = nestedPathParts.map((part) => {
-            const match = part.match(/^(\w+)(?:\[(\d+)\])?$/);
-            if (match) {
-              const [, key, index] = match;
-              if (index !== undefined) {
-                return `${camelCase(key)}${index}`;
-              }
-              return camelCase(key);
-            }
-            return camelCase(part);
-          });
-          const formattedPath = [baseFieldName, ...formattedPathParts].join('');
-          setFlatNestedValue(customFields, formattedPath, fieldValue);
+      // Check for complex custom fields
+      for (const path of complexCustomFieldsToInclude) {
+        const [baseFieldId, ...rest] = path.split('.');
+        const nestedPath = rest.join('.');
+        if (!issue.fields[baseFieldId]) {
+          continue;
+        }
+        const extractedValue = get(issue.fields[baseFieldId], nestedPath);
+        if (!extractedValue) {
+          continue;
         }
+        const baseFieldName = camelCase(fieldsById[baseFieldId].name);
+        const fieldName = nestedPath.split(/[\.\[\]]+/).map(camelCase).join('');
+        customFields[`${baseFieldName}${fieldName}`] = extractedValue;
       }
     }
-  });
+  }
 
   if (!['string', 'undefined'].includes(typeof requestedClass)) {
     logger.warn(
diff --git a/src/steps/issues.ts b/src/steps/issues.ts
index 9cd6c31..f13564b 100644
--- a/src/steps/issues.ts
+++ b/src/steps/issues.ts
@@ -72,21 +72,12 @@ export async function fetchIssues({
   logger.info(
     {
       customFields: config.customFields,
-      allFieldIdsAndNames: Object.values(fieldsById).map(
-        (field) => `${field.id}: ${field.name ?? 'undefined field name'}`,
-      ),
-    },
-    'Custom fields to ingest.',
-  );
-
-  logger.info(
-    {
       complexCustomFields: config.complexCustomFields,
       allFieldIdsAndNames: Object.values(fieldsById).map(
-        (field) => `${field.id}: ${field.name ?? 'undefined field name'}`,
+        (field) => `${field.id}: ${field.name ?? 'undefined field name'}`
       ),
     },
-    'Complex custom fields to ingest.',
+    'Custom and complex custom fields to ingest.'
   );
 
   const issueProcessor = async (projectKey: JiraProjectKey, issue: Issue) =>