Merge branch 'master' into develop

Author: tghamm

.github/workflows/dotnet.yml

@@ -0,0 +1,30 @@
+name: .NET
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v2
+      with:
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
+      run: dotnet restore Castle.DynamicLinqQueryBuilder.sln
+    - name: Build
+      run: dotnet build Castle.DynamicLinqQueryBuilder.sln --no-restore
+    - name: Test
+      run: dotnet test Castle.DynamicLinqQueryBuilder.Tests/Castle.DynamicLinqQueryBuilder.Tests.csproj /p:CollectCoverage=true /p:CoverletOutput=TestResults/ /p:CoverletOutputFormat=lcov --no-build --verbosity normal
+    - name: Publish coverage report to coveralls.io   
+      uses: coverallsapp/github-action@master   
+      with:
+        github-token: ${{ secrets.GITHUB_TOKEN }}
+        path-to-lcov: Castle.DynamicLinqQueryBuilder.Tests/TestResults/coverage.info

Castle.DynamicLinqQueryBuilder.Tests/Rules/Tests.cs

@@ -38,10 +38,17 @@ public class ExpressionTreeBuilderTestClass
             public List<double> DoubleList { get; set; }
             public List<string> StrList { get; set; }
             public List<ChildClass> ChildClasses { get; set; }
+            public List<ChildClass> NestedNullObjectChildClasses { get; set; }
 
         }
 
         public class ChildClass
+        {
+            public string ClassName { get; set; }
+            public ChildSubClass ChildSubClass { get; set; }
+        }
+
+        public class  ChildSubClass
         {
             public string ClassName { get; set; }
         }
@@ -100,7 +107,17 @@ public static List<ExpressionTreeBuilderTestClass> GetExpressionTreeData()
                 StrList = new List<string>() { "Str1", "Str2" },
                 DateList = new List<DateTime>() { DateTime.UtcNow.Date, DateTime.UtcNow.Date.AddDays(-2) },
                 DoubleList = new List<double>() { 1.48, 1.84, 1.33 },
-                IntNullList = new List<int?>() { 3, 4, 5, null }
+                IntNullList = new List<int?>() { 3, 4, 5, null },
+                NestedNullObjectChildClasses = new List<ChildClass>()
+                {
+                    new ChildClass()
+                    {
+                        ChildSubClass = new ChildSubClass()
+                        {
+                            ClassName = "ChildSubClass"
+                        }
+                    }
+                }
             };
             tData.Add(entry1);
 
@@ -124,7 +141,21 @@ public static List<ExpressionTreeBuilderTestClass> GetExpressionTreeData()
                 StrList = new List<string>() { "Str1", "Str2" },
                 DateList = new List<DateTime>() { DateTime.UtcNow.Date, DateTime.UtcNow.Date.AddDays(-2) },
                 DoubleList = new List<double>() { 1.48, 1.84, 1.33 },
-                IntNullList = new List<int?>() { 3, 4, 5, null }
+                IntNullList = new List<int?>() { 3, 4, 5, null },
+                NestedNullObjectChildClasses = new List<ChildClass>()
+                {
+                    new ChildClass()
+                    {
+                        
+                    },
+                    new ChildClass()
+                    {
+                        ChildSubClass = new ChildSubClass()
+                        {
+                            ClassName = "className"
+                        }
+                    }
+                }
             };
             tData.Add(entry2);
 
@@ -332,6 +363,34 @@ public void IsNullSubCollection()
             Assert.IsTrue(contentNullFilteredList.Count == 0);
         }
 
+        [Test]
+        public void IsNullNestedClassInSubCollection()
+        {
+            var startingQuery = GetExpressionTreeData().AsQueryable();
+
+
+            //expect no entries to match
+            var contentNullFilter = new QueryBuilderFilterRule
+            {
+                Condition = "and",
+                Rules = new List<QueryBuilderFilterRule>
+                {
+                    new QueryBuilderFilterRule
+                    {
+                        Condition = "and",
+                        Field = "NestedNullObjectChildClasses.ChildSubClass.ClassName",
+                        Id = "NestedNullObjectChildClasses.ChildSubClass.ClassName",
+                        Input = "NA",
+                        Operator = "equal",
+                        Type = "string",
+                        Value = new[] { "books" }
+                    }
+                }
+            };
+            var contentNullFilteredList = startingQuery.BuildQuery<ExpressionTreeBuilderTestClass>(contentNullFilter).ToList();
+            Assert.IsTrue(contentNullFilteredList != null);
+            Assert.IsTrue(contentNullFilteredList.Count == 0);
+        }
 
         [Test]
         public void InClause()

Castle.DynamicLinqQueryBuilder/QueryBuilder.cs

@@ -308,6 +308,12 @@ private static Expression BuildNestedExpression(Expression expression, IEnumerat
                         predicate
                     ));
                 }
+                else if (!expression.Type.IsValueType && propertyType != typeof(string))
+                {
+                    var notnull = IsNotNull(expression);
+                    Expression body = BuildNestedExpression(expression, propertyCollectionEnumerator, rule, options, type);
+                    return Expression.AndAlso(notnull, body);
+                }
             }
 
             return BuildOperatorExpression(expression, rule, options, type);