Add spatial extensions to builder (#2566)

Co-authored-by: Michael Staib <michael@chillicream.com>
ChilliCream · Nov 16, 2020 · be49faa · be49faa
1 parent b2877e3
commit be49faa
Show file tree

Hide file tree

Showing 6 changed files with 72 additions and 26 deletions.
diff --git a/...ions/QueryableFilterProviderExtensions.cs → ...sions/QueryableFilterProviderExtension.cs b/...ions/QueryableFilterProviderExtensions.cs → ...sions/QueryableFilterProviderExtension.cs
@@ -2,14 +2,14 @@
 
 namespace HotChocolate.Data.Filters.Expressions
 {
-    public class QueryableFilterProviderExtensions
+    public class QueryableFilterProviderExtension
         : FilterProviderExtensions<QueryableFilterContext>
     {
-        public QueryableFilterProviderExtensions()
+        public QueryableFilterProviderExtension()
         {
         }
 
-        public QueryableFilterProviderExtensions(
+        public QueryableFilterProviderExtension(
             Action<IFilterProviderDescriptor<QueryableFilterContext>> configure)
             : base(configure)
         {

diff --git a/src/HotChocolate/Data/test/Data.Filters.Tests/Convention/FilterConventionTests.cs b/src/HotChocolate/Data/test/Data.Filters.Tests/Convention/FilterConventionTests.cs
@@ -418,7 +418,7 @@ public void FilterProvider_Throws_Exception_When_NotInitializedByConvention()
             return builder.Create();
         }
 
-        public class MockFilterProviderExtensionConvention : QueryableFilterProviderExtensions
+        public class MockFilterProviderExtensionConvention : QueryableFilterProviderExtension
         {
             protected override void Configure(
                 IFilterProviderDescriptor<QueryableFilterContext> descriptor)

diff --git a/...ial/src/Data/Filters/Convention/Extensions/SpatialFilterConventionDescriptorExtensions.cs b/...ial/src/Data/Filters/Convention/Extensions/SpatialFilterConventionDescriptorExtensions.cs
@@ -1,10 +1,30 @@
 using System;
+using HotChocolate.Data.Filters.Expressions;
 using NetTopologySuite.Geometries;
 
 namespace HotChocolate.Data.Filters.Spatial
 {
     public static class SpatialFilterConventionDescriptorExtensions
     {
+        /// <summary>
+        /// Adds the spatial filter defaults
+        /// </summary>
+        public static IFilterConventionDescriptor AddSpatialDefaults(
+            this IFilterConventionDescriptor descriptor)
+        {
+            if (descriptor is null)
+            {
+                throw new ArgumentNullException(nameof(descriptor));
+            }
+
+            descriptor.AddSpatialOperations();
+            descriptor.BindSpatialTypes();
+            descriptor.AddProviderExtension(
+                new QueryableFilterProviderExtension(p => p.AddSpatialHandlers()));
+
+            return descriptor;
+        }
+
         /// <summary>
         /// The default names of the spatial filter operations
         /// </summary>

diff --git a/...e/Spatial/src/Data/Filters/Extensions/SpatialFilteringRequestExecutorBuilderExtensions.cs b/...e/Spatial/src/Data/Filters/Extensions/SpatialFilteringRequestExecutorBuilderExtensions.cs
@@ -0,0 +1,22 @@
+using System;
+using HotChocolate.Data.Filters;
+using HotChocolate.Data.Filters.Spatial;
+using HotChocolate.Execution.Configuration;
+using Microsoft.Extensions.DependencyInjection;
+
+namespace HotChocolate
+{
+    public static class SpatialFilteringRequestExecutorBuilderExtensions
+    {
+        public static IRequestExecutorBuilder AddSpatialFiltering(
+            this IRequestExecutorBuilder builder)
+        {
+            if (builder is null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder.ConfigureSchema(x => x.AddSpatialFiltering());
+        }
+    }
+}
diff --git a/...tChocolate/Spatial/src/Data/Filters/Extensions/SpatialFilteringSchemaBuilderExtensions.cs b/...tChocolate/Spatial/src/Data/Filters/Extensions/SpatialFilteringSchemaBuilderExtensions.cs
@@ -0,0 +1,20 @@
+using System;
+using HotChocolate.Data.Filters;
+using HotChocolate.Data.Filters.Spatial;
+
+namespace HotChocolate
+{
+    public static class SpatialFilteringSchemaBuilderExtensions
+    {
+        public static ISchemaBuilder AddSpatialFiltering(this ISchemaBuilder builder)
+        {
+            if (builder is null)
+            {
+                throw new ArgumentNullException(nameof(builder));
+            }
+
+            return builder.AddConvention<IFilterConvention>(
+                new FilterConventionExtension(x => x.AddSpatialDefaults()));
+        }
+    }
+}
diff --git a/src/HotChocolate/Spatial/test/Data.Filters.SqlServer.Tests/FilterVisitorTestBase.cs b/src/HotChocolate/Spatial/test/Data.Filters.SqlServer.Tests/FilterVisitorTestBase.cs
@@ -49,16 +49,11 @@ public FilterVisitorTestBase(PostgreSqlResource<PostgisConfig> resource)
             Func<IResolverContext, IEnumerable<TEntity>> resolver =
                 await BuildResolverAsync(entities);
 
-            ISchemaBuilder builder = SchemaBuilder.New()
+            return await new ServiceCollection()
+                .AddGraphQL()
+                .AddFiltering()
                 .AddSpatialTypes()
-                .AddFiltering(
-                    x => x
-                        .AddDefaults()
-                        .AddSpatialOperations()
-                        .BindSpatialTypes()
-                        .Provider(
-                            new QueryableFilterProvider(
-                                p => p.AddSpatialHandlers().AddDefaultFieldHandlers())))
+                .AddSpatialFiltering()
                 .AddQueryType(
                     c => c
                         .Name("Query")
@@ -82,14 +77,7 @@ public FilterVisitorTestBase(PostgreSqlResource<PostgisConfig> resource)
                                     }
                                 }
                             })
-                        .UseFiltering<T>());
-
-            ISchema schema = builder.Create();
-            return new ServiceCollection()
-                .Configure<RequestExecutorSetup>(
-                    Schema.DefaultName,
-                    o => o.Schema = schema)
-                .AddGraphQL()
+                        .UseFiltering<T>())
                 .UseRequest(
                     next => async context =>
                     {
@@ -105,11 +93,7 @@ public FilterVisitorTestBase(PostgreSqlResource<PostgisConfig> resource)
                         }
                     })
                 .UseDefaultPipeline()
-                .Services
-                .BuildServiceProvider()
-                .GetRequiredService<IRequestExecutorResolver>()
-                .GetRequestExecutorAsync()
-                .Result;
+                .BuildRequestExecutorAsync();
         }
     }
 }