chore: Hinzufügen von .net 7-Unterstützung für Domäne, Infrastruktur und Anwendung

WorkFlow.Application/Services/ConfigService.cs

@@ -6,11 +6,12 @@ using WorkFlow.Application.DTO.Config;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 
-namespace WorkFlow.Application.Services
+namespace WorkFlow.Application.Services;
+
+public class ConfigService : CRUDService<IConfigRepository, ConfigCreateDto, ConfigDto, Config, int>,
+    IConfigService, ICRUDService<ConfigCreateDto, ConfigDto, Config, int>
 {
-    public class ConfigService(IConfigRepository repository, IMapper mapper)
+    public ConfigService(IConfigRepository repository, IMapper mapper) : base(repository, mapper)
-        : CRUDService<IConfigRepository, ConfigCreateDto, ConfigDto, Config, int>(repository, mapper),
-        IConfigService, ICRUDService<ConfigCreateDto, ConfigDto, Config, int>
     {
     }
 }

WorkFlow.Application/Services/ProfileControlsTFService.cs

@@ -9,10 +9,13 @@ using WorkFlow.Infrastructure.Contracts;
 
 namespace WorkFlow.Application.Services
 {
-    public class ProfileControlsTFService(IProfileControlsTFRepository repository, IMapper mapper)
+    public class ProfileControlsTFService : CRUDService<IProfileControlsTFRepository, ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTF, int>,
-        : CRUDService<IProfileControlsTFRepository, ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTF, int>(repository, mapper),
         IProfileControlsTFService, ICRUDService<ProfileControlsTFCreateDto, ProfileControlsTFDto, ProfileControlsTF, int>
     {
+        public ProfileControlsTFService(IProfileControlsTFRepository repository, IMapper mapper) : base(repository, mapper)
+        {
+        }
+
         public async Task<DataResult<IEnumerable<ProfileControlsTFDto>>> ReadAsync(
             bool withProfile = true, bool withUser = false,
             int? userId = null, string? username = null,

WorkFlow.Application/Services/ProfileObjStateService.cs

@@ -7,26 +7,28 @@ using WorkFlow.Application.DTO.ProfileObjState;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 
-namespace WorkFlow.Application.Services
+namespace WorkFlow.Application.Services;
+
+public class ProfileObjStateService : CRUDService<IProfileObjStateRepository, ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>,
+    IProfileObjStateService, ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>
 {
-    public class ProfileObjStateService(IProfileObjStateRepository repository, IMapper mapper)
+    public ProfileObjStateService(IProfileObjStateRepository repository, IMapper mapper) : base(repository, mapper)
-        : CRUDService<IProfileObjStateRepository, ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>(repository, mapper),
-        IProfileObjStateService, ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>
     {
-        public async Task<DataResult<IEnumerable<ProfileObjStateDto>>> ReadAsync(
+    }
-            bool withProfile = true, bool withUser = true, bool withState = true,
-            int? userId = null, string? username = null,
-            int? profileId = null, int? objId = null, bool? profileActive = null)
-        {
-            var pos_list = await _repository.ReadAsync(
-                isReadonly: true,
-                withProfile: withProfile, withUser: withUser, withState: withState,
-                userId: userId, username: username,
-                profileId: profileId, objId: objId, profileActive: profileActive);
 
-            var post_dto_list = _mapper.Map<IEnumerable<ProfileObjStateDto>>(pos_list);
+    public async Task<DataResult<IEnumerable<ProfileObjStateDto>>> ReadAsync(
+        bool withProfile = true, bool withUser = true, bool withState = true,
+        int? userId = null, string? username = null,
+        int? profileId = null, int? objId = null, bool? profileActive = null)
+    {
+        var pos_list = await _repository.ReadAsync(
+            isReadonly: true,
+            withProfile: withProfile, withUser: withUser, withState: withState,
+            userId: userId, username: username,
+            profileId: profileId, objId: objId, profileActive: profileActive);
 
-            return Result.Success(post_dto_list);
+        var post_dto_list = _mapper.Map<IEnumerable<ProfileObjStateDto>>(pos_list);
-        }
+
+        return Result.Success(post_dto_list);
     }
 }

WorkFlow.Application/Services/ProfileService.cs

@@ -5,11 +5,12 @@ using WorkFlow.Application.DTO.Profile;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 
-namespace WorkFlow.Application.Services
+namespace WorkFlow.Application.Services;
+
+public class ProfileService : CRUDService<IProfileRepository, ProfileCreateDto, ProfileDto, Profile, int>,
+    IProfileService, ICRUDService<ProfileCreateDto, ProfileDto, Profile, int>
 {
-    public class ProfileService(IProfileRepository repository, AutoMapper.IMapper mapper)
+    public ProfileService(IProfileRepository repository, AutoMapper.IMapper mapper) : base(repository, mapper)
-        : CRUDService<IProfileRepository, ProfileCreateDto, ProfileDto, Profile, int>(repository, mapper),
-        IProfileService, ICRUDService<ProfileCreateDto, ProfileDto, Profile, int>
     {
     }
 }

WorkFlow.Application/Services/StateService.cs

@@ -6,11 +6,12 @@ using WorkFlow.Application.DTO.State;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 
-namespace WorkFlow.Application.Services
+namespace WorkFlow.Application.Services;
+
+public class StateService : CRUDService<IStateRepository, StateCreateDto, StateDto, State, int>,
+    IStateService, ICRUDService<StateCreateDto, StateDto, State, int>
 {
-    public class StateService(IStateRepository repository, IMapper mapper)
+    public StateService(IStateRepository repository, IMapper mapper) : base(repository, mapper)
-        : CRUDService<IStateRepository, StateCreateDto, StateDto, State, int>(repository, mapper),
-        IStateService, ICRUDService<StateCreateDto, StateDto, State, int>
     {
     }
 }

WorkFlow.Application/WorkFlow.Application.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

WorkFlow.Domain/WorkFlow.Domain.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>

WorkFlow.Infrastructure/Repositories/ConfigRepository.cs

@@ -6,7 +6,10 @@ using WorkFlow.Infrastructure.Contracts;
 namespace WorkFlow.Infrastructure.Repositories
 {
     //TODO: Make the db context type generic so that it can be used by other projects with different db contexts.
-    public class ConfigRepository(WFDBContext dbContext) : CRUDRepository<Config, int, WFDBContext>(dbContext, dbContext.Configs), IConfigRepository, ICRUDRepository<Config, int>
+    public class ConfigRepository : CRUDRepository<Config, int, WFDBContext>, IConfigRepository, ICRUDRepository<Config, int>
     {
+        public ConfigRepository(WFDBContext dbContext) : base(dbContext, dbContext.Configs)
+        {
+        }
     }
 }

WorkFlow.Infrastructure/Repositories/ProfileControlsTFRepository.cs

@@ -6,8 +6,12 @@ using WorkFlow.Infrastructure.Contracts;
 
 namespace WorkFlow.Infrastructure.Repositories
 {
-    public class ProfileControlsTFRepository(WFDBContext dbContext) : CRUDRepository<ProfileControlsTF, int, WFDBContext>(dbContext, dbContext.ProfileControlsTFs), IProfileControlsTFRepository, ICRUDRepository<ProfileControlsTF, int>
+    public class ProfileControlsTFRepository : CRUDRepository<ProfileControlsTF, int, WFDBContext>, IProfileControlsTFRepository, ICRUDRepository<ProfileControlsTF, int>
     {
+        public ProfileControlsTFRepository(WFDBContext dbContext) : base(dbContext, dbContext.ProfileControlsTFs)
+        {
+        }
+
         protected override IQueryable<ProfileControlsTF> ReadOnly() => base.ReadOnly().Include(pctf => pctf.Profile).Include(pctf => pctf.User);
 
         protected IQueryable<ProfileControlsTF> Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, int? profileId = null, int? userId = null, string? username = null, int? objId = null, bool? profileActive = null)

WorkFlow.Infrastructure/Repositories/ProfileObjStateRepository.cs

@@ -4,56 +4,59 @@ using Microsoft.EntityFrameworkCore;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 
-namespace WorkFlow.Infrastructure.Repositories
+namespace WorkFlow.Infrastructure.Repositories;
+
+public class ProfileObjStateRepository : CRUDRepository<ProfileObjState, int, WFDBContext>, IProfileObjStateRepository, ICRUDRepository<ProfileObjState, int>
 {
-    public class ProfileObjStateRepository(WFDBContext dbContext) : CRUDRepository<ProfileObjState, int, WFDBContext>(dbContext, dbContext.ProfileObjStates), IProfileObjStateRepository, ICRUDRepository<ProfileObjState, int>
+    public ProfileObjStateRepository(WFDBContext dbContext) : base(dbContext, dbContext.ProfileObjStates)
     {
-        protected override IQueryable<ProfileObjState> ReadOnly() => base.ReadOnly().Include(pos => pos.Profile).Include(pos => pos.State);
-
-        protected IQueryable<ProfileObjState> Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, bool withState = true, int? profileId = null, int? userId = null, string? username = null, int? stateId = null, int? objId = null, bool? profileActive = null)
-        {
-            var query = isReadonly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable();
-
-            if (withProfile)
-                query = query.Include(pctf => pctf.Profile);
-
-            if (withUser)
-                query = query.Include(pctf => pctf.User);
-
-            if (withState)
-                query = query.Include(pctf => pctf.State);
-
-            if (profileId is not null)
-                query = query.Where(pctf => pctf.ProfileId == profileId);
-
-            if (userId is not null)
-                query = query.Where(pctf => pctf.UserId == userId);
-
-            if (username is null)
-                query = query.Where(pctf => pctf.User!.Username == username);
-
-            if (stateId is null)
-                query = query.Where(pctf => pctf.State!.Id == stateId);
-
-            if (objId is not null)
-                query = query.Where(pctf => pctf.ObjId == objId);
-
-            if (profileActive is not null)
-                query = query.Where(pctf => pctf.Profile!.Active == profileActive);
-
-            return query;
-        }
-
-        public async Task<IEnumerable<ProfileObjState>> ReadAsync(
-            bool isReadonly = true,
-            bool withProfile = true, bool withUser = true, bool withState = true,
-            int? userId = null, string? username = null,
-            int? profileId = null, int? objId = null, bool? profileActive = null)
-            => await Read(
-                isReadonly: isReadonly,
-                withProfile: withProfile, withUser: withUser, withState: withState,
-                userId: userId, username: username,
-                profileId: profileId, objId: objId, profileActive: profileActive)
-            .ToListAsync();
     }
+
+    protected override IQueryable<ProfileObjState> ReadOnly() => base.ReadOnly().Include(pos => pos.Profile).Include(pos => pos.State);
+
+    protected IQueryable<ProfileObjState> Read(bool isReadonly = false, bool withProfile = true, bool withUser = true, bool withState = true, int? profileId = null, int? userId = null, string? username = null, int? stateId = null, int? objId = null, bool? profileActive = null)
+    {
+        var query = isReadonly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable();
+
+        if (withProfile)
+            query = query.Include(pctf => pctf.Profile);
+
+        if (withUser)
+            query = query.Include(pctf => pctf.User);
+
+        if (withState)
+            query = query.Include(pctf => pctf.State);
+
+        if (profileId is not null)
+            query = query.Where(pctf => pctf.ProfileId == profileId);
+
+        if (userId is not null)
+            query = query.Where(pctf => pctf.UserId == userId);
+
+        if (username is null)
+            query = query.Where(pctf => pctf.User!.Username == username);
+
+        if (stateId is null)
+            query = query.Where(pctf => pctf.State!.Id == stateId);
+
+        if (objId is not null)
+            query = query.Where(pctf => pctf.ObjId == objId);
+
+        if (profileActive is not null)
+            query = query.Where(pctf => pctf.Profile!.Active == profileActive);
+
+        return query;
+    }
+
+    public async Task<IEnumerable<ProfileObjState>> ReadAsync(
+        bool isReadonly = true,
+        bool withProfile = true, bool withUser = true, bool withState = true,
+        int? userId = null, string? username = null,
+        int? profileId = null, int? objId = null, bool? profileActive = null)
+        => await Read(
+            isReadonly: isReadonly,
+            withProfile: withProfile, withUser: withUser, withState: withState,
+            userId: userId, username: username,
+            profileId: profileId, objId: objId, profileActive: profileActive)
+        .ToListAsync();
 }

WorkFlow.Infrastructure/Repositories/ProfileRepository.cs

@@ -3,9 +3,11 @@ using DigitalData.Core.Infrastructure;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
 
-namespace WorkFlow.Infrastructure.Repositories
+namespace WorkFlow.Infrastructure.Repositories;
+
+public class ProfileRepository : CRUDRepository<Profile, int, WFDBContext>, IProfileRepository, ICRUDRepository<Profile, int>
 {
-    public class ProfileRepository(WFDBContext dbContext) : CRUDRepository<Profile, int, WFDBContext>(dbContext, dbContext.Profiles), IProfileRepository, ICRUDRepository<Profile, int>
+    public ProfileRepository(WFDBContext dbContext) : base(dbContext, dbContext.Profiles)
     {
     }
 }

WorkFlow.Infrastructure/Repositories/StateRepository.cs

@@ -2,9 +2,12 @@
 using DigitalData.Core.Infrastructure;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Contracts;
-namespace WorkFlow.Infrastructure.Repositories
+
+namespace WorkFlow.Infrastructure.Repositories;
+
+public class StateRepository : CRUDRepository<State, int, WFDBContext>, IStateRepository, ICRUDRepository<State, int>
 {
-    public class StateRepository(WFDBContext dbContext) : CRUDRepository<State, int, WFDBContext>(dbContext, dbContext.States), IStateRepository, ICRUDRepository<State, int>
+    public StateRepository(WFDBContext dbContext) : base(dbContext, dbContext.States)
     {
     }
 }

WorkFlow.Infrastructure/WFDBContext.cs

@@ -4,40 +4,43 @@ using DigitalData.UserManager.Infrastructure.Contracts;
 using Microsoft.EntityFrameworkCore;
 using WorkFlow.Domain.Entities;
 
-namespace WorkFlow.Infrastructure
+namespace WorkFlow.Infrastructure;
+
+public class WFDBContext : DbContext, IUserManagerDbContext
 {
-    public class WFDBContext(DbContextOptions options) : DbContext(options), IUserManagerDbContext
+    public DbSet<Config> Configs { get; set; }
+
+    public DbSet<ProfileControlsTF> ProfileControlsTFs { get; set; }
+
+    public DbSet<Profile> Profiles { get; set; }
+
+    public DbSet<ProfileObjState> ProfileObjStates { get; set; }
+
+    public DbSet<State> States { get; set; }
+
+    public DbSet<GroupOfUser> GroupOfUsers { get; set; }
+
+    public DbSet<Group> Groups { get; set; }
+
+    public DbSet<ModuleOfUser> ModuleOfUsers { get; set; }
+
+    public DbSet<Module> Modules { get; set; }
+
+    public DbSet<User> Users { get; set; }
+
+    public DbSet<UserRep> UserReps { get; set; }
+
+    public DbSet<ClientUser> ClientUsers { get; set; }
+
+    public WFDBContext(DbContextOptions options) : base(options)
     {
-        public DbSet<Config> Configs { get; set; }
+    }
 
-        public DbSet<ProfileControlsTF> ProfileControlsTFs { get; set; }
+    protected override void OnModelCreating(ModelBuilder modelBuilder)
+    {
+        //configure model builder for user manager tables
+        modelBuilder.ConfigureUserManager();
 
-        public DbSet<Profile> Profiles { get; set; }
+        base.OnModelCreating(modelBuilder);
-
-        public DbSet<ProfileObjState> ProfileObjStates { get; set; }
-
-        public DbSet<State> States { get; set; }
-
-        public DbSet<GroupOfUser> GroupOfUsers { get; set; }
-
-        public DbSet<Group> Groups { get; set; }
-
-        public DbSet<ModuleOfUser> ModuleOfUsers { get; set; }
-
-        public DbSet<Module> Modules { get; set; }
-
-        public DbSet<User> Users { get; set; }
-
-        public DbSet<UserRep> UserReps { get; set; }
-
-        public DbSet<ClientUser> ClientUsers { get; set; }
-
-        protected override void OnModelCreating(ModelBuilder modelBuilder)
-        {
-            //configure model builder for user manager tables
-            modelBuilder.ConfigureUserManager();
-
-            base.OnModelCreating(modelBuilder);
-        }
     }
 }

WorkFlow.Infrastructure/WorkFlow.Infrastructure.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
   </PropertyGroup>