Relationship endpoint bugfixes, implement POST and DELETE on to-many relationship link

benchmarks/Serialization/JsonApiDeserializerBenchmarks.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.Design;
 using BenchmarkDotNet.Attributes;
 using JsonApiDotNetCore.Configuration;
+using JsonApiDotNetCore.Middleware;
 using JsonApiDotNetCore.Resources;
 using JsonApiDotNetCore.Serialization;
 using JsonApiDotNetCore.Serialization.Objects;
@@ -37,7 +38,8 @@ public JsonApiDeserializerBenchmarks()
             var options = new JsonApiOptions();
             IResourceGraph resourceGraph = DependencyFactory.CreateResourceGraph(options);
             var targetedFields = new TargetedFields();
-            _jsonApiDeserializer = new RequestDeserializer(resourceGraph, new ResourceFactory(new ServiceContainer()), targetedFields, new HttpContextAccessor());
+            var request = new JsonApiRequest();
+            _jsonApiDeserializer = new RequestDeserializer(resourceGraph, new ResourceFactory(new ServiceContainer()), targetedFields, new HttpContextAccessor(), request);
         }
 
         [Benchmark]

benchmarks/Serialization/JsonApiSerializerBenchmarks.cs

@@ -49,7 +49,7 @@ private static FieldsToSerialize CreateFieldsToSerialize(IResourceGraph resource
 
             var accessor = new Mock<IResourceDefinitionAccessor>().Object;
 
-            return new FieldsToSerialize(resourceGraph, constraintProviders, accessor);
+            return new FieldsToSerialize(resourceGraph, constraintProviders, accessor, request);
         }
 
         [Benchmark]

src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsCustomController.cs

@@ -1,11 +1,9 @@
-using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
 using JsonApiDotNetCore.Configuration;
 using JsonApiDotNetCore.Controllers.Annotations;
 using JsonApiDotNetCore.Errors;
 using JsonApiDotNetCore.Resources;
-using JsonApiDotNetCore.Serialization.Objects;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Models;
 using Microsoft.AspNetCore.Mvc;
@@ -133,9 +131,10 @@ public async Task<IActionResult> PatchAsync(TId id, [FromBody] T resource)
         }
 
         [HttpPatch("{id}/relationships/{relationshipName}")]
-        public async Task<IActionResult> PatchRelationshipsAsync(TId id, string relationshipName, [FromBody] List<ResourceObject> relationships)
+        public async Task<IActionResult> PatchRelationshipAsync(TId id, string relationshipName, [FromBody] object secondaryResourceIds)
         {
-            await _resourceService.UpdateRelationshipAsync(id, relationshipName, relationships);
+            await _resourceService.SetRelationshipAsync(id, relationshipName, secondaryResourceIds);
+
             return Ok();
         }
 

src/Examples/JsonApiDotNetCoreExample/Controllers/TodoItemsTestController.cs

@@ -69,8 +69,8 @@ public override async Task<IActionResult> PatchAsync(int id, [FromBody] TodoItem
 
         [HttpPatch("{id}/relationships/{relationshipName}")]
         public override async Task<IActionResult> PatchRelationshipAsync(
-            int id, string relationshipName, [FromBody] object relationships)
-            => await base.PatchRelationshipAsync(id, relationshipName, relationships);
+            int id, string relationshipName, [FromBody] object secondaryResourceIds)
+            => await base.PatchRelationshipAsync(id, relationshipName, secondaryResourceIds);
 
         [HttpDelete("{id}")]
         public override async Task<IActionResult> DeleteAsync(int id)

src/Examples/JsonApiDotNetCoreExample/Data/AppDbContext.cs

@@ -39,38 +39,34 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
 
             modelBuilder.Entity<TodoItem>()
                 .HasOne(t => t.Assignee)
-                .WithMany(p => p.AssignedTodoItems)
-                .HasForeignKey(t => t.AssigneeId);
+                .WithMany(p => p.AssignedTodoItems);
 
             modelBuilder.Entity<TodoItem>()
                 .HasOne(t => t.Owner)
-                .WithMany(p => p.TodoItems)
-                .HasForeignKey(t => t.OwnerId);
+                .WithMany(p => p.TodoItems);
 
             modelBuilder.Entity<ArticleTag>()
-                .HasKey(bc => new { bc.ArticleId, bc.TagId });
+                .HasKey(bc => new {bc.ArticleId, bc.TagId});
 
             modelBuilder.Entity<IdentifiableArticleTag>()
-                .HasKey(bc => new { bc.ArticleId, bc.TagId });
+                .HasKey(bc => new {bc.ArticleId, bc.TagId});
 
             modelBuilder.Entity<Person>()
                 .HasOne(t => t.StakeHolderTodoItem)
                 .WithMany(t => t.StakeHolders)
-                .HasForeignKey(t => t.StakeHolderTodoItemId)
                 .OnDelete(DeleteBehavior.Cascade);
 
             modelBuilder.Entity<TodoItem>()
                 .HasOne(t => t.DependentOnTodo);
 
             modelBuilder.Entity<TodoItem>()
                 .HasMany(t => t.ChildrenTodos)
-                .WithOne(t => t.ParentTodo)
-                .HasForeignKey(t => t.ParentTodoId);
+                .WithOne(t => t.ParentTodo);
 
             modelBuilder.Entity<Passport>()
                 .HasOne(p => p.Person)
                 .WithOne(p => p.Passport)
-                .HasForeignKey<Person>(p => p.PassportId)
+                .HasForeignKey<Person>("PassportKey")
                 .OnDelete(DeleteBehavior.SetNull);
 
             modelBuilder.Entity<Passport>()
@@ -81,17 +77,17 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             modelBuilder.Entity<TodoItem>()
                 .HasOne(p => p.OneToOnePerson)
                 .WithOne(p => p.OneToOneTodoItem)
-                .HasForeignKey<TodoItem>(p => p.OneToOnePersonId);
+                .HasForeignKey<TodoItem>("OneToOnePersonKey");
 
             modelBuilder.Entity<TodoItemCollection>()
                 .HasOne(p => p.Owner)
                 .WithMany(p => p.TodoCollections)
                 .OnDelete(DeleteBehavior.Cascade);
 
             modelBuilder.Entity<Person>()
-                .HasOne(p => p.OneToOneTodoItem)
-                .WithOne(p => p.OneToOnePerson)
-                .HasForeignKey<TodoItem>(p => p.OneToOnePersonId);
+                .HasOne(p => p.Role)
+                .WithOne(p => p.Person)
+                .HasForeignKey<Person>("PersonRoleKey");
         }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Models/ArticleTag.cs

@@ -1,6 +1,3 @@
-using JsonApiDotNetCore.Resources;
-using JsonApiDotNetCore.Resources.Annotations;
-
 namespace JsonApiDotNetCoreExample.Models
 {
     public sealed class ArticleTag
@@ -11,17 +8,4 @@ public sealed class ArticleTag
         public int TagId { get; set; }
         public Tag Tag { get; set; }
     }
-
-    public class IdentifiableArticleTag : Identifiable
-    {
-        public int ArticleId { get; set; }
-        [HasOne]
-        public Article Article { get; set; }
-
-        public int TagId { get; set; }
-        [HasOne]
-        public Tag Tag { get; set; }
-
-        public string SomeMetaData { get; set; }
-    }
 }

src/Examples/JsonApiDotNetCoreExample/Models/IdentifiableArticleTag.cs

@@ -0,0 +1,18 @@
+using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Resources.Annotations;
+
+namespace JsonApiDotNetCoreExample.Models
+{
+    public class IdentifiableArticleTag : Identifiable
+    {
+        public int ArticleId { get; set; }
+        [HasOne]
+        public Article Article { get; set; }
+
+        public int TagId { get; set; }
+        [HasOne]
+        public Tag Tag { get; set; }
+
+        public string SomeMetaData { get; set; }
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Models/Passport.cs

@@ -51,7 +51,7 @@ public int? SocialSecurityNumber
         [NotMapped]
         public string BirthCountryName
         {
-            get => BirthCountry.Name;
+            get => BirthCountry?.Name;
             set
             {
                 BirthCountry ??= new Country();

src/Examples/JsonApiDotNetCoreExample/Models/Person.cs

@@ -57,20 +57,17 @@ public string FirstName
 
         [HasOne]
         public PersonRole Role { get; set; }
-        public int? PersonRoleId { get; set; }
 
         [HasOne]
         public TodoItem OneToOneTodoItem { get; set; }
 
         [HasOne]
         public TodoItem StakeHolderTodoItem { get; set; }
-        public int? StakeHolderTodoItemId { get; set; }
 
         [HasOne(Links = LinkTypes.All, CanInclude = false)]
         public TodoItem UnIncludeableItem { get; set; }
 
         [HasOne]
         public Passport Passport { get; set; }
-        public int? PassportId { get; set; }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Models/Tag.cs

@@ -11,11 +11,4 @@ public class Tag : Identifiable
         [Attr]
         public TagColor Color { get; set; }
     }
-
-    public enum TagColor
-    {
-        Red,
-        Green,
-        Blue
-    }
 }

src/Examples/JsonApiDotNetCoreExample/Models/TagColor.cs

@@ -0,0 +1,9 @@
+namespace JsonApiDotNetCoreExample.Models
+{
+    public enum TagColor
+    {
+        Red,
+        Green,
+        Blue
+    }
+}

src/Examples/JsonApiDotNetCoreExample/Models/TodoItem.cs

@@ -7,11 +7,6 @@ namespace JsonApiDotNetCoreExample.Models
 {
     public class TodoItem : Identifiable, IIsLockable
     {
-        public TodoItem()
-        {
-            GuidProperty = Guid.NewGuid();
-        }
-
         public bool IsLocked { get; set; }
 
         [Attr]
@@ -20,9 +15,6 @@ public TodoItem()
         [Attr]
         public long Ordinal { get; set; }
 
-        [Attr]
-        public Guid GuidProperty { get; set; }
-
         [Attr(Capabilities = AttrCapabilities.All & ~AttrCapabilities.AllowCreate)]
         public string AlwaysChangingValue
         {
@@ -36,21 +28,12 @@ public string AlwaysChangingValue
         [Attr(Capabilities = AttrCapabilities.All & ~(AttrCapabilities.AllowFilter | AttrCapabilities.AllowSort))]
         public DateTime? AchievedDate { get; set; }
 
-        [Attr]
-        public DateTime? UpdatedDate { get; set; }
-
         [Attr(Capabilities = AttrCapabilities.All & ~(AttrCapabilities.AllowCreate | AttrCapabilities.AllowChange))]
         public string CalculatedValue => "calculated";
 
         [Attr(Capabilities = AttrCapabilities.All & ~AttrCapabilities.AllowChange)]
         public DateTimeOffset? OffsetDate { get; set; }
 
-        public int? OwnerId { get; set; }
-
-        public int? AssigneeId { get; set; }
-
-        public Guid? CollectionId { get; set; }
-
         [HasOne]
         public Person Owner { get; set; }
 
@@ -60,23 +43,17 @@ public string AlwaysChangingValue
         [HasOne]
         public Person OneToOnePerson { get; set; }
 
-        public int? OneToOnePersonId { get; set; }
-
         [HasMany]
         public ISet<Person> StakeHolders { get; set; }
 
         [HasOne]
         public TodoItemCollection Collection { get; set; }
 
         // cyclical to-one structure
-        public int? DependentOnTodoId { get; set; }
-
         [HasOne]
         public TodoItem DependentOnTodo { get; set; }
 
         // cyclical to-many structure
-        public int? ParentTodoId {get; set;}
-
         [HasOne]
         public TodoItem ParentTodo { get; set; }
 

src/Examples/JsonApiDotNetCoreExample/Models/TodoItemCollection.cs

@@ -16,7 +16,5 @@ public sealed class TodoItemCollection : Identifiable<Guid>
 
         [HasOne]
         public Person Owner { get; set; }
-
-        public int? OwnerId { get; set; }
     }
 }

src/Examples/JsonApiDotNetCoreExample/Services/CustomArticleService.cs

@@ -15,16 +15,19 @@ public class CustomArticleService : JsonApiResourceService<Article>
     {
         public CustomArticleService(
             IResourceRepository<Article> repository,
+            IGetResourcesByIds getResourcesById,
             IQueryLayerComposer queryLayerComposer,
             IPaginationContext paginationContext,
             IJsonApiOptions options,
             ILoggerFactory loggerFactory,
             IJsonApiRequest request,
             IResourceChangeTracker<Article> resourceChangeTracker,
             IResourceFactory resourceFactory,
-            IResourceHookExecutor hookExecutor = null)
-            : base(repository, queryLayerComposer, paginationContext, options, loggerFactory, request,
-                resourceChangeTracker, resourceFactory, hookExecutor)
+            ITargetedFields targetedFields,
+            IResourceContextProvider resourceContextProvider,
+            IResourceHookExecutorFacade hookExecutor)
+            : base(repository, getResourcesById, queryLayerComposer, paginationContext, options, loggerFactory,
+                request, resourceChangeTracker, resourceFactory, targetedFields, resourceContextProvider, hookExecutor)
         { }
 
         public override async Task<Article> GetAsync(int id)

src/Examples/JsonApiDotNetCoreExample/Startups/Startup.cs

@@ -35,7 +35,9 @@ public override void ConfigureServices(IServiceCollection services)
             {
                 options.EnableSensitiveDataLogging();
                 options.UseNpgsql(_connectionString, innerOptions => innerOptions.SetPostgresVersion(new Version(9, 6)));
-            }, ServiceLifetime.Transient);
+            },
+                // TODO: Remove ServiceLifetime.Transient, after all integration tests have been converted to use IntegrationTestContext.
+                ServiceLifetime.Transient);
 
             services.AddJsonApi<AppDbContext>(ConfigureJsonApiOptions, discovery => discovery.AddCurrentAssembly());
 

src/Examples/MultiDbContextExample/Repositories/DbContextARepository.cs

@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 using MultiDbContextExample.Data;
 
@@ -12,11 +13,10 @@ public class DbContextARepository<TResource> : EntityFrameworkCoreRepository<TRe
         where TResource : class, IIdentifiable<int>
     {
         public DbContextARepository(ITargetedFields targetedFields, DbContextResolver<DbContextA> contextResolver,
-            IResourceGraph resourceGraph, IGenericServiceFactory genericServiceFactory,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders,
-            ILoggerFactory loggerFactory)
-            : base(targetedFields, contextResolver, resourceGraph, genericServiceFactory, resourceFactory,
-                constraintProviders, loggerFactory)
+            IResourceGraph resourceGraph, IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, 
+            IGetResourcesByIds getResourcesByIds, ILoggerFactory loggerFactory)
+            : base(targetedFields, contextResolver, resourceGraph, resourceFactory,
+                constraintProviders, getResourcesByIds, loggerFactory)
         {
         }
     }

src/Examples/MultiDbContextExample/Repositories/DbContextBRepository.cs

@@ -3,6 +3,7 @@
 using JsonApiDotNetCore.Queries;
 using JsonApiDotNetCore.Repositories;
 using JsonApiDotNetCore.Resources;
+using JsonApiDotNetCore.Services;
 using Microsoft.Extensions.Logging;
 using MultiDbContextExample.Data;
 
@@ -12,11 +13,10 @@ public class DbContextBRepository<TResource> : EntityFrameworkCoreRepository<TRe
         where TResource : class, IIdentifiable<int>
     {
         public DbContextBRepository(ITargetedFields targetedFields, DbContextResolver<DbContextB> contextResolver,
-            IResourceGraph resourceGraph, IGenericServiceFactory genericServiceFactory,
-            IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders,
-            ILoggerFactory loggerFactory)
-            : base(targetedFields, contextResolver, resourceGraph, genericServiceFactory, resourceFactory,
-                constraintProviders, loggerFactory)
+            IResourceGraph resourceGraph, IResourceFactory resourceFactory, IEnumerable<IQueryConstraintProvider> constraintProviders, 
+            IGetResourcesByIds getResourcesByIds, ILoggerFactory loggerFactory)
+            : base(targetedFields, contextResolver, resourceGraph, resourceFactory,
+                constraintProviders, getResourcesByIds, loggerFactory)
         {
         }
     }