.NET Core 2.2 -> 3.0

src/Examples/JsonApiDotNetCoreExample/Resources/PersonResource.cs

@@ -31,7 +31,7 @@ public Dictionary<string, object> GetMeta()
         {
             return new Dictionary<string, object> {
                 { "copyright", "Copyright 2015 Example Corp." },
-                { "authors", new string[] { "Jared Nance", "Maurits Moeys" } }
+                { "authors", new string[] { "Jared Nance", "Maurits Moeys", "Harro van der Kroft" } }
             };
         }
     }

src/JsonApiDotNetCore/Data/DefaultResourceRepository.cs

@@ -10,6 +10,7 @@
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 using Microsoft.Extensions.Logging;
 
 namespace JsonApiDotNetCore.Data
@@ -298,21 +299,43 @@ public virtual IQueryable<TResource> Include(IQueryable<TResource> entities, IEn
         /// <inheritdoc />
         public virtual async Task<IEnumerable<TResource>> PageAsync(IQueryable<TResource> entities, int pageSize, int pageNumber)
         {
+            // the IQueryable returned from the hook executor is sometimes consumed here.
+            // In this case, it does not support .ToListAsync(), so we use the method below.
             if (pageNumber >= 0)
             {
-                // the IQueryable returned from the hook executor is sometimes consumed here.
-                // In this case, it does not support .ToListAsync(), so we use the method below.
-                return await this.ToListAsync(entities.PageForward(pageSize, pageNumber));
+                entities = entities.PageForward(pageSize, pageNumber);
+                if (entities is IAsyncQueryProvider)
+                {
+                    return await entities.ToListAsync();
+                }
+                else
+                {
+                    return entities.ToList();
+                }
+            }
+            else
+            {
+                if (!(entities is IAsyncQueryProvider))
+                {
+                    entities = entities.Reverse();
+                    int firstIndex = pageSize * Math.Abs(pageNumber) - 1;
+                    int numberOfElementsInPage = Math.Min(pageSize, firstIndex + pageSize);
+
+                    return entities.Skip(firstIndex).Take(numberOfElementsInPage);
+                }
+                else
+                {
+                    // since EntityFramework does not support IQueryable.Reverse(), we need to know the number of queried entities
+                    var totalCount = await entities.CountAsync();
+
+                    int virtualFirstIndex = totalCount - pageSize * Math.Abs(pageNumber);
+                    int numberOfElementsInPage = Math.Min(pageSize, virtualFirstIndex + pageSize);
+
+                    return await ToListAsync(entities
+                            .Skip(virtualFirstIndex)
+                            .Take(numberOfElementsInPage));
+                }
             }
-            // since EntityFramework does not support IQueryable.Reverse(), we need to know the number of queried entities
-            var totalCount = await entities.CountAsync();
-            // may be negative
-            int virtualFirstIndex = totalCount - pageSize * Math.Abs(pageNumber);
-            int numberOfElementsInPage = Math.Min(pageSize, virtualFirstIndex + pageSize);
-
-            return await ToListAsync(entities
-                    .Skip(virtualFirstIndex)
-                    .Take(numberOfElementsInPage));
         }
 
         /// <inheritdoc />

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/PagingTests.cs

@@ -95,23 +95,20 @@ public async Task Can_Paginate_TodoItems_From_End()
             var totalCount = expectedEntitiesPerPage * 2;
             var person = new Person();
             var todoItems = _todoItemFaker.Generate(totalCount).ToList();
-
-            foreach (var todoItem in todoItems)
-                todoItem.Owner = person;
+            todoItems.ForEach(ti => ti.Owner = person);
 
             Context.TodoItems.RemoveRange(Context.TodoItems);
             Context.TodoItems.AddRange(todoItems);
             Context.SaveChanges();
-
             var route = $"/api/v1/todo-items?page[size]={expectedEntitiesPerPage}&page[number]=-1";
 
             // Act
             var response = await Client.GetAsync(route);
 
             // Assert
-            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-
             var body = await response.Content.ReadAsStringAsync();
+
+            Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             var deserializedBody = _fixture.GetDeserializer().DeserializeList<TodoItem>(body).Data;
 
             var expectedTodoItems = new[] { todoItems[totalCount - 2], todoItems[totalCount - 1] };

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/UpdatingDataTests.cs

@@ -70,7 +70,7 @@ public async Task Response400IfUpdatingNotSettableAttribute()
         public async Task Respond_404_If_EntityDoesNotExist()
         {
             // Arrange
-            var maxPersonId = _context.TodoItems.LastOrDefault()?.Id ?? 0;
+            var maxPersonId = _context.TodoItems.ToList().LastOrDefault()?.Id ?? 0;
             var todoItem = _todoItemFaker.Generate();
             todoItem.Id = maxPersonId + 100;
             todoItem.CreatedDate = DateTime.Now;
@@ -95,7 +95,7 @@ public async Task Respond_404_If_EntityDoesNotExist()
         public async Task Respond_422_If_IdNotInAttributeList()
         {
             // Arrange
-            var maxPersonId = _context.TodoItems.LastOrDefault()?.Id ?? 0;
+            var maxPersonId = _context.TodoItems.ToList().LastOrDefault()?.Id ?? 0;
             var todoItem = _todoItemFaker.Generate();
             todoItem.CreatedDate = DateTime.Now;
             var builder = new WebHostBuilder()

test/NoEntityFrameworkTests/Acceptance/Extensibility/NoEntityFrameworkTests.cs

@@ -3,7 +3,10 @@
 using System.Net.Http;
 using System.Net.Http.Headers;
 using System.Threading.Tasks;
+using JsonApiDotNetCoreExample;
 using JsonApiDotNetCoreExample.Models;
+using Microsoft.AspNetCore.Hosting;
+using Microsoft.AspNetCore.TestHost;
 using Newtonsoft.Json;
 using Xunit;
 
@@ -74,7 +77,6 @@ public async Task Can_Create_TodoItems()
         {
             // Arrange
             var description = Guid.NewGuid().ToString();
-            var client = _fixture.Server.CreateClient();
             var httpMethod = new HttpMethod("POST");
             var route = $"/api/v1/custom-todo-items/";
             var content = new
@@ -94,6 +96,11 @@ public async Task Can_Create_TodoItems()
             request.Content = new StringContent(JsonConvert.SerializeObject(content));
             request.Content.Headers.ContentType = new MediaTypeHeaderValue("application/vnd.api+json");
 
+            var builder = new WebHostBuilder()
+                .UseStartup<Startup>();
+            var server = new TestServer(builder);
+            var client = server.CreateClient();
+
             // Act
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();

test/NoEntityFrameworkTests/TestFixture.cs

@@ -1,6 +1,7 @@
 using JsonApiDotNetCore.Builders;
 using JsonApiDotNetCore.Models;
 using JsonApiDotNetCore.Serialization.Client;
+using JsonApiDotNetCoreExample;
 using JsonApiDotNetCoreExample.Data;
 using JsonApiDotNetCoreExample.Models;
 using JsonApiDotNetCoreExampleTests.Helpers.Extensions;
@@ -19,7 +20,7 @@ public class TestFixture : IDisposable
         private IServiceProvider _services;
         public TestFixture()
         {
-            var builder = new WebHostBuilder().UseStartup<TestStartup>();
+            var builder = new WebHostBuilder().UseStartup<Startup>();
             Server = new TestServer(builder);
             Context = Server.GetService<AppDbContext>();
             Context.Database.EnsureCreated();

test/UnitTests/Data/DefaultEntityRepositoryTest.cs

@@ -0,0 +1,74 @@
+using JsonApiDotNetCore.Builders;
+using JsonApiDotNetCore.Data;
+using JsonApiDotNetCore.Internal.Contracts;
+using JsonApiDotNetCore.Serialization;
+using JsonApiDotNetCoreExample.Data;
+using JsonApiDotNetCoreExample.Models;
+using Microsoft.EntityFrameworkCore;
+using Moq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Xunit;
+
+namespace UnitTests.Data
+{
+    public class DefaultEntityRepositoryTest
+    {
+
+        [Fact]
+        public async Task PageAsync_IQueryableIsAListAndPageNumberPositive_CanStillCount()
+        {
+            // If IQueryable is actually a list (this can happen after a filter or hook)
+            // It needs to not do CountAsync, because well.. its not asynchronous.
+
+            // Arrange
+            var repository = Setup();
+            var todoItems = new List<TodoItem>() {
+                new TodoItem{ Id = 1 },
+                new TodoItem{ Id = 2 }
+            };
+
+            // Act
+            var result = await repository.PageAsync(todoItems.AsQueryable(), pageSize: 1, pageNumber: 2);
+
+            // Assert
+            Assert.True(result.ElementAt(0).Id == todoItems[1].Id);
+        }
+
+        [Fact]
+        public async Task PageAsync_IQueryableIsAListAndPageNumberNegative_CanStillCount()
+        {
+            // If IQueryable is actually a list (this can happen after a filter or hook)
+            // It needs to not do CountAsync, because well.. its not asynchronous.
+
+            // Arrange
+            var repository = Setup();
+            var todoItems = new List<TodoItem>() {
+                new TodoItem{ Id = 1 },
+                new TodoItem{ Id = 2 },
+                new TodoItem{ Id = 3 },
+                new TodoItem{ Id = 4 }
+            };
+
+            // Act
+            var result = await repository.PageAsync(todoItems.AsQueryable(), pageSize: 1, pageNumber: -2);
+
+            // Assert
+            Assert.True(result.First().Id == 3);
+        }
+
+        private DefaultResourceRepository<TodoItem> Setup()
+        {
+            var contextResolverMock = new Mock<IDbContextResolver>();
+            contextResolverMock.Setup(m => m.GetContext()).Returns(new Mock<DbContext>().Object);
+            var resourceGraph = new Mock<IResourceGraph>();
+            var targetedFields = new Mock<ITargetedFields>();
+            var repository = new DefaultResourceRepository<TodoItem>(targetedFields.Object, contextResolverMock.Object, resourceGraph.Object, null);
+            return repository;
+        }
+
+    }
+}

test/UnitTests/UnitTests.csproj

@@ -23,6 +23,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
+    <Folder Include="Repositories\" />
     <Folder Include="Serialization\Common\" />
     <Folder Include="Serialization\Client\" />
     <Folder Include="Serialization\Server\" />