IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring: scope

Browse Source
This commit is contained in:
pavelbannov 2020-10-19 10:19:32 +03:00
parent 3a29e9970f
commit 9fe6fc3832
3 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
common/ASC.Common/DIHelper.cs
View File

@ -115,33 +115,41 @@ namespace ASC.Common
public bool TryAdd(Type service, Type implementation = null)
{
var di = service.GetCustomAttribute<DIAttribute>();
var di = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
var isnew = false;
if (di != null)
{
if (service.IsInterface && implementation == null)
if (!service.IsInterface || implementation != null)
{
var a = di.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
if (a != null)
{
var b = a.GetGenericArguments();
isnew = implementation != null ? Register(service, implementation) : Register(service);
}
foreach (var g in b)
if (service.IsInterface && implementation == null || !service.IsInterface)
{
if (di.Type != null)
{
var a = di.Type.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
if (a != null)
{
TryAdd(g);
}
var b = a.GetGenericArguments();
TryAdd(a, di.Type);
}
else
{
Register(service, di.Type);
foreach (var g in b)
{
TryAdd(g);
}
TryAdd(a, di.Type);
}
else
{
Register(service, di.Type);
}
}
if (di.CachedType != null)
{
a = di.CachedType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
var a = di.CachedType.GetInterfaces().FirstOrDefault(x => x.IsGenericType && x.GetGenericTypeDefinition() == typeof(IConfigureOptions<>));
if (a != null)
{
var b = a.GetGenericArguments();
@ -153,13 +161,13 @@ namespace ASC.Common
TryAdd(a, di.CachedType);
}
else
{
Register(service, di.CachedType);
}
}
}
else
{
isnew = implementation != null ? Register(service, implementation) : Register(service);
}
}
if (isnew)
@ -208,7 +216,7 @@ namespace ASC.Common
private bool Register(Type service, Type implementation)
{
var c = service.GetCustomAttribute<DIAttribute>();
var c = service.IsGenericType && service.GetGenericTypeDefinition() == typeof(IConfigureOptions<>) && implementation != null ? implementation.GetCustomAttribute<DIAttribute>() : service.GetCustomAttribute<DIAttribute>();
var serviceName = $"{service}{implementation}";
if (c is ScopeAttribute)
{

2
common/ASC.Core.Common/EF/Context/ConfigureDbContext.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Linq;
using ASC.Common;
using ASC.Common.Logging;
using ASC.Common.Utils;
@ -9,6 +10,7 @@ using Microsoft.Extensions.Options;
namespace ASC.Core.Common.EF
{
[Scope]
public class ConfigureDbContext : IConfigureNamedOptions<BaseDbContext>
{
public const string baseName = "default";

1
common/ASC.Core.Common/EF/Context/DbContextManager.cs
View File

@ -66,6 +66,7 @@ namespace ASC.Core.Common.EF
}
}
[Scope(typeof(ConfigureDbContext))]
public class DbContextManager<T> : BaseDbContextManager<T> where T : BaseDbContext, new()
{
public DbContextManager(IOptionsFactory<T> factory, IConfiguration configuration) : base(factory, configuration)