Merge pull request #28 from graphql-dotnet/result-serialization

Result Serialization
graphql-dotnet · Mar 1, 2017 · ad6a84c · ad6a84c
2 parents 540a4ab + e32f4db
commit ad6a84c
Show file tree

Hide file tree

Showing 11 changed files with 160 additions and 107 deletions.
diff --git a/deps/graphql-dotnet b/deps/graphql-dotnet
diff --git a/src/GraphQL.Conventions/Attributes/MetaData/DefaultValueAttribute.cs b/src/GraphQL.Conventions/Attributes/MetaData/DefaultValueAttribute.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Reflection;
+using GraphQL.Conventions.Attributes;
+using GraphQL.Conventions.Types.Descriptors;
+
+namespace GraphQL.Conventions
+{
+    [AttributeUsage(Fields, AllowMultiple = true, Inherited = true)]
+    public class DefaultValueAttribute : MetaDataAttributeBase
+    {
+        private readonly object _defaultValue;
+
+        public DefaultValueAttribute(object defaultValue)
+            : base(AttributeApplicationPhase.Initialization)
+        {
+            _defaultValue = defaultValue;
+        }
+
+        public override void MapField(GraphFieldInfo entity, MemberInfo memberInfo)
+        {
+            entity.DefaultValue = _defaultValue;
+        }
+    }
+}
diff --git a/src/GraphQL.Conventions/CommonAssemblyInfo.cs b/src/GraphQL.Conventions/CommonAssemblyInfo.cs
@@ -7,9 +7,9 @@
 [assembly: AssemblyProduct("GraphQL.Conventions")]
 [assembly: AssemblyCopyright("Copyright 2016-2017 Tommy Lillehagen. All rights reserved.")]
 [assembly: AssemblyTrademark("")]
-[assembly: AssemblyVersion("1.1.7.0")]
-[assembly: AssemblyFileVersion("1.1.7.0")]
-[assembly: AssemblyInformationalVersion("1.1.7.0")]
+[assembly: AssemblyVersion("1.1.8.0")]
+[assembly: AssemblyFileVersion("1.1.8.0")]
+[assembly: AssemblyInformationalVersion("1.1.8.0")]
 [assembly: CLSCompliant(false)]
 
 [assembly: InternalsVisibleTo("GraphQL.Conventions.Tests")]
diff --git a/src/GraphQL.Conventions/Types/Descriptors/GraphFieldInfo.cs b/src/GraphQL.Conventions/Types/Descriptors/GraphFieldInfo.cs
@@ -7,14 +7,20 @@ namespace GraphQL.Conventions.Types.Descriptors
 {
     public class GraphFieldInfo : GraphEntityInfo
     {
+        private object _defaultValue = null;
+
         public GraphFieldInfo(ITypeResolver typeResolver, MemberInfo field = null)
             : base(typeResolver, field)
         {
         }
 
         public GraphTypeInfo DeclaringType { get; set; }
 
-        public object DefaultValue => Value ?? Type.DefaultValue;
+        public object DefaultValue
+        {
+            get { return _defaultValue ?? Value; }
+            set { _defaultValue = value; }
+        }
 
         public List<GraphArgumentInfo> Arguments { get; } =
             new List<GraphArgumentInfo>();

diff --git a/src/GraphQL.Conventions/Types/Resolution/Extensions/ReflectionExtensions.cs b/src/GraphQL.Conventions/Types/Resolution/Extensions/ReflectionExtensions.cs
@@ -22,6 +22,18 @@ public static bool IsGenericType(this TypeInfo type, Type genericType)
             return type.IsGenericType && type.GetGenericTypeDefinition() == genericType;
         }
 
+        public static bool IsNullableType(this TypeInfo type)
+        {
+            return type.IsGenericType(typeof(Nullable<>));
+        }
+
+        public static TypeInfo BaseType(this TypeInfo type)
+        {
+            return type.IsNullableType()
+                ? type.TypeParameter()
+                : type;
+        }
+
         public static TypeInfo TypeParameter(this TypeInfo type)
         {
             if (type.IsArray)

diff --git a/src/GraphQL.Conventions/Types/Resolution/ObjectReflector.cs b/src/GraphQL.Conventions/Types/Resolution/ObjectReflector.cs
@@ -292,7 +292,20 @@ private GraphArgumentInfo DeriveArgument(ParameterInfo parameterInfo)
             {
                 argument.Type = GetType(parameterTypeInfo);
             }
-            argument.DefaultValue = parameterInfo.HasDefaultValue ? parameterInfo.DefaultValue : null;
+
+            if (parameterInfo.HasDefaultValue)
+            {
+                var baseType = argument.Type.TypeRepresentation.BaseType();
+                if (baseType.IsEnum)
+                {
+                    argument.DefaultValue = Enum.ToObject(baseType.AsType(), parameterInfo.DefaultValue);
+                }
+                else
+                {
+                    argument.DefaultValue = parameterInfo.DefaultValue;
+                }
+            }
+
             _metaDataHandler.DeriveMetaData(argument, parameterInfo);
             return argument;
         }

diff --git a/src/GraphQL.Conventions/Web/RequestHandler.cs b/src/GraphQL.Conventions/Web/RequestHandler.cs
@@ -151,7 +151,23 @@ public async Task<Response> ProcessRequest(Request request, IUserContext userCon
                     .EnableValidation(_useValidation)
                     .Execute()
                     .ConfigureAwait(false);
-                return new Response(request, result, _engine.SerializeResult(result));
+
+                var response = new Response(request, result);
+                var errors = result?.Errors?.Where(e => !string.IsNullOrWhiteSpace(e?.Message));
+                foreach (var error in errors ?? new List<ExecutionError>())
+                {
+                    if (_exceptionsTreatedAsWarnings.Contains(error.InnerException.GetType()))
+                    {
+                        response.Warnings.Add(error);
+                    }
+                    else
+                    {
+                        response.Errors.Add(error);
+                    }
+                }
+                result.Errors = new ExecutionErrors(response.Errors);
+                response.Body = _engine.SerializeResult(result);
+                return response;
             }
 
             public Response Validate(Request request)
@@ -179,55 +195,41 @@ public string DescribeSchema(bool returnJson = false)
             const string IntrospectionQuery = @"
             query IntrospectionQuery {
                 __schema {
-                queryType { name }
-                mutationType { name }
-                subscriptionType { name }
-                types {
-                    ...FullType
-                }
-                directives {
-                    name
-                    description
-                    args {
-                    ...InputValue
+                    queryType { name }
+                    mutationType { name }
+                    subscriptionType { name }
+                    types { ...FullType }
+                    directives {
+                        name
+                        description
+                        args { ...InputValue }
+                        onOperation
+                        onFragment
+                        onField
                     }
-                    onOperation
-                    onFragment
-                    onField
-                }
                 }
             }
             fragment FullType on __Type {
                 kind
                 name
                 description
                 fields(includeDeprecated: true) {
-                name
-                description
-                args {
-                    ...InputValue
-                }
-                type {
-                    ...TypeRef
-                }
-                isDeprecated
-                deprecationReason
-                }
-                inputFields {
-                ...InputValue
-                }
-                interfaces {
-                ...TypeRef
+                    name
+                    description
+                    args { ...InputValue }
+                    type { ...TypeRef }
+                    isDeprecated
+                    deprecationReason
                 }
+                inputFields { ...InputValue }
+                interfaces { ...TypeRef }
                 enumValues(includeDeprecated: true) {
-                name
-                description
-                isDeprecated
-                deprecationReason
-                }
-                possibleTypes {
-                ...TypeRef
+                    name
+                    description
+                    isDeprecated
+                    deprecationReason
                 }
+                possibleTypes { ...TypeRef }
             }
             fragment InputValue on __InputValue {
                 name
@@ -236,20 +238,20 @@ fragment InputValue on __InputValue {
                 defaultValue
             }
             fragment TypeRef on __Type {
-                kind
-                name
-                ofType {
                 kind
                 name
                 ofType {
                     kind
                     name
                     ofType {
-                    kind
-                    name
+                        kind
+                        name
+                        ofType {
+                            kind
+                            name
+                        }
                     }
                 }
-                }
             }
             ";
             #endregion

diff --git a/src/GraphQL.Conventions/Web/Response.cs b/src/GraphQL.Conventions/Web/Response.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -8,40 +7,18 @@ public class Response
     {
         public Response(
             Request request,
-            ExecutionResult result,
-            string serializedResult,
-            List<Type> exceptionsTreatedAsWarnings = null)
+            ExecutionResult result)
         {
             Request = request;
             ExecutionResult = result;
-            Body = serializedResult;
-            PopulateErrorsAndWarnings(exceptionsTreatedAsWarnings);
         }
 
         public Response(
             Request request,
-            Validation.IValidationResult result,
-            List<Type> exceptionsTreatedAsWarnings = null)
+            Validation.IValidationResult result)
         {
             Request = request;
             ValidationResult = result;
-            PopulateErrorsAndWarnings(exceptionsTreatedAsWarnings);
-        }
-
-        private void PopulateErrorsAndWarnings(List<Type> exceptionsTreatedAsWarnings)
-        {
-            var errors = Errors?.Where(e => !string.IsNullOrWhiteSpace(e?.Message));
-            foreach (var error in errors ?? new List<ExecutionError>())
-            {
-                if (exceptionsTreatedAsWarnings.Contains(error.InnerException.GetType()))
-                {
-                    Warnings.Add(error);
-                }
-                else
-                {
-                    Errors.Add(error);
-                }
-            }
         }
 
         public Request Request { get; private set; }
@@ -52,7 +29,7 @@ private void PopulateErrorsAndWarnings(List<Type> exceptionsTreatedAsWarnings)
 
         public Validation.IValidationResult ValidationResult { get; private set; }
 
-        public string Body { get; }
+        public string Body { get; internal set; }
 
         public bool HasData => ExecutionResult?.Data != null;
 

diff --git a/src/GraphQL.Conventions/project.json b/src/GraphQL.Conventions/project.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.1.7-*",
+  "version": "1.1.8-*",
   "description": "GraphQL Conventions for .NET",
   "authors": [
     "Tommy Lillehagen"

diff --git a/test/Tests/Adapters/Engine/ErrorTests.cs b/test/Tests/Adapters/Engine/ErrorTests.cs
@@ -22,11 +22,10 @@ public async void Will_Provide_Path_And_Code_For_Errors_On_Fields_With_Operation
             var error = result.Errors.First();
             error.Message.ShouldEqual("Test error.");
             error.Code.ShouldEqual("ARGUMENT");
-            error.Path.Count.ShouldEqual(4);
-            error.Path[0].ShouldEqual("Blah");
-            error.Path[1].ShouldEqual("getObject");
-            error.Path[2].ShouldEqual("field");
-            error.Path[3].ShouldEqual("test");
+            error.Path.Count.ShouldEqual(3);
+            error.Path[0].ShouldEqual("getObject");
+            error.Path[1].ShouldEqual("field");
+            error.Path[2].ShouldEqual("test");
         }
 
         [Test]
@@ -43,11 +42,10 @@ public async void Will_Provide_Path_And_Code_For_Errors_On_Fields_Without_Operat
             var error = result.Errors.First();
             error.Message.ShouldEqual("Test error.");
             error.Code.ShouldEqual("ARGUMENT");
-            error.Path.Count.ShouldEqual(4);
-            error.Path[0].ShouldEqual(null);
-            error.Path[1].ShouldEqual("getObject");
-            error.Path[2].ShouldEqual("field");
-            error.Path[3].ShouldEqual("test");
+            error.Path.Count.ShouldEqual(3);
+            error.Path[0].ShouldEqual("getObject");
+            error.Path[1].ShouldEqual("field");
+            error.Path[2].ShouldEqual("test");
         }
 
         [Test]
@@ -64,11 +62,10 @@ public async void Will_Provide_Path_And_Code_For_Errors_On_Fields_With_Aliases()
             var error = result.Errors.First();
             error.Message.ShouldEqual("Test error.");
             error.Code.ShouldEqual("ARGUMENT");
-            error.Path.Count.ShouldEqual(4);
-            error.Path[0].ShouldEqual(null);
-            error.Path[1].ShouldEqual("yo");
-            error.Path[2].ShouldEqual("foo");
-            error.Path[3].ShouldEqual("bar");
+            error.Path.Count.ShouldEqual(3);
+            error.Path[0].ShouldEqual("yo");
+            error.Path[1].ShouldEqual("foo");
+            error.Path[2].ShouldEqual("bar");
         }
 
         [Test]
@@ -91,22 +88,20 @@ public async void Will_Provide_Path_And_Code_For_Errors_In_Array_Fields()
             var error = result.Errors.ElementAt(0);
             error.Message.ShouldEqual("Test error.");
             error.Code.ShouldEqual("ARGUMENT");
-            error.Path.Count.ShouldEqual(5);
-            error.Path[0].ShouldEqual("Blah");
-            error.Path[1].ShouldEqual("getObject");
-            error.Path[2].ShouldEqual("arrayField");
-            error.Path[3].ShouldEqual("1");
-            error.Path[4].ShouldEqual("test");
+            error.Path.Count.ShouldEqual(4);
+            error.Path[0].ShouldEqual("getObject");
+            error.Path[1].ShouldEqual("arrayField");
+            error.Path[2].ShouldEqual("1");
+            error.Path[3].ShouldEqual("test");
 
             error = result.Errors.ElementAt(1);
             error.Message.ShouldEqual("Test error.");
             error.Code.ShouldEqual("ARGUMENT");
-            error.Path.Count.ShouldEqual(5);
-            error.Path[0].ShouldEqual("Blah");
-            error.Path[1].ShouldEqual("getObject");
-            error.Path[2].ShouldEqual("arrayField");
-            error.Path[3].ShouldEqual("3");
-            error.Path[4].ShouldEqual("test");
+            error.Path.Count.ShouldEqual(4);
+            error.Path[0].ShouldEqual("getObject");
+            error.Path[1].ShouldEqual("arrayField");
+            error.Path[2].ShouldEqual("3");
+            error.Path[3].ShouldEqual("test");
         }
 
         class Query
+1 −1		appveyor.yml
+5 −0		docs/getting-started.md
+7 −7		docs/learn.md
+1 −1		package.json
+116 −0		src/GraphQL.Tests/BasicQueryTestBase.cs
+79 −0		src/GraphQL.Tests/Bugs/Bug252ExecutorAppliesFIeldBuilderOnce.cs
+20 −0		src/GraphQL.Tests/Bugs/Bug271DateTimeInStringGraphTypeTests.cs
+82 −0		src/GraphQL.Tests/Conversion/FieldNameConverterTests.cs
+0 −79		src/GraphQL.Tests/Execution/RegisteredInstanceTests.cs
+2 −2		src/GraphQL.Tests/Execution/UnionInterfaceTests.cs
+34 −11		src/GraphQL.Tests/QueryTestBase.cs
+2 −5		src/GraphQL.Tests/Types/ComplexGraphTypeTests.cs
+3 −1		src/GraphQL.Tests/Utilities/SchemaPrinterTests.cs
+1 −1		src/GraphQL/Conversion/DateTimeConverter.cs
+59 −0		src/GraphQL/Conversion/IFieldNameConverter.cs
+4 −3		src/GraphQL/Execution/DocumentExecuter.cs
+9 −1		src/GraphQL/Execution/ExecutionErrors.cs
+3 −0		src/GraphQL/Execution/ExecutionOptions.cs
+12 −5		src/GraphQL/Execution/ExecutionResultJsonConverter.cs
+1 −2		src/GraphQL/Http/DocumentWriter.cs
+0 −1		src/GraphQL/ObjectExtensions.cs
+15 −4		src/GraphQL/StringExtensions.cs
+3 −4		src/GraphQL/Types/ComplexGraphType.cs
+15 −6		src/GraphQL/Types/GraphTypesLookup.cs
+7 −2		src/GraphQL/Types/Schema.cs
+12 −1		src/GraphQL/Utilities/SchemaPrinter.cs
+1 −1		src/GraphQL/project.json