added support for !=NULL and =NULL for string if conditions

Author: swagfin

ObjectSemantics.NET.Tests/ObjectSemanticsTests.cs

@@ -562,7 +562,7 @@ public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine(double amount)
         [InlineData(null)]
         [InlineData("John Doe")]
         [InlineData("")]
-        public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine_StringTest(string studentName)
+        public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine_String_EquallsNull(string studentName)
         {
             //Create Model
             Student student = new Student { StudentName = studentName };
@@ -571,13 +571,61 @@ public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine_StringTest(string
             {
                 FileContents = @"
 {{ if-start:StudentName(=NULL) }}
---is null--
+--ok-passed--
+{{ else-if }}
+--error-failed--
+{{ if-end:Balance }}"
+            };
+            string generatedTemplate = TemplateMapper.Map(student, template);
+            string expectedResult = string.IsNullOrEmpty(studentName) ? "\r\n\r\n--ok-passed--\r\n" : "\r\n\r\n--error-failed--\r\n";
+            Assert.Equal(expectedResult, generatedTemplate, false, true, true);
+        }
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("John Doe")]
+        [InlineData("")]
+        public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine_String_NotEquallsNull(string studentName)
+        {
+            //Create Model
+            Student student = new Student { StudentName = studentName };
+            //Template
+            var template = new ObjectSemanticsTemplate
+            {
+                FileContents = @"
+{{ if-start:StudentName(!=NULL) }}
+--ok-passed--
+{{ else-if }}
+--error-failed--
+{{ if-end:Balance }}"
+            };
+            string generatedTemplate = TemplateMapper.Map(student, template);
+            string expectedResult = (!string.IsNullOrEmpty(studentName)) ? "\r\n\r\n--ok-passed--\r\n" : "\r\n\r\n--error-failed--\r\n";
+            Assert.Equal(expectedResult, generatedTemplate, false, true, true);
+        }
+
+
+
+        [Theory]
+        [InlineData(null)]
+        [InlineData("John Doe")]
+        [InlineData("")]
+        public void Should_Act_On_IfCondition_Having_ElseIf_MultiLine_String_Equalls(string studentName)
+        {
+            //Create Model
+            Student student = new Student { StudentName = studentName };
+            //Template
+            var template = new ObjectSemanticsTemplate
+            {
+                FileContents = @"
+{{ if-start:StudentName(=John Doe) }}
+--ok-passed--
 {{ else-if }}
---not-null--
+--error-failed--
 {{ if-end:Balance }}"
             };
             string generatedTemplate = TemplateMapper.Map(student, template);
-            string expectedResult = (string.IsNullOrEmpty(studentName)) ? "\r\n\r\n--is null--\r\n" : "\r\n\r\n--not-null--\r\n";
+            string expectedResult = (studentName == "John Doe") ? "\r\n\r\n--ok-passed--\r\n" : "\r\n\r\n--error-failed--\r\n";
             Assert.Equal(expectedResult, generatedTemplate, false, true, true);
         }
 

ObjectSemantics.NET/Extensions/ExtractedObjPropertyExtensions.cs

@@ -18,7 +18,13 @@ public static bool IsPropertyValueConditionPassed(this ExtractedObjProperty prop
                 {
                     string v1 = property.OriginalValue?.ToString()?.Trim().ToLower() ?? string.Empty;
                     string v2 = GetConvertibleValue<string>(valueComparer)?.Trim().ToLower() ?? string.Empty;
-                    return string.Compare(v1, v2, true) == 0;
+                    switch (criteria)
+                    {
+                        case "=": return v1 == v2;
+                        case "!=": return v1 != v2;
+                        default:
+                            return string.Compare(v1, v2, true) == 0;
+                    }
                 }
                 else if (property.Type == typeof(int) || property.Type == typeof(double) || property.Type == typeof(long) || property.Type == typeof(float) || property.Type == typeof(decimal))
                 {

ObjectSemantics.NET/ObjectSemantics.NET.csproj

@@ -6,17 +6,18 @@
     > Mapping your object e.g. StudentDetails to a html Template that you define
     > Mapping a collection to enumerable or List to a html/text/ (predefined format)
 </Description>
-    <Copyright>Crudsoft Technologies @ 2022</Copyright>
+    <Copyright>Crudsoft Technologies @ 2023</Copyright>
     <PackageProjectUrl>https://github.com/swagfin/ObjectSemantics.NET</PackageProjectUrl>
     <PackageIcon>icon.jpg</PackageIcon>
     <PackageIconUrl />
     <RepositoryUrl>https://github.com/swagfin/ObjectSemantics.NET</RepositoryUrl>
     <RepositoryType>Github</RepositoryType>
-    <PackageReleaseNotes>v.5.1.3
-Added support for if condition statements with ElseIf</PackageReleaseNotes>
-    <AssemblyVersion>5.1.4.1</AssemblyVersion>
-    <FileVersion>5.1.4.1</FileVersion>
-    <Version>5.1.4</Version>
+    <PackageReleaseNotes>v.5.1.5
+Added support for if condition statements with ElseIf
+Optimized performance</PackageReleaseNotes>
+    <AssemblyVersion>5.1.5.1</AssemblyVersion>
+    <FileVersion>5.1.5.1</FileVersion>
+    <Version>5.1.5</Version>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <ApplicationIcon></ApplicationIcon>
     <PackageReadmeFile>README.md</PackageReadmeFile>