fix: can handle nullable guid contains

fixes #36

Author: pdevito3

QueryKit.IntegrationTests/Tests/DatabaseFilteringTests.cs

@@ -413,11 +413,13 @@ public async Task can_filter_by_guid_contains()
     {
         // Arrange
         var testingServiceScope = new TestingServiceScope();
-        var fakePersonOne = new FakeTestingPersonBuilder().Build();
+        var fakePersonOne = new FakeTestingPersonBuilder()
+            .WithId(Guid.Parse("3644bceb-d362-4044-9edb-a3ec71c9b1a1"))
+            .Build();
         var fakePersonTwo = new FakeTestingPersonBuilder().Build();
         await testingServiceScope.InsertAsync(fakePersonOne, fakePersonTwo);
 
-        var input = $"""{nameof(TestingPerson.Id)} @=* "{fakePersonOne.Id}" """;
+        var input = $"""(id @=* "9edb")""";
 
         // Act
         var queryablePeople = testingServiceScope.DbContext().People;
@@ -428,6 +430,31 @@ public async Task can_filter_by_guid_contains()
         people.Count.Should().Be(1);
         people[0].Id.Should().Be(fakePersonOne.Id);
     }
+
+    [Fact]
+    public async Task can_filter_by_nullable_guid_contains()
+    {
+        // Arrange
+        var testingServiceScope = new TestingServiceScope();
+        var fakeRecipeOne = new FakeRecipeBuilder()
+            .WithSecondaryId(Guid.Parse("385b1d2c-3b10-4ce0-b19b-f2b76280d57d"))
+            .Build();
+        var fakeRecipeTwo = new FakeRecipeBuilder().Build();
+        await testingServiceScope.InsertAsync(fakeRecipeOne, fakeRecipeTwo);
+        
+        var input = $"""(secondaryId @=* "4ce0")""";
+
+        // Act
+        var queryableRecipe = testingServiceScope.DbContext().Recipes;
+        var appliedQueryable = queryableRecipe.ApplyQueryKitFilter(input);
+        var people = await appliedQueryable.ToListAsync();
+        // var people = testingServiceScope.DbContext().Recipes
+        //     .Where(x => x.SecondaryId.ToString().Contains("4ce0")).ToList();
+
+        // Assert
+        people.Count.Should().Be(1);
+        people[0].Id.Should().Be(fakeRecipeOne.Id);
+    }
 
     [Fact]
     public async Task return_no_records_when_no_match()

QueryKit.WebApiTestProject/Entities/Recipes/Models/RecipeForCreation.cs

@@ -9,4 +9,5 @@ public sealed class RecipeForCreation
     public DateOnly? DateOfOrigin { get; set; }
     public bool HaveMadeItMyself { get; set; }
     public string CollectionEmail { get; set; }
+    public Guid? SecondaryId { get; set; }
 }

QueryKit.WebApiTestProject/Entities/Recipes/Models/RecipeForUpdate.cs

@@ -9,4 +9,5 @@ public sealed class RecipeForUpdate
     public DateOnly? DateOfOrigin { get; set; }
     public bool HaveMadeItMyself { get; set; }
     public string CollectionEmail { get; set; }
+    public Guid? SecondaryId { get; set; }
 }

QueryKit.WebApiTestProject/Entities/Recipes/Recipe.cs

@@ -31,6 +31,8 @@ private set
 
     public DateOnly? DateOfOrigin { get; private set; }
 
+    public Guid? SecondaryId { get; private set; }
+
     public bool HaveMadeItMyself { get; private set; }
 
     public List<string> Tags { get; set; } = new();
@@ -58,6 +60,7 @@ public static Recipe Create(RecipeForCreation recipeForCreation)
         newRecipe.DateOfOrigin = recipeForCreation.DateOfOrigin;
         newRecipe.HaveMadeItMyself = recipeForCreation.HaveMadeItMyself;
         newRecipe.CollectionEmail = new EmailAddress(recipeForCreation.CollectionEmail);
+        newRecipe.SecondaryId = recipeForCreation.SecondaryId;
         return newRecipe;
     }
 
@@ -70,6 +73,7 @@ public Recipe Update(RecipeForUpdate recipeForUpdate)
         DateOfOrigin = recipeForUpdate.DateOfOrigin;
         HaveMadeItMyself = recipeForUpdate.HaveMadeItMyself;
         CollectionEmail = new EmailAddress(recipeForUpdate.CollectionEmail);
+        SecondaryId = recipeForUpdate.SecondaryId;
         return this;
     }
 

…3182524_BaseTestingMigration.Designer.cs …6001404_BaseTestingMigration.Designer.csQueryKit.WebApiTestProject/Migrations/20231223182524_BaseTestingMigration.Designer.cs renamed to QueryKit.WebApiTestProject/Migrations/20240416001404_BaseTestingMigration.Designer.cs QueryKit.WebApiTestProject/Migrations/20231223182524_BaseTestingMigration.Designer.cs renamed to QueryKit.WebApiTestProject/Migrations/20240416001404_BaseTestingMigration.Designer.cs

@@ -52,6 +52,7 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     directions = table.Column<string>(type: "text", nullable: false),
                     rating = table.Column<int>(type: "integer", nullable: true),
                     date_of_origin = table.Column<DateOnly>(type: "date", nullable: true),
+                    secondary_id = table.Column<Guid>(type: "uuid", nullable: true),
                     have_made_it_myself = table.Column<bool>(type: "boolean", nullable: false),
                     tags = table.Column<List<string>>(type: "text[]", nullable: false),
                     collection_email = table.Column<string>(type: "text", nullable: true)

…s/20231223182524_BaseTestingMigration.cs …s/20240416001404_BaseTestingMigration.csQueryKit.WebApiTestProject/Migrations/20231223182524_BaseTestingMigration.cs renamed to QueryKit.WebApiTestProject/Migrations/20240416001404_BaseTestingMigration.cs QueryKit.WebApiTestProject/Migrations/20231223182524_BaseTestingMigration.cs renamed to QueryKit.WebApiTestProject/Migrations/20240416001404_BaseTestingMigration.cs

@@ -18,7 +18,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "8.0.0")
+                .HasAnnotation("ProductVersion", "8.0.1")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "fuzzystrmatch");
@@ -142,6 +142,10 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("integer")
                         .HasColumnName("rating");
 
+                    b.Property<Guid?>("SecondaryId")
+                        .HasColumnType("uuid")
+                        .HasColumnName("secondary_id");
+
                     b.Property<List<string>>("Tags")
                         .IsRequired()
                         .HasColumnType("text[]")

QueryKit.WebApiTestProject/Migrations/TestingDbContextModelSnapshot.cs

@@ -404,10 +404,19 @@ private static Parser<Expression> ComparisonExprParser<T>(ParameterExpression pa
                 if (temp.leftExpr.Type == typeof(Guid) || temp.leftExpr.Type == typeof(Guid?))
                 {
                     var toStringMethod = typeof(Guid).GetMethod("ToString", Type.EmptyTypes);
-                    var leftExpr = Expression.Call(temp.leftExpr, toStringMethod!);
+
+                    Expression leftExpr = temp.leftExpr.Type == typeof(Guid?) ?
+                        Expression.Condition(
+                            Expression.Property(temp.leftExpr, "HasValue"),
+                            Expression.Call(Expression.Property(temp.leftExpr, "Value"), toStringMethod!),
+                            Expression.Constant(null, typeof(string))
+                        ) :
+                        Expression.Call(temp.leftExpr, toStringMethod!);
+                    
                     return temp.op.GetExpression<T>(leftExpr, CreateRightExpr(temp.leftExpr, temp.right), config?.DbContextType);
                 }
 
+
                 var rightExpr = CreateRightExpr(temp.leftExpr, temp.right);
                 return temp.op.GetExpression<T>(temp.leftExpr, rightExpr, config?.DbContextType);
             });

QueryKit/FilterParser.cs

@@ -54,6 +54,12 @@ public FakeRecipeBuilder WithCollectionEmail(string collectionEmail)
         _creationData.CollectionEmail = collectionEmail;
         return this;
     }
+
+    public FakeRecipeBuilder WithSecondaryId(Guid? guid)
+    {
+        _creationData.SecondaryId = guid;
+        return this;
+    }
 
     public Recipe Build()
     {

SharedTestingHelper/Fakes/Recipes/FakeRecipeBuilder.cs

@@ -10,5 +10,6 @@ public FakeRecipeForCreation()
     {
         RuleFor(r => r.Visibility, f => f.PickRandom<VisibilityEnum>(VisibilityEnum.List).Name);
         RuleFor(x => x.CollectionEmail, f => f.Person.Email);
+        RuleFor(x => x.SecondaryId, Guid.NewGuid());
     }
 }