When there is only 1 potential duplicate, display side-by-side with r…

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/Persons/Merge/Matches.cshtml

@@ -10,21 +10,25 @@
 }
 
 <div class="govuk-grid-row">
-    <div class="govuk-grid-column-full-from-desktop">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
         <span class="govuk-caption-l">Support tasks</span>
         <h1 class="govuk-heading-l">@ViewBag.Title</h1>
+    </div>
+</div>
 
+<div class="govuk-grid-row">
+    <div class=@(Model.PotentialDuplicates!.Count == 2 ? "govuk-grid-column-full-from-desktop" : "govuk-grid-column-two-thirds-from-desktop")>
         @if (Model.CannotMergeReason is not null)
         {
             <govuk-warning-text icon-fallback-text="Warning" data-testid="warning-text">
                 @(Model.CannotMergeReason) Refer this to the Teaching Regulation Agency (TRA).
             </govuk-warning-text>
         }
 
-        <div class="trs-potential-duplicates">
+        <div class="trs-potential-duplicates @(Model.PotentialDuplicates!.Count == 2 ? "trs-potential-duplicates--side-by-side" : "")">
             @foreach (var (match, i) in Model.PotentialDuplicates!.Select((match, i) => (match, i)))
             {
-                <govuk-summary-card data-testid="[email protected]().ToLower()" class="trs-potential-duplicates--item">
+                <govuk-summary-card data-testid="[email protected]().ToLower()" class="trs-potential-duplicates__item">
                     <govuk-summary-card-title>
                         TRN @match.Trn
                     </govuk-summary-card-title>
@@ -59,13 +63,13 @@
                             </govuk-summary-list-row-value>
                         </govuk-summary-list-row>
                         <govuk-summary-list-row>
-                            <govuk-summary-list-row-key>Email</govuk-summary-list-row-key>
+                            <govuk-summary-list-row-key>Email address</govuk-summary-list-row-key>
                             <govuk-summary-list-row-value use-empty-fallback highlight="@(!match.MatchedAttributes.Contains(PersonMatchedAttribute.EmailAddress))">
                                 @match.EmailAddress
                             </govuk-summary-list-row-value>
                         </govuk-summary-list-row>
                         <govuk-summary-list-row>
-                            <govuk-summary-list-row-key>National Insurance number</govuk-summary-list-row-key>
+                            <govuk-summary-list-row-key>NI number</govuk-summary-list-row-key>
                             <govuk-summary-list-row-value use-empty-fallback highlight="@(!match.MatchedAttributes.Contains(PersonMatchedAttribute.NationalInsuranceNumber))">
                                 @match.NationalInsuranceNumber
                             </govuk-summary-list-row-value>
@@ -91,7 +95,11 @@
                 </govuk-summary-card>
             }
         </div>
+    </div>
+</div>
 
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
         <form action="@Model.GetPageLink(MergeJourneyPage.Matches)" method="post" data-testid="submit-form">
             @if (Model.CannotMergeReason is null)
             {

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/SupportTasks/ApiTrnRequests/Resolve/Matches.cshtml.cs

@@ -101,8 +101,8 @@ public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingConte
                 DateOfBirth = p.DateOfBirth,
                 EmailAddress = p.EmailAddress,
                 NationalInsuranceNumber = p.NationalInsuranceNumber,
-                Trn = p.Trn!,
                 Gender = p.Gender,
+                Trn = p.Trn!,
                 HasQts = p.QtsDate != null,
                 HasEyts = p.EytsDate != null,
                 HasActiveAlerts = p.Alerts!.Any(a => a.IsOpen),

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/SupportTasks/NpqTrnRequests/Resolve/Matches.cshtml.cs

@@ -55,6 +55,7 @@ public async Task<IActionResult> OnPostAsync()
                 state.DateOfBirthSource = null;
                 state.EmailAddressSource = null;
                 state.NationalInsuranceNumberSource = null;
+                state.GenderSource = null;
                 state.PersonAttributeSourcesSet = false;
             }
         });
@@ -116,7 +117,8 @@ public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingConte
                     r.LastName,
                     r.DateOfBirth,
                     r.EmailAddress,
-                    r.NationalInsuranceNumber)
+                    r.NationalInsuranceNumber,
+                    r.Gender)
             })
             .ToArray();
 

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/SupportTasks/NpqTrnRequests/Resolve/Merge.cshtml

@@ -78,6 +78,14 @@
                     Model.NationalInsuranceNumber!.TrnRequestValue,
                     Model.NationalInsuranceNumber!.ExistingRecordValue,
                     Model.NationalInsuranceNumberSource);
+
+                await RenderChoosePersonAttribute(
+                    Html.DisplayNameFor(m => m.GenderSource),
+                    Model.Gender!.Different,
+                    Html.NameFor(m => m.GenderSource),
+                    Model.Gender!.TrnRequestValue?.GetDisplayName(),
+                    Model.Gender!.ExistingRecordValue?.GetDisplayName(),
+                    Model.GenderSource);
             }
         </tbody>
     </table>

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/SupportTasks/NpqTrnRequests/Resolve/Merge.cshtml.cs

@@ -19,6 +19,8 @@ public class MergeModel(TrsDbContext dbContext, TrsLinkGenerator linkGenerator)
 
     public PersonAttribute<string?>? NationalInsuranceNumber { get; set; }
 
+    public PersonAttribute<Gender?>? Gender { get; set; }
+
     [BindProperty]
     [Display(Name = "Date of birth")]
     public PersonAttributeSource? DateOfBirthSource { get; set; }
@@ -31,6 +33,10 @@ public class MergeModel(TrsDbContext dbContext, TrsLinkGenerator linkGenerator)
     [Display(Name = "National Insurance number")]
     public PersonAttributeSource? NationalInsuranceNumberSource { get; set; }
 
+    [BindProperty]
+    [Display(Name = "Gender")]
+    public PersonAttributeSource? GenderSource { get; set; }
+
     [BindProperty]
     [Display(Name = "Add comments (optional)")]
     public string? Comments { get; set; }
@@ -41,6 +47,7 @@ public void OnGet()
         DateOfBirthSource = JourneyInstance!.State.DateOfBirthSource;
         EmailAddressSource = JourneyInstance!.State.EmailAddressSource;
         NationalInsuranceNumberSource = JourneyInstance!.State.NationalInsuranceNumberSource;
+        GenderSource = JourneyInstance!.State.GenderSource;
         Comments = JourneyInstance!.State.Comments;
     }
 
@@ -61,6 +68,11 @@ public async Task<IActionResult> OnPostAsync()
             ModelState.AddModelError(nameof(NationalInsuranceNumberSource), "Select a National Insurance number");
         }
 
+        if (Gender!.Different && GenderSource is null)
+        {
+            ModelState.AddModelError(nameof(GenderSource), "Select a gender");
+        }
+
         if (!ModelState.IsValid)
         {
             return this.PageWithErrors();
@@ -71,6 +83,7 @@ public async Task<IActionResult> OnPostAsync()
             state.DateOfBirthSource = DateOfBirthSource;
             state.EmailAddressSource = EmailAddressSource;
             state.NationalInsuranceNumberSource = NationalInsuranceNumberSource;
+            state.GenderSource = GenderSource;
             state.PersonAttributeSourcesSet = true;
             state.Comments = Comments;
         });
@@ -108,7 +121,8 @@ public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingConte
             personAttributes.LastName,
             personAttributes.DateOfBirth,
             personAttributes.EmailAddress,
-            personAttributes.NationalInsuranceNumber);
+            personAttributes.NationalInsuranceNumber,
+            personAttributes.Gender);
 
         DateOfBirth = new PersonAttribute<DateOnly?>(
             personAttributes.DateOfBirth,
@@ -125,6 +139,11 @@ public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingConte
             requestData.NationalInsuranceNumber,
             Different: !attributeMatches.Contains(PersonMatchedAttribute.NationalInsuranceNumber));
 
+        Gender = new PersonAttribute<Gender?>(
+            personAttributes.Gender,
+            requestData.Gender,
+            Different: !attributeMatches.Contains(PersonMatchedAttribute.Gender));
+
         PersonName = StringHelper.JoinNonEmpty(' ', new string?[] { personAttributes.FirstName, personAttributes.MiddleName, personAttributes.LastName });
 
         SourceApplicationUserName = requestData.ApplicationUser!.Name;

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/Pages/SupportTasks/NpqTrnRequests/Resolve/ResolveNpqTrnRequestPageModel.cs

@@ -102,16 +102,22 @@ IEnumerable<PersonMatchedAttribute> Impl()
             {
                 yield return PersonMatchedAttribute.NationalInsuranceNumber;
             }
+
+            if (state.GenderSource is PersonAttributeSource.TrnRequest)
+            {
+                yield return PersonMatchedAttribute.Gender;
+            }
         }
     }
 
     protected IReadOnlyCollection<PersonMatchedAttribute> GetPersonAttributeMatches(
-    string firstName,
-    string? middleName,
-    string lastName,
-    DateOnly? dateOfBirth,
-    string? emailAddress,
-    string? nationalInsuranceNumber)
+        string firstName,
+        string? middleName,
+        string lastName,
+        DateOnly? dateOfBirth,
+        string? emailAddress,
+        string? nationalInsuranceNumber,
+        Gender? gender)
     {
         return Impl().AsReadOnly();
 
@@ -148,6 +154,11 @@ IEnumerable<PersonMatchedAttribute> Impl()
             {
                 yield return PersonMatchedAttribute.NationalInsuranceNumber;
             }
+
+            if (gender == requestData.Gender)
+            {
+                yield return PersonMatchedAttribute.Gender;
+            }
         }
     }
 

TeachingRecordSystem/src/TeachingRecordSystem.SupportUi/wwwroot/Styles/site.scss

@@ -329,13 +329,13 @@
   }
 }
 
-.trs-potential-duplicates {
+.trs-potential-duplicates.trs-potential-duplicates--side-by-side {
   @include govuk-media-query($from: desktop) {
     display: flex;
     flex-flow: wrap;
   }
 
-  .trs-potential-duplicates--item {
+  .trs-potential-duplicates__item {
     @include govuk-media-query($from: desktop) {
       box-sizing: border-box;
       flex: 0 0 calc(50% - 15px);
@@ -346,3 +346,11 @@
     }
   }
 }
+
+.trs-summary-list__row--no-border {
+  border-bottom-color: transparent;
+}
+
+.trs-tag--transparent {
+  background: transparent;
+}

TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/PageTests/SupportTasks/ApiTrnRequests/Resolve/MatchesTests.cs

@@ -47,7 +47,8 @@ public async Task Get_ValidRequest_ShowsRequestDetails()
         var supportTask = await TestData.CreateApiTrnRequestSupportTaskAsync(applicationUser.UserId, s => s
             .WithEmailAddress(TestData.GenerateUniqueEmail())
             .WithMiddleName(TestData.GenerateMiddleName())
-            .WithNationalInsuranceNumber(TestData.GenerateNationalInsuranceNumber()));
+            .WithNationalInsuranceNumber(TestData.GenerateNationalInsuranceNumber())
+            .WithGender(TestData.GenerateGender()));
 
         var journeyInstance = await CreateJourneyInstance(supportTask.SupportTaskReference);
 
@@ -79,7 +80,8 @@ public async Task Get_ValidRequest_ShowsDetailsOfMatchedRecords()
         var supportTask = await TestData.CreateApiTrnRequestSupportTaskAsync(applicationUser.UserId, s => s
             .WithEmailAddress(TestData.GenerateUniqueEmail())
             .WithMiddleName(TestData.GenerateMiddleName())
-            .WithNationalInsuranceNumber(TestData.GenerateNationalInsuranceNumber()));
+            .WithNationalInsuranceNumber(TestData.GenerateNationalInsuranceNumber())
+            .WithGender(TestData.GenerateGender()));
 
         var firstMatch = await WithDbContext(
             dbContext => dbContext.Persons.SingleAsync(
@@ -251,13 +253,15 @@ public async Task Get_MatchedRecords_NullableFieldsEmptyInRecordAndEmptyInReques
         var matchedPerson = await TestData.CreatePersonAsync(p => p
             .WithEmail(null)
             .WithNationalInsuranceNumber(false)
+            .WithGender(false)
             .WithMiddleName(""));
 
         var supportTask = await TestData.CreateApiTrnRequestSupportTaskAsync(applicationUser.UserId, configure =>
         {
             configure.WithMiddleName(null);
             configure.WithEmailAddress(null);
             configure.WithNationalInsuranceNumber(null);
+            configure.WithGender(null);
             configure.WithMatchedPersons(matchedPerson.PersonId);
         });
 
@@ -277,9 +281,11 @@ public async Task Get_MatchedRecords_NullableFieldsEmptyInRecordAndEmptyInReques
         Assert.Equal("Not provided", firstMatchDetails.GetSummaryListValueForKey("Email"));
         Assert.Equal("Not provided", firstMatchDetails.GetSummaryListValueForKey("Middle name"));
         Assert.Equal("Not provided", firstMatchDetails.GetSummaryListValueForKey("National Insurance number"));
+        Assert.Equal("Not provided", firstMatchDetails.GetSummaryListValueForKey("Gender"));
 
         AssertMatchRowHasExpectedHighlight("Middle name", false);
         AssertMatchRowHasExpectedHighlight("National Insurance number", false);
+        AssertMatchRowHasExpectedHighlight("Gender", false);
         AssertMatchRowHasExpectedHighlight("Email", false);
 
         void AssertMatchRowHasExpectedHighlight(string summaryListKey, bool expectHighlight)

TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/PageTests/SupportTasks/NpqTrnRequests/NoMatches/CheckAnswersTests.cs

@@ -57,6 +57,7 @@ public async Task Post_CreatingNewRecord_CreatesRecordUpdatesSupportTaskPublishe
             .WithMiddleName(TestData.GenerateMiddleName())
             .WithNationalInsuranceNumber(TestData.GenerateNationalInsuranceNumber())
             .WithEmailAddress(TestData.GenerateUniqueEmail())
+            .WithGender(TestData.GenerateGender())
             .ExecuteAsync(TestData);
 
         var requestMetadata = supportTask.TrnRequestMetadata;
@@ -94,6 +95,7 @@ await WithDbContext(async dbContext =>
             Assert.Equal(person.DateOfBirth, requestMetadata.DateOfBirth);
             Assert.Equal(person.EmailAddress, requestMetadata.EmailAddress);
             Assert.Equal(person.NationalInsuranceNumber, requestMetadata.NationalInsuranceNumber);
+            Assert.Equal(person.Gender, requestMetadata.Gender);
         });
 
         // support task is updated
@@ -169,6 +171,7 @@ private void AssertPersonAttributesMatch(
         Assert.Equal(personAttributes.DateOfBirth, expectedPersonAttributes.DateOfBirth);
         Assert.Equal(personAttributes.EmailAddress, expectedPersonAttributes.EmailAddress);
         Assert.Equal(personAttributes.NationalInsuranceNumber, expectedPersonAttributes.NationalInsuranceNumber);
+        Assert.Equal(personAttributes.Gender, expectedPersonAttributes.Gender);
     }
 
     private void AssertTrnRequestMetadataMatches(EventModels.TrnRequestMetadata expected, EventModels.TrnRequestMetadata actual)

TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/PageTests/SupportTasks/NpqTrnRequests/NpqTrnRequestTestBase.cs

@@ -6,15 +6,18 @@ public abstract class NpqTrnRequestTestBase(HostFixture hostFixture) : TestBase(
 {
     protected async Task<(SupportTask SupportTask, TestData.CreatePersonResult MatchedPerson)> CreateSupportTaskWithAllDifferences(Guid applicationUserId)
     {
-        var matchedPerson = await TestData.CreatePersonAsync(p => p.WithNationalInsuranceNumber());
+        var matchedPerson = await TestData.CreatePersonAsync(p => p
+            .WithNationalInsuranceNumber()
+            .WithGender());
 
         var supportTask = await TestData.CreateNpqTrnRequestSupportTaskAsync(
             applicationUserId,
             t => t
                 .WithMatchedPersons(matchedPerson.PersonId)
                 .WithDateOfBirth(TestData.GenerateChangedDateOfBirth(matchedPerson.DateOfBirth))
                 .WithEmailAddress(TestData.GenerateUniqueEmail())
-                .WithNationalInsuranceNumber(TestData.GenerateChangedNationalInsuranceNumber(matchedPerson.NationalInsuranceNumber!)));
+                .WithNationalInsuranceNumber(TestData.GenerateChangedNationalInsuranceNumber(matchedPerson.NationalInsuranceNumber!))
+                .WithGender(TestData.GenerateChangedGender(matchedPerson.Gender!)));
 
         return (supportTask, matchedPerson);
     }
@@ -25,7 +28,8 @@ public abstract class NpqTrnRequestTestBase(HostFixture hostFixture) : TestBase(
     {
         var matchedPerson = await TestData.CreatePersonAsync(p => p
             .WithNationalInsuranceNumber()
-            .WithEmail(TestData.GenerateUniqueEmail()));
+            .WithEmail(TestData.GenerateUniqueEmail())
+            .WithGender());
 
         var supportTask = await TestData.CreateNpqTrnRequestSupportTaskAsync(
             applicationUserId,
@@ -42,7 +46,12 @@ public abstract class NpqTrnRequestTestBase(HostFixture hostFixture) : TestBase(
                 .WithNationalInsuranceNumber(
                     differentAttribute != PersonMatchedAttribute.NationalInsuranceNumber
                         ? matchedPerson.NationalInsuranceNumber
-                        : TestData.GenerateChangedNationalInsuranceNumber(matchedPerson.NationalInsuranceNumber!)));
+                        : TestData.GenerateChangedNationalInsuranceNumber(matchedPerson.NationalInsuranceNumber!))
+                .WithGender(
+                    differentAttribute != PersonMatchedAttribute.Gender
+                        ? matchedPerson.Gender
+                        : TestData.GenerateChangedGender(matchedPerson.Gender!)));
+
 
         return (supportTask, matchedPerson);
     }

TeachingRecordSystem/tests/TeachingRecordSystem.SupportUi.Tests/PageTests/SupportTasks/NpqTrnRequests/Reject/CheckAnswersTests.cs

@@ -24,9 +24,9 @@ public async Task Get_HasBackLinkExpected()
             RejectionReason = RejectionReasonOption.EvidenceDoesNotMatch,
         };
         var journeyInstance = await CreateJourneyInstance(
-                JourneyNames.RejectNpqTrnRequest,
-                state,
-                new KeyValuePair<string, object>("supportTaskReference", supportTask.SupportTaskReference));
+            JourneyNames.RejectNpqTrnRequest,
+            state,
+            new KeyValuePair<string, object>("supportTaskReference", supportTask.SupportTaskReference));
 
         var expectedBackLink = $"/support-tasks/npq-trn-requests/{supportTask.SupportTaskReference}/reject/reason?{journeyInstance.GetUniqueIdQueryParameter()}";
 
@@ -57,9 +57,9 @@ public async Task Get_ShowsSelectedReason()
             RejectionReason = RejectionReasonOption.EvidenceDoesNotMatch,
         };
         var journeyInstance = await CreateJourneyInstance(
-                JourneyNames.RejectNpqTrnRequest,
-                state,
-                new KeyValuePair<string, object>("supportTaskReference", supportTask.SupportTaskReference));
+            JourneyNames.RejectNpqTrnRequest,
+            state,
+            new KeyValuePair<string, object>("supportTaskReference", supportTask.SupportTaskReference));
 
         var request = new HttpRequestMessage(
             HttpMethod.Get,
@@ -176,6 +176,7 @@ private void AssertTrnRequestMetadataMatches(EventModels.TrnRequestMetadata expe
         Assert.Equal(expected.LastName, actual.LastName);
         Assert.Equal(expected.EmailAddress, actual.EmailAddress);
         Assert.Equal(expected.NationalInsuranceNumber, actual.NationalInsuranceNumber);
+        Assert.Equal(expected.Gender, actual.Gender);
         Assert.Equal(expected.DateOfBirth, actual.DateOfBirth);
         Assert.Equal(expected.ResolvedPersonId, actual.ResolvedPersonId);
         Assert.Equivalent(expected.Matches, actual.Matches);