Release/v2024.10.10.1

NuGet.config

@@ -2,6 +2,5 @@
 <configuration>
     <packageSources>
         <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
-        <add key="co-financing.org" value="https://packages.co-financing.org/nuget" />
     </packageSources>
 </configuration>

build.cake

@@ -3,6 +3,7 @@
 
 var target = Argument("target", "Test");
 var configuration = Argument("configuration", "Release");
+var fromVersion = Argument("fromVersion", "");
 
 
 Task("Clean")
@@ -63,4 +64,19 @@ Task("Publish")
         });
     });
 
+Task("Migrate")
+    .IsDependentOn("Test")
+    .Does(() =>{
+        var migrationProject = "src/Migrators/Migrators.MSSQL/Migrators.MSSQL.csproj";
+        var startupProject = "src/Server.UI/Server.UI.csproj";
+        var context = "Cfo.Cats.Infrastructure.Persistence.ApplicationDbContext";
+
+
+        var result = StartProcess("dotnet", $"ef migrations script {fromVersion} --no-build --configuration {configuration} --project {migrationProject} --startup-project {startupProject} --context {context} --idempotent -o ./publish/MigrationScript.sql");
+        if(result != 0)
+        {
+            Error("Failed to generate migration script");
+        }
+    });
+
 RunTarget(target);

cats.sln

@@ -24,7 +24,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_SolutionItems", "_Solution
 		docker-compose.yml = docker-compose.yml
 		.config\dotnet-tools.json = .config\dotnet-tools.json
 		LICENSE = LICENSE
-		LocalPublish.ps1 = LocalPublish.ps1
 		ModifyDatabase.ps1 = ModifyDatabase.ps1
 		NuGet.config = NuGet.config
 		README.md = README.md

src/Application/Common/Interfaces/IRightToWorkSettings.cs

@@ -0,0 +1,7 @@
+namespace Cfo.Cats.Application.Common.Interfaces;
+
+public interface IRightToWorkSettings
+{
+    IList<string> NationalitiesExempted { get; set; }
+}
+

src/Application/Common/Validators/RegularExpressionValidation.cs

@@ -14,8 +14,10 @@ public static class ValidationConstants
         public const string DateMustBeInPast = "Date must be in the past.";
         public const string DateMustBeInFuture = "Date must be in the future.";
 
-        public const string Notes = @"^[A-Za-z0-9 ?.,!""'\/$£&€\r\n\-\(\)@’;%]*$";
+        public const string Notes = @"^[A-Za-z0-9 ?.,!""'\/$£&€\r\n\-\(\)@’:;%]*$";
         public const string NotesMessage = "{0} must contain only letters, numbers, spaces and common punctuation";
+
+        public const int NotesLength = 1000;
 
         public const string GuidMessage = "{0} must contain a valid Guid";
 

src/Application/Features/Participants/Commands/AddConsent.cs

@@ -41,8 +41,8 @@ public async Task<Result<string>> Handle(Command request, CancellationToken canc
             }
 
             var document = Document.Create(request.Document!.Name,
-                $"Consent form for {request.ParticipantId}",
-                DocumentType.PDF);
+            $"Consent form for {request.ParticipantId}",
+            DocumentType.PDF);
 
             long maxSizeBytes = Convert.ToInt64(ByteSize.FromMegabytes(Infrastructure.Constants.Documents.Consent.MaximumSizeInMegabytes).Bytes);
             await using var stream = request.Document.OpenReadStream(maxSizeBytes);
@@ -53,12 +53,16 @@ public async Task<Result<string>> Handle(Command request, CancellationToken canc
 
             var result = await uploadService.UploadAsync($"{request.ParticipantId}/consent", uploadRequest);
 
-            document.SetURL(result);
-            document.SetVersion(request.DocumentVersion!);
+            if (result.Succeeded)
+            {
+                document.SetURL(result);
+                document.SetVersion(request.DocumentVersion!);
+
+                participant.AddConsent(request.ConsentDate!.Value, document.Id);
+
+                await unitOfWork.DbContext.Documents.AddAsync(document);
+            }
 
-            participant.AddConsent(request.ConsentDate!.Value, document.Id);
-
-            unitOfWork.DbContext.Documents.Add(document);
             return result;
         }
     }
@@ -135,4 +139,4 @@ private async Task<bool> BePdfFile(IBrowserFile? file, CancellationToken cancell
             }
         }
     }
-}
+}

src/Application/Features/Participants/Commands/AddNote.cs

@@ -63,7 +63,7 @@ public Validator(IUnitOfWork unitOfWork)
 
             RuleFor(c => c.Message)
                 .NotEmpty()
-                .MaximumLength(255)
+                .MaximumLength(ValidationConstants.NotesLength)
                 .Matches(ValidationConstants.Notes)
                 .WithMessage(string.Format(ValidationConstants.NotesMessage, "Message"));
         }

src/Application/Features/Participants/Commands/AddRightToWork.cs

@@ -2,10 +2,8 @@
 using Cfo.Cats.Application.Common.Validators;
 using Cfo.Cats.Application.SecurityConstants;
 using Cfo.Cats.Domain.Entities.Documents;
-using FluentValidation;
 using Humanizer.Bytes;
 using Microsoft.AspNetCore.Components.Forms;
-using System.IO;
 
 namespace Cfo.Cats.Application.Features.Participants.Commands;
 
@@ -35,7 +33,6 @@ public class Command : IRequest<Result<string>>
     public class Handler(IUnitOfWork unitOfWork, IUploadService uploadService)
         : IRequestHandler<Command, Result<string>>
     {
-
         public async Task<Result<string>> Handle(Command request, CancellationToken cancellationToken)
         {
             var participant = await unitOfWork.DbContext.Participants.FindAsync(request.ParticipantId);
@@ -57,17 +54,19 @@ public async Task<Result<string>> Handle(Command request, CancellationToken canc
             var uploadRequest = new UploadRequest(request.Document.Name, UploadType.Document, memoryStream.ToArray());
 
             var result = await uploadService.UploadAsync($"{request.ParticipantId}/rtw", uploadRequest);
-
-            document.SetURL(result);
-
-            if(request.IndefiniteRightToWork)
+            if (result.Succeeded)
             {
-                request.ValidTo = DateTime.MaxValue;
-            }
+                document.SetURL(result);
 
-            participant.AddRightToWork(request.ValidFrom!.Value, request.ValidTo!.Value, document.Id);
+                if (request.IndefiniteRightToWork)
+                {
+                    request.ValidTo = DateTime.MaxValue;
+                }
+
+                participant.AddRightToWork(request.ValidFrom!.Value, request.ValidTo!.Value, document.Id);
 
-            unitOfWork.DbContext.Documents.Add(document);
+                unitOfWork.DbContext.Documents.Add(document);
+            }
             return result;
         }
     }
@@ -145,6 +144,5 @@ private async Task<bool> BePdfFile(IBrowserFile? file, CancellationToken cancell
                 return header == "%PDF";
             }
         }
-
     }    
-}
+}

src/Application/Features/Participants/Commands/CreateParticipant.cs

@@ -61,7 +61,8 @@ public async Task<Result<string>> Handle(Command request, CancellationToken canc
                 activeInFeed: candidate.IsActive,
                 referralSource: request.ReferralSource!,
                 referralComments: request.ReferralComments,
-                locationId: candidate.MappedLocationId);
+                locationId: candidate.MappedLocationId,
+                nationality: candidate.Nationality);
 
             if(candidate.Crn is not null)
             {

src/Application/Features/Participants/Commands/ReassignParticipants.cs

@@ -0,0 +1,103 @@
+using Cfo.Cats.Application.Common.Security;
+using Cfo.Cats.Application.Common.Validators;
+using Cfo.Cats.Application.SecurityConstants;
+
+namespace Cfo.Cats.Application.Features.Participants.Commands
+{
+    public static class ReassignParticipants
+    {
+        [RequestAuthorize(Policy = SecurityPolicies.UserHasAdditionalRoles)]
+        public class Command : IRequest<Result<bool>>
+        {
+            public string[] ParticipantIdsToReassign { get; set; } = [];
+
+            public UserProfile? CurrentUser { get; set; }
+
+            public string? AssigneeId { get; set; }
+        }
+
+        public class Handler(IUnitOfWork unitOfWork) : IRequestHandler<Command, Result<bool>>
+        {
+            public async Task<Result<bool>> Handle(Command request, CancellationToken cancellationToken)
+            {
+                foreach (var participantId in request.ParticipantIdsToReassign)
+                {
+                    var participant = await unitOfWork.DbContext.Participants
+                        .FirstOrDefaultAsync(x => x.Id == participantId);
+
+                    if (participant is not null)
+                    {
+                        participant.AssignTo(request.AssigneeId);
+                    }
+                    else
+                    {
+                        return Result<bool>.Failure("Participant not found");
+                    }
+                }
+
+                return Result<bool>.Success(true);
+            }
+        }
+
+        public class A_ : AbstractValidator<Command>
+        {
+            public A_()
+            {
+                RuleFor(x => x.AssigneeId)
+                    .NotNull()
+                    .MinimumLength(36);
+
+                RuleFor(x => x.ParticipantIdsToReassign)
+                    .NotEmpty();
+
+                RuleFor(x => x.CurrentUser)
+                    .NotNull();
+            }
+        }
+
+        public class A_ParticipantExists : AbstractValidator<Command>
+        {
+            private readonly IUnitOfWork _unitOfWork;
+
+            public A_ParticipantExists(IUnitOfWork unitOfWork)
+            {
+                _unitOfWork = unitOfWork;
+
+                // Validate each ParticipantId in the list
+                RuleForEach(p => p.ParticipantIdsToReassign)
+                   .NotNull()
+                   .Length(9)
+                   .WithMessage("Invalid Participant Id")
+                   .MustAsync(Exist)
+                   .WithMessage("Participant does not exist")
+                   .Matches(ValidationConstants.AlphaNumeric)
+                   .WithMessage(string.Format(ValidationConstants.AlphaNumericMessage, "Participant Id"));
+            }
+
+            // Check if the participant exists in the database
+            private async Task<bool> Exist(string participantId, CancellationToken cancellationToken)
+                => await _unitOfWork.DbContext.Participants.AnyAsync(p => p.Id == participantId, cancellationToken);
+        }
+
+        public class B_AssignerHasAccessToAssignee : AbstractValidator<Command>
+        {
+            private IUnitOfWork _unitOfWork;
+            public B_AssignerHasAccessToAssignee(IUnitOfWork unitOfWork)
+            {
+                _unitOfWork = unitOfWork;
+
+                RuleFor(c => c)
+                    .MustAsync(ValidAssignee)
+                    .WithMessage("This assessment is created by you hence must not be processed at PQA stage by you");
+            }
+
+            private async Task<bool> ValidAssignee(Command c, CancellationToken cancellationToken)
+            {
+                return await _unitOfWork.DbContext.Users.Where(x => x.TenantId!.StartsWith(c.CurrentUser!.TenantId!)
+                                                                && x.Id == c.CurrentUser.UserId
+                                                                && x.IsActive == true
+                                                                ).AnyAsync(cancellationToken);
+            }
+        }
+    }
+}

src/Application/Features/Participants/DTOs/ParticipantDto.cs

@@ -14,6 +14,7 @@ public class ParticipantDto
     public DateOnly? DateOfBirth { get; set; }
     public DateTime? RiskDue { get; set; }
     public int? RiskDueInDays { get; set; }
+    public string? Nationality { get; set; }
 
     [Description("Enrolment Status")]
     public EnrolmentStatus? EnrolmentStatus { get; set; }
@@ -63,7 +64,8 @@ public Mapping()
 #nullable disable
                 .ForMember(target => target.SupportWorker, options => options.MapFrom(source => source.Owner.DisplayName))
                 .ForMember(dest => dest.RiskDue, opt => opt.MapFrom(src => src.RiskDue))
-                .ForMember(dest => dest.RiskDueInDays, opt => opt.MapFrom(src => src.RiskDueInDays()));
+                .ForMember(dest => dest.RiskDueInDays, opt => opt.MapFrom(src => src.RiskDueInDays()))
+                .ForMember(dest => dest.Nationality, opt => opt.MapFrom(src => src.Nationality));
         }
     }
 }

src/Application/Features/Participants/DTOs/ParticipantSummaryDto.cs

@@ -31,11 +31,18 @@ public class ParticipantSummaryDto
     public required DateOnly DateOfBirth { get; set; }
     public DateTime? RiskDue { get; set; }
     public int? RiskDueInDays { get; set; }
+    public string? Nationality { get; set; }
     /// <summary>
     ///  The current enrolment status of the participant
     /// </summary>
     public EnrolmentStatus EnrolmentStatus { get; set; } = EnrolmentStatus.IdentifiedStatus;
-
+
+    /// <summary>
+    ///  The current enrolment status of the participant
+    /// </summary>
+    public ConsentStatus ConsentStatus { get; set; } = ConsentStatus.PendingStatus;
+
+
     /// <summary>
     /// The person who "owns" this participant's case. Usually the support worker.
     /// </summary>
@@ -49,6 +56,9 @@ public class ParticipantSummaryDto
 
     public PathwayPlanSummaryDto? PathwayPlan { get; set; }
 
+    public bool HasActiveRightToWork { get; set; }
+    public bool IsRightToWorkRequired{ get; set; }
+
     private class Mapping : Profile
     {
         public Mapping()
@@ -62,7 +72,8 @@ public Mapping()
                 .ForMember(target => target.OwnerName, options => options.MapFrom(source => source.Owner!.DisplayName))
                 .ForMember(target => target.ParticipantName, options => options.MapFrom(source => source.FirstName + ' ' + source.LastName))
                 .ForMember(dest => dest.RiskDue, opt => opt.MapFrom(src => src.RiskDue))
-                .ForMember(dest => dest.RiskDueInDays, opt => opt.MapFrom(src => src.RiskDueInDays()));
+                .ForMember(dest => dest.RiskDueInDays, opt => opt.MapFrom(src => src.RiskDueInDays()))
+                .ForMember(dest => dest.Nationality, opt => opt.MapFrom(src => src.Nationality));
 
             CreateMap<ParticipantAssessment, AssessmentSummaryDto>()
                 .ForMember(target => target.AssessmentId, options => options.MapFrom(source => source.Id))

src/Application/Features/Participants/EventHandlers/RiskInformationReviewed.cs

@@ -0,0 +1,19 @@
+using Cfo.Cats.Domain.Events;
+
+namespace Cfo.Cats.Application.Features.Participants.EventHandlers;
+
+public class RiskInformationReviewed(IUnitOfWork unitOfWork) : INotificationHandler<RiskInformationReviewedDomainEvent>
+{
+    public async Task Handle(RiskInformationReviewedDomainEvent notification, CancellationToken cancellationToken)
+    {
+        var participant = await unitOfWork.DbContext.Participants
+            .Where(p => p.Id == notification.Item.ParticipantId)
+            .FirstOrDefaultAsync(cancellationToken);
+
+        if (participant is not null)
+        {
+            participant.SetRiskDue(DateTime.UtcNow.AddDays(70));
+        }
+
+    }
+}

src/Application/Features/Participants/Queries/GetParticipantSummary.cs

@@ -18,10 +18,9 @@ public class Query : IAuditableRequest<Result<ParticipantSummaryDto>>
         public string Identifier() => ParticipantId;
 
     }
-
-    public class Handler(IUnitOfWork unitOfWork, IMapper mapper) : IRequestHandler<Query, Result<ParticipantSummaryDto>>
+    public class Handler(IUnitOfWork unitOfWork, IMapper mapper, IRightToWorkSettings rtwSettings) : IRequestHandler<Query, Result<ParticipantSummaryDto>>
     {
-        
+
         public async Task<Result<ParticipantSummaryDto>> Handle(Query request, CancellationToken cancellationToken)
         {
             var query = from c in unitOfWork.DbContext.Participants
@@ -59,6 +58,13 @@ public async Task<Result<ParticipantSummaryDto>> Handle(Query request, Cancellat
 
             summary.BioSummary = mapper.Map<BioSummaryDto>(bio);
 
+            summary.HasActiveRightToWork = await unitOfWork.DbContext.Participants
+                .Where(x => x.Id == request.ParticipantId)
+                .SelectMany(p => p.RightToWorks)
+                .AnyAsync(x => x.Lifetime.EndDate >= DateTime.Now.Date, cancellationToken);
+
+            summary.IsRightToWorkRequired = rtwSettings.NationalitiesExempted.Any(s => s.Equals(summary.Nationality!, StringComparison.OrdinalIgnoreCase)) == false;
+
             return Result<ParticipantSummaryDto>.Success(summary);
         }
     }