Develop

LocalPublish.ps1

@@ -27,15 +27,15 @@ dotnet test --configuration Release --no-build --verbosity normal
 Write-Host "Publishing package" -ForegroundColor Green
 dotnet publish --no-build --configuration Release --output $publishPath
 
-Write-Host "Generting indempotent migration script" -ForegroundColor Green
+Write-Host "Generating indempotent migration script" -ForegroundColor Green
 dotnet ef migrations script --no-build --configuration Release --project src/Migrators/Migrators.MSSQL/Migrators.MSSQL.csproj --startup-project src/Server.UI/Server.UI.csproj --context Cfo.Cats.Infrastructure.Persistence.ApplicationDbContext --idempotent -o ./publish/Migration.sql
 
 Write-Host "Compressing artifacts" -ForegroundColor Green
 Compress-Archive -Path $sourcePath -DestinationPath $destinationPath
 
 Write-Host "Cleaning publish folder" -ForegroundColor Green
 
-Get-ChildItem -Path $publishPath -Exclude "build-artifacts.zip" | ForEach-Object {
+Get-ChildItem -Path $publishPath -Exclude build-artifacts.zip,Migration.sql | ForEach-Object {
     if ($_.FullName -ne $destinationPath) {
         Remove-Item -Recurse -Force $_.FullName
     }

src/Application/Common/Interfaces/ICommunicationsService.cs

@@ -2,6 +2,7 @@ namespace Cfo.Cats.Application.Common.Interfaces;
 
 public interface ICommunicationsService
 {
+    Task SendAccountDeactivationEmail(string email);
     Task SendSmsCodeAsync(string mobileNumber, string code);
     Task SendEmailCodeAsync(string email, string code);
 }

src/Application/Features/Candidates/DTOs/CandidateDto.cs

@@ -69,6 +69,8 @@ public class CandidateDto
     /// </summary>
     public required string Primary { get; set; }
 
+    public string[] RegistrationDetails { get; set; } = [];
+
     public string? EstCode { get; set; }
     public string? OrgCode { get; set; }
 
@@ -78,5 +80,7 @@ public class CandidateDto
 
     public string? LocationDescription { get; set; }
 
+    public string? RegistrationDetailsJson { get; set; }
+
     public int MappedLocationId { get; set; } = 0;
 }

src/Application/Features/Candidates/Queries/Search/CandidateSearchQueryValidator.cs

@@ -24,7 +24,9 @@ public CandidateSearchQueryValidator()
 
         RuleFor(q => q.DateOfBirth)
             .NotNull()
-            .WithMessage("Date of birth is required");
+            .WithMessage("Date of birth is required")
+            .LessThanOrEqualTo(DateTime.Today.AddYears(-18))
+            .WithMessage("Must be at least 18 years");
 
         RuleFor(q => q.ExternalIdentifier)
             .NotEmpty()

src/Application/Features/Dashboard/Queries/GetDashboard.cs

@@ -37,14 +37,14 @@ into grp
                     dto.ApprovedCases = result.Count;
                     continue;
                 }
-                if (result.Status == EnrolmentStatus.PendingStatus)
+                if (result.Status == EnrolmentStatus.IdentifiedStatus)
                 {
-                    dto.PendingCases = result.Count;
+                    dto.IdentifiedCases = result.Count;
                     continue;
                 }
-                if(result.Status == EnrolmentStatus.EnrolmentConfirmedStatus)
+                if(result.Status == EnrolmentStatus.EnrollingStatus)
                 {
-                    dto.ConfirmedCases = result.Count;
+                    dto.EnrollingCases = result.Count;
                     continue;
                 }
                 if (result.Status == EnrolmentStatus.SubmittedToProviderStatus)
@@ -76,8 +76,8 @@ public Validator()
 
 public class DashboardDto
 {
-    public int PendingCases { get; set; }
-    public int ConfirmedCases { get; set; }
+    public int IdentifiedCases { get; set; }
+    public int EnrollingCases { get; set; }
     public int CasesAtPqa { get; set; }
     public int CasesAtCfo { get; set; }
     public int ApprovedCases { get; set; }

src/Application/Features/Identity/Notifications/IdentityEvents/IdentityAuditNotification.cs

@@ -36,6 +36,9 @@ public static IdentityAuditNotification LoginSucceededTwoFactorRequired(string
     public static IdentityAuditNotification UserLockedOut(string  userName, string ipAddress)
         => new(IdentityActionType.UserAccountLockedOut, ipAddress,userName);
 
+    public static IdentityAuditNotification UserInactive(string userName, string ipAddress)
+    => new(IdentityActionType.UserInactive, ipAddress, userName);
+
     public static IdentityAuditNotification PasswordReset(string userName, string ipAddress, string? performedBy = null)
         => new(IdentityActionType.PasswordReset,ipAddress , userName, performedBy);
 

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

@@ -30,7 +30,7 @@ public async Task<Result> Handle(Command request, CancellationToken cancellation
 
             var supervisor = mapper.Map(request.Supervisor, participant.Supervisor);
 
-            participant.AddOrUpdateSupervisor(supervisor);
+            participant.UpdateSupervisor(supervisor);
 
             return Result.Success();
         }

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

@@ -49,7 +49,7 @@ public async Task<Result<string>> Handle(Command request, CancellationToken canc
                 $"Right to work evidence for {request.ParticipantId}",
                 DocumentType.PDF);
 
-            long maxSizeBytes = Convert.ToInt64(ByteSize.FromMegabytes(Infrastructure.Constants.Documents.Consent.MaximumSizeInMegabytes).Bytes);
+            long maxSizeBytes = Convert.ToInt64(ByteSize.FromMegabytes(Infrastructure.Constants.Documents.RightToWork.MaximumSizeInMegabytes).Bytes);
             await using var stream = request.Document.OpenReadStream(maxSizeBytes);
             using var memoryStream = new MemoryStream();
             await stream.CopyToAsync(memoryStream, cancellationToken);
@@ -134,7 +134,7 @@ private async Task<bool> BePdfFile(IBrowserFile? file, CancellationToken cancell
             if (file.ContentType != "application/pdf")
                 return false;
 
-            long maxSizeBytes = Convert.ToInt64(ByteSize.FromMegabytes(Infrastructure.Constants.Documents.Consent.MaximumSizeInMegabytes).Bytes);
+            long maxSizeBytes = Convert.ToInt64(ByteSize.FromMegabytes(Infrastructure.Constants.Documents.RightToWork.MaximumSizeInMegabytes).Bytes);
 
             // Check file signature (magic numbers)
             using (var stream = file.OpenReadStream(maxSizeBytes))

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

@@ -21,6 +21,7 @@ public class Handler(IUnitOfWork unitOfWork) : IRequestHandler<Command, Result<G
         public async Task<Result<Guid>> Handle(Command request, CancellationToken cancellationToken)
         {
             Risk? risk = await unitOfWork.DbContext.Risks
+                .Include(x => x.Participant)
                 .OrderByDescending(r => r.Created)
                 .FirstOrDefaultAsync(r => r.ParticipantId == request.ParticipantId);
 

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

@@ -23,7 +23,7 @@ public async Task<Result> Handle(Command request, CancellationToken cancellation
                 return Result.Failure("Participant not found");
             }
 
-            participant.TransitionTo(EnrolmentStatus.EnrolmentConfirmedStatus);
+            participant.TransitionTo(EnrolmentStatus.EnrollingStatus);
 
             return Result.Success();
         }

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

@@ -57,6 +57,7 @@ public async Task<Result<string>> Handle(Command request, CancellationToken canc
                 lastName: candidate.LastName,
                 gender: candidate.Gender,
                 dateOfBirth: candidate.DateOfBirth,
+                registrationDetailsJson: candidate.RegistrationDetailsJson,
                 activeInFeed: candidate.IsActive,
                 referralSource: request.ReferralSource!,
                 referralComments: request.ReferralComments,

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

@@ -18,7 +18,9 @@ public class Handler(IUnitOfWork unitOfWork, IMapper mapper, ICurrentUserService
     {
         public async Task<Result<Guid>> Handle(Command request, CancellationToken cancellationToken)
         {
-            var risk = await unitOfWork.DbContext.Risks.FindAsync(request.RiskId);
+            var risk = await unitOfWork.DbContext.Risks
+                .Include(x => x.Participant)
+                .FirstOrDefaultAsync(x => x.Id == request.RiskId);
 
             if(risk is null)
             {

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

@@ -12,6 +12,8 @@ public class ParticipantDto
     public string? MiddleName { get; set; }
     public string? LastName { get; set; }
     public DateOnly? DateOfBirth { get; set; }
+    public DateTime? RiskDue { get; set; }
+    public int? RiskDueInDays { get; set; }
 
     [Description("Enrolment Status")]
     public EnrolmentStatus? EnrolmentStatus { get; set; }
@@ -59,7 +61,9 @@ public Mapping()
                 .ForMember(target => target.TenantId, options => options.MapFrom(s => s.Owner!.TenantId))
                 .ForMember(target => target.ExternalIdentifiers, options => options.MapFrom(s => s.ExternalIdentifiers.ToArray()))
 #nullable disable
-                .ForMember(target => target.SupportWorker, options => options.MapFrom(source => source.Owner.DisplayName));
+                .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()));
         }
     }
 }

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

@@ -29,11 +29,12 @@ public class ParticipantSummaryDto
     /// The participant's date of birth
     /// </summary>
     public required DateOnly DateOfBirth { get; set; }
-
+    public DateTime? RiskDue { get; set; }
+    public int? RiskDueInDays { get; set; }
     /// <summary>
     ///  The current enrolment status of the participant
     /// </summary>
-    public EnrolmentStatus EnrolmentStatus { get; set; } = EnrolmentStatus.PendingStatus;
+    public EnrolmentStatus EnrolmentStatus { get; set; } = EnrolmentStatus.IdentifiedStatus;
 
     /// <summary>
     /// The person who "owns" this participant's case. Usually the support worker.
@@ -59,7 +60,9 @@ public Mapping()
                 .ForMember(target => target.EnrolmentLocation, options => options.MapFrom(source => source.EnrolmentLocation.Name))
  #pragma warning restore CS8602 // Dereference of a possibly null reference.
                 .ForMember(target => target.OwnerName, options => options.MapFrom(source => source.Owner!.DisplayName))
-                .ForMember(target => target.ParticipantName, options => options.MapFrom(source => source.FirstName + ' ' + source.LastName));
+                .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()));
 
             CreateMap<ParticipantAssessment, AssessmentSummaryDto>()
                 .ForMember(target => target.AssessmentId, options => options.MapFrom(source => source.Id))

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

@@ -1,5 +1,6 @@
 using Cfo.Cats.Application.Common.Validators;
 using Cfo.Cats.Domain.Entities.Participants;
+using Newtonsoft.Json;
 
 namespace Cfo.Cats.Application.Features.Participants.DTOs;
 
@@ -51,26 +52,38 @@ public class RiskDto
     [Description("Specific Risk(s)")]
     public string? SpecificRisk { get; set; }
 
-    public MappaCategory? MappaCategory { get; set; }
-    public MappaLevel? MappaLevel { get; set; }
-
-    [Description("Referrer Name")]
+    [Description("Full Name")]
     public string? ReferrerName { get; set; }
 
-    [Description("Referrer Email")]
+    [Description("Email Address")]
     public string? ReferrerEmail { get; set; }
 
-    [Description("Referred on")]
+    [Description("Date Completed")]
     public DateTime? ReferredOn { get; set; }
-
-    [Description("Declaration")]
-    public bool DeclarationSigned { get; set; } = false;
+    public string[] RegistrationDetails { get; set; } = [];
 
     private class Mapping : Profile
     {
         public Mapping()
         {
             CreateMap<Risk, RiskDto>(MemberList.None)
+                .ForMember(dest => dest.RegistrationDetails, opt => opt.MapFrom((dest, src) =>
+                {
+                    string? json;
+
+                    if(dest.Completed.HasValue)
+                    {
+                        json = dest.RegistrationDetailsJson;
+                    }
+                    else
+                    {
+                        json = dest.Participant?.RegistrationDetailsJson;
+                    }
+
+                    json ??= JsonConvert.Null;
+
+                    return JsonConvert.DeserializeObject<string[]>(json) ?? [];
+                }))
                 .ForMember(dest => dest.CommunityRiskDetail, opt => opt.MapFrom(src => new RiskDetail
                 {
                     RiskToChildren = src.RiskToChildrenInCommunity,
@@ -90,6 +103,10 @@ public Mapping()
                     RiskToOtherPrisoners = src.RiskToOtherPrisonersInCustody,
                 }))
                 .ReverseMap()
+                .ForMember(src => src.RegistrationDetailsJson, opt => opt.MapFrom((dest, src) => 
+                {
+                    return src.Participant?.RegistrationDetailsJson;
+                }))
                 .ForPath(src => src.RiskToChildrenInCommunity, opt => opt.MapFrom(dest => dest.CommunityRiskDetail.RiskToChildren))
                 .ForPath(src => src.RiskToPublicInCommunity, opt => opt.MapFrom(dest => dest.CommunityRiskDetail.RiskToPublic))
                 .ForPath(src => src.RiskToKnownAdultInCommunity, opt => opt.MapFrom(dest => dest.CommunityRiskDetail.RiskToKnownAdult))
@@ -237,20 +254,6 @@ public Validator()
                     .SetValidator(new RiskDetail.Validator());
             });
 
-            RuleFor(x => x.MappaCategory)
-                .NotNull()
-                .WithMessage("You must answer")
-                .NotEqual(MappaCategory.NotApplicable)
-                .When(x => x.MappaLevel != MappaLevel.NotApplicable)
-                .WithMessage("This answer is incompatible with the selected level");
-
-            RuleFor(x => x.MappaLevel)
-                .NotNull()
-                .WithMessage("You must answer")
-                .NotEqual(MappaLevel.NotApplicable)
-                .When(x => x.MappaCategory != MappaCategory.NotApplicable)
-                .WithMessage("This answer is incompatible with the selected category");
-
             RuleFor(x => x.IsSubjectToSHPO)
                 .NotNull()
                 .WithMessage("You must answer");
@@ -259,31 +262,23 @@ public Validator()
                 .NotNull()
                 .WithMessage("You must answer");
 
-            RuleFor(x => x.DeclarationSigned)
-                .Equal(true)
-                .WithMessage("You must confirm");
+            RuleFor(x => x.ReferrerName)
+                .NotEmpty()
+                .WithMessage("You must provide the name")
+                .Matches(ValidationConstants.NameCompliantWithDMS)
+                .WithMessage(string.Format(ValidationConstants.NameCompliantWithDMSMessage, "Name"));
 
-            When(x => x.DeclarationSigned, () =>
-            {
-                RuleFor(x => x.ReferrerName)
-                    .NotEmpty()
-                    .WithMessage("You must provide the referrers name")
-                    .Matches(ValidationConstants.NameCompliantWithDMS)
-                    .WithMessage(string.Format(ValidationConstants.NameCompliantWithDMSMessage, "Referrer Name"));
-
-                RuleFor(x => x.ReferrerEmail)
-                    .NotEmpty()
-                    .WithMessage("You must provide the referrers email")
-                    .EmailAddress()
-                    .WithMessage("Must be a valid email address");
-
-                RuleFor(x => x.ReferredOn)
-                    .NotEmpty()
-                    .WithMessage("You must provide the referral date")
-                    .LessThanOrEqualTo(DateTime.UtcNow.Date)
-                    .WithMessage(ValidationConstants.DateMustBeInPast);
-            });
+            RuleFor(x => x.ReferrerEmail)
+                .NotEmpty()
+                .WithMessage("You must provide the email")
+                .EmailAddress()
+                .WithMessage("Must be a valid email address");
 
+            RuleFor(x => x.ReferredOn)
+                .NotEmpty()
+                .WithMessage("You must provide the date")
+                .LessThanOrEqualTo(DateTime.UtcNow.Date)
+                .WithMessage(ValidationConstants.DateMustBeInPast);
         }
     }
 

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

@@ -11,8 +11,9 @@ public class RiskSummaryDto
     public required RiskReviewReason ReviewReason { get; set; }
     public required DateTime Created { get; set; }
     public required string CreatedBy { get; set; }
-    public DateTime? ReferredOn { get; set; }
 
+    [Description("Date Risk form completed")]
+    public DateTime? ReferredOn { get; set; }
     private class Mapping : Profile
     {
         public Mapping()

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

@@ -0,0 +1,21 @@
+using Cfo.Cats.Domain.Events;
+
+namespace Cfo.Cats.Application.Features.Participants.EventHandlers;
+
+public class ConsentCreated(IUnitOfWork unitOfWork):INotificationHandler<ConsentCreatedDomainEvent>
+{
+    public async Task Handle(ConsentCreatedDomainEvent notification, CancellationToken cancellationToken)
+    {
+        var participant = await unitOfWork.DbContext.Participants
+            .Where(p => p.Id == notification.ParticipantId)
+            .FirstOrDefaultAsync(cancellationToken);
+
+        if (participant is { Consents.Count: 1 })
+        {
+            //Only on first Consent submit
+            participant.SetRiskDue(notification.ConsentDate.AddDays(14));
+            unitOfWork.DbContext.Participants.Update(participant);
+        }
+
+    }
+}

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

@@ -7,7 +7,7 @@ public class ParticipantCreated(IUnitOfWork unitOfWork) : INotificationHandler<P
 {
     public async Task Handle(ParticipantCreatedDomainEvent notification, CancellationToken cancellationToken)
     {
-        var history = ParticipantEnrolmentHistory.Create(notification.Item.Id, EnrolmentStatus.PendingStatus);
+        var history = ParticipantEnrolmentHistory.Create(notification.Item.Id, EnrolmentStatus.IdentifiedStatus);
         await unitOfWork.DbContext.ParticipantEnrolmentHistories.AddAsync(history, cancellationToken);
     }
 }