chore: Refactor project structure and update DI setup

Die Datei `DIExtensions.cs` wurde erheblich überarbeitet, um Abhängigkeiten von der Schicht `DigitalData.UserManager.Infrastructure` zu entfernen. Die Methode `AddUserManager` wurde vereinfacht und eine Methode `AddEncryptor` hinzugefügt. Die Projektverweise auf die Infrastrukturebene in der Anwendungsprojektdatei wurden entfernt. Aktualisierte Servicedateien zur Verwendung neuer Repository-Schnittstellen aus „DigitalData.UserManager.Application.Contracts.Repositories“. Repository-Schnittstellen wurden in den Namensraum für Anwendungsverträge verschoben und ihre Definitionen aktualisiert. Einführung von `DependencyInjection.cs` für die Handhabung von Infrastrukturdienstregistrierungen. Aktualisierte Repository-Implementierungen, um sie an die neue Struktur anzupassen, die Trennung von Belangen zu verbessern und die Injektion von Abhängigkeiten zu vereinfachen.
This commit is contained in:
Developer 02
2025-04-16 11:02:44 +02:00
parent 239a5708a7
commit 2d792c8544
32 changed files with 226 additions and 201 deletions

View File

@@ -1,7 +1,8 @@
using DigitalData.Core.Infrastructure;
using DigitalData.UserManager.Domain.Entities;
using DigitalData.UserManager.Infrastructure.Contracts;
using DigitalData.UserManager.Application.Contracts.Repositories;
using Microsoft.EntityFrameworkCore;
using DigitalData.UserManager.Infrastructure.Contracts;
namespace DigitalData.UserManager.Infrastructure.Repositories
{

View File

@@ -2,6 +2,7 @@
using DigitalData.UserManager.Infrastructure.Contracts;
using DigitalData.Core.Infrastructure;
using Microsoft.EntityFrameworkCore;
using DigitalData.UserManager.Application.Contracts.Repositories;
namespace DigitalData.UserManager.Infrastructure.Repositories
{

View File

@@ -1,4 +1,5 @@
using DigitalData.Core.Infrastructure;
using DigitalData.UserManager.Application.Contracts.Repositories;
using DigitalData.UserManager.Domain.Entities;
using DigitalData.UserManager.Infrastructure.Contracts;
using Microsoft.EntityFrameworkCore;

View File

@@ -1,32 +1,32 @@
using DigitalData.Core.Infrastructure;
using DigitalData.UserManager.Application.Contracts.Repositories;
using DigitalData.UserManager.Domain.Entities;
using DigitalData.UserManager.Infrastructure.Contracts;
using Microsoft.EntityFrameworkCore;
namespace DigitalData.UserManager.Infrastructure.Repositories
namespace DigitalData.UserManager.Infrastructure.Repositories;
public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
where TDbContext : DbContext, IUserManagerDbContext
{
public class ModuleOfUserRepository<TDbContext> : CRUDRepository<ModuleOfUser, int, TDbContext>, IModuleOfUserRepository
where TDbContext : DbContext, IUserManagerDbContext
public ModuleOfUserRepository(TDbContext dbContext) : base(dbContext, dbContext.ModuleOfUsers)
{
public ModuleOfUserRepository(TDbContext dbContext) : base(dbContext, dbContext.ModuleOfUsers)
{
}
private IQueryable<ModuleOfUser> ReadByUser(string username)
{
return _dbSet.Where(mou => mou.User!.Username == username).Include(mou => mou.Module);
}
public IQueryable<ModuleOfUser> ReadByModuleId(int moduleId)
{
return _dbSet.Where(mou => mou.ModuleId == moduleId);
}
public async Task<IEnumerable<ModuleOfUser>> ReadByModelUserIdAsync(int moduleId, int userId)
{
return await _dbSet.Where(mou => mou.ModuleId == moduleId && mou.UserId == userId).ToListAsync();
}
public async Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username) => await ReadByUser(username).ToListAsync();
}
private IQueryable<ModuleOfUser> ReadByUser(string username)
{
return _dbSet.Where(mou => mou.User!.Username == username).Include(mou => mou.Module);
}
public IQueryable<ModuleOfUser> ReadByModuleId(int moduleId)
{
return _dbSet.Where(mou => mou.ModuleId == moduleId);
}
public async Task<IEnumerable<ModuleOfUser>> ReadByModelUserIdAsync(int moduleId, int userId)
{
return await _dbSet.Where(mou => mou.ModuleId == moduleId && mou.UserId == userId).ToListAsync();
}
public async Task<IEnumerable<ModuleOfUser>> ReadByUserAsync(string username) => await ReadByUser(username).ToListAsync();
}

View File

@@ -1,15 +1,15 @@
using DigitalData.Core.Infrastructure;
using DigitalData.UserManager.Application.Contracts.Repositories;
using DigitalData.UserManager.Domain.Entities;
using DigitalData.UserManager.Infrastructure.Contracts;
using Microsoft.EntityFrameworkCore;
namespace DigitalData.UserManager.Infrastructure.Repositories
namespace DigitalData.UserManager.Infrastructure.Repositories;
public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
where TDbContext : DbContext, IUserManagerDbContext
{
public class ModuleRepository<TDbContext> : CRUDRepository<Module, int, TDbContext>, IModuleRepository
where TDbContext : DbContext, IUserManagerDbContext
public ModuleRepository(TDbContext dbContext) : base(dbContext, dbContext.Modules)
{
public ModuleRepository(TDbContext dbContext) : base(dbContext, dbContext.Modules)
{
}
}
}

View File

@@ -1,48 +1,48 @@
using DigitalData.Core.Infrastructure;
using DigitalData.UserManager.Application.Contracts.Repositories;
using DigitalData.UserManager.Domain.Entities;
using DigitalData.UserManager.Infrastructure.Contracts;
using Microsoft.EntityFrameworkCore;
namespace DigitalData.UserManager.Infrastructure.Repositories
namespace DigitalData.UserManager.Infrastructure.Repositories;
public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
where TDbContext : DbContext, IUserManagerDbContext
{
public class UserRepRepository<TDbContext> : CRUDRepository<UserRep, int, TDbContext>, IUserRepRepository
where TDbContext : DbContext, IUserManagerDbContext
public UserRepRepository(TDbContext dbContext) : base(dbContext, dbContext.UserReps)
{
public UserRepRepository(TDbContext dbContext) : base(dbContext, dbContext.UserReps)
{
}
}
public async Task<IEnumerable<UserRep>> ReadAllAsync(
bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false,
int? userId = null, int? repUserId = null, int? groupId = null, int? repGroupId = null, bool readOnly = true)
{
var query = readOnly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable();
public async Task<IEnumerable<UserRep>> ReadAllAsync(
bool withUser = false, bool withRepGroup = false, bool withGroup = false, bool withRepUser = false,
int? userId = null, int? repUserId = null, int? groupId = null, int? repGroupId = null, bool readOnly = true)
{
var query = readOnly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable();
if (withUser)
query = query.Include(ur => ur.User);
if (withUser)
query = query.Include(ur => ur.User);
if (withRepGroup)
query = query.Include(ur => ur.RepGroup);
if (withRepGroup)
query = query.Include(ur => ur.RepGroup);
if (withGroup)
query = query.Include(ur => ur.Group);
if (withGroup)
query = query.Include(ur => ur.Group);
if (withRepUser)
query = query.Include(ur => ur.RepUser);
if (withRepUser)
query = query.Include(ur => ur.RepUser);
if (userId is not null)
query = query.Where(ur => ur.UserId == userId);
if (userId is not null)
query = query.Where(ur => ur.UserId == userId);
if (repUserId is not null)
query = query.Where(ur => ur.RepUserId == repUserId);
if (repUserId is not null)
query = query.Where(ur => ur.RepUserId == repUserId);
if (groupId is not null)
query = query.Where(ur => ur.GroupId == groupId);
if (groupId is not null)
query = query.Where(ur => ur.GroupId == groupId);
if (repGroupId is not null)
query = query.Where(ur => ur.RepGroupId == repGroupId);
if (repGroupId is not null)
query = query.Where(ur => ur.RepGroupId == repGroupId);
return await query.ToListAsync();
}
return await query.ToListAsync();
}
}

View File

@@ -1,4 +1,5 @@
using DigitalData.Core.Infrastructure;
using DigitalData.UserManager.Application.Contracts.Repositories;
using DigitalData.UserManager.Domain.Entities;
using DigitalData.UserManager.Infrastructure.Contracts;
using Microsoft.EntityFrameworkCore;