feat(DbContextReolver): make the implementation generic and remove injection of DbContext

Author: jaredcnance

src/JsonApiDotNetCore/Data/DbContextResolver.cs

@@ -1,14 +1,14 @@
-using System;
 using JsonApiDotNetCore.Extensions;
 using Microsoft.EntityFrameworkCore;
 
 namespace JsonApiDotNetCore.Data
 {
-    public class DbContextResolver : IDbContextResolver
+    public class DbContextResolver<TContext>  : IDbContextResolver
+        where TContext : DbContext
     {
-        private readonly DbContext _context;
+        private readonly TContext _context;
 
-        public DbContextResolver(DbContext context)
+        public DbContextResolver(TContext context)
         {
             _context = context;
         }

src/JsonApiDotNetCore/Extensions/IServiceCollectionExtensions.cs

@@ -77,7 +77,8 @@ public static void AddJsonApiInternals<TContext>(
             if (jsonApiOptions.ContextGraph == null)
                 jsonApiOptions.BuildContextGraph<TContext>(null);
 
-            services.AddScoped(typeof(DbContext), typeof(TContext));
+            services.AddScoped<IDbContextResolver, DbContextResolver<TContext>>();
+
             AddJsonApiInternals(services, jsonApiOptions);
         }
 
@@ -91,7 +92,6 @@ public static void AddJsonApiInternals(
                 services.AddSingleton<DbContextOptions>(new DbContextOptionsBuilder().Options);
             }
 
-            services.AddScoped<IDbContextResolver, DbContextResolver>();
             services.AddScoped(typeof(IEntityRepository<>), typeof(DefaultEntityRepository<>));
             services.AddScoped(typeof(IEntityRepository<,>), typeof(DefaultEntityRepository<,>));
             services.AddScoped(typeof(IResourceService<>), typeof(EntityResourceService<>));

src/JsonApiDotNetCore/Internal/Generics/GenericProcessor.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
+using JsonApiDotNetCore.Data;
 using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Models;
 using Microsoft.EntityFrameworkCore;
@@ -10,9 +11,9 @@ namespace JsonApiDotNetCore.Internal.Generics
     public class GenericProcessor<T> : IGenericProcessor where T : class, IIdentifiable
     {
         private readonly DbContext _context;
-        public GenericProcessor(DbContext context)
+        public GenericProcessor(IDbContextResolver contextResolver)
         {
-            _context = context;
+            _context = contextResolver.GetContext();
         }
 
         public async Task UpdateRelationshipsAsync(object parent, RelationshipAttribute relationship, IEnumerable<string> relationshipIds)

src/JsonApiDotNetCore/Internal/Generics/GenericProcessorFactory.cs

@@ -1,4 +1,5 @@
 using System;
+using JsonApiDotNetCore.Data;
 using Microsoft.EntityFrameworkCore;
 
 namespace JsonApiDotNetCore.Internal.Generics
@@ -8,10 +9,11 @@ public class GenericProcessorFactory : IGenericProcessorFactory
         private readonly DbContext _dbContext;
         private readonly IServiceProvider _serviceProvider;
 
-        public GenericProcessorFactory(DbContext dbContext, 
+        public GenericProcessorFactory(
+            IDbContextResolver dbContextResolver, 
             IServiceProvider serviceProvider)
         {
-            _dbContext = dbContext;
+            _dbContext = dbContextResolver.GetContext();
             _serviceProvider = serviceProvider;
         }
 

test/JsonApiDotNetCoreExampleTests/Unit/Extensions/IServiceCollectionExtensionsTests.cs

@@ -1,19 +1,19 @@
-using Xunit;
 using JsonApiDotNetCore.Builders;
-using Microsoft.Extensions.DependencyInjection;
-using JsonApiDotNetCore.Extensions;
 using JsonApiDotNetCore.Configuration;
-using Microsoft.EntityFrameworkCore;
 using JsonApiDotNetCore.Data;
+using JsonApiDotNetCore.Extensions;
+using JsonApiDotNetCore.Formatters;
 using JsonApiDotNetCore.Internal;
-using Microsoft.AspNetCore.Http;
+using JsonApiDotNetCore.Internal.Generics;
+using JsonApiDotNetCore.Serialization;
 using JsonApiDotNetCore.Services;
 using JsonApiDotNetCoreExample.Data;
-using Microsoft.Extensions.Caching.Memory;
 using JsonApiDotNetCoreExample.Models;
-using JsonApiDotNetCore.Serialization;
-using JsonApiDotNetCore.Formatters;
-using JsonApiDotNetCore.Internal.Generics;
+using Microsoft.AspNetCore.Http;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Caching.Memory;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
 
 namespace JsonApiDotNetCoreExampleTests.Unit.Extensions
 {
@@ -36,7 +36,7 @@ public void AddJsonApiInternals_Adds_All_Required_Services()
             var provider = services.BuildServiceProvider();
 
             // assert
-            Assert.NotNull(provider.GetService<DbContext>());
+            Assert.NotNull(provider.GetService<IDbContextResolver>());
             Assert.NotNull(provider.GetService(typeof(IEntityRepository<TodoItem>)));
             Assert.NotNull(provider.GetService<JsonApiOptions>());
             Assert.NotNull(provider.GetService<IContextGraph>());