Set Person.Trn to be non-nullable

Author: stusherwin

TeachingRecordSystem/src/TeachingRecordSystem.Api/V1/Handlers/GetTeacherHandler.cs

@@ -23,7 +23,7 @@ public async Task<GetTeacherResponse> Handle(GetTeacherRequest request, Cancella
         var matched = await dbContext.Persons.FromSql(
                 $"""
                 SELECT * FROM persons
-                WHERE status = 0 AND trn IS NOT NULL AND
+                WHERE status = 0 AND
                 date_of_birth = {birthDate}::date AND (
                     trn = {request.Trn} OR
                     (national_insurance_numbers && array_remove(ARRAY[{nationalInsuranceNumber}]::varchar[], null) COLLATE "case_insensitive")

TeachingRecordSystem/src/TeachingRecordSystem.Api/V2/Handlers/FindTeachersHandler.cs

@@ -20,7 +20,7 @@ await HandleDefaultRequestAsync() :
         {
             Results = result.Select(p => new FindTeacherResult
             {
-                Trn = p.Trn!,
+                Trn = p.Trn,
                 EmailAddresses = !string.IsNullOrEmpty(p.EmailAddress) ? [p.EmailAddress] : [],
                 FirstName = p.FirstName,
                 MiddleName = p.MiddleName,
@@ -101,7 +101,7 @@ SELECT p.* FROM matches m
 file static class Extensions
 {
     public static IQueryable<PostgresModels.Person> ApplyBaseFilters(this IQueryable<PostgresModels.Person> query) =>
-        query.Include(p => p.Alerts).Where(p => p.Trn != null && p.Status == PersonStatus.Active);
+        query.Include(p => p.Alerts).Where(p => p.Status == PersonStatus.Active);
 
     public static IEnumerable<string> ExceptEmpty(this IEnumerable<string> source) =>
         source.Where(v => !string.IsNullOrEmpty(v));

TeachingRecordSystem/src/TeachingRecordSystem.Api/V3/Implementation/Operations/FindPersonsBase.cs

@@ -35,7 +35,6 @@ protected async Task<FindPersonsResult> CreateResultAsync(IReadOnlyCollection<Gu
             .Include(p => p.Qualifications!).AsSplitQuery()
             .Include(p => p.PreviousNames).AsSplitQuery()
             .Where(p => matchedPersonIds.Contains(p.PersonId))
-            .Where(p => p.Trn != null)
             .ToDictionaryAsync(p => p.PersonId, p => p);
 
         var items = await matchedPersonIds
@@ -44,7 +43,7 @@ protected async Task<FindPersonsResult> CreateResultAsync(IReadOnlyCollection<Gu
             .Select(id => persons[id])
             .SelectAwait(async person => new FindPersonsResultItem()
             {
-                Trn = person.Trn!,
+                Trn = person.Trn,
                 DateOfBirth = person.DateOfBirth!.Value,
                 FirstName = person.FirstName,
                 MiddleName = person.MiddleName,

TeachingRecordSystem/src/TeachingRecordSystem.Api/V3/Implementation/Operations/GetPerson.cs

@@ -272,7 +272,7 @@ public async Task<ApiResult<GetPersonResult>> ExecuteAsync(GetPersonCommand comm
 
         return new GetPersonResult()
         {
-            Trn = person.Trn!,
+            Trn = person.Trn,
             FirstName = person.FirstName,
             MiddleName = person.MiddleName,
             LastName = person.LastName,

TeachingRecordSystem/src/TeachingRecordSystem.Api/V3/Implementation/Operations/GetPersonHelper.cs

@@ -1,4 +1,3 @@
-using System.Diagnostics;
 using OneOf;
 using TeachingRecordSystem.Core.DataStore.Postgres;
 
@@ -42,11 +41,9 @@ where p.merged_with_person_id is null
             return ApiError.RecordIsNotActive(trn);
         }
 
-        Debug.Assert(person.Trn is not null);
-
         if (person.Trn != trn)
         {
-            return ApiError.RecordIsMerged(trn, person.Trn!);
+            return ApiError.RecordIsMerged(trn, person.Trn);
         }
 
         return person;

TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Controllers/OAuth2Controller.cs

@@ -1,5 +1,4 @@
 using System.Security.Claims;
-using Dfe.Analytics;
 using Dfe.Analytics.AspNetCore;
 using Microsoft.AspNetCore;
 using Microsoft.AspNetCore.Authentication;
@@ -10,6 +9,7 @@
 using OpenIddict.Server.AspNetCore;
 using TeachingRecordSystem.AuthorizeAccess.Infrastructure.Security;
 using TeachingRecordSystem.Core.DataStore.Postgres;
+using TeachingRecordSystem.Core.DataStore.Postgres.Models;
 using static OpenIddict.Abstractions.OpenIddictConstants;
 
 namespace TeachingRecordSystem.AuthorizeAccess.Controllers;
@@ -42,7 +42,7 @@ public async Task<IActionResult> AuthorizeAsync()
         var clientId = request.ClientId!;
         var client = await dbContext.ApplicationUsers.SingleAsync(u => u.ClientId == clientId);
 
-        if (HttpContext.GetWebRequestEvent() is Event webRequestEvent)
+        if (HttpContext.GetWebRequestEvent() is Dfe.Analytics.Event webRequestEvent)
         {
             webRequestEvent.Data[DfeAnalyticsEventDataKeys.ApplicationUserId] = [client.UserId.ToString()];
         }
@@ -150,9 +150,9 @@ public async Task<IActionResult> UserInfoAsync()
             .Include(o => o.Person)
             .SingleAsync(u => u.Subject == subject);
 
-        if (oneLoginUser.Person?.Trn is string trn)
+        if (oneLoginUser.Person is Person p)
         {
-            claims.Add(ClaimTypes.Trn, trn);
+            claims.Add(ClaimTypes.Trn, p.Trn);
         }
 
         if (User.HasScope(Scopes.Email))

TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/Pages/DebugIdentity.cshtml.cs

@@ -110,7 +110,7 @@ public async Task<IActionResult> OnPostAsync()
 
         if (_oneLoginUser!.PersonId is not null && !DetachPerson)
         {
-            await JourneyInstance!.UpdateStateAsync(state => helper.Complete(state, _oneLoginUser.Person!.Trn!));
+            await JourneyInstance!.UpdateStateAsync(state => helper.Complete(state, _oneLoginUser.Person!.Trn));
             return GetNextPage();
         }
 
@@ -167,5 +167,5 @@ public override async Task OnPageHandlerExecutionAsync(PageHandlerExecutingConte
         await base.OnPageHandlerExecutionAsync(context, next);
     }
 
-    public record PersonInfo(Guid PersonId, string? Trn, string FirstName, string LastName, DateOnly? DateOfBirth, string? NationalInsuranceNumber);
+    public record PersonInfo(Guid PersonId, string Trn, string FirstName, string LastName, DateOnly? DateOfBirth, string? NationalInsuranceNumber);
 }

TeachingRecordSystem/src/TeachingRecordSystem.AuthorizeAccess/SignInJourneyHelper.cs

@@ -247,7 +247,7 @@ await journeyInstance.UpdateStateAsync(state =>
             var matchedDateOfBirth = verifiedDatesOfBirth.FirstOrDefault(dob => dob == getAnIdentityPerson.DateOfBirth);
             if (matchedLastName == default || matchedDateOfBirth == default)
             {
-                return new(getAnIdentityPerson.PersonId, getAnIdentityPerson.Trn!, MatchRoute: null, MatchedAttributes: null);
+                return new(getAnIdentityPerson.PersonId, getAnIdentityPerson.Trn, MatchRoute: null, MatchedAttributes: null);
             }
             var matchedAttributes = new Dictionary<PersonMatchedAttribute, string>()
             {
@@ -262,7 +262,7 @@ await journeyInstance.UpdateStateAsync(state =>
                 await idDbContext.SaveChangesAsync();
             }
 
-            return new(getAnIdentityPerson.PersonId, getAnIdentityPerson.Trn!, MatchRoute: matchRoute, matchedAttributes);
+            return new(getAnIdentityPerson.PersonId, getAnIdentityPerson.Trn, MatchRoute: matchRoute, matchedAttributes);
         }
     }
 
@@ -356,7 +356,6 @@ public async Task<bool> TryMatchToTeachingRecordAsync(JourneyInstance<SignInJour
             return null;
         }
         Debug.Assert(trnRequestMetadata.ResolvedPersonId.HasValue);
-        Debug.Assert(resolvedPerson.Trn is not null);
 
         oneLoginUser.SetVerified(
             verifiedOn: trnRequestMetadata.CreatedOn,

TeachingRecordSystem/src/TeachingRecordSystem.Core/DataStore/Postgres/Models/Person.cs

@@ -23,7 +23,7 @@ public class Person
     public PersonStatus Status { get; set; }
     public Guid? MergedWithPersonId { get; set; }
     public Person? MergedWithPerson { get; }
-    public required string? Trn { get; set; }
+    public required string Trn { get; set; }
     public required string FirstName { get; set; }
     public required string MiddleName { get; set; }
     public required string LastName { get; set; }

TeachingRecordSystem/src/TeachingRecordSystem.Core/Jobs/AllocateTrnsToPersonsWithEypsJob.cs

@@ -17,7 +17,7 @@ public async Task ExecuteAsync(bool dryRun, CancellationToken cancellationToken)
 
         // Get all persons where HasEyps has been set to true but there is no TRN
         var personsWithHasEypsAndNoTrn = await dbContext.Persons
-            .Where(p => p.HasEyps && p.Trn == null)
+            .Where(p => p.HasEyps)
             .ToListAsync(cancellationToken);
 
         var updatedPersons = new List<Guid>();