feat: after update, after create

Author: maurei

src/JsonApiDotNetCore/Hooks/ResourceHookExecutor.cs

@@ -295,7 +295,7 @@ public virtual void AfterCreate<TEntity>(IEnumerable<TEntity> entities, Resource
                 hookContainer.AfterCreate(uniqueEntities, pipeline);
             }
             EntityTreeLayer nextLayer = _layerFactory.CreateLayer(layer);
-
+            AfterUpdateRelationship(nextLayer, pipeline);
         }
 
         public virtual void AfterUpdate<TEntity>(IEnumerable<TEntity> entities, ResourceAction pipeline) where TEntity : class, IIdentifiable
@@ -307,6 +307,8 @@ public virtual void AfterUpdate<TEntity>(IEnumerable<TEntity> entities, Resource
                 var uniqueEntities = layer.GetAllUniqueEntities().Cast<TEntity>();
                 hookContainer.AfterUpdate(uniqueEntities, pipeline);
             }
+            EntityTreeLayer nextLayer = _layerFactory.CreateLayer(layer);
+            AfterUpdateRelationship(nextLayer, pipeline);
         }
 
         void AfterUpdateRelationship(EntityTreeLayer currentLayer, ResourceAction pipeline)
@@ -316,7 +318,8 @@ void AfterUpdateRelationship(EntityTreeLayer currentLayer, ResourceAction pipeli
                 var entityType = node.EntityType;
                 var hookContainer = _meta.GetResourceHookContainer(entityType, ResourceHook.AfterUpdateRelationship);
                 if (hookContainer == null) continue;
-                CallHook(hookContainer, ResourceHook.AfterUpdateRelationship, new object[] { node.UniqueSet, pipeline });
+                var relationshipHelper = TypeHelper.CreateInstanceOfOpenType(typeof(UpdatedRelationshipHelper<>), node.EntityType, node.EntitiesByRelationships);
+                CallHook(hookContainer, ResourceHook.AfterUpdateRelationship, new object[] { relationshipHelper, pipeline });
             }
             EntityTreeLayer nextLayer = _layerFactory.CreateLayer(currentLayer);
             if (nextLayer.Any()) AfterUpdateRelationship(nextLayer, pipeline);

test/UnitTests/ResourceHooks/ResourceHookExecutor/AfterCreateTests.cs

@@ -0,0 +1,86 @@
+using JsonApiDotNetCore.Services;
+using JsonApiDotNetCoreExample.Models;
+using Moq;
+using System.Collections.Generic;
+using Xunit;
+
+namespace UnitTests.ResourceHooks
+{
+    public class AfterCreateTests : HooksTestsSetup
+    {
+        private readonly ResourceHook[] targetHooks = { ResourceHook.AfterCreate, ResourceHook.AfterUpdateRelationship };
+
+        [Fact]
+        public void AfterCreate()
+        {
+            // arrange
+            var todoDiscovery = SetDiscoverableHooks<TodoItem>(targetHooks, DisableDbValues);
+            var personDiscovery = SetDiscoverableHooks<Person>(targetHooks, DisableDbValues);
+            (var contextMock, var hookExecutor, var todoResourceMock,
+                var ownerResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery);
+            var todoList = CreateTodoWithOwner();
+
+            // act
+            hookExecutor.AfterCreate(todoList, ResourceAction.Create);
+
+            // assert
+            todoResourceMock.Verify(rd => rd.AfterCreate(It.IsAny<IEnumerable<TodoItem>>(), ResourceAction.Create), Times.Once());
+            ownerResourceMock.Verify(rd => rd.AfterUpdateRelationship(It.IsAny<IUpdatedRelationshipHelper<Person>>(), ResourceAction.Create), Times.Once());
+            VerifyNoOtherCalls(todoResourceMock, ownerResourceMock);
+        }
+
+        [Fact]
+        public void AfterCreate_Without_Parent_Hook_Implemented()
+        {
+            // arrange
+            var todoDiscovery = SetDiscoverableHooks<TodoItem>(NoHooks, DisableDbValues);
+            var personDiscovery = SetDiscoverableHooks<Person>(targetHooks, DisableDbValues);
+            (var contextMock, var hookExecutor, var todoResourceMock,
+                var ownerResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery);
+            var todoList = CreateTodoWithOwner();
+
+            // act
+            hookExecutor.AfterCreate(todoList, ResourceAction.Create);
+
+            // assert
+            ownerResourceMock.Verify(rd => rd.AfterUpdateRelationship(It.IsAny<IUpdatedRelationshipHelper<Person>>(), ResourceAction.Create), Times.Once());
+            VerifyNoOtherCalls(todoResourceMock, ownerResourceMock);
+        }
+
+        [Fact]
+        public void AfterCreate_Without_Child_Hook_Implemented()
+        {
+            // arrange
+            var todoDiscovery = SetDiscoverableHooks<TodoItem>(targetHooks, DisableDbValues);
+            var personDiscovery = SetDiscoverableHooks<Person>(NoHooks, DisableDbValues);
+            (var contextMock, var hookExecutor, var todoResourceMock,
+                var ownerResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery);
+            var todoList = CreateTodoWithOwner();
+
+            // act
+            hookExecutor.AfterCreate(todoList, ResourceAction.Create);
+
+            // assert
+            todoResourceMock.Verify(rd => rd.AfterCreate(It.IsAny<IEnumerable<TodoItem>>(), ResourceAction.Create), Times.Once());
+            VerifyNoOtherCalls(todoResourceMock, ownerResourceMock);
+        }
+
+        [Fact]
+        public void AfterCreate_Without_Any_Hook_Implemented()
+        {
+            // arrange
+            var todoDiscovery = SetDiscoverableHooks<TodoItem>(NoHooks, DisableDbValues);
+            var personDiscovery = SetDiscoverableHooks<Person>(NoHooks, DisableDbValues);
+            (var contextMock, var hookExecutor, var todoResourceMock,
+                var ownerResourceMock) = CreateTestObjects(todoDiscovery, personDiscovery);
+            var todoList = CreateTodoWithOwner();
+
+            // act
+            hookExecutor.AfterCreate(todoList, ResourceAction.Create);
+
+            // assert
+            VerifyNoOtherCalls(todoResourceMock, ownerResourceMock);
+        }
+    }
+}
+