fix property ignores from base classes

asemio · Jan 18, 2021 · 026f2b5 · 026f2b5
1 parent a327cb8
commit 026f2b5
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 6 deletions.
diff --git a/OttoTheGeek.Tests/ScalarObjectQueryResolverTests.cs b/OttoTheGeek.Tests/ScalarObjectQueryResolverTests.cs
@@ -22,7 +22,12 @@ protected override SchemaBuilder ConfigureSchema(SchemaBuilder builder)
                 return builder.GraphType<SimpleScalarQueryModel<ChildObject>>(b =>
                     b.Named("Query").LooseScalarField(x => x.Child)
                         .ResolvesVia<ChildResolver>()
-                );
+                ).GraphType<ChildObject>(BuildChildObject);
+            }
+
+            private GraphTypeBuilder<ChildObject> BuildChildObject(GraphTypeBuilder<ChildObject> builder)
+            {
+                return builder.IgnoreProperty(x => x.Ignored);
             }
         }
 
@@ -34,7 +39,11 @@ public Task<ChildObject> Resolve()
             }
         }
 
-        public sealed class ChildObject
+        public class ChildObjectBase
+        {
+            public int Ignored { get; set; }
+        }
+        public sealed class ChildObject : ChildObjectBase
         {
             public string Value1 => "hello";
             public string Value2 => "world";
@@ -82,6 +91,45 @@ public void BuildsSchemaType()
             queryType.Should().BeEquivalentTo(expectedType);
         }
 
+        [Fact]
+        public void BuildsChildObjectType()
+        {
+            var server = new WorkingModel().CreateServer();
+
+            var rawResult = server.Execute<JObject>(@"{
+                __type(name:""ChildObject"") {
+                    name
+                    kind
+                    fields {
+                        name
+                    }
+                }
+            }");
+
+            var expectedType = new ObjectType {
+                Kind = ObjectKinds.Object,
+                Name = "ChildObject",
+                Fields = new [] {
+                    new ObjectField
+                    {
+                        Name = "value1"
+                    },
+                    new ObjectField
+                    {
+                        Name = "value2"
+                    },
+                    new ObjectField
+                    {
+                        Name = "value3"
+                    },
+                }
+            };
+
+            var queryType = rawResult["__type"].ToObject<ObjectType>();
+
+            queryType.Should().BeEquivalentTo(expectedType);
+        }
+
         [Fact]
         public void ReturnsObjectValues()
         {

diff --git a/OttoTheGeek/GraphTypeBuilder.cs b/OttoTheGeek/GraphTypeBuilder.cs
@@ -123,7 +123,7 @@ public ComplexGraphType<TModel> BuildGraphType (GraphTypeCache cache, IServiceCo
                 return cache.GetOrCreate<TModel> (services);
             }
 
-            foreach (var prop in typeof (TModel).GetProperties ().Except (_config.PropsToIgnore)) {
+            foreach (var prop in typeof (TModel).GetProperties ().Where(x => !_config.IsPropertyIgnored(x))) {
                 var fieldConfig = _config.GetFieldConfig(prop);
                 fieldConfig.ConfigureField(graphType, cache, services);
             }

diff --git a/OttoTheGeek/Internal/GraphTypeConfiguration.cs b/OttoTheGeek/Internal/GraphTypeConfiguration.cs
@@ -56,6 +56,12 @@ public GraphTypeConfiguration<T> ConfigureField(PropertyInfo prop, Func<FieldCon
             return Clone(fieldConfig: _fieldConfig.Add(prop, newConfig));
         }
 
+        public bool IsPropertyIgnored(PropertyInfo prop)
+        {
+            return PropsToIgnore
+                .Any(x => x.DeclaringType == prop.DeclaringType && x.Name == prop.Name);
+        }
+
         public FieldConfiguration<T> GetFieldConfig(PropertyInfo prop)
         {
             return _fieldConfig.Get(prop)

diff --git a/OttoTheGeek/Internal/ListFieldBuilder.cs b/OttoTheGeek/Internal/ListFieldBuilder.cs
@@ -1,6 +1,3 @@
-using System;
-using System.Collections.Generic;
-using System.Linq.Expressions;
 using System.Reflection;
 
 namespace OttoTheGeek.Internal