(#199) Tweak to CreateNextLink to use QueryHelpers.

Author: Adrian Hall

src/CommunityToolkit.Datasync.Server/Controllers/TableController.Query.cs

@@ -16,6 +16,10 @@
 using Microsoft.OData;
 using System.Diagnostics.CodeAnalysis;
 using CommunityToolkit.Datasync.Server.OData;
+using Microsoft.AspNetCore.Http.Extensions;
+using Microsoft.AspNetCore.WebUtilities;
+using Microsoft.Extensions.Primitives;
+using System.Globalization;
 
 namespace CommunityToolkit.Datasync.Server;
 
@@ -155,23 +159,18 @@ internal PagedResult BuildPagedResult(ODataQueryOptions queryOptions, IEnumerabl
         // Internal function to create the nextLink property for the paged result.
         static string CreateNextLink(HttpRequest request, int skip = 0, int top = 0)
         {
-            string? queryString = request.QueryString.Value;
-            List<string> query = (queryString ?? "").TrimStart('?')
-                .Split('&')
-                .Where(q => !q.StartsWith($"{SkipParameterName}=") && !q.StartsWith($"{TopParameterName}="))
-                .ToList();
-
+            Dictionary<string, StringValues> query = QueryHelpers.ParseNullableQuery(request.QueryString.Value) ?? [];
             if (skip > 0)
             {
-                query.Add($"{SkipParameterName}={skip}");
+                query[SkipParameterName] = skip.ToString(CultureInfo.InvariantCulture);
             }
 
             if (top > 0)
             {
-                query.Add($"{TopParameterName}={top}");
+                query[TopParameterName] = top.ToString(CultureInfo.InvariantCulture);
             }
 
-            return string.Join('&', query).TrimStart('&');
+            return QueryHelpers.AddQueryString(string.Empty, query).TrimStart('?');
         }
 
         PagedResult result = new(results ?? []) { Count = queryOptions.Count != null ? count : null };

src/CommunityToolkit.Datasync.Server/Extensions/InternalExtensions.cs

@@ -55,14 +55,7 @@ internal static IQueryable<T> ApplyDeletedView<T>(this IQueryable<T> query, Http
     /// <param name="settings">The query settings being used.</param>
     /// <returns>A modified <see cref="IQueryable{T}"/> representing the filtered data.</returns>
     internal static IQueryable<T> ApplyODataFilter<T>(this IQueryable<T> query, FilterQueryOption? filterQueryOption, ODataQuerySettings settings)
-    {
-        if (filterQueryOption is null)
-        {
-            return query;
-        }
-
-        return ((IQueryable<T>?)filterQueryOption.ApplyTo(query, settings)) ?? query;
-    }
+        => (IQueryable<T>)(filterQueryOption?.ApplyTo(query, settings) ?? query);
 
     /// <summary>
     /// Applies the <c>$orderBy</c> OData query option to the provided query.
@@ -73,21 +66,7 @@ internal static IQueryable<T> ApplyODataFilter<T>(this IQueryable<T> query, Filt
     /// <param name="settings">The query settings being used.</param>
     /// <returns>A modified <see cref="IQueryable{T}"/> representing the ordered data.</returns>
     internal static IQueryable<T> ApplyODataOrderBy<T>(this IQueryable<T> query, OrderByQueryOption? orderingQueryOption, ODataQuerySettings settings) where T : ITableData
-    {
-        // Note that we ALWAYS do a sort so that the ordering is consistent across all queries.
-        if (orderingQueryOption is null)
-        {
-            return query.OrderBy(e => e.Id);
-        }
-
-        IOrderedQueryable<T>? orderedQuery = orderingQueryOption.ApplyTo(query, settings);
-        if (orderedQuery is null)
-        {
-            return query.OrderBy(e => e.Id);
-        }
-
-        return orderedQuery.ThenBy(x => x.Id);
-    }
+        => orderingQueryOption?.ApplyTo(query, settings).ThenBy(e => e.Id) ?? query.OrderBy(e => e.Id);
 
     /// <summary>
     /// Applies the <c>$skip</c> and <c>$top</c> OData query options to the provided query.

tests/CommunityToolkit.Datasync.Server.Test/Helpers/LiveControllerTests.cs

@@ -10,7 +10,7 @@ namespace CommunityToolkit.Datasync.Server.Test.Helpers;
 /// <summary>
 /// The base set of tests for the controller tests going against a live server.
 /// </summary>
-/// <typeparam name="TEntity"></typeparam>
+[ExcludeFromCodeCoverage]
 public abstract class LiveControllerTests<TEntity> : BaseTest where TEntity : class, ITableData
 {
     /// <summary>

tests/CommunityToolkit.Datasync.Server.Test/Helpers/LiveTestsCollection.cs

@@ -7,6 +7,7 @@ namespace CommunityToolkit.Datasync.Server.Test.Helpers;
 /// <summary>
 ///  This can be used to share state between the various live tests.  It isn't used right now.
 /// </summary>
+[ExcludeFromCodeCoverage]
 public class DatabaseFixture
 {
     public bool AzureSqlIsInitialized { get; set; } = false;
@@ -15,6 +16,7 @@ public class DatabaseFixture
     public bool PgIsInitialized { get; set; } = false;
 }
 
+[ExcludeFromCodeCoverage]
 [CollectionDefinition("LiveTestsCollection", DisableParallelization = true)]
 public class LiveTestsCollection : ICollectionFixture<DatabaseFixture>
 {

tests/CommunityToolkit.Datasync.TestService/AccessControlProviders/MovieAccessControlProvider.cs

@@ -7,6 +7,7 @@
 
 namespace CommunityToolkit.Datasync.TestService.AccessControlProviders;
 
+[ExcludeFromCodeCoverage]
 public class MovieAccessControlProvider<T> : AccessControlProvider<T> where T : class, IMovie, ITableData
 {
     /// <summary>