Refactor DependencyInjection and RepositoryConfiguration classes
Restructure code for improved readability and maintainability. Move RepositoryConfiguration as a nested public class inside DependencyInjection, group related service registration logic, and clarify method organization. No functional changes.
This commit is contained in:
@@ -11,142 +11,134 @@ using System.Linq;
|
||||
#endif
|
||||
|
||||
namespace DigitalData.Core.Infrastructure
|
||||
#if NET
|
||||
;
|
||||
#elif NETFRAMEWORK
|
||||
{
|
||||
#endif
|
||||
|
||||
public static class DependencyInjection
|
||||
{
|
||||
public static IServiceCollection AddDbRepository(this IServiceCollection services, Action<RepositoryConfiguration> options)
|
||||
public static class DependencyInjection
|
||||
{
|
||||
// register services from configuration
|
||||
var cfg = new RepositoryConfiguration();
|
||||
options.Invoke(cfg);
|
||||
cfg.RegisterAllServices(services);
|
||||
|
||||
return services;
|
||||
}
|
||||
|
||||
public class RepositoryConfiguration
|
||||
{
|
||||
// 1. register from assembly
|
||||
private readonly Queue<Action<IServiceCollection>> RegsFromAssembly = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
// 2. register entities (can overwrite)
|
||||
private readonly Queue<Action<IServiceCollection>> RegsEntity = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
// 3. register db set factories (can overwrite)
|
||||
private readonly Queue<Action<IServiceCollection>> RegsDbSetFactory = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
// 4. register repository
|
||||
private readonly Queue<Action<IServiceCollection>> RegsRepository = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
internal void RegisterAllServices(IServiceCollection services)
|
||||
public static IServiceCollection AddDbRepository(this IServiceCollection services, Action<RepositoryConfiguration> options)
|
||||
{
|
||||
// 1. register from assembly
|
||||
RegsFromAssembly.InvokeAll(services);
|
||||
// register services from configuration
|
||||
var cfg = new RepositoryConfiguration();
|
||||
options.Invoke(cfg);
|
||||
cfg.RegisterAllServices(services);
|
||||
|
||||
// 2. register entities (can overwrite)
|
||||
RegsEntity.InvokeAll(services);
|
||||
|
||||
// 3. register db set factories (can overwrite)
|
||||
RegsDbSetFactory.InvokeAll(services);
|
||||
return services;
|
||||
}
|
||||
|
||||
internal RepositoryConfiguration() { }
|
||||
|
||||
public void RegisterFromAssembly<TDbContext>(Assembly assembly) where TDbContext : DbContext
|
||||
public class RepositoryConfiguration
|
||||
{
|
||||
void reg(IServiceCollection services)
|
||||
// 1. register from assembly
|
||||
private readonly Queue<Action<IServiceCollection>> RegsFromAssembly = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
// 2. register entities (can overwrite)
|
||||
private readonly Queue<Action<IServiceCollection>> RegsEntity = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
// 3. register db set factories (can overwrite)
|
||||
private readonly Queue<Action<IServiceCollection>> RegsDbSetFactory = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
// 4. register repository
|
||||
private readonly Queue<Action<IServiceCollection>> RegsRepository = new Queue<Action<IServiceCollection>>();
|
||||
|
||||
internal void RegisterAllServices(IServiceCollection services)
|
||||
{
|
||||
// scan all types in the Assembly
|
||||
var entityTypes = assembly.GetTypes()
|
||||
.Where(t => t.IsClass && !t.IsAbstract && t.GetCustomAttribute<TableAttribute>() != null);
|
||||
// 1. register from assembly
|
||||
RegsFromAssembly.InvokeAll(services);
|
||||
|
||||
foreach (var entityType in entityTypes)
|
||||
// 2. register entities (can overwrite)
|
||||
RegsEntity.InvokeAll(services);
|
||||
|
||||
// 3. register db set factories (can overwrite)
|
||||
RegsDbSetFactory.InvokeAll(services);
|
||||
}
|
||||
|
||||
internal RepositoryConfiguration() { }
|
||||
|
||||
public void RegisterFromAssembly<TDbContext>(Assembly assembly) where TDbContext : DbContext
|
||||
{
|
||||
void reg(IServiceCollection services)
|
||||
{
|
||||
#region Repository
|
||||
/// register repository
|
||||
// create generic DbRepository<DbContext, TEntity> type
|
||||
var repositoryType = typeof(DbRepository<,>).MakeGenericType(typeof(TDbContext), entityType);
|
||||
var interfaceType = typeof(IRepository<>).MakeGenericType(entityType);
|
||||
// scan all types in the Assembly
|
||||
var entityTypes = assembly.GetTypes()
|
||||
.Where(t => t.IsClass && !t.IsAbstract && t.GetCustomAttribute<TableAttribute>() != null);
|
||||
|
||||
// add into DI container as Scoped
|
||||
services.AddScoped(interfaceType, repositoryType);
|
||||
#endregion Repository
|
||||
foreach (var entityType in entityTypes)
|
||||
{
|
||||
#region Repository
|
||||
/// register repository
|
||||
// create generic DbRepository<DbContext, TEntity> type
|
||||
var repositoryType = typeof(DbRepository<,>).MakeGenericType(typeof(TDbContext), entityType);
|
||||
var interfaceType = typeof(IRepository<>).MakeGenericType(entityType);
|
||||
|
||||
#region DbSetFactory
|
||||
/// register DbSetFactory
|
||||
var addDbSetFactoryMethod = typeof(DependencyInjection)
|
||||
.GetMethod(nameof(AddDbSetFactory),
|
||||
BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
|
||||
// add into DI container as Scoped
|
||||
services.AddScoped(interfaceType, repositoryType);
|
||||
#endregion Repository
|
||||
|
||||
var genericMethod = addDbSetFactoryMethod
|
||||
#region DbSetFactory
|
||||
/// register DbSetFactory
|
||||
var addDbSetFactoryMethod = typeof(DependencyInjection)
|
||||
.GetMethod(nameof(AddDbSetFactory),
|
||||
BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public);
|
||||
|
||||
var genericMethod = addDbSetFactoryMethod
|
||||
#if NET
|
||||
!
|
||||
#endif
|
||||
.MakeGenericMethod(typeof(TDbContext), entityType);
|
||||
genericMethod.Invoke(null, new [] { services, null });
|
||||
#endregion DbSetFactory
|
||||
.MakeGenericMethod(typeof(TDbContext), entityType);
|
||||
genericMethod.Invoke(null, new [] { services, null });
|
||||
#endregion DbSetFactory
|
||||
}
|
||||
}
|
||||
|
||||
RegsFromAssembly.Enqueue(reg);
|
||||
}
|
||||
|
||||
RegsFromAssembly.Enqueue(reg);
|
||||
}
|
||||
|
||||
public void RegisterEntity<TDbContext, TEntity>(Func<TDbContext, DbSet<TEntity>>
|
||||
public void RegisterEntity<TDbContext, TEntity>(Func<TDbContext, DbSet<TEntity>>
|
||||
#if NET
|
||||
?
|
||||
#endif
|
||||
dbSetFactory = null)
|
||||
where TDbContext : DbContext
|
||||
where TEntity : class
|
||||
{
|
||||
void reg(IServiceCollection services)
|
||||
=> services
|
||||
.AddScoped<IRepository<TEntity>, DbRepository<TDbContext, TEntity>>()
|
||||
.AddDbSetFactory(dbSetFactory);
|
||||
dbSetFactory = null)
|
||||
where TDbContext : DbContext
|
||||
where TEntity : class
|
||||
{
|
||||
void reg(IServiceCollection services)
|
||||
=> services
|
||||
.AddScoped<IRepository<TEntity>, DbRepository<TDbContext, TEntity>>()
|
||||
.AddDbSetFactory(dbSetFactory);
|
||||
|
||||
RegsEntity.Enqueue(reg);
|
||||
RegsEntity.Enqueue(reg);
|
||||
}
|
||||
|
||||
public void RegisterDbSetFactory<TDbContext, TEntity>(Func<TDbContext, DbSet<TEntity>> dbSetFactory)
|
||||
where TDbContext : DbContext
|
||||
where TEntity : class
|
||||
=> RegsDbSetFactory.Enqueue(s => s.AddDbSetFactory(dbSetFactory));
|
||||
|
||||
public void RegisterDefaultRepository<TDbContext>()
|
||||
where TDbContext : DbContext
|
||||
=> RegsRepository.Enqueue(s => s.AddScoped<IRepository, DbRepository<TDbContext>>());
|
||||
}
|
||||
|
||||
public void RegisterDbSetFactory<TDbContext, TEntity>(Func<TDbContext, DbSet<TEntity>> dbSetFactory)
|
||||
where TDbContext : DbContext
|
||||
where TEntity : class
|
||||
=> RegsDbSetFactory.Enqueue(s => s.AddDbSetFactory(dbSetFactory));
|
||||
|
||||
public void RegisterDefaultRepository<TDbContext>()
|
||||
where TDbContext : DbContext
|
||||
=> RegsRepository.Enqueue(s => s.AddScoped<IRepository, DbRepository<TDbContext>>());
|
||||
}
|
||||
|
||||
private static void InvokeAll<T>(this Queue<Action<T>> queue, T services)
|
||||
{
|
||||
while (queue.Count > 0)
|
||||
queue.Dequeue().Invoke(services);
|
||||
}
|
||||
private static void InvokeAll<T>(this Queue<Action<T>> queue, T services)
|
||||
{
|
||||
while (queue.Count > 0)
|
||||
queue.Dequeue().Invoke(services);
|
||||
}
|
||||
|
||||
internal static IServiceCollection AddDbSetFactory<TDbContext, TEntity>(this IServiceCollection services, Func<TDbContext, DbSet<TEntity>>
|
||||
internal static IServiceCollection AddDbSetFactory<TDbContext, TEntity>(this IServiceCollection services, Func<TDbContext, DbSet<TEntity>>
|
||||
#if NET
|
||||
?
|
||||
#endif
|
||||
create = null)
|
||||
where TDbContext : DbContext
|
||||
where TEntity : class
|
||||
{
|
||||
create = null)
|
||||
where TDbContext : DbContext
|
||||
where TEntity : class
|
||||
{
|
||||
#if NET
|
||||
create ??= ctx => ctx.Set<TEntity>();
|
||||
create ??= ctx => ctx.Set<TEntity>();
|
||||
#elif NETFRAMEWORK
|
||||
if(create is null)
|
||||
create = ctx => ctx.Set<TEntity>();
|
||||
if(create is null)
|
||||
create = ctx => ctx.Set<TEntity>();
|
||||
#endif
|
||||
services.AddSingleton(_ => new DbSetFactory<TDbContext, TEntity>(create));
|
||||
return services;
|
||||
services.AddSingleton(_ => new DbSetFactory<TDbContext, TEntity>(create));
|
||||
return services;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#if NETFRAMEWORK
|
||||
}
|
||||
#endif
|
||||
}
|
||||
Reference in New Issue
Block a user