refactor: renamed some internals, and added id to mapped out entity in service layer

Author: maurei

src/Examples/JsonApiDotNetCoreExample/Startup.cs

@@ -40,7 +40,7 @@ public virtual IServiceProvider ConfigureServices(IServiceCollection services)
                     options.DefaultPageSize = 5;
                     options.IncludeTotalRecordCount = true;
                     options.EnableResourceHooks = true;
-                    options.DatabaseValuesInDiffs = true;
+                    options.LoadDatabaseValues = true;
                 }, 
                 mvcBuilder,
                 discovery => discovery.AddCurrentAssembly());

src/JsonApiDotNetCore/Configuration/JsonApiOptions.cs

@@ -50,7 +50,7 @@ public class JsonApiOptions
         /// 
         /// Defaults to <see langword="true"/>.
         /// </summary>
-        public bool DatabaseValuesInDiffs { get; set; } = true;
+        public bool LoadDatabaseValues { get; set; } = true;
 
         /// <summary>
         /// The base URL Namespace

src/JsonApiDotNetCore/Extensions/IApplicationBuilderExtensions.cs

@@ -22,8 +22,11 @@ public static IApplicationBuilder UseJsonApi(this IApplicationBuilder app, bool
             if (useMvc)
                 app.UseMvc();
 
-            var inverseRelationshipResolver = app.ApplicationServices.GetService<IInverseRelationships>();
-            inverseRelationshipResolver?.Resolve();
+            using (var scope = app.ApplicationServices.CreateScope())
+            {
+                var inverseRelationshipResolver = scope.ServiceProvider.GetService<IInverseRelationships>();
+                inverseRelationshipResolver?.Resolve();
+            }
 
             return app;
         }

src/JsonApiDotNetCore/Hooks/Discovery/HooksDiscovery.cs

@@ -56,7 +56,7 @@ void DiscoverImplementedHooksForModel()
                                 diffEnabledHooks.Add(hook);
                                 continue;
                             }
-                            var attr = method.GetCustomAttributes(true).OfType<IncludeDatabaseValues>().SingleOrDefault();
+                            var attr = method.GetCustomAttributes(true).OfType<LoadDatabaseValues>().SingleOrDefault();
                             if (attr != null)
                             {
                                 var targetList = attr.value ? diffEnabledHooks : diffDisabledHooks;

src/JsonApiDotNetCore/Hooks/Discovery/IncludeDatabaseValues.cs renamed to src/JsonApiDotNetCore/Hooks/Discovery/LoadDatabaseValuesAttribute.cs

@@ -1,10 +1,10 @@
 using System;
 namespace JsonApiDotNetCore.Hooks
 {
-    public class IncludeDatabaseValues : Attribute
+    public class LoadDatabaseValues : Attribute
     {
         public readonly bool value;
-        public IncludeDatabaseValues(bool mode = true)
+        public LoadDatabaseValues(bool mode = true)
         {
             value = mode;
         }

src/JsonApiDotNetCore/Hooks/Execution/HookExecutorHelper.cs

@@ -118,7 +118,7 @@ bool ShouldLoadDbValues(DependentType entityType, ResourceHook hook)
             }
             else
             {
-                return _context.Options.DatabaseValuesInDiffs;
+                return _context.Options.LoadDatabaseValues;
             }
 
         }

src/JsonApiDotNetCore/Services/EntityResourceService.cs

@@ -215,13 +215,14 @@ public virtual async Task<object> GetRelationshipAsync(TId id, string relationsh
         public virtual async Task<TResource> UpdateAsync(TId id, TResource resource)
         {
             var entity = MapIn(resource);
-
+            // why is entity passed along to UpdateAsync if it is never used internally??
+            // I think we should just set the id on the request-parsed entity and pass that along to the repo.
+            entity.Id = id;
 
             entity = IsNull(_hookExecutor) ? entity : _hookExecutor.BeforeUpdate(AsList(entity), ResourcePipeline.Patch).SingleOrDefault();
             entity = await _entities.UpdateAsync(id, entity);
             if (!IsNull(_hookExecutor, entity))
             {
-                // TODO: should not fire after read for L=0
                 _hookExecutor.AfterUpdate(AsList(entity), ResourcePipeline.Patch);
                 entity = _hookExecutor.OnReturn(AsList(entity), ResourcePipeline.Patch).SingleOrDefault();
             }

test/UnitTests/ResourceHooks/ResourceHooksTestsSetup.cs

@@ -302,7 +302,7 @@ void MockHooks<TModel>(Mock<IResourceHookContainer<TModel>> resourceDefinition)
             var processorFactory = new Mock<IGenericProcessorFactory>();
             var context = new Mock<IJsonApiContext>();
             context.Setup(c => c.GenericProcessorFactory).Returns(processorFactory.Object);
-            context.Setup(c => c.Options).Returns(new JsonApiOptions { DatabaseValuesInDiffs = false });
+            context.Setup(c => c.Options).Returns(new JsonApiOptions { LoadDatabaseValues = false });
             context.Setup(c => c.ResourceGraph).Returns(ResourceGraph.Instance);
 
             return (context, processorFactory);