Merge pull request #8 from swagfin/refactor/minor-changes-and-refactoring

Refactor/minor changes and refactoring

Author: swagfin

ObjectSemantics.NET.Tests/ObjectSemanticsTests.cs

@@ -76,6 +76,46 @@ public void Should_Map_Enumerable_Collection_In_Object()
             Assert.Equal(expectedResult, generatedTemplate, false, true, true);
         }
 
+        [Fact]
+        public void Should_Map_Multiple_Enumerable_Collection_On_Same_Template()
+        {
+            //Create Model
+            Student student = new Student
+            {
+                StudentName = "John Doe",
+                Invoices = new List<Invoice>
+                {
+                     new Invoice{  Id=2, RefNo="INV_002",Narration="Grade II Fees Invoice", Amount=2000, InvoiceDate= new DateTime(2023, 04, 01) },
+                     new Invoice{  Id=1, RefNo="INV_001",Narration="Grade I Fees Invoice", Amount=320, InvoiceDate= new DateTime(2022, 08, 01)  }
+                }
+            };
+            //Template
+            var template = new ObjectSemanticsTemplate
+            {
+                FileContents = @"
+{{ StudentName }} Invoices
+LOOP #1
+{{ for-each-start:invoices  }}
+    <h5>{{ Id }} On Loop #1</h5>
+{{ for-each-end:invoices }}
+LOOP #2
+{{ for-each-start:invoices  }}
+    <h5>{{ Id }} On Loop #2</h5>
+{{ for-each-end:invoices }}
+"
+            };
+            string generatedTemplate = TemplateMapper.Map(student, template);
+            string expectedResult = "\r\nJohn Doe Invoices" +
+                "\r\nLOOP #1" +
+                "\r\n    <h5>2 On Loop #1</h5>" +
+                "\r\n    <h5>1 On Loop #1</h5>" +
+                "\r\nLOOP #2" +
+                "\r\n    <h5>2 On Loop #2</h5>" +
+                "\r\n    <h5>1 On Loop #2</h5>" +
+                "\r\n"; ;
+            Assert.Equal(expectedResult, generatedTemplate, false, true, true);
+        }
+
         [Fact]
         public void Should_Map_Additional_Parameters()
         {

ObjectSemantics.NET/Algorithim/GavinsAlgorithim.cs

@@ -98,7 +98,6 @@ internal static TemplatedContent GenerateTemplateFromFileContents(string fileCon
             string _replaceCode = string.Format("REPLACE_IF_CONDITION_{0}", Guid.NewGuid().ToString().ToUpper());
             string subBlock = templatedContent.Template.GetSubstringByIndexStartAndEnd(regexIfConditionMatch.Index + regexIfConditionMatch.Length, regexIfConditionMatchEnd.Index - 1);
             //#Replace Template Block with unique Code
-            //templatedContent.Template = templatedContent.Template.ReplaceFirstOccurrence(subBlock, _replaceCode);
             templatedContent.Template = templatedContent.Template.ReplaceByIndexStartAndEnd(regexIfConditionMatch.Index, (regexIfConditionMatchEnd.Index - 1) + regexIfConditionMatchEnd.Length, _replaceCode);
             //#Append Condition Code
             templatedContent.ReplaceIfConditionCodes.Add(new ReplaceIfConditionCode
@@ -116,8 +115,8 @@ internal static TemplatedContent GenerateTemplateFromFileContents(string fileCon
         #endregion
 
         #region Generate Obj Looop
-        Match regexLoopMatch = Regex.Match(templatedContent.Template, "{{(.+?)for-each-start:(.+?)}}", RegexOptions.IgnoreCase);
-        Match regexLoopEnd = Regex.Match(templatedContent.Template, "{{(.+?)for-each-end:(.+?)}}", RegexOptions.IgnoreCase);
+        Match regexLoopMatch = Regex.Match(templatedContent.Template, "{{\\s*for-each-start:([^()]+?)\\s*}}", RegexOptions.IgnoreCase);
+        Match regexLoopEnd = Regex.Match(templatedContent.Template, "{{\\s*for-each-end:([^()]+?)\\s*}}", RegexOptions.IgnoreCase);
         while (regexLoopMatch.Success && regexLoopEnd.Success)
         {
             int startAtIndex = templatedContent.Template.IndexOf(regexLoopMatch.Value); //Getting again index just incase it was replaced
@@ -128,7 +127,7 @@ internal static TemplatedContent GenerateTemplateFromFileContents(string fileCon
             string replaceCode = string.Format("REPLACE_LOOP_{0}", Guid.NewGuid().ToString().ToUpper());
             templatedContent.Template = Regex.Replace(templatedContent.Template, subBlock, replaceCode, RegexOptions.IgnoreCase);
             //Loop Target Object Name
-            string targetObjName = regexLoopMatch.Value.Replace("{", string.Empty).Replace("}", string.Empty).Trim().Split(new string[] { ":" }, StringSplitOptions.RemoveEmptyEntries).LastOrDefault();
+            string targetObjName = (regexLoopMatch.Groups.Count >= 1) ? regexLoopMatch.Groups[1].Value?.Trim()?.ToString()?.ToLower()?.Replace(" ", string.Empty) : string.Empty;
             //Obj
             ReplaceObjLoopCode replaceObjLoopCode = new ReplaceObjLoopCode { ReplaceRef = replaceCode, TargetObjectName = targetObjName };
             //Extra Loop Contents