Block ability to merge a person record which has MQs

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Extensions.cs

@@ -95,6 +95,7 @@ public static IServiceCollection AddSupportUiServices(this IServiceCollection se
             .AddTransient<RequireClosedAlertFilter>()
             .AddTransient<RequireOpenAlertFilter>()
             .AddTransient<RedirectWithPersonIdFilter>()
+            .AddTransient<CheckPersonCanBeMergedFilter>()
             .AddSingleton<ITagHelperInitializer<FormTagHelper>, FormTagHelperInitializer>()
             .AddSingleton<ITagHelperInitializer<TextInputTagHelper>, TextInputTagHelperInitializer>()
             .AddScoped<SupportUiFormContext>()

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/CheckPersonCanBeMergedFilter.cs

@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+using TeachingRecordSystem.Core.DataStore.Postgres;
+
+namespace TeachingRecordSystem.SupportUi.Infrastructure.Filters;
+
+public class CheckPersonCanBeMergedFilter(TrsDbContext dbContext) : IAsyncResourceFilter
+{
+    public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
+    {
+        var currentPerson = context.HttpContext.Features.GetRequiredFeature<CurrentPersonFeature>();
+        var person = await dbContext.Persons
+            .SingleAsync(p => p.PersonId == currentPerson.PersonId);
+
+        var hasOpenAlert = await dbContext.Alerts
+            .AnyAsync(a => a.PersonId == currentPerson.PersonId && a.EndDate == null);
+
+        var hasMandatoryQualification = await dbContext.MandatoryQualifications
+            .AnyAsync(mq => mq.PersonId == currentPerson.PersonId);
+
+        var hasProfessionalStatus =
+            person.EytsDate.HasValue ||
+            person.HasEyps ||
+            person.PqtsDate.HasValue ||
+            person.QtsDate.HasValue ||
+            person.QtlsStatus != QtlsStatus.None;
+
+        if (hasOpenAlert ||
+            hasMandatoryQualification ||
+            hasProfessionalStatus ||
+            person.InductionStatus != InductionStatus.None)
+        {
+            context.Result = new BadRequestResult();
+            return;
+        }
+
+        await next();
+    }
+}

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/CheckPersonExistsFilter.cs

@@ -54,7 +54,7 @@ public class CheckPersonExistsFilterFactory : IFilterFactory, IOrderedFilter
 {
     public bool IsReusable => false;
 
-    public int Order => -200;
+    public int Order => FilterOrders.CheckPersonExistsFilterOrder;
 
     public IFilterMetadata CreateInstance(IServiceProvider serviceProvider) =>
         ActivatorUtilities.CreateInstance<CheckPersonExistsFilter>(serviceProvider);

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/CheckSupportTaskExistsFilter.cs

@@ -60,7 +60,7 @@ public class CheckSupportTaskExistsFilterFactory(bool openOnly, params SupportTa
 {
     public bool IsReusable => false;
 
-    public int Order => -200;
+    public int Order => FilterOrders.CheckSupportTaskExistsFilterOrder;
 
     public IFilterMetadata CreateInstance(IServiceProvider serviceProvider) =>
         ActivatorUtilities.CreateInstance<CheckSupportTaskExistsFilter>(serviceProvider, openOnly, supportTaskTypes);

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/CheckUserExistsFilter.cs

@@ -5,7 +5,7 @@ namespace TeachingRecordSystem.SupportUi.Infrastructure.Filters;
 
 public class CheckUserExistsFilter : IAsyncResourceFilter, IOrderedFilter
 {
-    public int Order => int.MinValue;
+    public int Order => FilterOrders.CheckUserExistsFilterOrder;
 
     public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
     {

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/FilterOrders.cs

@@ -0,0 +1,21 @@
+namespace TeachingRecordSystem.SupportUi.Infrastructure.Filters;
+
+public class FilterOrders
+{
+    public const int CheckUserExistsFilterOrder = int.MinValue;
+    public const int RedirectWithPersonIdFilterOrder = -1000;
+    public const int RequireFeatureEnabledFilterOrder = -300;
+    public const int CheckPersonExistsFilterOrder = -200;
+    public const int CheckMandatoryQualificationExistsFilterOrder = -200;
+    public const int CheckSupportTaskExistsFilterOrder = -200;
+    public const int CheckPersonCanBeMergedFilterOrder = -150;
+    public const int ActivateInstanceFilterOrder = -100; // Form Flow
+    public const int MissingInstanceFilterOrder = -100; // Form Flow
+    public const int CheckJourneyStepsFilterOrder = -10; // Form Flow
+    public const int CheckAlertExistsFilterOrder = 0;
+    public const int CheckRouteToProfessionalStatusExistsFilterOrder = 0;
+    public const int RequireOpenAlertFilterOrder = 1;
+    public const int RequireClosedAlertFilterOrder = 1;
+
+    public const int RequireActivePersonFilterOrder = 100;
+}

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/RedirectWithPersonIdFilter.cs

@@ -10,7 +10,7 @@ public partial class RedirectWithPersonIdFilter(TrsDbContext dbContext) : IAsync
     [GeneratedRegex(@"^\/persons\/([0-9]{7})($|\/)")]
     private static partial Regex _personWithTrnPathRegex();
 
-    public static int Order => -1000;
+    public static int Order => FilterOrders.RedirectWithPersonIdFilterOrder;
 
     public async Task OnResourceExecutionAsync(ResourceExecutingContext context, ResourceExecutionDelegate next)
     {

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/RequireActivePersonFilter.cs

@@ -29,5 +29,5 @@ public void OnResourceExecuted(ResourceExecutedContext context)
     {
     }
 
-    public int Order => 100;
+    public int Order => FilterOrders.RequireActivePersonFilterOrder;
 }

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/RequireClosedAlertFilter.cs

@@ -6,7 +6,7 @@ namespace TeachingRecordSystem.SupportUi.Infrastructure.Filters;
 
 public class RequireClosedAlertFilter : IResourceFilter, IOrderedFilter
 {
-    public int Order => 1;  // After CheckAlertExistsFilter
+    public int Order => FilterOrders.RequireClosedAlertFilterOrder;  // After CheckAlertExistsFilter
 
     public void OnResourceExecuted(ResourceExecutedContext context)
     {

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/RequireFeatureEnabledFilter.cs

@@ -23,7 +23,7 @@ public class RequireFeatureEnabledFilterFactoryAttribute(string featureName) : A
 {
     public bool IsReusable => false;
 
-    public int Order => -300;
+    public int Order => FilterOrders.RequireFeatureEnabledFilterOrder;
 
     public IFilterMetadata CreateInstance(IServiceProvider serviceProvider) =>
         ActivatorUtilities.CreateInstance<RequireFeatureEnabledFilter>(serviceProvider, featureName);

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Infrastructure/Filters/RequireOpenAlertFilter.cs

@@ -6,7 +6,7 @@ namespace TeachingRecordSystem.SupportUi.Infrastructure.Filters;
 
 public class RequireOpenAlertFilter : IResourceFilter, IOrderedFilter
 {
-    public int Order => 1;  // After CheckAlertExistsFilter
+    public int Order => FilterOrders.RequireOpenAlertFilterOrder;  // After CheckAlertExistsFilter
 
     public void OnResourceExecuted(ResourceExecutedContext context)
     {

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/DeleteMq/Conventions.cs

@@ -12,7 +12,7 @@ public void Configure(RazorPagesOptions options)
             this.GetFolderPathFromNamespace(),
             model =>
             {
-                model.Filters.Add(new ServiceFilterAttribute<CheckMandatoryQualificationExistsFilter>());
+                model.Filters.Add(new ServiceFilterAttribute<CheckMandatoryQualificationExistsFilter>() { Order = FilterOrders.CheckMandatoryQualificationExistsFilterOrder });
             });
     }
 }

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Mqs/EditMq/Conventions.cs

@@ -12,7 +12,7 @@ public void Configure(RazorPagesOptions options)
             this.GetFolderPathFromNamespace(),
             model =>
             {
-                model.Filters.Add(new ServiceFilterAttribute<CheckMandatoryQualificationExistsFilter>() { Order = -200 });
+                model.Filters.Add(new ServiceFilterAttribute<CheckMandatoryQualificationExistsFilter>() { Order = FilterOrders.CheckMandatoryQualificationExistsFilterOrder });
             });
     }
 }

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Persons/MergePerson/Conventions.cs

@@ -1,5 +1,7 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.RazorPages;
+using TeachingRecordSystem.SupportUi.Infrastructure.Filters;
 using TeachingRecordSystem.SupportUi.Infrastructure.Security;
 
 namespace TeachingRecordSystem.SupportUi.Pages.Persons.MergePerson;
@@ -12,6 +14,8 @@ public void Configure(RazorPagesOptions options)
             this.GetFolderPathFromNamespace(),
             model =>
             {
+                model.Filters.Add(new CheckPersonExistsFilterFactory());
+                model.Filters.Add(new ServiceFilterAttribute<CheckPersonCanBeMergedFilter>() { Order = FilterOrders.CheckPersonCanBeMergedFilterOrder });
                 model.EndpointMetadata.Add(new AuthorizeAttribute()
                 {
                     Policy = AuthorizationPolicies.PersonDataEdit

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Persons/MergePerson/Index.cshtml.cs

@@ -11,5 +11,8 @@ public class IndexModel(SupportUiLinkGenerator linkGenerator) : PageModel
     [FromRoute]
     public Guid PersonId { get; set; }
 
-    public IActionResult OnGet() => Redirect(linkGenerator.Persons.MergePerson.EnterTrn(PersonId, JourneyInstance!.InstanceId));
+    public IActionResult OnGet()
+    {
+        return Redirect(linkGenerator.Persons.MergePerson.EnterTrn(PersonId, JourneyInstance!.InstanceId));
+    }
 }

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Persons/PersonDetail/Index.cshtml.cs

@@ -10,8 +10,6 @@ namespace TeachingRecordSystem.SupportUi.Pages.Persons.PersonDetail;
 [AllowDeactivatedPerson]
 public class IndexModel(TrsDbContext dbContext, IAuthorizationService authorizationService) : PageModel
 {
-    private static readonly InductionStatus[] _invalidInductionStatusesForMerge = [InductionStatus.InProgress, InductionStatus.Passed, InductionStatus.Failed];
-
     [FromRoute]
     public Guid PersonId { get; set; }
 
@@ -33,6 +31,7 @@ public async Task OnGetAsync()
             .IgnoreQueryFilters()
             .Include(p => p.PreviousNames).AsSplitQuery()
             .Include(p => p.Alerts).AsSplitQuery()
+            .Include(p => p.Qualifications).AsSplitQuery()
             .SingleAsync(p => p.PersonId == PersonId);
 
         Person = BuildPersonInfo(person);
@@ -48,12 +47,15 @@ public async Task OnGetAsync()
             canEditPersonData &&
             Person.IsActive;
 
+        var hasMandatoryQualification = person.Qualifications!
+            .Any(q => q.QualificationType == QualificationType.MandatoryQualification);
+
         CanMerge =
             canEditNonPersonOrAlertData &&
             !HasOpenAlert &&
+            !hasMandatoryQualification &&
             Person!.IsActive &&
-            (PersonProfessionalStatus is not PersonProfessionalStatusInfo professionalStatus ||
-                !_invalidInductionStatusesForMerge.Contains(professionalStatus.InductionStatus));
+            PersonProfessionalStatus is not PersonProfessionalStatusInfo professionalStatus;
 
         // Person cannot be reactivated if they were deactivated as part of a merge
         // where they were merged into another Person (i.e. they were the secondary