tests: DRCU update tests

Author: maurei

src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs

@@ -81,15 +81,15 @@ public IResourceHookContainer<TEntity> GetResourceHookContainer<TEntity>(Resourc
             return (IResourceHookContainer<TEntity>)GetResourceHookContainer(typeof(TEntity), hook);
         }
 
-        public IEnumerable LoadDbValues(DependentType entityType, IEnumerable entities, ResourceHook hook, params RelationshipProxy[] relationships)
+        public IEnumerable LoadDbValues(PrincipalType repositoryEntityType, Type affectedHookEntityType, IEnumerable entities, ResourceHook hook, params RelationshipProxy[] relationships)
         {
-            if (!ShouldLoadDbValues(entityType, hook)) return null;
+            if (!ShouldLoadDbValues(affectedHookEntityType, hook)) return null;
 
             var paths = relationships.Select(p => p.Attribute.RelationshipPath).ToArray();
-            var idType = GetIdentifierType(entityType);
+            var idType = GetIdentifierType(repositoryEntityType);
             var parameterizedGetWhere = GetType()
                     .GetMethod(nameof(GetWhereAndInclude), BindingFlags.NonPublic | BindingFlags.Instance)
-                    .MakeGenericMethod(entityType, idType);
+                    .MakeGenericMethod(repositoryEntityType, idType);
             var casted = ((IEnumerable<object>)entities).Cast<IIdentifiable>();
             var ids = casted.Select(e => e.StringId).Cast(idType);
             var values = (IEnumerable)parameterizedGetWhere.Invoke(this, new object[] { ids, paths });
@@ -98,16 +98,15 @@ public IEnumerable LoadDbValues(DependentType entityType, IEnumerable entities,
 
         public HashSet<TEntity> LoadDbValues<TEntity>(IEnumerable<TEntity> entities, ResourceHook hook, params RelationshipProxy[] relationships) where TEntity : class, IIdentifiable
         {
-            var dbValues = LoadDbValues(typeof(TEntity), entities, hook, relationships)?.Cast<TEntity>();
+            var entityType = typeof(TEntity);
+            var dbValues = LoadDbValues(entityType, entityType, entities, hook, relationships)?.Cast<TEntity>();
             if (dbValues == null) return null;
             return new HashSet<TEntity>(dbValues);
         }
 
 
         bool ShouldLoadDbValues(DependentType entityType, ResourceHook hook)
         {
-            if (hook == ResourceHook.BeforeImplicitUpdateRelationship) return true;
-
             var discovery = GetHookDiscovery(entityType);
 
             if (discovery.DatabaseDiffDisabledHooks.Contains(hook))
@@ -122,7 +121,6 @@ bool ShouldLoadDbValues(DependentType entityType, ResourceHook hook)
             {
                 return _context.Options.LoadDatabaseValues;
             }
-
         }
 
         bool ShouldExecuteHook(DependentType entityType, ResourceHook hook)
@@ -180,7 +178,7 @@ public Dictionary<RelationshipProxy, IEnumerable> LoadImplicitlyAffected(
             foreach (var kvp in principalEntitiesByRelation)
             {
                 if (IsHasManyThrough(kvp, out var principals, out var relationship)) continue;
-                var includedPrincipals = LoadDbValues(relationship.PrincipalType, principals, ResourceHook.BeforeImplicitUpdateRelationship, relationship);
+                var includedPrincipals = LoadDbValues(relationship.PrincipalType, relationship.DependentType, principals, ResourceHook.BeforeImplicitUpdateRelationship, relationship);
 
                 foreach (IIdentifiable ip in includedPrincipals)
                 {

src/JsonApiDotNetCore/Hooks/Execution/IHookExecutorHelper.cs

@@ -42,7 +42,7 @@ internal interface IHookExecutorHelper
         /// <summary>
         /// For a set of entities, loads current values from the database
         /// </summary>
-        IEnumerable LoadDbValues(Type entityType, IEnumerable entities, ResourceHook hook, params RelationshipProxy[] relationships);
+        IEnumerable LoadDbValues(Type repositoryEntityType, Type affectedHookEntityType,  IEnumerable entities, ResourceHook hook, params RelationshipProxy[] relationships);
         /// <summary>
         /// For a set of entities, loads current values from the database
         /// </summary>

src/JsonApiDotNetCore/Hooks/ResourceHookExecutor.cs

@@ -246,7 +246,7 @@ void FireNestedBeforeUpdateHooks(ResourcePipeline pipeline, EntityChildLayer lay
                 {
                     if (uniqueEntities.Cast<IIdentifiable>().Any())
                     {
-                        var dbValues = _executorHelper.LoadDbValues(entityType, uniqueEntities, ResourceHook.BeforeUpdateRelationship, node.RelationshipsToNextLayer);
+                        var dbValues = _executorHelper.LoadDbValues(entityType, entityType, uniqueEntities, ResourceHook.BeforeUpdateRelationship, node.RelationshipsToNextLayer);
                         var resourcesByRelationship = CreateRelationshipHelper(entityType, node.RelationshipsFromPreviousLayer.GetDependentEntities(), dbValues);
                         var allowedIds = CallHook(nestedHookcontainer, ResourceHook.BeforeUpdateRelationship, new object[] { GetIds(uniqueEntities), resourcesByRelationship, pipeline }).Cast<string>();
                         var updated = GetAllowedEntities(uniqueEntities, allowedIds);
@@ -276,13 +276,13 @@ void FireNestedBeforeUpdateHooks(ResourcePipeline pipeline, EntityChildLayer lay
         /// Given a source of entities, gets the implicitly affected entities 
         /// from the database and calls the BeforeImplicitUpdateRelationship hook.
         /// </summary>
-        void FireForAffectedImplicits(Type entityType, Dictionary<RelationshipProxy, IEnumerable> implicitsTarget, ResourcePipeline pipeline, IEnumerable existingImplicitEntities = null)
+        void FireForAffectedImplicits(Type entityTypeToInclude, Dictionary<RelationshipProxy, IEnumerable> implicitsTarget, ResourcePipeline pipeline, IEnumerable existingImplicitEntities = null)
         {
-            var container = _executorHelper.GetResourceHookContainer(entityType, ResourceHook.BeforeImplicitUpdateRelationship);
+            var container = _executorHelper.GetResourceHookContainer(entityTypeToInclude, ResourceHook.BeforeImplicitUpdateRelationship);
             if (container == null) return;
             var implicitAffected = _executorHelper.LoadImplicitlyAffected(implicitsTarget, existingImplicitEntities);
             if (!implicitAffected.Any()) return;
-            var resourcesByRelationship = CreateRelationshipHelper(entityType, implicitAffected);
+            var resourcesByRelationship = CreateRelationshipHelper(entityTypeToInclude, implicitAffected);
             CallHook(container, ResourceHook.BeforeImplicitUpdateRelationship, new object[] { resourcesByRelationship, pipeline, });
         }