refactor(ProfileService): CRUDService-Implementierung entfernen

- Removed inheritance from ICRUDRepository in IProfileRepository and related implementation
- Cleaned up ProfileRepository to no longer extend CRUDRepository
- Removed `profileActive` filter from IProfileObjStateRepository and implementation
- Adjusted Read and ReadAsync methods accordingly

WorkFlow.API/Properties/PublishProfiles/IISProfileNet7.pubxml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <WebPublishMethod>Package</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <ProjectGuid>4fb33592-ef0d-47c3-9cde-03b2ef12be00</ProjectGuid>
-    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\workFLOW\API\net7\$(Version)\workFLOW.API.zip</DesktopBuildPackageLocation>
-    <PackageAsSingleFile>true</PackageAsSingleFile>
-    <DeployIisAppPath>WorkFlow.API</DeployIisAppPath>
-    <_TargetId>IISWebDeployPackage</_TargetId>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
-</Project>

WorkFlow.API/Properties/PublishProfiles/IISProfileNet8.pubxml

@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-https://go.microsoft.com/fwlink/?LinkID=208121.
--->
-<Project>
-  <PropertyGroup>
-    <WebPublishMethod>Package</WebPublishMethod>
-    <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
-    <LastUsedPlatform>Any CPU</LastUsedPlatform>
-    <SiteUrlToLaunchAfterPublish />
-    <LaunchSiteAfterPublish>true</LaunchSiteAfterPublish>
-    <ExcludeApp_Data>false</ExcludeApp_Data>
-    <ProjectGuid>4fb33592-ef0d-47c3-9cde-03b2ef12be00</ProjectGuid>
-    <DesktopBuildPackageLocation>P:\Install .Net\0 DD - Smart UP\workFLOW\API\net8\$(Version)\workFLOW.API.zip</DesktopBuildPackageLocation>
-    <PackageAsSingleFile>true</PackageAsSingleFile>
-    <DeployIisAppPath>WorkFlow.API</DeployIisAppPath>
-    <_TargetId>IISWebDeployPackage</_TargetId>
-    <TargetFramework>net7.0</TargetFramework>
-    <RuntimeIdentifier>win-x64</RuntimeIdentifier>
-    <SelfContained>true</SelfContained>
-  </PropertyGroup>
-</Project>

WorkFlow.Application/Contracts/IProfileObjStateService.cs

@@ -1,15 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using DigitalData.Core.DTO;
-using WorkFlow.Application.DTO.ProfileObjState;
-using WorkFlow.Domain.Entities;
-
-namespace WorkFlow.Application.Contracts
-{
-    public interface IProfileObjStateService : ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>
-    {
-        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);
-    }
-}

WorkFlow.Application/Contracts/IProfileService.cs

@@ -1,10 +0,0 @@
-using DigitalData.Core.Abstractions.Application;
-using WorkFlow.Application.DTO.Profile;
-using WorkFlow.Domain.Entities;
-
-namespace WorkFlow.Application.Contracts
-{
-    public interface IProfileService : ICRUDService<ProfileCreateDto, ProfileDto, Profile, int>
-    {
-    }
-}

WorkFlow.Application/Services/ProfileService.cs

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

WorkFlow.Domain/Entities/Profile.cs

@@ -1,44 +0,0 @@
-using DigitalData.Core.Abstractions;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-
-namespace WorkFlow.Domain.Entities
-{
-    [Table("TBMWF_PROFILE", Schema = "dbo")]
-    public class Profile : IUnique<int>
-    {
-        [Key]
-        [Column("GUID")]
-        public int Id { get; init; }
-
-        [Required]
-        [Column("INTL_NAME", TypeName = "varchar(200)")]
-        public required string IntlName { get; init; }
-
-        [Required]
-        [Column("EXT_ID1")]
-        public required int ExtId1 { get; init; }
-
-        [Required]
-        [Column("ACTIVE")]
-        public required bool Active { get; init; }
-
-        [Required]
-        [Column("ADDED_WHO", TypeName = "varchar(30)")]
-        public required string AddedWho { get; init; }
-
-        [Required]
-        [Column("ADDED_WHEN", TypeName = "datetime")]
-        public required DateTime AddedWhen { get; init; }
-
-        [Column("CHANGED_WHO", TypeName = "varchar(30)")]
-        public string? ChangedWho { get; init; }
-
-        [Column("CHANGED_WHEN", TypeName = "datetime")]
-        public DateTime? ChangedWhen { get; init; }
-
-        [Required]
-        [Column("TYPE_ID")]
-        public required byte TypeId { get; init; }
-    }
-}

WorkFlow.Infrastructure/Contracts/IProfileRepository.cs

@@ -1,9 +0,0 @@
-using DigitalData.Core.Abstractions.Infrastructure;
-using WorkFlow.Domain.Entities;
-
-namespace WorkFlow.Infrastructure.Contracts
-{
-    public interface IProfileRepository : ICRUDRepository<Profile, int>
-    {
-    }
-}

WorkFlow.Infrastructure/Repositories/ProfileRepository.cs

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

WorkFlow.sln

@@ -3,13 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.9.34622.214
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkFlow.Domain", "WorkFlow.Domain\WorkFlow.Domain.csproj", "{71E9264E-A2F0-4E5A-B010-8E4618C0C6AC}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8EC462FD-D22E-90A8-E5CE-7E832BA40C5D}"
+	ProjectSection(SolutionItems) = preProject
+		README.md = README.md
+	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WorkFlow.Infrastructure", "WorkFlow.Infrastructure\WorkFlow.Infrastructure.csproj", "{62526D0D-3365-4113-854A-3656191D7C63}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlow.Application", "WorkFlow.Application\WorkFlow.Application.csproj", "{5700B5DD-D17E-4E17-ADE5-48C95A0CC364}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlow.API", "src\WorkFlow.API\WorkFlow.API.csproj", "{2B724243-4C79-F3A4-EE25-B9A53C81464C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlow.API", "WorkFlow.API\WorkFlow.API.csproj", "{4FB33592-EF0D-47C3-9CDE-03B2EF12BE00}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlow.Application", "src\WorkFlow.Application\WorkFlow.Application.csproj", "{F1B4AC83-5137-C20B-641C-1699B46007A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlow.Domain", "src\WorkFlow.Domain\WorkFlow.Domain.csproj", "{92A11048-6B9C-374E-87A0-BD6D8F864B77}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WorkFlow.Infrastructure", "src\WorkFlow.Infrastructure\WorkFlow.Infrastructure.csproj", "{94F2D67D-649E-63D2-A3BF-0BEC98C2D7E6}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,26 +24,32 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{71E9264E-A2F0-4E5A-B010-8E4618C0C6AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{71E9264E-A2F0-4E5A-B010-8E4618C0C6AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{71E9264E-A2F0-4E5A-B010-8E4618C0C6AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{71E9264E-A2F0-4E5A-B010-8E4618C0C6AC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{62526D0D-3365-4113-854A-3656191D7C63}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{62526D0D-3365-4113-854A-3656191D7C63}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{62526D0D-3365-4113-854A-3656191D7C63}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{62526D0D-3365-4113-854A-3656191D7C63}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5700B5DD-D17E-4E17-ADE5-48C95A0CC364}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5700B5DD-D17E-4E17-ADE5-48C95A0CC364}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5700B5DD-D17E-4E17-ADE5-48C95A0CC364}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5700B5DD-D17E-4E17-ADE5-48C95A0CC364}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4FB33592-EF0D-47C3-9CDE-03B2EF12BE00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4FB33592-EF0D-47C3-9CDE-03B2EF12BE00}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4FB33592-EF0D-47C3-9CDE-03B2EF12BE00}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4FB33592-EF0D-47C3-9CDE-03B2EF12BE00}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2B724243-4C79-F3A4-EE25-B9A53C81464C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2B724243-4C79-F3A4-EE25-B9A53C81464C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2B724243-4C79-F3A4-EE25-B9A53C81464C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2B724243-4C79-F3A4-EE25-B9A53C81464C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{F1B4AC83-5137-C20B-641C-1699B46007A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F1B4AC83-5137-C20B-641C-1699B46007A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F1B4AC83-5137-C20B-641C-1699B46007A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F1B4AC83-5137-C20B-641C-1699B46007A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{92A11048-6B9C-374E-87A0-BD6D8F864B77}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{92A11048-6B9C-374E-87A0-BD6D8F864B77}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{92A11048-6B9C-374E-87A0-BD6D8F864B77}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{92A11048-6B9C-374E-87A0-BD6D8F864B77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94F2D67D-649E-63D2-A3BF-0BEC98C2D7E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94F2D67D-649E-63D2-A3BF-0BEC98C2D7E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94F2D67D-649E-63D2-A3BF-0BEC98C2D7E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94F2D67D-649E-63D2-A3BF-0BEC98C2D7E6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(NestedProjects) = preSolution
+		{2B724243-4C79-F3A4-EE25-B9A53C81464C} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{F1B4AC83-5137-C20B-641C-1699B46007A0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{92A11048-6B9C-374E-87A0-BD6D8F864B77} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+		{94F2D67D-649E-63D2-A3BF-0BEC98C2D7E6} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
+	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1ECB3995-5040-40BC-BC70-906E64BB4E01}
 	EndGlobalSection

src/WorkFlow.Application/Contracts/IProfileObjStateService.cs

@@ -0,0 +1,14 @@
+using DigitalData.Core.Abstractions.Application;
+using DigitalData.Core.DTO;
+using WorkFlow.Application.DTO.ProfileObjState;
+using WorkFlow.Domain.Entities;
+
+namespace WorkFlow.Application.Contracts;
+
+public interface IProfileObjStateService : ICRUDService<ProfileObjStateCreateDto, ProfileObjStateDto, ProfileObjState, int>
+{
+    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);
+}

src/WorkFlow.Application/Contracts/IProfileService.cs

@@ -0,0 +1,5 @@
+namespace WorkFlow.Application.Contracts;
+
+public interface IProfileService
+{
+}

src/WorkFlow.Application/Services/ProfileObjStateService.cs

@@ -19,13 +19,13 @@ public class ProfileObjStateService : CRUDService<IProfileObjStateRepository, Pr
     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)
+        int? profileId = null, int? objId = 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);
+            profileId: profileId, objId: objId);
 
         var post_dto_list = _mapper.Map<IEnumerable<ProfileObjStateDto>>(pos_list);
 

src/WorkFlow.Application/Services/ProfileService.cs

@@ -0,0 +1,7 @@
+using WorkFlow.Application.Contracts;
+
+namespace WorkFlow.Application.Services;
+
+public class ProfileService : IProfileService
+{
+}

src/WorkFlow.Domain/Entities/Profile.cs

@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations.Schema;
+
+namespace WorkFlow.Domain.Entities;
+
+public class Profile
+{
+    [Column("PROFILE_ID")]
+    public int? Id { get; set; }
+
+    [Column("TYPE_ID")]
+    public int? TypeId { get; set; }
+
+    [Column("CAPTION")]
+    public string? Caption { get; set; }
+
+    [Column("SUBTITLE")]
+    public string? Subtitle { get; set; }
+
+    [Column("COUNTOBJ")]
+    public int? CountObj { get; set; }
+
+    [Column("FORE_COLOR")]
+    public string? ForeColor { get; set; }
+
+    [Column("BACK_COLOR")]
+    public string? BackColor { get; set; }
+}

src/WorkFlow.Infrastructure/Contracts/IProfileObjStateRepository.cs

@@ -9,6 +9,6 @@ namespace WorkFlow.Infrastructure.Contracts
             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);
+            int? profileId = null, int? objId = null);
     }
 }

src/WorkFlow.Infrastructure/Contracts/IProfileRepository.cs

@@ -0,0 +1,5 @@
+namespace WorkFlow.Infrastructure.Contracts;
+
+public interface IProfileRepository
+{
+}

src/WorkFlow.Infrastructure/Repositories/ProfileControlsTFRepository.cs

@@ -14,7 +14,7 @@ namespace WorkFlow.Infrastructure.Repositories
 
         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)
+        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)
         {
             var query = isReadonly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable();
 
@@ -36,9 +36,6 @@ namespace WorkFlow.Infrastructure.Repositories
             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;
         }
 
@@ -51,7 +48,7 @@ namespace WorkFlow.Infrastructure.Repositories
                 isReadonly: isReadonly,
                 withProfile: withProfile, withUser: withUser,
                 userId: userId, username: username,
-                profileId: profileId, objId: objId, profileActive: profileActive)
+                profileId: profileId, objId: objId)
             .ToListAsync();
     }
 }

src/WorkFlow.Infrastructure/Repositories/ProfileObjStateRepository.cs

@@ -14,7 +14,7 @@ public class ProfileObjStateRepository : CRUDRepository<ProfileObjState, int, WF
 
     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)
+    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)
     {
         var query = isReadonly ? _dbSet.AsNoTracking() : _dbSet.AsQueryable();
 
@@ -42,9 +42,6 @@ public class ProfileObjStateRepository : CRUDRepository<ProfileObjState, int, WF
         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;
     }
 
@@ -52,11 +49,11 @@ public class ProfileObjStateRepository : CRUDRepository<ProfileObjState, int, WF
         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)
+        int? profileId = null, int? objId = null)
         => await Read(
             isReadonly: isReadonly,
             withProfile: withProfile, withUser: withUser, withState: withState,
             userId: userId, username: username,
-            profileId: profileId, objId: objId, profileActive: profileActive)
+            profileId: profileId, objId: objId)
         .ToListAsync();
 }

src/WorkFlow.Infrastructure/Repositories/ProfileRepository.cs

@@ -0,0 +1,7 @@
+using WorkFlow.Infrastructure.Contracts;
+
+namespace WorkFlow.Infrastructure.Repositories;
+
+public class ProfileRepository : IProfileRepository
+{
+}