Merge pull request #638 from bcgov/prodmerge

Prodmerge promote

.gitignore

@@ -388,3 +388,8 @@ FodyWeavers.xsd
 /diam-config/.idea/workspace.xml
 /diam-admin-react
 /Infra/terraform/keycloak
+/auth
+/BlazorAdmin
+/backend/DIAMAdminServer
+/keycloak/extensions
+/backend/service.edt/appsettings.Development.json

backend/ApprovalFlow/ApprovalFlow.csproj

@@ -4,13 +4,16 @@
     <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
-    <Version>1.1.5</Version>
+    <Version>1.1.7</Version>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
   </PropertyGroup>
 
    <ItemGroup>
     <ProjectReference Include="..\common\Common.csproj" />
-  </ItemGroup>
+     <ProjectReference Include="..\CommonModels\CommonModels.csproj" />
+     <ProjectReference Include="..\CommonConstants\CommonConstants.csproj" />
+
+   </ItemGroup>
 
    <ItemGroup>
      <Folder Include="API\v1\" />

backend/ApprovalFlow/Data/Approval/ApprovalHistory.cs

@@ -14,7 +14,7 @@ public class ApprovalHistory : BaseAuditable
     public string DecisionNote { get; set; } = string.Empty;
     public string Approver { get; set; } = string.Empty;
     public int RequestId { get; set; }
-    public Request AccessRequest { get; set; }
+    public Request AccessRequest { get; set; } = default!;
     public Instant? Deleted { get; set; }
     public ApprovalStatus Status { get; set; } = ApprovalStatus.PENDING;
 

backend/ApprovalFlow/Data/Approval/ApprovalRequest.cs

@@ -10,7 +10,6 @@ public class ApprovalRequest : BaseAuditable
 {
     [Key]
     public int Id { get; set; }
-    public string Reason { get; set; } = string.Empty;
     [Required]
     public string MessageKey { get; set; } = string.Empty;
     public string UserId { get; set; } = string.Empty;
@@ -21,9 +20,23 @@ public class ApprovalRequest : BaseAuditable
     public string RequiredAccess { get; set; } = string.Empty;
     public Instant? Approved { get; set; }
     public Instant? Completed { get; set; }
-    public ICollection<PersonalIdentity> PersonalIdentities { get; set; } = new List<PersonalIdentity>();
+    public ICollection<PersonalIdentity> PersonalIdentities { get; set; } = [];
+    public ICollection<ApprovalRequestReasons> Reasons { get; set; } = [];
+
+    public ICollection<Request> Requests { get; set; } = [];
+
+}
+
+[Table(nameof(ApprovalRequestReasons))]
+public class ApprovalRequestReasons : BaseAuditable
+{
+    [Key]
+    public int Id { get; set; }
+    [Required]
+    public string Reason { get; set; } = string.Empty;
+    public ApprovalRequest ApprovalRequest { get; set; } = default!;
+    public int ApprovalRequestId { get; set; }
 
-    public ICollection<Request> Requests { get; set; } = new List<Request>();
 
 }
 

backend/ApprovalFlow/Data/ApprovalFlowDataStoreDbContext.cs

@@ -39,6 +39,7 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
         modelBuilder.HasDefaultSchema("approvalflow");
         base.OnModelCreating(modelBuilder);
 
+
         modelBuilder
         .Entity<Request>()
         .Property(d => d.ApprovalType)

backend/ApprovalFlow/Features/Approvals/ApprovalResponseCommand.cs

@@ -14,7 +14,7 @@ namespace ApprovalFlow.Features.Approvals;
 using Newtonsoft.Json;
 using Serilog;
 
-public class ApprovalResponseCommand : IRequestHandler<ApproveDenyInput, ApprovalModel>
+public class ApprovalResponseCommand : IRequestHandler<ApprovalResponseInput, ApprovalModel>
 {
     private readonly ApprovalFlowDataStoreDbContext dbContext;
     private readonly IClock clock;
@@ -36,15 +36,15 @@ public ApprovalResponseCommand(ApprovalFlowDataStoreDbContext dbContext,
 
 
 
-    public class CommandValidator : AbstractValidator<ApproveDenyInput>
+    public class CommandValidator : AbstractValidator<ApprovalResponseInput>
     {
         public CommandValidator()
         {
             this.RuleFor(x => x.ApprovalRequestId).GreaterThan(0);
         }
     }
 
-    public async Task<ApprovalModel> Handle(ApproveDenyInput input, CancellationToken cancellationToken)
+    public async Task<ApprovalModel> Handle(ApprovalResponseInput input, CancellationToken cancellationToken)
     {
         Serilog.Log.Information($"Handling incoming approval request {input.ApprovalRequestId} Approver {input.ApproverUserId} - Approved {input.Approved}");
 

backend/ApprovalFlow/Features/Approvals/ApprovalsController.cs

@@ -38,7 +38,7 @@ public async Task<ActionResult<IList<ApprovalModel>>> GetPendingApprovals([FromQ
     [ProducesResponseType(StatusCodes.Status400BadRequest)]
     [Authorize(Policy = Policies.ApprovalAuthorization)]
 
-    public async Task<ActionResult<ApprovalModel>> PostApprovalResponse([FromBody] ApproveDenyInput command)
+    public async Task<ActionResult<ApprovalModel>> PostApprovalResponse([FromBody] ApprovalResponseInput command)
     {
         var user = HttpContext.User.Identities.First().Claims.FirstOrDefault( claim => claim.Type.Equals(Claims.PreferredUsername))?.Value;
         command.ApproverUserId = user;

backend/ApprovalFlow/Features/Approvals/ApprovalsQuery.cs

@@ -16,31 +16,44 @@ public class PendingApprovalQueryHandler : IRequestHandler<ApprovalsQuery, IList
 {
     private readonly ApprovalFlowDataStoreDbContext context;
     private readonly IMapper mapper;
-    public PendingApprovalQueryHandler(ApprovalFlowDataStoreDbContext context, IMapper mapper)
+    public PendingApprovalQueryHandler(ApprovalFlowDataStoreDbContext context)
     {
         this.context = context;
-        this.mapper = mapper;
+
+        var config = new MapperConfiguration(cfg =>
+        {
+            cfg.CreateMap<ApprovalRequest, ApprovalModel>();
+            cfg.CreateMap<ApprovalRequestReasons, ReasonModel>();
+            cfg.CreateMap<PersonalIdentity, PersonalIdentityModel>();
+            cfg.CreateMap<Request, RequestModel>();
+
+
+        });
+        this.mapper = config.CreateMapper();
     }
 
+
     public async Task<IList<ApprovalModel>> Handle(ApprovalsQuery request, CancellationToken cancellationToken)
     {
         List<ApprovalRequest> results;
         if (request.PendingOnly)
         {
-            results = this.context.ApprovalRequests.AsSplitQuery().Include(req => req.PersonalIdentities).Include(req => req.Requests).ThenInclude(req => req.History).Where(req => req.Completed == null).ToList();
+            results = this.context.ApprovalRequests.AsSplitQuery().Include(req => req.Reasons).Include(req => req.PersonalIdentities).Include(req => req.Requests).ThenInclude(req => req.History).Where(req => req.Completed == null).ToList();
 
         }
         else
         {
-            results = this.context.ApprovalRequests.AsSplitQuery().Include(req => req.PersonalIdentities).Include(req => req.Requests).ThenInclude(req => req.History).ToList();
+            results = this.context.ApprovalRequests.AsSplitQuery().Include(req => req.Reasons).Include(req => req.PersonalIdentities).Include(req => req.Requests).ThenInclude(req => req.History).ToList();
 
         }
 
 
         if (results.Any())
         {
             Serilog.Log.Information($"Found {results.Count()} results");
-            return this.mapper.Map<List<ApprovalModel>>(results);
+            var mappedResults = this.mapper.Map<List<ApprovalModel>>(results);
+
+            return mappedResults;
         }
         else
         {