From a108701b962636c03e3693c1cf136fe99de85ce0 Mon Sep 17 00:00:00 2001
From: mas2hc <son.maidinhnam@vn.bosch.com>
Date: Wed, 12 Jul 2023 15:03:12 +0700
Subject: [PATCH] Fix the issue when handling nested params in list

---
 JsonPreprocessor/CJsonPreprocessor.py | 43 +++++++++++++++++++++------
 1 file changed, 34 insertions(+), 9 deletions(-)

diff --git a/JsonPreprocessor/CJsonPreprocessor.py b/JsonPreprocessor/CJsonPreprocessor.py
index 227760ce..4bc6efef 100644
--- a/JsonPreprocessor/CJsonPreprocessor.py
+++ b/JsonPreprocessor/CJsonPreprocessor.py
@@ -664,6 +664,18 @@ def __handleStrNoneTrueFalse(objJson):
                 else:
                     oJson[k] = v
             return oJson
+        
+        def __handleListElements(sInput : str) -> str:
+            items = re.split("\s*,\s*", sInput)
+            j=0
+            newItem = ""
+            for item in items:
+                j+=1
+                if j<len(items):
+                    newItem = newItem + self.__checkAndUpdateKeyValue(item) + ","
+                else:
+                    newItem = newItem + self.__checkAndUpdateKeyValue(item)
+            return newItem
 
         jFile=jFile.strip()
 
@@ -699,15 +711,28 @@ def __handleStrNoneTrueFalse(objJson):
                 for item in items:
                     i+=1
                     newSubItem = ""
-                    if re.search("\s*\[[^\[\]]*\]\s*,*\s*", item):
-                        subItems = re.split("\s*,\s*", item)
-                        j=0
-                        for subItem in subItems:
-                            j+=1
-                            if j<len(subItems):
-                                newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem) + ","
-                            else:
-                                newSubItem = newSubItem + self.__checkAndUpdateKeyValue(subItem)
+                    if re.search("^\s*\[.+\]\s*,*\s*$", item) and item.count('[')==item.count(']'):
+                        item = item.strip()
+                        bLastElement = True
+                        if item.endswith(","):
+                            bLastElement = False
+                        item = re.sub("^\[", "", item)
+                        item = re.sub("\s*\]\s*,*$", "", item)
+                        newSubItem = __handleListElements(item)
+                        newSubItem = "[" + newSubItem + "]" if bLastElement else "[" + newSubItem + "],"
+                    elif re.search("^\s*\[.*\${.+", item):
+                        item = item.strip()
+                        item = re.sub("^\[", "", item)
+                        newSubItem = __handleListElements(item)
+                        newSubItem = "[" + newSubItem
+                    elif re.search("]\s*,*\s*", item) and item.count('[') < item.count(']'):
+                        item = item.rstrip()
+                        bLastElement = True
+                        if item.endswith(","):
+                            bLastElement = False
+                        item = re.sub("\s*\]\s*,*$", "", item)
+                        newSubItem = __handleListElements(item)
+                        newSubItem = newSubItem + "]" if bLastElement else newSubItem + "],"
                     else:
                         newSubItem = self.__checkAndUpdateKeyValue(item)
                     if i<len(items):