Improve array search filter for nullable Guid properties

src/AutoFilterer/Attributes/ArraySearchFilterAttribute.cs

@@ -1,4 +1,5 @@
-using System.Collections;
+using AutoFilterer.Extensions;
+using System.Collections;
 using System.Linq;
 using System.Linq.Expressions;
 using System.Reflection;
@@ -14,17 +15,17 @@ public override Expression BuildExpression(ExpressionBuildContext context)
             return Expression.Constant(true); // TODO: Make it better. Maybe return null? When null, it should be ignored and combined with another expressions.
         }
 
-        var type = context.TargetProperty.PropertyType;
-        var prop = Expression.Property(context.ExpressionBody, context.TargetProperty.Name);
+        var type = context.TargetProperty.PropertyType.AsNonNullable();
+        var prop = Expression.Property(context.ExpressionBody, context.TargetProperty.Name).GetValueExpressionIfNullable();
 
         var containsMethod = typeof(Enumerable).GetMethods().FirstOrDefault(x => x.Name == nameof(Enumerable.Contains)).MakeGenericMethod(type);
 
         var containsExpression = Expression.Call(
                                                 method: containsMethod,
                                                 arguments: new Expression[]
                                                 {
-                                                        Expression.Property(Expression.Constant(context.FilterObject), context.FilterProperty),
-                                                        Expression.Property(context.ExpressionBody, context.TargetProperty)
+                                                        Expression.Property(Expression.Constant(context.FilterObject), context.FilterProperty).GetValueExpressionIfNullable(),
+                                                        Expression.Property(context.ExpressionBody, context.TargetProperty).GetValueExpressionIfNullable()
                                                 });
 
         return containsExpression;

tests/AutoFilterer.Tests/Attributes/ArraySearchAttributeTests.cs

@@ -57,6 +57,27 @@ public void BuildExpression_ShouldGenerateQueryCorrect_WithAttribute(List<Prefer
             Assert.True(actualResult.Contains(expected));
     }
 
+    [Theory, AutoMoqData(count: 64)]
+    public void BuildExpression_ShouldGenerateQueryCorrect_Guid_WithoutAttribute(List<Preferences> data)
+    {
+        // Arrange
+        var queryable = data.AsQueryable();
+        var filter = new PreferencesFilter_ArraySearchWithoutAttribute_Guid
+        {
+            OrganizationUnitId = data.Take(3).Select(x => x.OrganizationUnitId.GetValueOrDefault()).ToArray()
+        };
+
+        // Act
+        var expectedResult = queryable.Where(x => filter.OrganizationUnitId.Contains(x.OrganizationUnitId.GetValueOrDefault()));
+        var actualResult = queryable.ApplyFilter(filter);
+
+        // Assert
+        Assert.Equal(expectedResult.Count(), actualResult.Count());
+
+        foreach (var expected in expectedResult)
+            Assert.True(actualResult.Contains(expected));
+    }
+
     private static IEnumerable<T> Repeat<T>(Func<T> func, int times = 3)
     {
         for (int i = 0; i < times; i++)

tests/AutoFilterer.Tests/Environment/Dtos/PreferencesFilter_ArraySearchWithoutAttribute_Guid.cs

@@ -0,0 +1,10 @@
+using AutoFilterer.Attributes;
+using AutoFilterer.Types;
+using System;
+
+namespace AutoFilterer.Tests.Environment.Dtos;
+
+public class PreferencesFilter_ArraySearchWithoutAttribute_Guid : FilterBase
+{
+    public Guid[] OrganizationUnitId { get; set; }
+}

tests/AutoFilterer.Tests/Environment/Models/Preferences.cs

@@ -1,4 +1,5 @@
-using System;
+using AutoFilterer.Attributes;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -13,4 +14,7 @@ public class Preferences
     public string GivenName { get; set; }
     public int SecurityLevel { get; set; }
     public int? ReadLimit { get; set; }
+
+    [ArraySearchFilter]
+    public Guid? OrganizationUnitId { get; set; }
 }