Merge remote-tracking branch 'origin/master' into update/dependencies

Author: SoLetsDev

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/Applications/ApplicationsEndpoints.cs

@@ -520,6 +520,7 @@ public enum ApplicationTypes
   New,
   Renewal,
   LabourMobility,
+  ICRA
 }
 
 public enum EducationOrigin

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ICRA/ICRAEligibilitiesEndpoints.cs

@@ -0,0 +1,88 @@
+using AutoMapper;
+using ECER.Infrastructure.Common;
+using ECER.Managers.Registry.Contract.ICRA;
+using ECER.Utilities.Hosting;
+using ECER.Utilities.Security;
+using MediatR;
+using Microsoft.AspNetCore.Http.HttpResults;
+
+namespace ECER.Clients.RegistryPortal.Server.ICRA;
+
+public class ICRAEligibilitiesEndpoints : IRegisterEndpoints
+{
+  public void Register(IEndpointRouteBuilder endpointRouteBuilder)
+  {
+    endpointRouteBuilder.MapPut("/api/icra/{id?}", async Task<Results<Ok<DraftICRAEligibilityResponse>, BadRequest<string>, NotFound>> (string? id, SaveDraftICRAEligibilityRequest request, HttpContext ctx, CancellationToken ct, IMediator messageBus, IMapper mapper) =>
+        {
+          bool IdIsNotGuid = !Guid.TryParse(id, out _); if (IdIsNotGuid && id != null) { id = null; }
+          bool PayloadIdIsNotGuid = !Guid.TryParse(request.Eligibility.Id, out _); if (PayloadIdIsNotGuid && request.Eligibility.Id != null) { request.Eligibility.Id = null; }
+
+          if (request.Eligibility.Id != id) return TypedResults.BadRequest("resource id and payload id do not match");
+          var userContext = ctx.User.GetUserContext();
+          var eligibility = mapper.Map<Managers.Registry.Contract.ICRA.ICRAEligibility>(request.Eligibility, opts => opts.Items.Add("ApplicantId", userContext!.UserId))!;
+
+          if (id != null)
+          {
+            var query = new ICRAEligibilitiesQuery
+            {
+              ById = id,
+              ByApplicantId = userContext!.UserId,
+              ByStatus = [Managers.Registry.Contract.ICRA.ICRAStatus.Draft]
+            };
+            var results = await messageBus.Send(query, ct);
+            if (!results.Items.Any()) return TypedResults.NotFound();
+          }
+
+          var freshEligibility = await messageBus.Send(new SaveICRAEligibilityCommand(eligibility), ct);
+          return TypedResults.Ok(new DraftICRAEligibilityResponse(mapper.Map<ICRAEligibility>(freshEligibility)));
+        })
+        .WithOpenApi("Save a draft icra eligibility for the current user", string.Empty, "icra_put")
+        .RequireAuthorization()
+        .WithParameterValidation();
+
+    endpointRouteBuilder.MapGet("/api/icra/{id?}", async (string? id, ICRAStatus[]? byStatus, HttpContext ctx, IMediator messageBus, IMapper mapper, CancellationToken ct) =>
+        {
+          var userId = ctx.User.GetUserContext()?.UserId;
+
+          bool IdIsNotGuid = !Guid.TryParse(id, out _); if (IdIsNotGuid) { id = null; }
+          var query = new ICRAEligibilitiesQuery
+          {
+            ById = id,
+            ByApplicantId = userId,
+            ByStatus = byStatus?.Convert<ICRAStatus, Managers.Registry.Contract.ICRA.ICRAStatus>()
+          };
+          var results = await messageBus.Send(query, ct);
+          return TypedResults.Ok(mapper.Map<IEnumerable<ICRAEligibility>>(results.Items));
+        })
+        .WithOpenApi("Handles icra queries", string.Empty, "icra_get")
+        .RequireAuthorization()
+        .WithParameterValidation();
+  }
+}
+
+public record SaveDraftICRAEligibilityRequest(ICRAEligibility Eligibility);
+
+public record DraftICRAEligibilityResponse(ICRAEligibility Eligibility);
+
+public record ICRAEligibilityQueryResponse(IEnumerable<ICRAEligibility> Items);
+
+public record ICRAEligibility()
+{
+  public string? Id { get; set; }
+  public string ApplicantId { get; set; } = string.Empty;
+  public string? PortalStage { get; set; }
+
+  public ICRAStatus Status { get; set; }
+}
+
+public enum ICRAStatus
+{
+  Active,
+  Draft,
+  Eligible,
+  Inactive,
+  Ineligible,
+  InReview,
+  ReadyforReview,
+  Submitted
+}

src/ECER.Clients.RegistryPortal/ECER.Clients.RegistryPortal.Server/ICRA/ICRAEligibilityMapper.cs

@@ -0,0 +1,13 @@
+using AutoMapper;
+using System.Diagnostics.Contracts;
+
+namespace ECER.Clients.RegistryPortal.Server.ICRA;
+
+public class ICRAEligibilityMapper : Profile
+{
+  public ICRAEligibilityMapper()
+  {
+    CreateMap<ICRAEligibility, Managers.Registry.Contract.ICRA.ICRAEligibility>()
+    .ReverseMap();
+  }
+}

src/ECER.Managers.Registry.Contract/Applications/Contract.cs

@@ -238,7 +238,8 @@ public enum ApplicationTypes
 {
   New,
   Renewal,
-  LabourMobility
+  LabourMobility,
+  ICRA
 }
 
 public enum EducationOrigin

src/ECER.Managers.Registry.Contract/ICRA/Contract.cs

@@ -0,0 +1,35 @@
+using MediatR;
+
+namespace ECER.Managers.Registry.Contract.ICRA;
+
+public record SaveICRAEligibilityCommand(ICRAEligibility eligibility) : IRequest<Contract.ICRA.ICRAEligibility?>;
+
+public record ICRAEligibilitiesQuery : IRequest<ICRAEligibilitiesQueryResults>
+{
+  public string? ById { get; set; }
+  public string? ByApplicantId { get; set; }
+  public string? PortalStage { get; set; }
+  public IEnumerable<ICRAStatus>? ByStatus { get; set; }
+}
+
+public record ICRAEligibilitiesQueryResults(IEnumerable<ICRAEligibility> Items);
+
+public record ICRAEligibility()
+{
+  public string? Id { get; set; }
+  public string? PortalStage { get; set; }
+  public string ApplicantId { get; set; } = string.Empty;
+  public ICRAStatus Status { get; set; }
+}
+
+public enum ICRAStatus
+{
+  Active,
+  Draft,
+  Eligible,
+  Inactive,
+  Ineligible,
+  InReview,
+  ReadyforReview,
+  Submitted
+}

src/ECER.Managers.Registry/Configurer.cs

@@ -14,6 +14,7 @@ public void Configure([NotNull] ConfigurationContext configurationContext)
   {
     configurationContext.Services.AddTransient<ApplicationHandlers>();
     configurationContext.Services.AddTransient<CommunicationHandlers>();
+    configurationContext.Services.AddTransient<ICRAEligibilityHandlers>();
     configurationContext.Services.AddTransient<RegistrantHandlers>();
     configurationContext.Services.AddTransient<PortalInvitationHandlers>();
     configurationContext.Services.AddTransient<RecaptchaHandlers>();

src/ECER.Managers.Registry/ICRAEligibilityHandlers.cs

@@ -0,0 +1,48 @@
+using AutoMapper;
+using ECER.Infrastructure.Common;
+using ECER.Managers.Registry.Contract.ICRA;
+using ECER.Resources.Documents.ICRA;
+using MediatR;
+
+
+namespace ECER.Managers.Registry;
+
+/// <summary>
+/// Message handlers
+/// </summary>
+public class ICRAEligibilityHandlers(
+     IICRARepository iCRARepository,
+     IMapper mapper)
+  : IRequestHandler<SaveICRAEligibilityCommand, Contract.ICRA.ICRAEligibility?>,
+    IRequestHandler<ICRAEligibilitiesQuery, ICRAEligibilitiesQueryResults>
+{
+
+  public async Task<Contract.ICRA.ICRAEligibility?> Handle(SaveICRAEligibilityCommand request, CancellationToken cancellationToken)
+  {
+    ArgumentNullException.ThrowIfNull(request);
+
+    var iCRAEligibilityId = await iCRARepository.Save(mapper.Map<Resources.Documents.ICRA.ICRAEligibility>(request.eligibility)!, cancellationToken);
+
+    var freshIcraEligibilities = await iCRARepository.Query(new ICRAQuery
+    {
+      ById = iCRAEligibilityId,
+    }, cancellationToken);
+
+    return mapper.Map<Contract.ICRA.ICRAEligibility>(freshIcraEligibilities.SingleOrDefault())!;
+  }
+
+
+  public async Task<ICRAEligibilitiesQueryResults> Handle(ICRAEligibilitiesQuery request, CancellationToken cancellationToken)
+  {
+    ArgumentNullException.ThrowIfNull(request);
+
+    var eligibilities = await iCRARepository.Query(new ICRAQuery
+    {
+      ById = request.ById,
+      ByApplicantId = request.ByApplicantId,
+      ByStatus = request.ByStatus?.Convert<Contract.ICRA.ICRAStatus, Resources.Documents.ICRA.ICRAStatus>(),
+    }, cancellationToken);
+    return new ICRAEligibilitiesQueryResults(mapper.Map<IEnumerable<Contract.ICRA.ICRAEligibility>>(eligibilities)!);
+  }
+
+}

src/ECER.Managers.Registry/ICRAEligibilityMapper.cs

@@ -0,0 +1,12 @@
+using AutoMapper;
+using ECER.Resources.Documents.ICRA;
+
+namespace ECER.Managers.Registry;
+
+internal class ICRAEligibilityMapper : Profile
+{
+  public ICRAEligibilityMapper()
+  {
+    CreateMap<Contract.ICRA.ICRAEligibility, ICRAEligibility>().ReverseMap();
+  }
+}

src/ECER.Resources.Documents/Applications/IApplicationRepository.cs

@@ -173,7 +173,8 @@ public enum ApplicationTypes
 {
   New,
   Renewal,
-  LabourMobility
+  LabourMobility,
+  ICRA
 }
 
 public enum EducationOrigin

src/ECER.Resources.Documents/Configurer.cs

@@ -16,5 +16,6 @@ public void Configure([NotNull] ConfigurationContext configurationContext)
     configurationContext.Services.AddTransient<IApplicationRepository, ApplicationRepository>();
     configurationContext.Services.AddTransient<IPortalInvitationRepository, PortalInvitationRepository>();
     configurationContext.Services.AddTransient<IMetadataResourceRepository, MetadataResourceRepository>();
+    configurationContext.Services.AddTransient<ICRA.IICRARepository, ICRA.ICRARepository>();
   }
 }