Refactor user DTOs and update faker method

- Aktualisiert `CreateUserDtoFaker` um `UserCreateDto` anstelle von `UserDto` zu generieren.
- Die Klasse `UserDto` wurde entfernt, da sie nicht mehr benötigt wird.
- Hinzufügen von `UserCreateDto` für die Erstellung von Benutzern, Erweiterung von `UserBase`.
- Einführung von `UserReadDto` zum Lesen von Benutzerdaten, ebenfalls eine Erweiterung von `UserBase`.

DigitalData.Core.Abstractions/DigitalData.Core.Abstractions.csproj

@@ -17,9 +17,9 @@
 		<RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
 		<PackAsTool>False</PackAsTool>
 		<PackageIcon>core_icon.png</PackageIcon>
-		<Version>3.4.0</Version>
+		<Version>3.4.1</Version>
-		<AssemblyVersion>3.4.0</AssemblyVersion>
+		<AssemblyVersion>3.4.1</AssemblyVersion>
-		<FileVersion>3.4.0</FileVersion>
+		<FileVersion>3.4.1</FileVersion>
 	</PropertyGroup>
 
 	<ItemGroup>

DigitalData.Core.Abstractions/Infrastructure/Extensions.cs

@@ -0,0 +1,18 @@
+using System.Linq.Expressions;
+
+namespace DigitalData.Core.Abstractions.Infrastructure;
+
+public static class Extensions
+{
+    public static async Task<TEntity?> ReadFirstOrDefaultAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
+        => (await repository.ReadAsync(expression)).FirstOrDefault();
+
+    public static async Task<TEntity> ReadFirstAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
+        => (await repository.ReadAsync(expression)).First();
+
+    public static async Task<TEntity?> ReadSingleOrDefaultAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
+        => (await repository.ReadAsync(expression)).SingleOrDefault();
+
+    public static async Task<TEntity> ReadSingleAsync<TEntity>(this IRepository<TEntity> repository, Expression<Func<TEntity, bool>>? expression = null)
+        => (await repository.ReadAsync(expression)).Single();
+}

DigitalData.Core.Abstractions/Infrastructure/ICRUDRepository.cs

@@ -5,7 +5,6 @@
     /// </summary>
     /// <typeparam name="TEntity">The type of the entity this repository works with.</typeparam>
     /// <typeparam name="TId">The type of the identifier for the entity.</typeparam>
-    [Obsolete("ICRUDRepository has been deprecated. Please use the IRepository interface instead, which provides a better abtraction (e.g. without tracking) and flexibility.")]
     public interface ICRUDRepository<TEntity, TId> where TEntity : class, IUnique<TId>
     {
         /// <summary>

DigitalData.Core.Abstractions/Infrastructure/IRepository.cs

@@ -4,13 +4,17 @@ namespace DigitalData.Core.Abstractions.Infrastructure;
 
 public interface IRepository<TEntity>
 {
-    public Task<TEntity> CreateAsync(TEntity dto, CancellationToken ct = default);
+    public Task<TEntity> CreateAsync(TEntity entity, CancellationToken ct = default);
 
-    public Task<TEntity> CreateAsync(IEnumerable<TEntity> dtos, CancellationToken ct = default);
+    public Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken ct = default);
 
-    public Task<IEnumerable<TEntity>> ReadAsync(Expression? expression = null, CancellationToken ct = default);
+    public Task<TEntity> CreateAsync<TDto>(TDto dto, CancellationToken ct = default);
 
-    public Task<IEnumerable<TEntity>> UpdateAsync<TDto>(TDto dto, Expression expression, CancellationToken ct = default);
+    public Task<IEnumerable<TEntity>> CreateAsync<TDto>(IEnumerable<TDto> dtos, CancellationToken ct = default);
 
-    public Task<IEnumerable<TEntity>> DeleteAsync<TDto>(Expression expression, CancellationToken ct = default);
+    public Task<IEnumerable<TEntity>> ReadAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default);
+
+    public Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken ct = default);
+
+    public Task DeleteAsync<TDto>(Expression<Func<TEntity, bool>> expression, CancellationToken ct = default);
 }

DigitalData.Core.Application/DigitalData.Core.Application.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
 	<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
@@ -14,9 +14,9 @@
     <PackageIcon>core_icon.png</PackageIcon>
     <RepositoryUrl>http://git.dd:3000/AppStd/WebCoreModules.git</RepositoryUrl>
     <PackageTags>digital data core application clean architecture</PackageTags>
-    <Version>3.2.0</Version>
+    <Version>3.2.1</Version>
-    <AssemblyVersion>3.2.0</AssemblyVersion>
+    <AssemblyVersion>3.2.1</AssemblyVersion>
-    <FileVersion>3.2.0</FileVersion>
+    <FileVersion>3.2.1</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>

DigitalData.Core.Infrastructure/DbRepository.cs

@@ -5,13 +5,13 @@ using System.Linq.Expressions;
 
 namespace DigitalData.Core.Infrastructure;
 
-internal class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbContext : DbContext where TEntity : class
+public class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TDbContext : DbContext where TEntity : class
 {
-    protected readonly TDbContext Context;
+    protected internal readonly TDbContext Context;
 
-    protected readonly DbSet<TEntity> Entities;
+    protected internal readonly DbSet<TEntity> Entities;
 
-    protected readonly IMapper Mapper;
+    protected internal readonly IMapper Mapper;
 
     public DbRepository(TDbContext context, Func<TDbContext, DbSet<TEntity>> queryFactory, IMapper mapper)
     {
@@ -20,28 +20,59 @@ internal class DbRepository<TDbContext, TEntity> : IRepository<TEntity> where TD
         Mapper = mapper;
     }
 
-    public virtual Task<TEntity> CreateAsync(TEntity entity, CancellationToken ct = default)
+    public virtual async Task<TEntity> CreateAsync(TEntity entity, CancellationToken ct = default)
     {
-        throw new NotImplementedException();
+        Entities.Add(entity);
+        await Context.SaveChangesAsync(ct);
+        return entity;
     }
 
-    public virtual Task<TEntity> CreateAsync(IEnumerable<TEntity> entities, CancellationToken ct = default)
+    public virtual async Task<IEnumerable<TEntity>> CreateAsync(IEnumerable<TEntity> entities, CancellationToken ct = default)
     {
-        throw new NotImplementedException();
+        Entities.AddRange(entities);
+        await Context.SaveChangesAsync(ct);
+        return entities;
     }
 
-    public virtual Task<IEnumerable<TEntity>> DeleteAsync<TDto>(Expression expression, CancellationToken ct = default)
+    public virtual Task<TEntity> CreateAsync<TDto>(TDto dto, CancellationToken ct = default)
     {
-        throw new NotImplementedException();
+        var entity = Mapper.Map<TEntity>(dto);
+        return CreateAsync(entity, ct);
     }
 
-    public virtual Task<IEnumerable<TEntity>> ReadAsync(Expression? expression = null, CancellationToken ct = default)
+    public virtual Task<IEnumerable<TEntity>> CreateAsync<TDto>(IEnumerable<TDto> dtos, CancellationToken ct = default)
     {
-        throw new NotImplementedException();
+        var entities = dtos.Select(dto => Mapper.Map<TEntity>(dto));
+        return CreateAsync(entities, ct);
     }
 
-    public virtual Task<IEnumerable<TEntity>> UpdateAsync<TDto>(TDto dto, Expression expression, CancellationToken ct = default)
+    public virtual async Task<IEnumerable<TEntity>> ReadAsync(Expression<Func<TEntity, bool>>? expression = null, CancellationToken ct = default)
+        => expression is null
+            ? await Entities.AsNoTracking().ToListAsync(ct)
+            : await Entities.AsNoTracking().Where(expression).ToListAsync(ct);
+
+    public virtual async Task UpdateAsync<TDto>(TDto dto, Expression<Func<TEntity, bool>> expression, CancellationToken ct = default)
     {
-        throw new NotImplementedException();
+        var entities = await Entities.Where(expression).ToListAsync(ct);
+
+        foreach (var entity in entities)
+        {
+            Mapper.Map(dto, entity);
+            Entities.Add(entity);
+        }
+
+        await Context.SaveChangesAsync(ct);
+    }
+
+    public virtual async Task DeleteAsync<TDto>(Expression<Func<TEntity, bool>> expression, CancellationToken ct = default)
+    {
+        var entities = await Entities.Where(expression).ToListAsync(ct);
+
+        foreach (var entity in entities)
+        {
+            entities.Remove(entity);
+        }
+
+        await Context.SaveChangesAsync(ct);
     }
 }

DigitalData.Core.Infrastructure/DependencyInjection.cs

@@ -8,7 +8,7 @@ public static class DependencyInjection
 {
     public static IServiceCollection AddDbRepository<TDbContext, TEntity>(this IServiceCollection services, Func<TDbContext, DbSet<TEntity>> queryFactory)
         where TDbContext : DbContext
-        where TEntity : DbContext
+        where TEntity : class
     {
         return services
             .AddScoped<IRepository<TEntity>, DbRepository<TDbContext, TEntity>>()

DigitalData.Core.Infrastructure/DigitalData.Core.Infrastructure.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
@@ -6,7 +6,7 @@
     <Nullable>enable</Nullable>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
     <PackageId>DigitalData.Core.Infrastructure</PackageId>
-    <Version>2.0.0.0</Version>
+    <Version>2.0.1</Version>
     <Authors>Digital Data GmbH</Authors>
     <Company>Digital Data GmbH</Company>
     <Product>DigitalData.Core.Infrastructure</Product>

DigitalData.Core.Tests/DigitalData.Core.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
 
@@ -10,6 +10,7 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="Bogus" Version="35.6.3" />
     <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.16" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
     <PackageReference Include="Moq" Version="4.20.70" />
@@ -29,4 +30,19 @@
     <ProjectReference Include="..\DigitalData.Core.Security\DigitalData.Core.Security.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.20" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.15" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.15" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.4" />
+	<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.4" />
+  </ItemGroup>
+
 </Project>

DigitalData.Core.Tests/Infrastructure/DbRepositoryTests.cs

@@ -0,0 +1,69 @@
+namespace DigitalData.Core.Tests.Infrastructure;
+
+using DigitalData.Core.Infrastructure;
+using DigitalData.Core.Tests.Mock;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.Hosting;
+using System.Reflection;
+using DigitalData.Core.Abstractions.Infrastructure;
+
+public class DbRepositoryTests
+{
+    private IHost _host;
+
+    private IRepository<User> _userRepo;
+
+    [SetUp]
+    public void Setup()
+    {
+        var builder = Host.CreateApplicationBuilder();
+
+        builder.Services.AddDbContext<MockDbContext>(opt => opt.UseInMemoryDatabase("MockDB"));
+
+        builder.Services.AddDbRepository<MockDbContext, User>(context => context.Users);
+
+        builder.Services.AddAutoMapper(Assembly.GetExecutingAssembly());
+
+        _host = builder.Build();
+
+        _userRepo = _host.Services.GetRequiredService<IRepository<User>>();
+    }
+
+    [TearDown]
+    public void TearDown()
+    {
+        if (_host is IDisposable disposableHost)
+            disposableHost.Dispose();
+    }
+
+    [TestCase(true, TestName = "WhenGivenMultipleUsers")]
+    [TestCase(false, TestName = "WhenGivenSingleUser")]
+    public void CreateAsync_ShouldNotThrow(bool multiple)
+    {
+        // Arrange
+        var faker = Fake.CreateUserFaker();
+
+        // Act & Assert
+        if (multiple)
+            Assert.DoesNotThrowAsync(async () => await _userRepo.CreateAsync(faker.Generate(Random.Shared.Next(1, 10))));
+        else
+            Assert.DoesNotThrowAsync(async () => await _userRepo.CreateAsync(faker.Generate()));
+    }
+
+    [TestCase(true, TestName = "WhenGivenMultipleUsers")]
+    [TestCase(false, TestName = "WhenGivenSingleUser")]
+    public async Task ReadAsync_ShouldReturnCreated(bool multiple)
+    {
+        // Arrange
+        var faker = Fake.CreateUserFaker();
+        var user = faker.Generate();
+
+        // Act
+        var createdUser = await _userRepo.CreateAsync(user);
+        var readUser = await _userRepo.ReadFirstOrDefaultAsync(u => u.Id == createdUser.Id);
+
+        // Assert
+        Assert.That(createdUser, Is.EqualTo(readUser));
+    }
+}

DigitalData.Core.Tests/Mock/Fake.cs

@@ -0,0 +1,16 @@
+using Bogus;
+
+namespace DigitalData.Core.Tests.Mock;
+
+public static class Fake
+{
+    public static Faker<User> CreateUserFaker(string? firstName = null, string? email = null, int? age = null) => new Faker<User>()
+        .RuleFor(u => u.FirstName, f => firstName ?? f.Name.FirstName())
+        .RuleFor(u => u.Email, f => email ?? f.Internet.Email())
+        .RuleFor(u => u.Age, f => age ?? f.Random.Int(18, 99));
+
+    public static Faker<UserCreateDto> CreateUserDtoFaker(string? firstName = null, string? email = null, int? age = null) => new Faker<UserCreateDto>()
+        .RuleFor(u => u.FirstName, f => firstName ?? f.Name.FirstName())
+        .RuleFor(u => u.Email, f => email ?? f.Internet.Email())
+        .RuleFor(u => u.Age, f => age ?? f.Random.Int(18, 99));
+}

DigitalData.Core.Tests/Mock/MockDbContext.cs

@@ -0,0 +1,12 @@
+using Microsoft.EntityFrameworkCore;
+
+namespace DigitalData.Core.Tests.Mock;
+
+public class MockDbContext : DbContext
+{
+    public DbSet<User> Users { get; set; }
+
+    public MockDbContext(DbContextOptions options) : base(options)
+    {
+    }
+}

DigitalData.Core.Tests/Mock/User.cs

@@ -0,0 +1,12 @@
+namespace DigitalData.Core.Tests.Mock;
+
+public class User : UserBase
+{
+    public required int Id { get; init; }
+
+    public override int GetHashCode() => HashCode.Combine(Id, FirstName, Email, Age);
+
+    public override bool Equals(object? obj)
+        => (obj is User user && user.GetHashCode() == GetHashCode())
+        || (obj is UserBase userBase && userBase.GetHashCode() == base.GetHashCode());
+}

DigitalData.Core.Tests/Mock/UserBase.cs

@@ -0,0 +1,14 @@
+namespace DigitalData.Core.Tests.Mock;
+
+public class UserBase
+{
+    public required string FirstName { get; init; }
+
+    public required string Email { get; init; }
+
+    public required int Age { get; init; }
+
+    public override int GetHashCode() => HashCode.Combine(FirstName, Email, Age);
+
+    public override bool Equals(object? obj) => obj is UserBase user && user.GetHashCode() == GetHashCode();
+}

DigitalData.Core.Tests/Mock/UserCreateDto.cs

@@ -0,0 +1,5 @@
+namespace DigitalData.Core.Tests.Mock;
+
+public class UserCreateDto : UserBase
+{
+}

DigitalData.Core.Tests/Mock/UserReadDto.cs

@@ -0,0 +1,5 @@
+namespace DigitalData.Core.Tests.Mock;
+
+public class UserReadDto : UserBase
+{
+}

DigitalData.Core.sln

@@ -31,6 +31,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Security", "Security", "{72
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DigitalData.Core.Abstractions.Security", "DigitalData.Core.Abstractions.Security\DigitalData.Core.Abstractions.Security.csproj", "{C9266749-9504-4EA9-938F-F083357B60B7}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{EDF84A84-1E01-484E-B073-383F7139C891}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,7 +97,19 @@ Global
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
+		{A765EBEA-3D1E-4F36-869B-6D72F87FF3F6} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{DB404CD9-CBB8-4771-AB1B-FD4FDE2C28CC} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{C57B2480-F632-4691-9C4C-8CC01237203C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{B54DEF90-C30C-44EA-9875-76F1B330CBB7} = {EDF84A84-1E01-484E-B073-383F7139C891}
+		{0B051A5F-BD38-47D1-BAFF-D44BA30D3FB7} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{6A80FFEC-9B83-40A7-8C78-124440B48B33} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{13E40DF1-6123-4838-9BF8-086C94E6ADF6} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{84B18026-F9A0-4366-BC69-1662D9E7342D} = {EDF84A84-1E01-484E-B073-383F7139C891}
+		{E009A053-A9F4-48F2-984F-EF5C376A9B14} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{47D80C65-74A2-4EB8-96A5-D571A9108FB3} = {72CBAFBA-55CC-49C9-A484-F8F4550054CB}
+		{0FA93730-8084-4907-B172-87D610323796} = {EDF84A84-1E01-484E-B073-383F7139C891}
+		{9BC2DEC5-E89D-48CC-9A51-4D94496EE4A6} = {EDF84A84-1E01-484E-B073-383F7139C891}
+		{72CBAFBA-55CC-49C9-A484-F8F4550054CB} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
 		{C9266749-9504-4EA9-938F-F083357B60B7} = {72CBAFBA-55CC-49C9-A484-F8F4550054CB}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution