Move contentById and contentAtRoot to sub fields

Closes #11

Author: rasmusjp

src/Our.Umbraco.GraphQL/Our.Umbraco.GraphQL.csproj

@@ -255,6 +255,8 @@
     <Compile Include="Schema\Conventions.cs" />
     <Compile Include="Types\ConnectionExtensions.cs" />
     <Compile Include="Types\ConnectionWithFilterBuilder.cs" />
+    <Compile Include="Types\PublishedContentAtRootQuery.cs" />
+    <Compile Include="Types\PublishedContentQuery.cs" />
     <Compile Include="Web\AppBuilderExtensions.cs" />
     <Compile Include="Web\GraphQLServerOptions.cs" />
     <Compile Include="Web\GraphQLMiddleware.cs" />

src/Our.Umbraco.GraphQL/Schema/UmbracoSchema.cs

@@ -76,29 +76,7 @@ public UmbracoSchema(
             RegisterTypes(mediaTypes.ToArray());
             // RegisterTypes(memberTypeService.GetAll().CreateGraphTypes(PublishedItemType.Member, resolveName).ToArray());
 
-            var query = new UmbracoQuery();
-
-
-
-            foreach (var type in documentTypes.FindAll(x => x.GetMetadata<bool>("allowedAtRoot")))
-            {
-                string documentTypeAlias = type.GetMetadata<string>("documentTypeAlias");
-
-                query.AddField(
-                    new FieldType
-                    {
-                        Name = type.GetMetadata<string>("documentTypeAlias"),
-                        ResolvedType = new ListGraphType(type),
-                        Resolver = new FuncFieldResolver<object>(context =>
-                        {
-                            var userContext = (UmbracoGraphQLContext)context.UserContext;
-                            return userContext.Umbraco.TypedContentAtXPath($"/root/{documentTypeAlias}");
-                        })
-                    }
-                );
-            }
-
-            Query = query;
+            Query = new UmbracoQuery(documentTypes);
         }
 
         public static IEnumerable<IGraphType> CreateGraphTypes(

src/Our.Umbraco.GraphQL/Types/PublishedContentAtRootQuery.cs

@@ -0,0 +1,41 @@
+using System.Collections.Generic;
+using System.Linq;
+using GraphQL.Resolvers;
+using GraphQL.Types;
+
+namespace Our.Umbraco.GraphQL.Types
+{
+    public class PublishedContentAtRootQuery : ObjectGraphType
+    {
+        public PublishedContentAtRootQuery(IEnumerable<IGraphType> documentGraphTypes)
+        {
+            Name = "PublishedContentAtRootQuery";
+
+            Field<NonNullGraphType<ListGraphType<PublishedContentGraphType>>>()
+                .Name("all")
+                .Resolve(context =>
+                {
+                    var userContext = (UmbracoGraphQLContext)context.UserContext;
+                    return userContext.Umbraco.TypedContentAtRoot();
+                });
+
+            foreach (var type in documentGraphTypes.Where(x => x.GetMetadata<bool>("allowedAtRoot")))
+            {
+                string documentTypeAlias = type.GetMetadata<string>("documentTypeAlias");
+
+                this.AddField(
+                    new FieldType
+                    {
+                        Name = type.Name,
+                        ResolvedType = new NonNullGraphType(new ListGraphType(type)),
+                        Resolver = new FuncFieldResolver<object>(context =>
+                        {
+                            var userContext = (UmbracoGraphQLContext)context.UserContext;
+                            return userContext.Umbraco.TypedContentAtXPath($"/root/{documentTypeAlias}");
+                        })
+                    }
+                );
+            }
+        }
+    }
+}

src/Our.Umbraco.GraphQL/Types/PublishedContentQuery.cs

@@ -0,0 +1,28 @@
+using System.Collections.Generic;
+using GraphQL.Types;
+
+namespace Our.Umbraco.GraphQL.Types
+{
+    public class PublishedContentQuery : ObjectGraphType
+    {
+        public PublishedContentQuery(IEnumerable<IGraphType> documentGraphTypes)
+        {
+            Name = "PublishedContentQuery";
+
+            Field<PublishedContentGraphType>()
+                .Name("byId")
+                .Argument<NonNullGraphType<IdGraphType>>("id", "The unique content id")
+                .Resolve(context =>
+                {
+                    var userContext = (UmbracoGraphQLContext)context.UserContext;
+                    var id = context.GetArgument<int>("id");
+                    return userContext.Umbraco.TypedContent(id);
+                });
+
+            Field<NonNullGraphType<PublishedContentAtRootQuery>>()
+                .Name("atRoot")
+                .Resolve(context => context.ReturnType)
+                .Type(new NonNullGraphType(new PublishedContentAtRootQuery(documentGraphTypes)));
+        }
+    }
+}

src/Our.Umbraco.GraphQL/Types/UmbracoQuery.cs

@@ -1,30 +1,16 @@
+using System.Collections.Generic;
 using GraphQL.Types;
-using Umbraco.Core.Models;
 
 namespace Our.Umbraco.GraphQL.Types
 {
-
     public class UmbracoQuery : ObjectGraphType
     {
-        public UmbracoQuery()
+        public UmbracoQuery(IEnumerable<IGraphType> documentTypes)
         {
-            Field<PublishedContentGraphType>()
+            Field<NonNullGraphType<PublishedContentQuery>>()
                 .Name("content")
-                .Argument<NonNullGraphType<IdGraphType>>("id", "The unique content id")
-                .Resolve(context =>
-                {
-                    var userContext = (UmbracoGraphQLContext)context.UserContext;
-                    var id = context.GetArgument<int>("id");
-                    return userContext.Umbraco.TypedContent(id);
-                });
-
-            Field<ListGraphType<PublishedContentGraphType>>()
-                .Name("contentAtRoot")
-                .Resolve(context =>
-                {
-                    var userContext = (UmbracoGraphQLContext)context.UserContext;
-                    return userContext.Umbraco.TypedContentAtRoot();
-                });
+                .Resolve(context => context.ReturnType)
+                .Type(new NonNullGraphType(new PublishedContentQuery(documentTypes)));
         }
     }
 }