Fixes the sort order in GraphQL queries. (#17476)

Author: gvkries

src/OrchardCore/OrchardCore.ContentManagement.GraphQL/Queries/ContentItemsFieldType.cs

@@ -362,7 +362,7 @@ private static IQuery<ContentItem, ContentItemIndex> OrderBy(IQuery<ContentItem,
 
                 foreach (var property in orderByArguments)
                 {
-                    var direction = (OrderByDirection)property.Value.Value<int>();
+                    var direction = property.Value.GetEnumValue<OrderByDirection>();
 
                     Expression<Func<ContentItemIndex, object>> selector = null;
 

test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/DynamicContentTypeQueryTests.cs

@@ -109,4 +109,83 @@ public async Task ShouldQueryMultipleContentFields()
 
         Assert.Equal(context.Product2ContentItemId, result["data"]["product"].AsArray().First()["contentItemId"].ToString());
     }
+
+    [Fact]
+    public async Task ShouldOrderByCreatedUtc()
+    {
+        using var context = new DynamicContentTypeContext();
+        await context.InitializeAsync();
+
+        var resultAsc = await context
+            .GraphQLClient
+            .Content
+            .Query(@"product(orderBy: {createdUtc: ASC}) {
+                        contentItemId
+                        displayText
+                        createdUtc
+                    }");
+
+        var resultDesc = await context
+            .GraphQLClient
+            .Content
+            .Query(@"product(orderBy: {createdUtc: DESC}) {
+                        contentItemId
+                        displayText
+                        createdUtc
+                    }");
+
+        Assert.Equal(new DateTime(2024, 04, 07, 0, 0, 0, DateTimeKind.Utc), resultAsc["data"]["product"].AsArray().First()["createdUtc"].GetValue<DateTime>());
+        Assert.Equal(new DateTime(2024, 05, 18, 0, 0, 0, DateTimeKind.Utc), resultDesc["data"]["product"].AsArray().First()["createdUtc"].GetValue<DateTime>());
+    }
+
+    [Fact]
+    public async Task ShouldQuerySimilarNamedContentFields()
+    {
+        using var context = new DynamicContentTypeContext();
+        await context.InitializeAsync();
+
+        var numberResult = await context
+            .GraphQLClient
+            .Content
+            .Query(@"numberType(where: {value: 123}) {
+                        contentItemId
+                        displayText
+                        value
+                    }");
+
+        var stringResult = await context
+            .GraphQLClient
+            .Content
+            .Query(@"stringType(where: {value: ""Text123""}) {
+                        contentItemId
+                        displayText
+                        value
+                    }");
+
+        Assert.Single(numberResult["data"]["numberType"].AsArray());
+        Assert.Equal("123", numberResult["data"]["numberType"].AsArray().First()["value"].ToString());
+
+        Assert.Single(stringResult["data"]["stringType"].AsArray());
+        Assert.Equal("Text123", stringResult["data"]["stringType"].AsArray().First()["value"].ToString());
+    }
+
+    [Fact]
+    public async Task ShouldDistinquishMultipleNamedContentFields()
+    {
+        using var context = new DynamicContentTypeContext();
+        await context.InitializeAsync();
+
+        // Make sure values of field2 are not included by querying field1
+        var result = await context
+            .GraphQLClient
+            .Content
+            .Query(@"twoNumbersType(where: {field1: 200}) {
+                        contentItemId
+                        displayText
+                        field1
+                        field2
+                    }");
+
+        Assert.Empty(result["data"]["twoNumbersType"].AsArray());
+    }
 }

test/OrchardCore.Tests/Apis/GraphQL/ContentManagement/Recipes/DynamicContentTypeQueryTest.json

@@ -150,6 +150,7 @@
           "DisplayText": "Product 1",
           "Latest": true,
           "Published": true,
+          "CreatedUtc": "2024-04-07T00:00:00Z",
           "PricePart": {
             "Amount": {
               "Value": 10
@@ -175,6 +176,7 @@
           "DisplayText": "Product 2",
           "Latest": true,
           "Published": true,
+          "CreatedUtc": "2024-05-18T00:00:00Z",
           "PricePart": {
             "Amount": {
               "Value": 22