Fix DateTimeOffset as Variable

octokit · Apr 6, 2020 · 28d3a6b · 28d3a6b
1 parent a0ae8ec
commit 28d3a6b
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 1 deletion.
diff --git a/Octokit.GraphQL.Core/Core/Syntax/VariableDefinition.cs b/Octokit.GraphQL.Core/Core/Syntax/VariableDefinition.cs
@@ -31,6 +31,10 @@ public static string ToTypeName(Type type, bool isNullable)
             {
                 name = "Boolean";
             }
+            else if (type == typeof(DateTimeOffset))
+            {
+                name = "DateTime";
+            }
             else if (type.IsConstructedGenericType && type.GetGenericTypeDefinition() == typeof(IEnumerable<>))
             {
                 var inner = ToTypeName(type.GenericTypeArguments[0], false);

diff --git a/Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs b/Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs
@@ -1,4 +1,6 @@
-using System.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 using System.Threading.Tasks;
 using Octokit.GraphQL.Core;
 using Octokit.GraphQL.IntegrationTests.Utilities;
@@ -78,5 +80,23 @@ public async Task Viewer_By_GraphyQL_Matches_Api()
             //PublicGists
             //TotalPrivateRepos
         }
+
+        [IntegrationTest]
+        public async Task DateTime_Filter_Works()
+        {
+            var query = new GraphQL.Query()
+                        .Viewer.ContributionsCollection(from: Variable.Var("start"))
+                        .Select(c => c.User.Name);
+
+            var vars = new Dictionary<string, object>
+            {
+                { "start", new DateTimeOffset(2000, 1, 2, 3, 4, 5, default) }
+            };
+
+            var response = await Connection.Run(query.Compile(), vars);
+
+            // no server error
+            Assert.NotNull(response);
+        }
     }
 }
diff --git a/Octokit.GraphQL.UnitTests/QueryBuilderTests.cs b/Octokit.GraphQL.UnitTests/QueryBuilderTests.cs
@@ -317,5 +317,26 @@ ... on User {
 
             Assert.Equal(expected, query.ToString(), ignoreLineEndingDifferences: true);
         }
+
+        [Fact]
+        public void DateTimeOffsetVariable()
+        {
+            var expected = @"query($start: DateTime) {
+  user(login: ""grokys"") {
+    contributionsCollection(from: $start) {
+      latestRestrictedContributionDate
+    }
+  }
+}";
+
+            var expression = new Query()
+                             .User("grokys")
+                             .ContributionsCollection(@from: Variable.Var("start"))
+                             .Select(c => c.LatestRestrictedContributionDate);
+
+            var query = expression.Compile();
+
+            Assert.Equal(expected, query.ToString(), ignoreLineEndingDifferences: true);
+        }
     }
 }