EF Core: Owned types support

src/OpenRiaServices.Server.EntityFrameworkCore/Framework/EFCoreTypeDescriptor.cs

@@ -245,8 +245,18 @@ protected override IEnumerable<Attribute> GetMemberAttributes(PropertyDescriptor
 #else
                 bool isManyToMany = navigation.IsCollection && navigation.Inverse?.IsCollection == true;
 #endif
+
+#if NETSTANDARD2_0
                 if (!isManyToMany)
                 {
+#else
+                if (!isManyToMany
+                    // Don't generate association attributes for Owned types (onless they have all FK fields explictly defined, in which case they can be treated as Entities)
+                    //  if we generate association attributes then it cannot be treated as a ComplexObject
+                    && !(navigation.TargetEntityType.IsOwned() && navigation.ForeignKey.Properties.Any(static p => p.IsShadowProperty())))
+                {
+#endif
+
                     var assocAttrib = (AssociationAttribute)pd.Attributes[typeof(AssociationAttribute)];
                     if (assocAttrib == null)
                     {

src/OpenRiaServices.Server.EntityFrameworkCore/Test/DbContextModel/Scenarios/ComplexTypes.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+
+#nullable enable
+
+#if NET8_0_OR_GREATER
+
+namespace EFCoreModels.Scenarios.ComplexTypes
+{
+
+    public class Address
+    {
+        public required string AddressLine { get; set; }
+        public required string City { get; set; }
+    }
+
+    public class ContactInfo
+    {
+        public required Address Address { get; set; }
+
+        public required string HomePhone { get; set; }
+
+        public int PossibleId { get; set; }
+    }
+
+    public class Employee
+    {
+        public int EmployeeId { get; set; }
+        public required ContactInfo ContactInfo { get; set; }
+    }
+
+    public class ComplexTypesDbContext : DbContext
+    {
+        public ComplexTypesDbContext()
+        {
+        }
+
+        public ComplexTypesDbContext(DbContextOptions<ComplexTypesDbContext> options)
+            : base(options)
+        {
+        }
+
+        public DbSet<Employee> Employees { get; set; }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            // add concurrencymode = Fixed on all "Owned types" ??
+
+            modelBuilder.Owned<Address>();
+            //modelBuilder.Owned<ContactInfo>();
+
+            modelBuilder.Entity<Employee>()
+                .ComplexProperty(typeof(ContactInfo), nameof(Employee.ContactInfo), x =>
+                {
+                    x.Property(nameof(ContactInfo.HomePhone)).HasMaxLength(24);
+                    x.ComplexProperty(typeof(Address), nameof(ContactInfo.Address), address =>
+                    {
+                        address.Property(nameof(Address.AddressLine)).HasMaxLength(100);
+                        address.Property(nameof(Address.City)).HasMaxLength(50);
+                    });
+                })
+                .HasKey(e => e.EmployeeId)
+                ;
+
+            base.OnModelCreating(modelBuilder);
+        }
+
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (!optionsBuilder.IsConfigured)
+            {
+                optionsBuilder.UseSqlServer("Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True");
+            }
+        }
+    }
+}
+#endif

src/OpenRiaServices.Server.EntityFrameworkCore/Test/DbContextModel/Scenarios/OwnedTypes.cs

@@ -0,0 +1,81 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+
+#nullable enable
+
+#if NET8_0_OR_GREATER
+
+namespace EFCoreModels.Scenarios.OwnedTypes
+{
+
+    public class Address
+    {
+        public required string AddressLine { get; set; }
+        public required string City { get; set; }
+    }
+
+    public class ContactInfo
+    {
+        public required Address Address { get; set; }
+
+        public required string HomePhone { get; set; }
+
+        public int PossibleId { get; set; }
+    }
+
+    public class Employee
+    {
+        public int EmployeeId { get; set; }
+        public required ContactInfo ContactInfo { get; set; }
+    }
+
+    // TODO: Owned typed with "backwards" FK
+    public class OwnedTypesDbContext : DbContext
+    {
+        public OwnedTypesDbContext()
+        {
+        }
+
+        public OwnedTypesDbContext(DbContextOptions<OwnedTypesDbContext> options)
+            : base(options)
+        {
+        }
+
+        public DbSet<Employee> Employees { get; set; }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            // add concurrencymode = Fixed on all "Owned types" ??
+
+            modelBuilder.Owned<Address>();
+            //modelBuilder.Owned<ContactInfo>();
+
+            modelBuilder.Entity<Employee>()
+                .OwnsOne(typeof(ContactInfo), nameof(Employee.ContactInfo), x =>
+                {
+                    x.Property(nameof(ContactInfo.HomePhone)).HasMaxLength(24);
+                    x.OwnsOne(typeof(Address), nameof(ContactInfo.Address), address =>
+                    {
+                        address.Property(nameof(Address.AddressLine)).HasMaxLength(100);
+                        address.Property(nameof(Address.City)).HasMaxLength(50);
+                    });
+                })
+                .HasKey(e => e.EmployeeId)
+                ;
+
+            base.OnModelCreating(modelBuilder);
+        }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (!optionsBuilder.IsConfigured)
+            {
+                optionsBuilder.UseSqlServer("Data Source=(localdb)\\MSSQLLocalDB;Initial Catalog=AdventureWorks;Integrated Security=True;MultipleActiveResultSets=True");
+            }
+        }
+    }
+}
+#endif

src/OpenRiaServices.Server.EntityFrameworkCore/Test/OpenRiaServices.Server.EntityFrameworkCore.Test/DomainServiceDescriptionTests.cs

@@ -0,0 +1,95 @@
+using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
+using OwnedTypes = EFCoreModels.Scenarios.OwnedTypes;
+using ComplexTypes = EFCoreModels.Scenarios.ComplexTypes;
+using MSTest = Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace OpenRiaServices.Server.EntityFrameworkCore.Test
+{
+    [TestClass]
+    public class DomainServiceDescriptionTests
+    {
+        /// <summary>
+        /// Verify that the EF metadata provider is registered for mapped CTs, and that attribute are inferred properly
+        /// </summary>
+        [TestMethod]
+        public void ComplexType_EFCore_OwnedTypes()
+        {
+            DomainServiceDescription dsd = DomainServiceDescription.GetDescription(typeof(EFCoreOwnedTypesService));
+
+            CollectionAssert.AreEquivalent(dsd.EntityTypes.ToList(), new[] { typeof(OwnedTypes.Employee) });
+            CollectionAssert.AreEquivalent(dsd.ComplexTypes.ToList(), new[] { typeof(OwnedTypes.Address), typeof(OwnedTypes.ContactInfo) });
+
+            var employee = TypeDescriptor.GetProperties(typeof(OwnedTypes.Employee));
+            Assert.IsNotNull(employee[nameof(OwnedTypes.Employee.EmployeeId)]!.Attributes[typeof(KeyAttribute)]);
+
+            // the HomePhone member is mapped as non-nullable, with a max length of 24. Verify attributes
+            // were inferred
+            var contactInfo = TypeDescriptor.GetProperties(typeof(OwnedTypes.ContactInfo));
+            var homePhone = contactInfo[nameof(OwnedTypes.ContactInfo.HomePhone)]!;
+            Assert.IsNotNull(homePhone.Attributes[typeof(RequiredAttribute)]);
+            StringLengthAttribute sl = (StringLengthAttribute)homePhone.Attributes[typeof(StringLengthAttribute)]!;
+            Assert.AreEqual(24, sl.MaximumLength);
+
+
+            // the AddressLine1 member is mapped as non-nullable, with a max length of 100. Verify attributes
+            // were inferred
+            var address = TypeDescriptor.GetProperties(typeof(OwnedTypes.Address));
+            var addressLine = address[nameof(OwnedTypes.Address.AddressLine)]!;
+            Assert.IsNotNull(addressLine.Attributes[typeof(RequiredAttribute)]);
+            sl = (StringLengthAttribute)addressLine.Attributes[typeof(StringLengthAttribute)]!;
+            Assert.AreEqual(100, sl.MaximumLength);
+        }
+        /// <summary>
+        /// Verify that the EF metadata provider is registered for mapped CTs, and that attribute are inferred properly
+        /// </summary>
+        [TestMethod]
+        [MSTest.Ignore("Does not work yet, attributes are not discovered on ComplexObjects")]
+        public void ComplexType_EFCore_ComplexTypes()
+        {
+            DomainServiceDescription dsd = DomainServiceDescription.GetDescription(typeof(EFCoreComplexTypesService));
+
+            CollectionAssert.AreEquivalent(dsd.EntityTypes.ToList(), new[] { typeof(ComplexTypes.Employee) });
+            CollectionAssert.AreEquivalent(dsd.ComplexTypes.ToList(), new[] { typeof(ComplexTypes.Address), typeof(ComplexTypes.ContactInfo) });
+
+            var employee = TypeDescriptor.GetProperties(typeof(ComplexTypes.Employee));
+            Assert.IsNotNull(employee[nameof(ComplexTypes.Employee.EmployeeId)]!.Attributes[typeof(KeyAttribute)]);
+
+            // the HomePhone member is mapped as non-nullable, with a max length of 24. Verify attributes
+            // were inferred
+            var contactInfo = TypeDescriptor.GetProperties(typeof(ComplexTypes.ContactInfo));
+            var homePhone = contactInfo[nameof(ComplexTypes.ContactInfo.HomePhone)]!;
+
+            Assert.IsNotNull(homePhone.Attributes[typeof(RequiredAttribute)]);
+            StringLengthAttribute sl = (StringLengthAttribute)homePhone.Attributes[typeof(StringLengthAttribute)]!;
+            Assert.AreEqual(24, sl.MaximumLength);
+
+
+            // the AddressLine1 member is mapped as non-nullable, with a max length of 100. Verify attributes
+            // were inferred
+            var address = TypeDescriptor.GetProperties(typeof(ComplexTypes.Address));
+            var addressLine = address[nameof(ComplexTypes.Address.AddressLine)]!;
+            Assert.IsNotNull(addressLine.Attributes[typeof(RequiredAttribute)]);
+            sl = (StringLengthAttribute)addressLine.Attributes[typeof(StringLengthAttribute)]!;
+            Assert.AreEqual(100, sl.MaximumLength);
+        }
+    }
+
+    [EnableClientAccess]
+    public class EFCoreOwnedTypesService : DbDomainService<OwnedTypes.OwnedTypesDbContext>
+    {
+        public IQueryable<OwnedTypes.Employee> GetCustomers()
+        {
+            return null!;
+        }
+    }
+
+    [EnableClientAccess]
+    public class EFCoreComplexTypesService : DbDomainService<ComplexTypes.ComplexTypesDbContext>
+    {
+        public IQueryable<ComplexTypes.Employee> GetCustomers()
+        {
+            return null!;
+        }
+    }
+}

src/OpenRiaServices.Server.EntityFrameworkCore/Test/OpenRiaServices.Server.EntityFrameworkCore.Test/OpenRiaServices.Server.EntityFrameworkCore.Test.csproj

@@ -0,0 +1,31 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+
+    <IsPackable>false</IsPackable>
+    <IsTestProject>true</IsTestProject>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.3.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.3.1" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Framework\OpenRiaServices.Server.EntityFrameworkCore.csproj" />
+    <ProjectReference Include="..\DbContextModel\EFCoreModels.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Using Include="Microsoft.VisualStudio.TestTools.UnitTesting" />
+  </ItemGroup>
+
+</Project>

src/RiaServices.sln

@@ -155,6 +155,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaservices.EndToEnd.Wc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OpenRiaservices.EndToEnd.AspNetCore.Test", "Test\OpenRiaservices.EndToEnd.AspNetCore.Test\OpenRiaservices.EndToEnd.AspNetCore.Test.csproj", "{17F902F4-7254-4FB9-9AF6-B3291B129B45}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRiaServices.Server.EntityFrameworkCore.Test", "OpenRiaServices.Server.EntityFrameworkCore\Test\OpenRiaServices.Server.EntityFrameworkCore.Test\OpenRiaServices.Server.EntityFrameworkCore.Test.csproj", "{76DBD075-9DC2-4583-8BAB-2713E60F555B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -377,6 +379,10 @@ Global
 		{17F902F4-7254-4FB9-9AF6-B3291B129B45}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{17F902F4-7254-4FB9-9AF6-B3291B129B45}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{17F902F4-7254-4FB9-9AF6-B3291B129B45}.Release|Any CPU.Build.0 = Release|Any CPU
+		{76DBD075-9DC2-4583-8BAB-2713E60F555B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{76DBD075-9DC2-4583-8BAB-2713E60F555B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{76DBD075-9DC2-4583-8BAB-2713E60F555B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{76DBD075-9DC2-4583-8BAB-2713E60F555B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -449,6 +455,7 @@ Global
 		{27DB096E-8794-4B9A-B3D0-AF74926DF9FD} = {BB0E26DD-14D3-4CD5-8F2B-B5C1CA281719}
 		{9428260A-EA94-430D-9A1A-CB9830B9E8EE} = {27DB096E-8794-4B9A-B3D0-AF74926DF9FD}
 		{17F902F4-7254-4FB9-9AF6-B3291B129B45} = {27DB096E-8794-4B9A-B3D0-AF74926DF9FD}
+		{76DBD075-9DC2-4583-8BAB-2713E60F555B} = {E8CAC11B-50B6-4243-A12A-D831EBB064CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C135CEC9-180C-4B67-92AC-3342375AE14C}