Deseralization errors

- Fix facet & autocomplete serialization error
- Fix potential bug when build OrderBy

Author: ManhOptimizely

APIs/src/EpiServer.ContentGraph/Api/Querying/GraphQueryBuilder.cs

@@ -238,7 +238,7 @@ public async Task<ContentGraphResult> GetResultAsync()
         /// </summary>
         /// <returns>string</returns>
         /// <exception cref="ServiceException"></exception>
-        public async Task<string?> GetRawResultAsync()
+        public async Task<string> GetRawResultAsync()
         {
             string url = GetServiceUrl();
 
@@ -253,8 +253,7 @@ public async Task<ContentGraphResult> GetResultAsync()
                     AdditionalInformation(jsonRequest, body);
                     using (var reader = new StreamReader(await jsonRequest.GetResponseStream(body), jsonRequest.Encoding))
                     {
-                        var jsonReader = new JsonTextReader(reader);
-                        return jsonReader.ReadAsString();
+                        return await reader.ReadToEndAsync();
                     }
                 }
                 catch (AggregateException asyncException)

APIs/src/EpiServer.ContentGraph/Api/Querying/TypeQueryBuilder.cs

@@ -582,10 +582,11 @@ public override GraphQueryBuilder ToQuery()
                 if (!graphObject.OrderBy.IsNullOrEmpty())
                 {
                     graphObject.OrderBy = $"orderBy:{{{graphObject.OrderBy}}}";
+                    graphObject.Filter = graphObject.Filter.IsNullOrEmpty() ? graphObject.OrderBy : $"{graphObject.Filter},{graphObject.OrderBy}";
                 }
-                if (!graphObject.Locale.IsNullOrEmpty() || !graphObject.Filter.IsNullOrEmpty() || !graphObject.WhereClause.IsNullOrEmpty() || !graphObject.OrderBy.IsNullOrEmpty())
+                if (!graphObject.Locale.IsNullOrEmpty() || !graphObject.Filter.IsNullOrEmpty() || !graphObject.WhereClause.IsNullOrEmpty())
                 {
-                    graphObject.Filter = $"({graphObject.Locale}{graphObject.Filter}{graphObject.WhereClause}{graphObject.OrderBy})";
+                    graphObject.Filter = $"({graphObject.Locale}{graphObject.Filter}{graphObject.WhereClause})";
                 }
                 if (!graphObject.Facets.IsNullOrEmpty())
                 {

APIs/src/EpiServer.ContentGraph/Api/Result/ContentGraphHits.cs

@@ -27,7 +27,7 @@ public Dictionary<string, IEnumerable<Facet>> Facets
                     facets = new Dictionary<string, IEnumerable<Facet>>();
                     foreach (var key in keys)
                     {
-                        facets.Add(key, RawFacets[key].ToObject<IEnumerable<Facet>>());
+                        GetJArray(RawFacets[key], key, facets);
                     }
                 }
                 return facets;
@@ -48,19 +48,47 @@ public Dictionary<string, IEnumerable<string>> AutoComplete
                     autocompletes = new Dictionary<string, IEnumerable<string>>();
                     foreach (var key in keys)
                     {
-                        autocompletes.Add(key, RawAutoComplete[key].ToObject<IEnumerable<string>>());
+                        GetJArray(RawAutoComplete[key], key, autocompletes);
                     }
                 }
                 return autocompletes;
             }
         }
         [JsonProperty("facets")]
-        private Dictionary<string, JArray> RawFacets { get; set; }
+        private Dictionary<string, object> RawFacets { get; set; }
         [JsonProperty("autocomplete")]
-        private Dictionary<string, JArray> RawAutoComplete { get; set; }
+        private Dictionary<string, object> RawAutoComplete { get; set; }
         [JsonProperty("cursor")]
         public string Cursor { get; set; }
         [JsonProperty("total")]
         public int Total { get; set; }
+        private void GetJArray<TReturn>(object jObject, string key, Dictionary<string, IEnumerable<TReturn>> keyValues)
+        {
+            switch (jObject.GetType().Name)
+            {
+                case "JObject":
+                    foreach (var token in ((JObject)jObject).Values())
+                    {
+                        string tempKey = key;
+                        if (token.GetType() == typeof(JArray))
+                        {
+                            tempKey = $"{tempKey}.{token.Path}";
+                            keyValues.Add(tempKey, ((JArray)token).ToObject<IEnumerable<TReturn>>());
+                        }
+                        else
+                        {
+                            GetJArray(token, tempKey, keyValues);
+                        }
+                    }
+                    break;
+                case "JArray":
+                    keyValues.Add(key, ((JArray)jObject).ToObject<IEnumerable<TReturn>>());
+                    break;
+                case "JProperty":
+                    break;
+                default:
+                    break;
+            }
+        }
     }
 }