fix(Data Mapper): map not loading on some instances (Azure#3359)

fixed crashing on loading map on some instances

Author: Elaina-Lee

libs/data-mapper/src/lib/utils/DataMap.Utils.ts

@@ -298,7 +298,7 @@ export const splitKeyIntoChildren = (sourceKey: string): string[] => {
     } else {
       if (element === '"') {
         currentWord += element;
-        if (functionParams[index + 1] && functionParams[index + 1] === ',') {
+        if (openParenthesis === 0 && functionParams[index + 1] && functionParams[index + 1] === ',') {
           results.push(currentWord.trim());
           currentWord = '';
 

libs/data-mapper/src/lib/utils/__test__/DataMapUtils.spec.ts

@@ -213,6 +213,33 @@ describe('utils/DataMap', () => {
         'string(EmployeeID)',
       ]);
     });
+
+    it('Concat with three values including custom string', async () => {
+      expect(splitKeyIntoChildren('concat(EmployeeName, "EmployeeAge", EmployeeID)')).toEqual([
+        'EmployeeName',
+        '"EmployeeAge"',
+        'EmployeeID',
+      ]);
+    });
+
+    it('Concat with three values surrounded by another function including custom string', async () => {
+      expect(splitKeyIntoChildren('int(concat(/ns0:PersonOrigin/FirstName, " ",/ns0:PersonOrigin/LastName))')).toEqual([
+        'concat(/ns0:PersonOrigin/FirstName, " ",/ns0:PersonOrigin/LastName)',
+      ]);
+    });
+
+    it('Concat with three values surrounded by two other functions including custom string in the middle', async () => {
+      expect(splitKeyIntoChildren('subtract(2023, int(concat(/ns0:PersonOrigin/FirstName, " ",/ns0:PersonOrigin/LastName)))')).toEqual([
+        '2023',
+        'int(concat(/ns0:PersonOrigin/FirstName, " ",/ns0:PersonOrigin/LastName))',
+      ]);
+    });
+
+    it('Concat with three values surrounded by two other functions including custom string in the middle', async () => {
+      expect(
+        splitKeyIntoChildren('subtract(2023, int(concat("custom string", /ns0:PersonOrigin/FirstName, /ns0:PersonOrigin/LastName)))')
+      ).toEqual(['2023', 'int(concat("custom string", /ns0:PersonOrigin/FirstName, /ns0:PersonOrigin/LastName))']);
+    });
   });
 
   describe('qualifyLoopRelativeSourceKeys', () => {
@@ -332,6 +359,23 @@ describe('utils/DataMap', () => {
         '/ns0:TargetSchemaRoot/Looping/ManyToMany/$for(/ns0:SourceSchemaRoot/Looping/ManyToMany/Simple)/Simple/$for(SourceSimpleChild)/SimpleChild/$for(SourceSimpleChildChild)/SimpleChildChild/Direct'
       );
     });
+
+    it('returns unchanged string for multiple loops with custom string', () => {
+      const result = removeSequenceFunction([
+        'int',
+        Separators.OpenParenthesis,
+        'concat',
+        Separators.OpenParenthesis,
+        '"customString"',
+        Separators.Comma,
+        '/ns0:PersonOrigin/FirstName',
+        Separators.Comma,
+        '/ns0:PersonOrigin/LastName',
+        Separators.CloseParenthesis,
+        Separators.CloseParenthesis,
+      ]);
+      expect(result).toEqual('int(concat("customString",/ns0:PersonOrigin/FirstName,/ns0:PersonOrigin/LastName))');
+    });
   });
 
   describe('separateIntoTokens', () => {
@@ -369,6 +413,49 @@ describe('utils/DataMap', () => {
       expect(result[13]).toEqual(Separators.CloseParenthesis);
       expect(result[14]).toEqual('/Person/Name');
     });
+
+    it('separates a loop and sequence target', () => {
+      const result = separateIntoTokens('int(concat(/ns0:PersonOrigin/FirstName,/ns0:PersonOrigin/LastName))');
+      expect(result[0]).toEqual('int');
+      expect(result[1]).toEqual(Separators.OpenParenthesis);
+      expect(result[2]).toEqual('concat');
+      expect(result[3]).toEqual(Separators.OpenParenthesis);
+      expect(result[4]).toEqual('/ns0:PersonOrigin/FirstName');
+      expect(result[5]).toEqual(Separators.Comma);
+      expect(result[6]).toEqual('/ns0:PersonOrigin/LastName');
+      expect(result[7]).toEqual(Separators.CloseParenthesis);
+      expect(result[8]).toEqual(Separators.CloseParenthesis);
+    });
+
+    it('separates a loop and sequence target', () => {
+      const result = separateIntoTokens('int(concat(/ns0:PersonOrigin/FirstName,/ns0:PersonOrigin/LastName,"customString"))');
+      expect(result[0]).toEqual('int');
+      expect(result[1]).toEqual(Separators.OpenParenthesis);
+      expect(result[2]).toEqual('concat');
+      expect(result[3]).toEqual(Separators.OpenParenthesis);
+      expect(result[4]).toEqual('/ns0:PersonOrigin/FirstName');
+      expect(result[5]).toEqual(Separators.Comma);
+      expect(result[6]).toEqual('/ns0:PersonOrigin/LastName');
+      expect(result[7]).toEqual(Separators.Comma);
+      expect(result[8]).toEqual('"customString"');
+      expect(result[9]).toEqual(Separators.CloseParenthesis);
+      expect(result[10]).toEqual(Separators.CloseParenthesis);
+    });
+
+    it('separates a loop and sequence target', () => {
+      const result = separateIntoTokens('int(concat("customString",/ns0:PersonOrigin/FirstName,/ns0:PersonOrigin/LastName))');
+      expect(result[0]).toEqual('int');
+      expect(result[1]).toEqual(Separators.OpenParenthesis);
+      expect(result[2]).toEqual('concat');
+      expect(result[3]).toEqual(Separators.OpenParenthesis);
+      expect(result[4]).toEqual('"customString"');
+      expect(result[5]).toEqual(Separators.Comma);
+      expect(result[6]).toEqual('/ns0:PersonOrigin/FirstName');
+      expect(result[7]).toEqual(Separators.Comma);
+      expect(result[8]).toEqual('/ns0:PersonOrigin/LastName');
+      expect(result[9]).toEqual(Separators.CloseParenthesis);
+      expect(result[10]).toEqual(Separators.CloseParenthesis);
+    });
   });
 });