Adding warning to user page when user has prohibition (#753)

DFE-Digital · Oct 30, 2023 · 5b2a6bb · 5b2a6bb
1 parent 821e5c5
commit 5b2a6bb
Show file tree

Hide file tree

Showing 25 changed files with 208 additions and 45 deletions.
diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/User.cshtml b/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/User.cshtml
@@ -6,13 +6,25 @@
 }
 
 @section BeforeContent {
-    <govuk-back-link asp-page="Users"/>
+    <govuk-back-link asp-page="Users" />
 }
 
 <h1 class="govuk-heading-l">
     @Model.Name
 </h1>
 
+
+@if (Model.HasProhibitions)
+{
+    <section class="govuk-!-margin-bottom-6">
+        <govuk-warning-text icon-fallback-text="Warning" data-testid="user-has-prohibitions">
+            <span>This user has prohibitions and cannot access every service</span>
+        </govuk-warning-text>
+    </section>
+}
+
+
+
 <section class="x-govuk-summary-card govuk-!-margin-bottom-6">
     <header class="x-govuk-summary-card__header">
         <h2 class="x-govuk-summary-card__title">
@@ -126,17 +138,17 @@
                     <govuk-summary-list-row-value>@Model.Trn</govuk-summary-list-row-value>
                 </govuk-summary-list-row>
                 @{
-                    if(Model.EffectiveVerificationLevel == TrnVerificationLevel.Low)
+                    if (Model.EffectiveVerificationLevel == TrnVerificationLevel.Low)
                     {
-                      <govuk-summary-list-row>
+                        <govuk-summary-list-row>
                             <govuk-summary-list-row-key>TRN verification level</govuk-summary-list-row-key>
                             <govuk-summary-list-row-value><govuk-tag class="govuk-tag--yellow">Low</govuk-tag></govuk-summary-list-row-value>
                             <govuk-summary-list-row-actions>
-                             <govuk-summary-list-row-action asp-page="ElevateUserTrnVerification" asp-route-userId="@Model.UserId" visually-hidden-text="TRN verification level">Elevate</govuk-summary-list-row-action>
+                                <govuk-summary-list-row-action asp-page="ElevateUserTrnVerification" asp-route-userId="@Model.UserId" visually-hidden-text="TRN verification level">Elevate</govuk-summary-list-row-action>
                             </govuk-summary-list-row-actions>
-                      </govuk-summary-list-row>
+                        </govuk-summary-list-row>
                     }
-                    else if(Model.EffectiveVerificationLevel == TrnVerificationLevel.Medium)
+                    else if (Model.EffectiveVerificationLevel == TrnVerificationLevel.Medium)
                     {
                         <govuk-summary-list-row>
                             <govuk-summary-list-row-key>TRN verification level</govuk-summary-list-row-key>

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/User.cshtml.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Pages/Admin/User.cshtml.cs
@@ -49,6 +49,8 @@ public UserModel(TeacherIdentityServerDbContext dbContext, IDqtApiClient dqtApiC
 
     public TrnVerificationLevel? EffectiveVerificationLevel { get; set; }
 
+    public bool HasProhibitions { get; set; }
+
     [FromRoute]
     public Guid UserId { get; set; }
 
@@ -112,6 +114,7 @@ public async Task<IActionResult> OnGet()
             DqtName = $"{dqtUser.FirstName} {dqtUser.LastName}";
             DqtDateOfBirth = dqtUser.DateOfBirth;
             DqtNationalInsuranceNumber = dqtUser.NationalInsuranceNumber;
+            HasProhibitions = dqtUser.Alerts.Any(y => y.AlertType == AlertType.Prohibition);
         }
 
         return Page();

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/DqtApi/DqtApiClient.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/DqtApi/DqtApiClient.cs
@@ -1,3 +1,5 @@
+using System.Text.Json;
+using System.Text.Json.Serialization;
 using Flurl;
 using TeacherIdentity.AuthServer.Infrastructure.Http;
 
@@ -7,6 +9,14 @@ public class DqtApiClient : IDqtApiClient
 {
     private readonly HttpClient _client;
 
+    private static JsonSerializerOptions _serializerOptions { get; } = new JsonSerializerOptions(JsonSerializerDefaults.Web)
+    {
+        Converters =
+        {
+            new JsonStringEnumConverter(),
+        }
+    };
+
     public DqtApiClient(HttpClient httpClient)
     {
         _client = httpClient;
@@ -34,15 +44,15 @@ public async Task<FindTeachersResponse> FindTeachers(FindTeachersRequest request
 
     public async Task<TeacherInfo?> GetTeacherByTrn(string trn, CancellationToken cancellationToken)
     {
-        var response = await _client.GetAsync($"/v3/teachers/{trn}?include=PendingDetailChanges", cancellationToken);
+        var response = await _client.GetAsync($"/v3/teachers/{trn}?include=PendingDetailChanges,Alerts", cancellationToken);
 
         if ((int)response.StatusCode == StatusCodes.Status404NotFound)
         {
             return null;
         }
 
         response.HandleErrorResponse();
-        return await response.Content.ReadFromJsonAsync<TeacherInfo>(cancellationToken: cancellationToken);
+        return await response.Content.ReadFromJsonAsync<TeacherInfo>(options: _serializerOptions, cancellationToken: cancellationToken);
     }
 
     public async Task<GetIttProvidersResponse> GetIttProviders(CancellationToken cancellationToken)

diff --git a/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/DqtApi/TeacherInfo.cs b/dotnet-authserver/src/TeacherIdentity.AuthServer/Services/DqtApi/TeacherInfo.cs
@@ -1,3 +1,4 @@
+
 namespace TeacherIdentity.AuthServer.Services.DqtApi;
 
 public record TeacherInfo
@@ -11,4 +12,17 @@ public record TeacherInfo
     public required bool PendingNameChange { get; init; }
     public required bool PendingDateOfBirthChange { get; init; }
     public required string? Email { get; init; }
+    public required IReadOnlyCollection<AlertInfo> Alerts { get; init; }
+}
+
+public record AlertInfo
+{
+    public required AlertType AlertType { get; init; }
+    public required string DqtSanctionCode { get; init; }
 }
+
+public enum AlertType
+{
+    Prohibition
+}
+
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Account.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Account.cs
@@ -68,7 +68,8 @@ public async Task ChangeOfficialDateOfBirth()
             PendingDateOfBirthChange = false,
             PendingNameChange = false,
             Trn = user.Trn!,
-            Email = null
+            Email = null,
+            Alerts = Array.Empty<AlertInfo>()
         };
 
         ConfigureDqtApiGetTeacherResponse(user.Trn!, dqtTeacherInfo);
@@ -157,7 +158,8 @@ public async Task ChangeOfficialName()
             PendingDateOfBirthChange = false,
             PendingNameChange = false,
             Trn = user.Trn!,
-            Email = null
+            Email = null,
+            Alerts = Array.Empty<AlertInfo>()
         };
 
         ConfigureDqtApiGetTeacherResponse(user.Trn!, dqtTeacherInfo);

diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Elevate.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/Elevate.cs
@@ -62,7 +62,8 @@ public async Task UserSignsInWithLowVerificationLevel_IsRedirectedToElevateJourn
             NationalInsuranceNumber = nino,
             PendingDateOfBirthChange = false,
             PendingNameChange = false,
-            Trn = user.Trn!
+            Trn = user.Trn!,
+            Alerts = Array.Empty<AlertInfo>()
         });
 
         await page.SubmitElevateCheckAnswersPage();
@@ -171,7 +172,8 @@ public async Task AlreadySignedInUserWithLowVerificationLevel_IsRedirectedToElev
             NationalInsuranceNumber = nino,
             PendingDateOfBirthChange = false,
             PendingNameChange = false,
-            Trn = user.Trn!
+            Trn = user.Trn!,
+            Alerts = Array.Empty<AlertInfo>()
         });
 
         await page.SubmitElevateCheckAnswersPage();

diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TrnTokenSignInJourney.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.EndToEndTests/TrnTokenSignInJourney.cs
@@ -42,7 +42,8 @@ public async Task NewTeacherUser_WithTrnToken_CreatesUserAndCompletesFlow()
                 NationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber(),
                 PendingDateOfBirthChange = false,
                 PendingNameChange = false,
-                Email = trnToken.Email
+                Email = trnToken.Email,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         await using var context = await _hostFixture.CreateBrowserContext();
@@ -92,7 +93,8 @@ public async Task NewTeacherUser_WithTrnTokenForDqtRecordWithMissingDateOfBirth_
                 NationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber(),
                 PendingDateOfBirthChange = false,
                 PendingNameChange = false,
-                Email = trnToken.Email
+                Email = trnToken.Email,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         await using var context = await _hostFixture.CreateBrowserContext();
@@ -143,7 +145,8 @@ public async Task NewTeacherUser_WithTrnTokenChangesEmail_CreatesUserAndComplete
                 NationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber(),
                 PendingDateOfBirthChange = false,
                 PendingNameChange = false,
-                Email = trnToken.Email
+                Email = trnToken.Email,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         await using var context = await _hostFixture.CreateBrowserContext();
@@ -769,7 +772,8 @@ public async Task NewTeacherUser_WithTrnTokenChangesToInstitutionEmail_CreatesUs
                 NationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber(),
                 PendingDateOfBirthChange = false,
                 PendingNameChange = false,
-                Email = trnToken.Email
+                Email = trnToken.Email,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         var invalidEmailSuffix = "invalid.sch.uk";
@@ -929,7 +933,8 @@ private async Task<TrnTokenModel> CreateValidTrnToken(
                 NationalInsuranceNumber = Faker.Identification.UkNationalInsuranceNumber(),
                 PendingDateOfBirthChange = false,
                 PendingNameChange = false,
-                Email = email
+                Email = email,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         return await _hostFixture.TestData.GenerateTrnToken(trn, email: email);

diff --git a/...ts/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/DateOfBirth/DateOfBirthTests.cs b/...ts/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/DateOfBirth/DateOfBirthTests.cs
@@ -1,4 +1,6 @@
 using TeacherIdentity.AuthServer.Models;
+using TeacherIdentity.AuthServer.Services.DqtApi;
+
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.DateOfBirth;
 
 public class DateOfBirthTests : TestBase
@@ -189,7 +191,8 @@ private void MockDqtApiResponse(User user, bool hasDobConflict, bool hasPendingD
                 Trn = user.Trn!,
                 PendingNameChange = false,
                 PendingDateOfBirthChange = hasPendingDobChange,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 }
diff --git a/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/IndexTests.cs b/dotnet-authserver/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/IndexTests.cs
@@ -133,7 +133,8 @@ public async Task Get_ValidRequestForUserWithTrn_ShowsOfficialNames(bool hasPref
                 Trn = user.Trn!,
                 PendingNameChange = false,
                 PendingDateOfBirthChange = false,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         var request = new HttpRequestMessage(HttpMethod.Get, "/account");
@@ -186,7 +187,8 @@ public async Task Get_ValidRequestForUser_ShowsCorrectDobSummaryRowElements(
                 Trn = user.Trn!,
                 PendingNameChange = false,
                 PendingDateOfBirthChange = hasPendingReview,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         var request = new HttpRequestMessage(HttpMethod.Get, "/account");
@@ -218,7 +220,8 @@ public async Task Get_ValidRequestForUserWithPendingNameChange_DoesShowPendingTa
                 Trn = user.Trn!,
                 PendingNameChange = true,
                 PendingDateOfBirthChange = false,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
 
         var request = new HttpRequestMessage(HttpMethod.Get, "/account");

diff --git a/...eacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/ConfirmTests.cs b/...eacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/ConfirmTests.cs
@@ -119,7 +119,8 @@ private void MockDqtApiResponse(User user, bool hasDobConflict, bool hasPendingD
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = hasPendingDateOfBirthChange,
                 PendingNameChange = false,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 

diff --git a/...eacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/DetailsTests.cs b/...eacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/DetailsTests.cs
@@ -1,3 +1,4 @@
+using TeacherIdentity.AuthServer.Services.DqtApi;
 using User = TeacherIdentity.AuthServer.Models.User;
 
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.OfficialDateOfBirth;
@@ -180,7 +181,8 @@ private void MockDqtApiResponse(User user, bool hasDobConflict, bool hasPendingD
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = hasPendingDateOfBirthChange,
                 PendingNameChange = false,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 

diff --git a/...acherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/EvidenceTests.cs b/...acherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/EvidenceTests.cs
@@ -1,3 +1,4 @@
+using TeacherIdentity.AuthServer.Services.DqtApi;
 using User = TeacherIdentity.AuthServer.Models.User;
 
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.OfficialDateOfBirth;
@@ -179,7 +180,8 @@ private void MockDqtApiResponse(User user, bool hasDobConflict, bool hasPendingD
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = hasPendingDateOfBirthChange,
                 PendingNameChange = false,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 

diff --git a/...ty.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/OfficialDateOfBirthTests.cs b/...ty.AuthServer.Tests/EndpointTests/Account/OfficialDateOfBirth/OfficialDateOfBirthTests.cs
@@ -1,4 +1,5 @@
 using TeacherIdentity.AuthServer.Models;
+using TeacherIdentity.AuthServer.Services.DqtApi;
 
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.OfficialDateOfBirth;
 
@@ -61,7 +62,8 @@ private void MockDqtApiResponse(User user, bool hasDobConflict, bool hasPendingD
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = hasPendingDateOfBirthChange,
                 PendingNameChange = false,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 

diff --git a/...tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/ConfirmTests.cs b/...tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/ConfirmTests.cs
@@ -185,7 +185,8 @@ private void MockDqtApiResponse(User user, bool hasPendingNameChange)
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = false,
                 PendingNameChange = hasPendingNameChange,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 }
diff --git a/...tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/DetailsTests.cs b/...tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/DetailsTests.cs
@@ -1,3 +1,4 @@
+using TeacherIdentity.AuthServer.Services.DqtApi;
 using User = TeacherIdentity.AuthServer.Models.User;
 
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.OfficialName;
@@ -203,7 +204,8 @@ private void MockDqtApiResponse(User user, bool hasPendingNameChange, string mid
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = false,
                 PendingNameChange = hasPendingNameChange,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 

diff --git a/...ests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/EvidenceTests.cs b/...ests/TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/EvidenceTests.cs
@@ -1,5 +1,6 @@
 using System.Text.RegularExpressions;
 using TeacherIdentity.AuthServer.Models;
+using TeacherIdentity.AuthServer.Services.DqtApi;
 using User = TeacherIdentity.AuthServer.Models.User;
 
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.OfficialName;
@@ -226,7 +227,8 @@ private void MockDqtApiResponse(User user, bool hasPendingNameChange)
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = false,
                 PendingNameChange = hasPendingNameChange,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 

diff --git a/.../TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/OfficialNameTests.cs b/.../TeacherIdentity.AuthServer.Tests/EndpointTests/Account/OfficialName/OfficialNameTests.cs
@@ -1,4 +1,5 @@
 using TeacherIdentity.AuthServer.Models;
+using TeacherIdentity.AuthServer.Services.DqtApi;
 
 namespace TeacherIdentity.AuthServer.Tests.EndpointTests.Account.OfficialName;
 
@@ -62,7 +63,8 @@ private void MockDqtApiResponse(User user, bool hasPendingNameChange)
                 Trn = user.Trn!,
                 PendingDateOfBirthChange = false,
                 PendingNameChange = hasPendingNameChange,
-                Email = null
+                Email = null,
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 }
diff --git a/...rver/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Admin/AssignTrn/ConfirmTests.cs b/...rver/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Admin/AssignTrn/ConfirmTests.cs
@@ -553,7 +553,8 @@ private void ConfigureDqtApiMock(
                 Trn = trn,
                 PendingNameChange = false,
                 PendingDateOfBirthChange = false,
-                Email = email ?? Faker.Internet.Email()
+                Email = email ?? Faker.Internet.Email(),
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 }
diff --git a/...server/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Admin/AssignTrn/IndexTests.cs b/...server/tests/TeacherIdentity.AuthServer.Tests/EndpointTests/Admin/AssignTrn/IndexTests.cs
@@ -299,7 +299,8 @@ private void ConfigureDqtApiMock(
                 Trn = trn,
                 PendingNameChange = false,
                 PendingDateOfBirthChange = false,
-                Email = email ?? Faker.Internet.Email()
+                Email = email ?? Faker.Internet.Email(),
+                Alerts = Array.Empty<AlertInfo>()
             });
     }
 }