add support for owned entities

Author: SimonCropp

src/Directory.Build.props

@@ -2,7 +2,7 @@
 <Project>
   <PropertyGroup>
     <NoWarn>CS1591;NU5104;CS1573</NoWarn>
-    <Version>15.0.2</Version>
+    <Version>15.0.3</Version>
     <AssemblyVersion>1.0.0</AssemblyVersion>
     <PackageTags>EntityFrameworkCore, EntityFramework, GraphQL</PackageTags>
     <SignAssembly>false</SignAssembly>

src/GraphQL.EntityFramework/NavigationReader.cs

@@ -9,10 +9,16 @@ static class NavigationReader
 {
     public static IReadOnlyDictionary<Type, IReadOnlyList<Navigation>> GetNavigationProperties(IModel model)
     {
-        return model
-            .GetEntityTypes()
-            .Where(x => !x.IsOwned())
-            .ToDictionary(x => x.ClrType, GetNavigations);
+        var dictionary = new Dictionary<Type, IReadOnlyList<Navigation>>();
+        foreach (var property in model.GetEntityTypes())
+        {
+            if (!dictionary.ContainsKey(property.ClrType))
+            {
+                dictionary[property.ClrType] = GetNavigations(property);
+            }
+        }
+
+        return dictionary;
     }
 
     static IReadOnlyList<Navigation> GetNavigations(IEntityType entity)

src/Tests/IntegrationTests/Graphs/Owned/OwnedChild.cs

@@ -0,0 +1,7 @@
+using Microsoft.EntityFrameworkCore;
+
+[Owned]
+public class OwnedChild
+{
+    public string Property { get; set; } = null!;
+}

src/Tests/IntegrationTests/Graphs/Owned/OwnedChildGraph.cs

@@ -0,0 +1,13 @@
+using GraphQL;
+using GraphQL.EntityFramework;
+
+[GraphQLMetadata(nameof(OwnedChild))]
+public class OwnedChildGraph :
+    EfObjectGraphType<IntegrationDbContext, OwnedChild>
+{
+    public OwnedChildGraph(IEfGraphQLService<IntegrationDbContext> graphQlService) :
+        base(graphQlService)
+    {
+        AutoMap();
+    }
+}

src/Tests/IntegrationTests/Graphs/Owned/OwnedParent.cs

@@ -0,0 +1,10 @@
+using System;
+
+public class OwnedParent
+{
+    public Guid Id { get; set; } = Guid.NewGuid();
+    public string? Property { get; set; }
+
+    public OwnedChild Child1 { get; set; } = null!;
+    public OwnedChild Child2 { get; set; } = null!;
+}

src/Tests/IntegrationTests/Graphs/Owned/OwnedParentGraph.cs

@@ -0,0 +1,13 @@
+using GraphQL;
+using GraphQL.EntityFramework;
+
+[GraphQLMetadata(nameof(OwnedParent))]
+public class OwnedParentGraph :
+    EfObjectGraphType<IntegrationDbContext, OwnedParent>
+{
+    public OwnedParentGraph(IEfGraphQLService<IntegrationDbContext> graphQlService) :
+        base(graphQlService)
+    {
+        AutoMap();
+    }
+}

src/Tests/IntegrationTests/IntegrationTests.Owned.verified.txt

@@ -0,0 +1,21 @@
+{
+  target:
+{
+  "data": {
+    "ownedParent": {
+      "property": "Parent value",
+      "child1": {
+        "property": "Value1"
+      }
+    }
+  }
+},
+  sql: [
+    {
+      Text:
+SELECT TOP(2) [o].[Id], [o].[Property], [o].[Child1_Property], [o].[Child2_Property]
+FROM [OwnedParents] AS [o]
+WHERE [o].[Id] = 'Guid_1'
+    }
+  ]
+}

src/Tests/IntegrationTests/IntegrationTests.SchemaPrint.verified.txt

@@ -202,6 +202,17 @@ input OrderBy {
   descending: Boolean
 }
 
+type OwnedChild {
+  property: String!
+}
+
+type OwnedParent {
+  child1: OwnedChild!
+  child2: OwnedChild!
+  id: ID!
+  property: String
+}
+
 type PageInfo {
   hasNextPage: Boolean!
   hasPreviousPage: Boolean!
@@ -268,6 +279,7 @@ type Query {
   parentEntitiesViewConnection(after: String, first: Int, before: String, last: Int, where: [WhereExpression!], orderBy: [OrderBy!]): ParentViewConnection!
   parentEntityView(where: [WhereExpression!]): ParentView!
   parentEntityViewNullable(where: [WhereExpression!]): ParentView
+  ownedParent(id: ID, ids: [ID!], where: [WhereExpression!]): OwnedParent
 }
 
 type SkipLevelGraph {

src/Tests/IntegrationTests/IntegrationTests.cs

@@ -468,6 +468,29 @@ public async Task Single_Found_NoTracking()
         await RunQuery(database, query, null, null, true, new object[] {entity1, entity2});
     }
 
+    [Fact]
+    public async Task Owned()
+    {
+        var query = @"
+{
+  ownedParent(id: ""00000000-0000-0000-0000-000000000001"") {
+    property
+    child1 {
+      property
+    }
+  }
+}";
+        OwnedParent entity1 = new()
+        {
+            Id = Guid.Parse("00000000-0000-0000-0000-000000000001"),
+            Property = "Parent value",
+            Child1 = new OwnedChild { Property = "Value1" },
+            Child2 = new OwnedChild { Property = "Value2" }
+        };
+        await using var database = await sqlInstance.Build();
+        await RunQuery(database, query, null, null, false, new object[] { entity1 });
+    }
+
     [Fact]
     public async Task Single_Found()
     {

src/Tests/IntegrationTests/MyDataContext.cs

@@ -25,6 +25,7 @@ public class IntegrationDbContext :
     public DbSet<ManyToManyLeftEntity> ManyToManyLeftEntities { get; set; } = null!;
     public DbSet<ManyToManyRightEntity> ManyToManyRightEntities { get; set; } = null!;
     public DbSet<ManyToManyMiddleEntity> ManyToManyMiddleEntities { get; set; } = null!;
+    public DbSet<OwnedParent> OwnedParents { get; set; } = null!;
 
     public IntegrationDbContext(DbContextOptions options) :
         base(options)
@@ -56,6 +57,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.Entity<WithManyChildrenEntity>();
         modelBuilder.Entity<Child1Entity>();
         modelBuilder.Entity<NamedIdEntity>();
+        modelBuilder.Entity<OwnedParent>();
         modelBuilder.Entity<Child2Entity>();
         modelBuilder.Entity<DerivedEntity>().HasBaseType<InheritedEntity>();
         modelBuilder.Entity<DerivedWithNavigationEntity>()