Merge branch 'master' into fix/make-isimmutable-work

Author: maurei

src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs

@@ -26,7 +26,6 @@ public TodoItem()
         [Attr("achieved-date", isFilterable: false, isSortable: false)]
         public DateTime? AchievedDate { get; set; }
 
-
         [Attr("updated-date")]
         public DateTime? UpdatedDate { get; set; }
 
@@ -36,6 +35,9 @@ public string CalculatedValue
             get => "joe";
         }
 
+        [Attr("offset-date")]
+        public DateTimeOffset? OffsetDate { get; set; }
+ 
         public int? OwnerId { get; set; }
         public int? AssigneeId { get; set; }
         public Guid? CollectionId { get; set; }

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -78,18 +78,8 @@ public DefaultEntityRepository(
             _resourceDefinition = resourceDefinition;
         }
 
-
-        
-        public virtual IQueryable<TEntity> Get()
-        {
-            if (_jsonApiContext.QuerySet?.Fields != null && _jsonApiContext.QuerySet.Fields.Count > 0)
-                return _dbSet.Select(_jsonApiContext.QuerySet?.Fields);
-
-            return _dbSet;
-        }
-
         /// <inheritdoc />
-        public virtual IQueryable<TEntity> GetQueryable() 
+        public virtual IQueryable<TEntity> Get()
             => _dbSet;
 
         public virtual IQueryable<TEntity> Select(IQueryable<TEntity> entities, List<string> fields)
@@ -140,15 +130,15 @@ public virtual IQueryable<TEntity> Sort(IQueryable<TEntity> entities, List<SortQ
         /// <inheritdoc />
         public virtual async Task<TEntity> GetAsync(TId id)
         {
-            return await Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields).SingleOrDefaultAsync(e => e.Id.Equals(id));
+            return await Select(Get(), _jsonApiContext.QuerySet?.Fields).SingleOrDefaultAsync(e => e.Id.Equals(id));
         }
 
         /// <inheritdoc />
         public virtual async Task<TEntity> GetAndIncludeAsync(TId id, string relationshipName)
         {
             _logger?.LogDebug($"[JADN] GetAndIncludeAsync({id}, {relationshipName})");
 
-            var includedSet = Include(Select(GetQueryable(), _jsonApiContext.QuerySet?.Fields), relationshipName);
+            var includedSet = Include(Select(Get(), _jsonApiContext.QuerySet?.Fields), relationshipName);
             var result = await includedSet.SingleOrDefaultAsync(e => e.Id.Equals(id));
 
             return result;

src/JsonApiDotNetCore/Data/IEntityReadRepository.cs

@@ -19,9 +19,6 @@ public interface IEntityReadRepository<TEntity, in TId>
         /// The base GET query. This is a good place to apply rules that should affect all reads, 
         /// such as authorization of resources.
         /// </summary>
-        IQueryable<TEntity> GetQueryable();
-
-        [Obsolete("This method has been deprecated, use GetQueryable() instead")]
         IQueryable<TEntity> Get();
 
         /// <summary>

src/JsonApiDotNetCore/JsonApiDotNetCore.csproj

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

src/JsonApiDotNetCore/Serialization/JsonApiDeSerializer.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Reflection;
 using JsonApiDotNetCore.Extensions;
@@ -36,8 +37,12 @@ public object Deserialize(string requestBody)
         {
             try
             {
-                var bodyJToken = JToken.Parse(requestBody);
-
+                JToken bodyJToken;
+                using (JsonReader jsonReader = new JsonTextReader(new StringReader(requestBody)))
+                {
+                    jsonReader.DateParseHandling = DateParseHandling.None;
+                    bodyJToken = JToken.Load(jsonReader);
+                }
                 if (RequestIsOperation(bodyJToken))
                 {
                     _jsonApiContext.IsBulkOperationRequest = true;

src/JsonApiDotNetCore/Services/EntityResourceService.cs

@@ -98,7 +98,7 @@ public virtual async Task<bool> DeleteAsync(TId id)
 
         public virtual async Task<IEnumerable<TResource>> GetAsync()
         {
-            var entities = _entities.GetQueryable();
+            var entities = _entities.Get();
 
             entities = ApplySortAndFilterQuery(entities);
 
@@ -242,7 +242,7 @@ protected virtual IQueryable<TEntity> IncludeRelationships(IQueryable<TEntity> e
 
         private async Task<TResource> GetWithRelationshipsAsync(TId id)
         {
-            var query = _entities.Select(_entities.GetQueryable(), _jsonApiContext.QuerySet?.Fields).Where(e => e.Id.Equals(id));
+            var query = _entities.Select(_entities.Get(), _jsonApiContext.QuerySet?.Fields).Where(e => e.Id.Equals(id));
 
             _jsonApiContext.QuerySet.IncludedRelationships.ForEach(r =>
             {

test/JsonApiDotNetCoreExampleTests/Acceptance/TodoItemsControllerTests.cs

@@ -452,6 +452,7 @@ public async Task Can_Post_TodoItem()
             _context.SaveChanges();
 
             var todoItem = _todoItemFaker.Generate();
+            var nowOffset = new DateTimeOffset();
             var content = new
             {
                 data = new
@@ -461,7 +462,8 @@ public async Task Can_Post_TodoItem()
                     {
                         { "description", todoItem.Description },
                         { "ordinal", todoItem.Ordinal },
-                        { "created-date", todoItem.CreatedDate }
+                        { "created-date", todoItem.CreatedDate },
+                        { "offset-date", nowOffset }
                     },
                     relationships = new
                     {
@@ -494,6 +496,7 @@ public async Task Can_Post_TodoItem()
             Assert.Equal(HttpStatusCode.Created, response.StatusCode);
             Assert.Equal(todoItem.Description, deserializedBody.Description);
             Assert.Equal(todoItem.CreatedDate.ToString("G"), deserializedBody.CreatedDate.ToString("G"));
+            Assert.Equal(nowOffset.ToString("yyyy-MM-ddTHH:mm:ssK"), deserializedBody.OffsetDate?.ToString("yyyy-MM-ddTHH:mm:ssK"));
             Assert.Null(deserializedBody.AchievedDate);
         }
 

test/JsonApiDotNetCoreExampleTests/Helpers/Repositories/AuthorizedTodoItemsRepository.cs

@@ -23,9 +23,9 @@ public AuthorizedTodoItemsRepository(
             _authService = authService;
         }
 
-        public override IQueryable<TodoItem> GetQueryable()
+        public override IQueryable<TodoItem> Get()
         {
-            return base.GetQueryable().Where(todoItem => todoItem.OwnerId == _authService.CurrentUserId);
+            return base.Get().Where(todoItem => todoItem.OwnerId == _authService.CurrentUserId);
         }
     }
 }