Refactor DTOs and MappingProfile for consistency

Standardized namespaces for DTO classes and redefined several records to include necessary properties. Removed mapping configurations from MappingProfile, indicating a potential refactor. Introduced ProfileObjStateDto with a States property and ensured ProfileControlsTFDto and StateDto are properly encapsulated.

src/WorkFlow.API/Controllers/ProfileController.cs

@@ -32,6 +32,6 @@ public class ProfileController : ControllerBase
         }
 
         var profile = await _mediator.ReadProfileAsync(userId);
-        return profile is null ? NotFound() : Ok(profile);
+        return Ok(profile);
     }
 }

src/WorkFlow.Application/DTO/Config/ConfigCreateDto.cs

@@ -1,4 +0,0 @@
-namespace WorkFlow.Application.Dto.Config
-{
-    public record ConfigCreateDto(string Title, string String);
-}

src/WorkFlow.Application/DTO/Config/ConfigUpdateDto.cs

@@ -1,4 +0,0 @@
-namespace WorkFlow.Application.Dto.Config
-{
-    public record ConfigUpdateDto(string Title, string String) : BaseUpdateDto;
-}

src/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFCreateDto.cs

@@ -1,14 +0,0 @@
-namespace WorkFlow.Application.Dto.ProfileControlsTF
-{
-    public record ProfileControlsTFCreateDto(
-                                        int ProfileId,
-                                        int UserId,
-                                        long ObjId,
-                                        string ObjType,
-                                        string AttrName,
-                                        string CtrlType,
-                                        string CtrlCaption,
-                                        bool Mandatory,                                        
-                                        bool ReadOnly,
-                                        string? ChoiceList = null) : BaseCreateDto;
-}

src/WorkFlow.Application/DTO/ProfileControlsTF/ProfileControlsTFUpdateDto.cs

@@ -1,6 +0,0 @@
-namespace WorkFlow.Application.Dto.ProfileControlsTF;
-
-/// <summary>
-/// This Data Transfer Object (DTO) serves as a placeholder and does not support updates.
-/// </summary>
-public record ProfileControlsTFUpdateDto(long Id);

src/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateCreateDto.cs

@@ -1,11 +0,0 @@
-namespace WorkFlow.Application.Dto.ProfileObjState
-{
-    public record ProfileObjStateCreateDto(
-                                      int ProfileId,
-                                      int UserId,
-                                      long ObjId,
-                                      int StateId,
-                                      string? State2 = null,
-                                      string? State3 = null,
-                                      string? State4 = null) : BaseCreateDto;
-}

src/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateDto.cs

@@ -1,18 +0,0 @@
-using DigitalData.UserManager.Application.DTOs.User;
-using WorkFlow.Application.Dto.State;
-
-namespace WorkFlow.Application.Dto.ProfileObjState
-{
-    public record ProfileObjStateDto(int Id,
-                                      int ProfileId,
-                                      int UserId,
-                                      long ObjId,
-                                      int StateId,
-                                      string AddedWho,
-                                      DateTime AddedWhen,
-                                      string? State2 = null,
-                                      string? State3 = null,
-                                      string? State4 = null,
-                                      UserReadDto? User = null,
-                                      StateDto? State = null);
-}

src/WorkFlow.Application/DTO/ProfileObjState/ProfileObjStateUpdateDto.cs

@@ -1,6 +0,0 @@
-namespace WorkFlow.Application.Dto.ProfileObjState;
-
-/// <summary>
-/// This Data Transfer Object (DTO) serves as a placeholder and does not support updates.
-/// </summary>
-public record ProfileObjStateUpdateDto(long Id);

src/WorkFlow.Application/DTO/State/StateCreateDto.cs

@@ -1,4 +0,0 @@
-namespace WorkFlow.Application.Dto.State
-{
-    public record StateCreateDto(string IntlState) : BaseCreateDto;
-}

src/WorkFlow.Application/DTO/State/StateUpdateDto.cs

@@ -1,6 +0,0 @@
-namespace WorkFlow.Application.Dto.State;
-
-/// <summary>
-/// This Data Transfer Object (DTO) serves as a placeholder and does not support updates.
-/// </summary>
-public record StateUpdateDto(int Id);

src/WorkFlow.Application/Dto/ConfigDto.cs

@@ -1,4 +1,4 @@
-namespace WorkFlow.Application.Dto.Config
+namespace WorkFlow.Application.Dto
 {
     public record ConfigDto(int Id,
                             string Title,

src/WorkFlow.Application/Dto/ObjectDto.cs

@@ -11,4 +11,6 @@ public class ObjectDto
     public IEnumerable<string> Sublines { get; set; } = Array.Empty<string>();
 
     public string? CmdCheckIn { get; set; }
+
+    public IEnumerable<string?> States { get; set; } = Array.Empty<string>();
 }

src/WorkFlow.Application/Dto/ProfileControlsTFDto.cs

@@ -1,6 +1,6 @@
 using DigitalData.UserManager.Application.DTOs.User;
 
-namespace WorkFlow.Application.Dto.ProfileControlsTF
+namespace WorkFlow.Application.Dto
 {
     public record ProfileControlsTFDto(int Id,
                                         int ProfileId,

src/WorkFlow.Application/Dto/ProfileObjStateDto.cs

@@ -0,0 +1,6 @@
+namespace WorkFlow.Application.Dto;
+
+public class ProfileObjStateDto
+{
+    public IEnumerable<string?> States { get; set; } = Array.Empty<string>();
+}

src/WorkFlow.Application/Dto/StateDto.cs

@@ -1,4 +1,4 @@
-namespace WorkFlow.Application.Dto.State
+namespace WorkFlow.Application.Dto
 {
     public record StateDto(int Id, string IntlState, string AddedWho, DateTime AddedWhen);
 }

src/WorkFlow.Application/MappingProfile.cs

@@ -1,9 +1,5 @@
 using WorkFlow.Application.Buttons;
 using WorkFlow.Application.Dto;
-using WorkFlow.Application.Dto.Config;
-using WorkFlow.Application.Dto.ProfileControlsTF;
-using WorkFlow.Application.Dto.ProfileObjState;
-using WorkFlow.Application.Dto.State;
 using WorkFlow.Domain.Entities;
 
 namespace WorkFlow.Application;
@@ -23,19 +19,7 @@ public class MappingProfile : AutoMapper.Profile
         .ForMember(dest => dest.Headlines, opt => opt.MapFrom(src =>
             new[] { src.Headline1, src.Headline2 }))
         .ForMember(dest => dest.Sublines, opt => opt.MapFrom(src =>
-            new[] { src.Subline1, src.Subline2 }));
-
-
-        // Mapping create-DTO to entity
-        CreateMap<ConfigCreateDto, Config>();
-        CreateMap<ProfileControlsTFCreateDto, ProfileControlsTF>();
-        CreateMap<ProfileObjStateCreateDto, ProfileObjState>();
-        CreateMap<StateCreateDto, State>();
-
-        // Mapping update-DTO to entity
-        CreateMap<ConfigUpdateDto, Config>();
-        CreateMap<ProfileControlsTFUpdateDto, ProfileControlsTF>();
-        CreateMap<ProfileObjStateUpdateDto, ProfileObjState>();
-        CreateMap<StateUpdateDto, State>();
+            new[] { src.Subline1, src.Subline2 }))
+        .ForMember(dest => dest.States, opt => opt.MapFrom(src => src.States));
     }
 }

src/WorkFlow.Application/Profiles/ReadProfileQuery.cs

@@ -1,5 +1,6 @@
 using AutoMapper;
 using DigitalData.Core.Abstraction.Application.Repository;
+using DigitalData.Core.Exceptions;
 using MediatR;
 using WorkFlow.Application.Buttons;
 using WorkFlow.Application.Contracts.Repositories;
@@ -12,13 +13,13 @@ namespace WorkFlow.Application.Profiles;
 /// Represents a request to read a user profile by their user ID.
 /// </summary>
 /// <param name="UserId">The ID of the user whose profile is being requested.</param>
-public record ReadProfileQuery(int UserId, bool IncludeObject = true) : IRequest<ProfileDto?>;
+public record ReadProfileQuery(int UserId, bool IncludeObject = true) : IRequest<ProfileDto>;
 
 /// <summary>
 /// Handles the <see cref="ReadProfileQuery"/> request by retrieving the user profile
 /// from the data store using the <see cref="IProfileRepository"/>.
 /// </summary>
-public class ReadProfileHandler : IRequestHandler<ReadProfileQuery, ProfileDto?>
+public class ReadProfileHandler : IRequestHandler<ReadProfileQuery, ProfileDto>
 {
     private readonly IProfileRepository _profileRepository;
 
@@ -48,26 +49,23 @@ public class ReadProfileHandler : IRequestHandler<ReadProfileQuery, ProfileDto?>
     /// <param name="request">The request containing the user ID.</param>
     /// <param name="cancel">A cancellation token for the operation.</param>
     /// <returns>The user profile if found; otherwise, <c>null</c>.</returns>
-    public async Task<ProfileDto?> Handle(ReadProfileQuery request, CancellationToken cancel = default)
+    public async Task<ProfileDto> Handle(ReadProfileQuery request, CancellationToken cancel = default)
     {
-        var profile = await _profileRepository.ReadAsync(request.UserId, cancel);
-        if (request.IncludeObject && profile?.Id is int profileId)
+        var profile = await _profileRepository.ReadAsync(request.UserId, cancel)
+            ?? throw new NotFoundException();
+
+        if (request.IncludeObject && profile.Id is int profileId)
             profile.Objects = await _objRepository.ReadAsync(request.UserId, profileId, cancel);
 
-        var profileDto = _mapper.Map<ProfileDto>(profile);
+        if (profile.Id is int pId)
+            profile.Buttons = await _bttnRepository.Read(b => b.ProfileId == pId).ToListAsync(cancel);
 
-        if (profile?.Id is int pId)
-        {
-            var bttns = await _bttnRepository.Read(b => b.ProfileId == pId).ToListAsync(cancel);
-            profileDto.Buttons = _mapper.Map<IEnumerable<ButtonDto>>(bttns);
-        }
-
-        return profileDto;
+        return _mapper.Map<ProfileDto>(profile);
     }
 }
 
 public static class ReadProfileQueryExtensions
 {
-    public static Task<ProfileDto?> ReadProfileAsync(this IMediator mediator, int userId, bool includeObject = true)
+    public static Task<ProfileDto> ReadProfileAsync(this IMediator mediator, int userId, bool includeObject = true)
         => mediator.Send(new ReadProfileQuery(UserId: userId, IncludeObject: includeObject));
 }

src/WorkFlow.Application/WorkFlow.Application.csproj

@@ -9,6 +9,7 @@
   <ItemGroup>
     <PackageReference Include="DigitalData.Core.Abstraction.Application" Version="1.0.0" />
     <PackageReference Include="DigitalData.Core.Application" Version="3.3.4" />
+    <PackageReference Include="DigitalData.Core.Exceptions" Version="1.0.1" />
     <PackageReference Include="MediatR" Version="13.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.20" />
     <PackageReference Include="UserManager" Version="1.1.2" />

src/WorkFlow.Domain/Entities/Profile.cs

@@ -27,4 +27,7 @@ public class Profile
 
     [NotMapped]
     public IEnumerable<ProfileObject>? Objects { get; set; }
+
+    [NotMapped]
+    public IEnumerable<Button>? Buttons { get; set; }
 }

src/WorkFlow.Domain/Entities/ProfileObjState.cs

@@ -1,5 +1,4 @@
-using DigitalData.UserManager.Domain.Entities;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace WorkFlow.Domain.Entities;
@@ -8,48 +7,84 @@ namespace WorkFlow.Domain.Entities;
 public class ProfileObjState
 {
     [Key]
-    [Column("GUID")]
-    public long Id { get; init; }
+    [Column("GUID", TypeName = "bigint")]
+    public long Id { get; set; }
+
+    /// <summary>
+    /// Although this field is marked as <c>nullable</c> in the database schema to allow 
+    /// for greater flexibility during database-level operations or migrations, it is 
+    /// treated as <c>required</c> and <c>not null</c> within the application logic. 
+    /// Validation should be enforced at the application level to ensure a value is provided.
+    /// </summary>
+    [Column("MWF_PROFILE_ID", TypeName = "int")]
+    public int? ProfileId { get; set; }
+
+    /// <summary>
+    /// Although this field is marked as <c>nullable</c> in the database schema to allow 
+    /// for greater flexibility during database-level operations or migrations, it is 
+    /// treated as <c>required</c> and <c>not null</c> within the application logic. 
+    /// Validation should be enforced at the application level to ensure a value is provided.
+    /// </summary>
+    [Column("USR_ID", TypeName = "int")]
+    public int? UserId { get; set; }
+
+    /// <summary>
+    /// Although this field is marked as <c>nullable</c> in the database schema to allow 
+    /// for greater flexibility during database-level operations or migrations, it is 
+    /// treated as <c>required</c> and <c>not null</c> within the application logic. 
+    /// Validation should be enforced at the application level to ensure a value is provided.
+    /// </summary>
+    [Column("OBJ_ID", TypeName = "bigint")]
+    public long? ObjectId { get; set; }
 
     [Required]
-    [Column("MWF_PROFILE_ID")]
-    public required int ProfileId { get; init; }
+    [Column("STATE_ID", TypeName = "int")]
+    public int StateId { get; set; }
 
-    [Required]
-    [Column("USR_ID")]
-    public required int UserId { get; init; }
+    [Column("STATE2", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string? State2 { get; set; }
 
-    [Required]
-    [Column("OBJ_ID")]
-    public required long ObjId { get; init; }
+    [Column("STATE3", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string? State3 { get; set; }
 
-    [Required]
-    [Column("STATE_ID")]
-    public required int StateId { get; init; }
+    [Column("STATE4", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string? State4 { get; set; }
 
-    [Column("STATE2", TypeName = "nvarchar(3000)")]
-    public string? State2 { get; init; }
+    /// <summary>
+    /// Although this field is marked as <c>nullable</c> in the database schema to allow 
+    /// for greater flexibility during database-level operations or migrations, it is 
+    /// treated as <c>required</c> and <c>not null</c> within the application logic. 
+    /// Validation should be enforced at the application level to ensure a value is provided.
+    /// </summary>
+    [Column("ADDED_WHO", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string? AddedWho { get; set; } = "SYS";
 
-    [Column("STATE3", TypeName = "nvarchar(3000)")]
-    public string? State3 { get; init; }
-
-    [Column("STATE4", TypeName = "nvarchar(3000)")]
-    public string? State4 { get; init; }
-
-    [Required]
-    [Column("ADDED_WHO", TypeName = "varchar(30)")]
-    public required string AddedWho { get; init; }
-
-    [Required]
+    /// <summary>
+    /// Although this field is marked as <c>nullable</c> in the database schema to allow 
+    /// for greater flexibility during database-level operations or migrations, it is 
+    /// treated as <c>required</c> and <c>not null</c> within the application logic. 
+    /// Validation should be enforced at the application level to ensure a value is provided.
+    /// </summary>
     [Column("ADDED_WHEN", TypeName = "datetime")]
-    public required DateTime AddedWhen { get; init; }
+    public DateTime? AddedWhen { get; set; } = DateTime.Now;
 
-    [ForeignKey("ProfileId")]
-    public Profile? Profile { get; init; } = null;
+    [Column("CHANGED_WHO", TypeName = "nvarchar(100)")]
+    [StringLength(100)]
+    public string? ChangedWho { get; set; }
 
-    [ForeignKey("UserId")]
-    public User? User { get; init; } = null;
+    [Column("CHANGED_WHEN", TypeName = "datetime")]
+    public DateTime? ChangedWhen { get; set; }
 
     [ForeignKey("StateId")]
-    public State? State { get; init; } = null;
+    public virtual State? State1 { get; set; }
+
+    [NotMapped]
+    public IEnumerable<string?> States => new List<string?>
+    {
+        State1?.IntlState, State2, State3, State4
+    };
 }

src/WorkFlow.Domain/Entities/ProfileObjects.cs

@@ -24,4 +24,7 @@ public class ProfileObject
 
     [Column("CMD_CheckIn")]
     public string? CmdCheckIn { get; set; }
+
+    [ForeignKey("ObjStateId")]
+    public virtual ProfileObjState? States { get; set; }
 }

src/WorkFlow.Domain/Entities/State.cs

@@ -1,25 +1,24 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace WorkFlow.Domain.Entities
+namespace WorkFlow.Domain.Entities;
+
+[Table("TBMWF_WF_STATE", Schema = "dbo")]
+public class State
 {
-    [Table("TBMWF_WF_STATE", Schema = "dbo")]
-    public class State
-    {
-        [Key]
-        [Column("GUID")]
-        public int Id { get; init; }
+    [Key]
+    [Column("GUID")]
+    public int Id { get; init; }
 
-        [Required]
-        [Column("INTL_STATE", TypeName = "varchar(100)")]
-        public required string IntlState { get; init; }
+    [Required]
+    [Column("INTL_STATE", TypeName = "varchar(100)")]
+    public required string IntlState { get; init; }
 
-        [Required]
-        [Column("ADDED_WHO", TypeName = "varchar(30)")]
-        public required string AddedWho { 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; }
-    }
+    [Required]
+    [Column("ADDED_WHEN", TypeName = "datetime")]
+    public required DateTime AddedWhen { get; init; }
 }

src/WorkFlow.Infrastructure/DependencyInjection.cs

@@ -3,9 +3,6 @@ using DigitalData.Core.Infrastructure.AutoMapper;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using WorkFlow.Application.Contracts.Repositories;
-using WorkFlow.Application.Dto.Config;
-using WorkFlow.Application.Dto.ProfileControlsTF;
-using WorkFlow.Application.Dto.State;
 using WorkFlow.Domain.Entities;
 using WorkFlow.Infrastructure.Repositories;
 
@@ -18,11 +15,12 @@ public static class DependencyInjection
         services.TryAddScoped<IProfileRepository, ProfileRepository>();
         services.TryAddScoped<IProfileObjRepository, ProfileObjRepository>();
 
-        services.AddDbRepository<WFDBContext, Config>(c => c.Configs).UseAutoMapper(typeof(ConfigUpdateDto));
-        services.AddDbRepository<WFDBContext, ProfileControlsTF>(c => c.ProfileControlsTFs).UseAutoMapper(typeof(ProfileControlsTFUpdateDto));
-        services.AddDbRepository<WFDBContext, State>(c => c.States).UseAutoMapper(typeof(StateUpdateDto));
+        services.AddDbRepository<WFDBContext, Config>(c => c.Configs).UseAutoMapper();
+        services.AddDbRepository<WFDBContext, ProfileControlsTF>(c => c.ProfileControlsTFs).UseAutoMapper();
+        services.AddDbRepository<WFDBContext, State>(c => c.States).UseAutoMapper();
         services.AddDbRepository<WFDBContext, Button>(c => c.Buttons).UseAutoMapper();
-        services.AddDbRepository<WFDBContext, State>(c => c.States).UseAutoMapper(typeof(StateUpdateDto));
+        services.AddDbRepository<WFDBContext, State>(c => c.States).UseAutoMapper();
+        services.AddDbRepository<WFDBContext, ProfileObjState>(c => c.ProfileObjStates).UseAutoMapper();
 
         return services;
     }

src/WorkFlow.Infrastructure/Repositories/ProfileObjRepository.cs

@@ -35,5 +35,6 @@ public class ProfileObjRepository : IProfileObjRepository
     public async Task<IEnumerable<ProfileObject>> ReadAsync(int userId, int profileId, CancellationToken cancel = default)
         => await _context.Objects
             .FromSqlRaw("SELECT * FROM [FNMWF_GET_PROFILE_OBJECTS] ({0}, {1})", userId, profileId)
+            .Include(obj => obj.States).ThenInclude(objState => objState.State1)
             .ToListAsync(cancel);
 }