feat: test new .net 8 type

Author: pdevito3

QueryKit.IntegrationTests/Tests/DatabaseFilteringTests.cs

@@ -467,6 +467,35 @@ public async Task can_filter_nested_property_using_ownsone()
         people[0].Id.Should().Be(fakePersonOne.Id);
     }
 
+    [Fact]
+    public async Task can_filter_nested_property_using_ownsone_with_alias()
+    {
+        // Arrange
+        var testingServiceScope = new TestingServiceScope();
+        var faker = new Faker();
+        var fakePersonOne = new FakeTestingPersonBuilder()
+            .WithPhysicalAddress(new Address(faker.Address.StreetAddress()
+                , faker.Address.SecondaryAddress()
+                , faker.Address.City()
+                , faker.Address.State()
+                , faker.Address.ZipCode()
+                , faker.Address.Country()))
+            .Build();
+        await testingServiceScope.InsertAsync(fakePersonOne);
+        var input = $"""state == "{fakePersonOne.PhysicalAddress.State}" """;
+
+        // Act
+        var config = new QueryKitConfiguration(config =>
+        {
+            config.Property<TestingPerson>(x => x.PhysicalAddress.State).HasQueryName("state");
+        });
+        var people = testingServiceScope.DbContext().People.ApplyQueryKitFilter(input, config).ToList();
+
+        // Assert
+        people.Count.Should().Be(1);
+        people[0].Id.Should().Be(fakePersonOne.Id);
+    }
+    
     [Fact]
     public async Task can_filter_by_decimal()
     {
@@ -727,4 +756,62 @@ public async Task can_filter_on_child_entity_with_config()
         people.FirstOrDefault(x => x.Id == fakeRecipeOne.Id).Should().NotBeNull();
         people.FirstOrDefault(x => x.Id == fakeRecipeTwo.Id).Should().BeNull();
     }
+    
+    [Fact]
+    public async Task can_filter_with_child_props_for_complex_property()
+    {
+        // Arrange
+        var testingServiceScope = new TestingServiceScope();
+        var faker = new Faker();
+        var fakePersonOne = new FakeRecipeBuilder()
+            .WithCollectionEmail(faker.Internet.Email())
+            .Build();
+        var fakePersonTwo = new FakeRecipeBuilder()
+            .Build();
+        await testingServiceScope.InsertAsync(fakePersonOne, fakePersonTwo);
+        
+        var input = $"""CollectionEmail.Value == "{fakePersonOne.CollectionEmail.Value}" """;
+
+        // Act
+        var queryablePeople = testingServiceScope.DbContext().Recipes;
+        var config = new QueryKitConfiguration(config =>
+        {
+            config.Property<Recipe>(x => x.CollectionEmail.Value);//.HasQueryName("email");
+        });
+        var appliedQueryable = queryablePeople.ApplyQueryKitFilter(input, config);
+        var people = await appliedQueryable.ToListAsync();
+
+        // Assert
+        people.Count.Should().Be(1);
+        people[0].Id.Should().Be(fakePersonOne.Id);
+    }
+    
+    [Fact]
+    public async Task can_filter_with_child_props_for_complex_property_with_alias()
+    {
+        // Arrange
+        var testingServiceScope = new TestingServiceScope();
+        var faker = new Faker();
+        var fakePersonOne = new FakeRecipeBuilder()
+            .WithCollectionEmail(faker.Internet.Email())
+            .Build();
+        var fakePersonTwo = new FakeRecipeBuilder()
+            .Build();
+        await testingServiceScope.InsertAsync(fakePersonOne, fakePersonTwo);
+        
+        var input = $"""email == "{fakePersonOne.CollectionEmail.Value}" """;
+
+        // Act
+        var queryablePeople = testingServiceScope.DbContext().Recipes;
+        var config = new QueryKitConfiguration(config =>
+        {
+            config.Property<Recipe>(x => x.CollectionEmail.Value).HasQueryName("email");
+        });
+        var appliedQueryable = queryablePeople.ApplyQueryKitFilter(input, config);
+        var people = await appliedQueryable.ToListAsync();
+
+        // Assert
+        people.Count.Should().Be(1);
+        people[0].Id.Should().Be(fakePersonOne.Id);
+    }
 }

QueryKit.WebApiTestProject/Database/RecipeConfiguration.cs

@@ -13,6 +13,10 @@ public void Configure(EntityTypeBuilder<Recipe> builder)
     {
         builder.Property(x => x.Tags).HasColumnType("text[]");
 
+        builder.ComplexProperty(x => x.CollectionEmail,
+            x => x.Property(y => y.Value)
+                .HasColumnName("collection_email"));
+
         // example for a simple 1:1 value object
         // builder.Property(x => x.Percent)
         //     .HasConversion(x => x.Value, x => new Percent(x))

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

@@ -8,5 +8,5 @@ public sealed class RecipeForCreation
     public int? Rating { get; set; }
     public DateOnly? DateOfOrigin { get; set; }
     public bool HaveMadeItMyself { get; set; }
-
+    public string CollectionEmail { get; set; }
 }

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

@@ -8,5 +8,5 @@ public sealed class RecipeForUpdate
     public int? Rating { get; set; }
     public DateOnly? DateOfOrigin { get; set; }
     public bool HaveMadeItMyself { get; set; }
-
+    public string CollectionEmail { get; set; }
 }

QueryKit.WebApiTestProject/Entities/Recipes/Recipe.cs

@@ -23,6 +23,8 @@ private set
         }
     }
 
+    public EmailAddress CollectionEmail { get; private set; }
+    
     public string Directions { get; private set; }
 
     public int? Rating { get; private set; }
@@ -55,6 +57,7 @@ public static Recipe Create(RecipeForCreation recipeForCreation)
         newRecipe.Rating = recipeForCreation.Rating;
         newRecipe.DateOfOrigin = recipeForCreation.DateOfOrigin;
         newRecipe.HaveMadeItMyself = recipeForCreation.HaveMadeItMyself;
+        newRecipe.CollectionEmail = new EmailAddress(recipeForCreation.CollectionEmail);
         return newRecipe;
     }
 
@@ -66,6 +69,7 @@ public Recipe Update(RecipeForUpdate recipeForUpdate)
         Rating = recipeForUpdate.Rating;
         DateOfOrigin = recipeForUpdate.DateOfOrigin;
         HaveMadeItMyself = recipeForUpdate.HaveMadeItMyself;
+        CollectionEmail = new EmailAddress(recipeForUpdate.CollectionEmail);
         return this;
     }
 

…2014351_BaseTestingMigration.Designer.cs …3182524_BaseTestingMigration.Designer.csQueryKit.WebApiTestProject/Migrations/20231222014351_BaseTestingMigration.Designer.cs renamed to QueryKit.WebApiTestProject/Migrations/20231223182524_BaseTestingMigration.Designer.cs QueryKit.WebApiTestProject/Migrations/20231222014351_BaseTestingMigration.Designer.cs renamed to QueryKit.WebApiTestProject/Migrations/20231223182524_BaseTestingMigration.Designer.cs

@@ -53,7 +53,8 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     rating = table.Column<int>(type: "integer", nullable: true),
                     date_of_origin = table.Column<DateOnly>(type: "date", nullable: true),
                     have_made_it_myself = table.Column<bool>(type: "boolean", nullable: false),
-                    tags = table.Column<List<string>>(type: "text[]", nullable: false)
+                    tags = table.Column<List<string>>(type: "text[]", nullable: false),
+                    collection_email = table.Column<string>(type: "text", nullable: true)
                 },
                 constraints: table =>
                 {

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

@@ -157,6 +157,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                         .HasColumnType("text")
                         .HasColumnName("visibility");
 
+                    b.ComplexProperty<Dictionary<string, object>>("CollectionEmail", "QueryKit.WebApiTestProject.Entities.Recipes.Recipe.CollectionEmail#EmailAddress", b1 =>
+                        {
+                            b1.IsRequired();
+
+                            b1.Property<string>("Value")
+                                .HasColumnType("text")
+                                .HasColumnName("collection_email");
+                        });
+
                     b.HasKey("Id")
                         .HasName("pk_recipes");
 

QueryKit.WebApiTestProject/Migrations/TestingDbContextModelSnapshot.cs

@@ -331,13 +331,18 @@ public sealed class PersonConfiguration : IEntityTypeConfiguration<SpecialPerson
     public void Configure(EntityTypeBuilder<SpecialPerson> builder)
     {
         builder.HasKey(x => x.Id);
-        
-      // Option 1
+      
+      	// Option 1 (as of .NET 8)
+      	builder.ComplexProperty(x => x.Email,
+            x => x.Property(y => y.Value)
+                .HasColumnName("email")); 
+      
+      	// Option 2
         builder.Property(x => x.Email)
             .HasConversion(x => x.Value, x => new EmailAddress(x))
             .HasColumnName("email");      
 
-        // Option 2      
+        // Option 3   
         builder.OwnsOne(x => x.Email, opts =>
         {
             opts.Property(x => x.Value).HasColumnName("email");

README.md

@@ -49,6 +49,12 @@ public FakeRecipeBuilder WithHaveMadeItMyself(bool haveMadeItMyself)
         return this;
     }
 
+    public FakeRecipeBuilder WithCollectionEmail(string collectionEmail)
+    {
+        _creationData.CollectionEmail = collectionEmail;
+        return this;
+    }
+    
     public Recipe Build()
     {
         var result = Recipe.Create(_creationData);