Merge pull request #3 from simonmau/owned-entities

Added support for owned entities

Author: mjuen

Enum.Ext/Enum.Ext.EFCore.Tests/DbContext/Entities/EntityWithOwnedProperty.cs

@@ -0,0 +1,20 @@
+using Enum.Ext.Tests.Shared;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
+
+namespace Enum.Ext.EFCore.Tests.DbContext.Entities
+{
+    public class EntityWithOwnedProperty
+    {
+        public int Id { get; set; }
+
+        [Required]
+        public OwnedStuff OwnedStuff { get; set; }
+    }
+
+    [Owned]
+    public class OwnedStuff
+    {
+        public Weekday Weekday { get; set; }
+    }
+}

Enum.Ext/Enum.Ext.EFCore.Tests/DbContext/TestDbContext.cs

@@ -24,5 +24,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         }
 
         public DbSet<SomeEntity> SomeEntities { get; set; }
+
+        public DbSet<EntityWithOwnedProperty> EntitiesWithOwnedProperties { get; set; }
     }
 }

Enum.Ext/Enum.Ext.EFCore.Tests/Migrations/20220730194709_OwnedEntity.Designer.cs

@@ -0,0 +1,30 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Enum.Ext.EFCore.Tests.Migrations
+{
+    public partial class OwnedEntity : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "EntitiesWithOwnedProperties",
+                columns: table => new
+                {
+                    Id = table.Column<int>(type: "INTEGER", nullable: false),
+                    OwnedStuff_Weekday = table.Column<int>(type: "INTEGER", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_EntitiesWithOwnedProperties", x => x.Id);
+                });
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "EntitiesWithOwnedProperties");
+        }
+    }
+}

Enum.Ext/Enum.Ext.EFCore.Tests/Migrations/20220730194709_OwnedEntity.cs

@@ -4,6 +4,8 @@
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 
+#nullable disable
+
 namespace Enum.Ext.EFCore.Tests.Migrations
 {
     [DbContext(typeof(TestDbContext))]
@@ -12,20 +14,54 @@ partial class TestDbContextModelSnapshot : ModelSnapshot
         protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
-            modelBuilder
-                .HasAnnotation("ProductVersion", "2.2.4-servicing-10062");
+            modelBuilder.HasAnnotation("ProductVersion", "6.0.0");
+
+            modelBuilder.Entity("Enum.Ext.EFCore.Tests.DbContext.Entities.EntityWithOwnedProperty", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
+
+                    b.HasKey("Id");
+
+                    b.ToTable("EntitiesWithOwnedProperties");
+                });
 
             modelBuilder.Entity("Enum.Ext.EFCore.Tests.DbContext.Entities.SomeEntity", b =>
                 {
                     b.Property<int>("Id")
-                        .ValueGeneratedOnAdd();
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("INTEGER");
 
-                    b.Property<int?>("Weekday");
+                    b.Property<int?>("Weekday")
+                        .HasColumnType("INTEGER");
 
                     b.HasKey("Id");
 
                     b.ToTable("SomeEntities");
                 });
+
+            modelBuilder.Entity("Enum.Ext.EFCore.Tests.DbContext.Entities.EntityWithOwnedProperty", b =>
+                {
+                    b.OwnsOne("Enum.Ext.EFCore.Tests.DbContext.Entities.OwnedStuff", "OwnedStuff", b1 =>
+                        {
+                            b1.Property<int>("EntityWithOwnedPropertyId")
+                                .HasColumnType("INTEGER");
+
+                            b1.Property<int?>("Weekday")
+                                .HasColumnType("INTEGER");
+
+                            b1.HasKey("EntityWithOwnedPropertyId");
+
+                            b1.ToTable("EntitiesWithOwnedProperties");
+
+                            b1.WithOwner()
+                                .HasForeignKey("EntityWithOwnedPropertyId");
+                        });
+
+                    b.Navigation("OwnedStuff")
+                        .IsRequired();
+                });
 #pragma warning restore 612, 618
         }
     }

Enum.Ext/Enum.Ext.EFCore.Tests/Migrations/TestDbContextModelSnapshot.cs

@@ -44,5 +44,43 @@ public void Test_SaveData()
                 }
             }
         }
+
+        [Test]
+        public void Test_SaveData_WithOwnedEntity()
+        {
+            // In-memory database only exists while the connection is open
+            using (var connection = new SqliteConnection("DataSource=:memory:"))
+            {
+                connection.Open();
+
+                var options = new DbContextOptionsBuilder<TestDbContext>()
+                    .UseSqlite(connection)
+                    .Options;
+
+                using (var db = new TestDbContext(options))
+                {
+                    db.Database.EnsureCreated();
+
+                    db.EntitiesWithOwnedProperties.Add(new Enum.Ext.EFCore.Tests.DbContext.Entities.EntityWithOwnedProperty()
+                    {
+                        OwnedStuff = new Enum.Ext.EFCore.Tests.DbContext.Entities.OwnedStuff()
+                        {
+                            Weekday = Weekday.Thursday
+                        }
+                    });
+
+                    db.SaveChanges();
+                }
+
+                using (var db = new TestDbContext(options))
+                {
+                    var entities = db.EntitiesWithOwnedProperties.ToList();
+
+                    entities.Count.Should().Be(1);
+                    entities.Single().OwnedStuff.Should().NotBeNull();
+                    entities.Single().OwnedStuff!.Weekday.Should().Be(Weekday.Thursday);
+                }
+            }
+        }
     }
 }

Enum.Ext/Enum.Ext.EFCore.Tests/TestDbContext.cs

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>1.0.7</Version>
+    <Version>1.1.0</Version>
     <Authors>Mauracher Simon, Juen Marcel</Authors>
     <PackageProjectUrl>https://github.com/simonmau/enum_ext</PackageProjectUrl>
     <RepositoryUrl>https://github.com/simonmau/enum_ext</RepositoryUrl>

Enum.Ext/Enum.Ext.EFCore/Enum.Ext.EFCore.csproj

@@ -1,4 +1,5 @@
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using System;
 using System.Linq;
@@ -27,7 +28,18 @@ public static void ConfigureEnumExt(this ModelBuilder modelBuilder)
 
                     var converter = (ValueConverter)Activator.CreateInstance(converterType);
 
-                    modelBuilder.Entity(entityType.Name).Property(property.Name).HasConversion(converter);
+                    if (entityType.IsOwned())
+                    {
+#pragma warning disable EF1001 // Internal EF Core API usage, might change without notice -> have not found a better way till now
+                        var navigationBuilder = new OwnedNavigationBuilder(entityType.FindOwnership());
+#pragma warning restore EF1001
+
+                        navigationBuilder.Property(property.Name).HasConversion(converter);
+                    }
+                    else
+                    {
+                        modelBuilder.Entity(entityType.Name).Property(property.Name).HasConversion(converter);
+                    }
                 }
             }
         }