PR feedback

Author: jaredcnance

src/JsonApiDotNetCore/Builders/DocumentBuilder.cs

@@ -75,7 +75,7 @@ private Dictionary<string, object> GetMeta(IIdentifiable entity)
             if (entity is IHasMeta metaEntity)
                 builder.Add(metaEntity.GetMeta(_jsonApiContext));
 
-            if (_jsonApiContext.Options.IncludeTotalRecordCount)
+            if (_jsonApiContext.Options.IncludeTotalRecordCount && _jsonApiContext.PageManager.TotalRecords != null)
                 builder.Add("total-records", _jsonApiContext.PageManager.TotalRecords);
 
             if (_requestMeta != null)

src/JsonApiDotNetCore/Internal/PageManager.cs

@@ -6,12 +6,12 @@ namespace JsonApiDotNetCore.Internal
 {
     public class PageManager
     {
-        public int TotalRecords { get; set; }
+        public int? TotalRecords { get; set; }
         public int PageSize { get; set; }
         public int DefaultPageSize { get; set; }
         public int CurrentPage { get; set; }
         public bool IsPaginated => PageSize > 0;
-        public int TotalPages => (TotalRecords == 0) ? -1 : (int)Math.Ceiling(decimal.Divide(TotalRecords, PageSize));
+        public int TotalPages => (TotalRecords == 0 || TotalRecords == null) ? -1 : (int)Math.Ceiling(decimal.Divide(TotalRecords.Value, PageSize));
 
         public RootLinks GetPageLinks(LinkBuilder linkBuilder)
         {

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <VersionPrefix>2.3.0</VersionPrefix>
+    <VersionPrefix>2.3.1</VersionPrefix>
     <TargetFrameworks>$(NetStandardVersion)</TargetFrameworks>
     <AssemblyName>JsonApiDotNetCore</AssemblyName>
     <PackageId>JsonApiDotNetCore</PackageId>

src/JsonApiDotNetCore/Services/JsonApiContext.cs

@@ -86,20 +86,20 @@ internal static bool PathIsRelationship(string requestPath)
             const char pathSegmentDelimiter = '/';
 
             var span = requestPath.AsSpan();
-            
+
             // we need to iterate over the string, from the end,
             // checking whether or not the 2nd to last path segment
             // is "relationships"
             // -2 is chosen in case the path ends with '/'
-            for(var i = requestPath.Length - 2; i >= 0; i--)
+            for (var i = requestPath.Length - 2; i >= 0; i--)
             {
                 // if there are not enough characters left in the path to 
                 // contain "relationships"
-                if(i < relationships.Length) 
+                if (i < relationships.Length)
                     return false;
 
                 // we have found the first instance of '/'
-                if(span[i] == pathSegmentDelimiter)
+                if (span[i] == pathSegmentDelimiter)
                 {
                     // in the case of a "relationships" route, the next
                     // path segment will be "relationships"
@@ -112,20 +112,18 @@ internal static bool PathIsRelationship(string requestPath)
 
             return false;
         }
-        
+
         private PageManager GetPageManager()
         {
             if (Options.DefaultPageSize == 0 && (QuerySet == null || QuerySet.PageQuery.PageSize == 0))
                 return new PageManager();
 
             var query = QuerySet?.PageQuery ?? new PageQuery();
-            var requestMethod = _httpContextAccessor.HttpContext.Request.Method;
 
             return new PageManager
             {
                 DefaultPageSize = Options.DefaultPageSize,
                 CurrentPage = query.PageOffset,
-                TotalRecords = (requestMethod == "POST" || requestMethod == "PATCH") ? 1 : 0,
                 PageSize = query.PageSize > 0 ? query.PageSize : Options.DefaultPageSize
             };
         }

test/JsonApiDotNetCoreExampleTests/Acceptance/Spec/DocumentTests/Meta.cs

@@ -48,15 +48,15 @@ public async Task Total_Record_Count_Included()
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
             var documents = JsonConvert.DeserializeObject<Documents>(responseBody);
-            
+
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotNull(documents.Meta);
             Assert.Equal((long)expectedCount, (long)documents.Meta["total-records"]);
         }
 
         [Fact]
-        public async Task Total_Record_Count_Not_Included_When_None()
+        public async Task Total_Record_Count_Included_When_None()
         {
             // arrange
             _context.TodoItems.RemoveRange(_context.TodoItems);
@@ -75,14 +75,15 @@ public async Task Total_Record_Count_Not_Included_When_None()
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
             var documents = JsonConvert.DeserializeObject<Documents>(responseBody);
-            
+
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.Null(documents.Meta);
+            Assert.NotNull(documents.Meta);
+            Assert.Equal(0, (long)documents.Meta["total-records"]);
         }
 
         [Fact]
-        public async Task Total_Record_Count_Included_POST()
+        public async Task Total_Record_Count_Not_Included_In_POST_Response()
         {
             // arrange
             _context.TodoItems.RemoveRange(_context.TodoItems);
@@ -116,15 +117,14 @@ public async Task Total_Record_Count_Included_POST()
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
             var documents = JsonConvert.DeserializeObject<Document>(responseBody);
-            
+
             // assert
             Assert.Equal(HttpStatusCode.Created, response.StatusCode);
-            Assert.NotNull(documents.Meta);
-            Assert.Equal((long)expectedCount, (long)documents.Meta["total-records"]);
+            Assert.Null(documents.Meta);
         }
 
         [Fact]
-        public async Task Total_Record_Count_Included_PATCH()
+        public async Task Total_Record_Count_Not_Included_In_PATCH_Response()
         {
             // arrange
             _context.TodoItems.RemoveRange(_context.TodoItems);
@@ -161,11 +161,10 @@ public async Task Total_Record_Count_Included_PATCH()
             var response = await client.SendAsync(request);
             var responseBody = await response.Content.ReadAsStringAsync();
             var documents = JsonConvert.DeserializeObject<Document>(responseBody);
-            
+
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
-            Assert.NotNull(documents.Meta);
-            Assert.Equal((long)expectedCount, (long)documents.Meta["total-records"]);
+            Assert.Null(documents.Meta);
         }
 
         [Fact]
@@ -187,26 +186,26 @@ public async Task EntityThatImplements_IHasMeta_Contains_MetaData()
             // act
             var response = await client.SendAsync(request);
             var documents = JsonConvert.DeserializeObject<Documents>(await response.Content.ReadAsStringAsync());
-            
+
             // assert
             Assert.Equal(HttpStatusCode.OK, response.StatusCode);
             Assert.NotNull(documents.Meta);
             Assert.NotNull(expectedMeta);
             Assert.NotEmpty(expectedMeta);
-            
-            foreach(var hash in expectedMeta)
+
+            foreach (var hash in expectedMeta)
             {
-                if(hash.Value is IList)
+                if (hash.Value is IList)
                 {
                     var listValue = (IList)hash.Value;
-                    for(var i=0; i < listValue.Count; i++)
+                    for (var i = 0; i < listValue.Count; i++)
                         Assert.Equal(listValue[i].ToString(), ((IList)documents.Meta[hash.Key])[i].ToString());
                 }
                 else
                 {
                     Assert.Equal(hash.Value, documents.Meta[hash.Key]);
                 }
-            }                
+            }
         }
     }
 }