From 130e076064e6dba0881b5fb530c44bfc1bbc366f Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Fri, 19 Jul 2024 14:51:41 +0100
Subject: [PATCH 01/14] Created initial data model for new page

---
 .../Constants/ContentTypes.cs                 |  1 +
 .../CheckAdditionalRequirementsPage.cs        | 18 ++++++++++
 .../Services/ContentfulContentService.cs      | 15 +++++++-
 .../Services/IContentService.cs               |  2 ++
 .../Content/MockContentfulService.cs          | 19 +++++++++++
 .../Services/ContentfulContentServiceTests.cs | 34 +++++++++++++++++++
 6 files changed, 88 insertions(+), 1 deletion(-)
 create mode 100644 src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs

diff --git a/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs b/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs
index ca1acce6..a6278faf 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs
@@ -16,4 +16,5 @@ public static class ContentTypes
     public const string DropdownQuestionPage = "dropdownQuestionPage";
     public const string QualificationListPage = "qualificationListPage";
     public const string ConfirmQualificationPage = "confirmQualificationPage";
+    public const string CheckAdditionalRequirementsPage = "checkAdditionalRequirementsPage";
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs b/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs
new file mode 100644
index 00000000..7fdab55c
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs
@@ -0,0 +1,18 @@
+namespace Dfe.EarlyYearsQualification.Content.Entities;
+
+public class CheckAdditionalRequirementsPage
+{
+    public string Heading { get; set; } = string.Empty;
+
+    public NavigationLink? BackButton { get; init; }
+
+    public string QualificationLabel { get; set; } = string.Empty;
+
+    public string QualificationLevelLabel { get; set; } = string.Empty;
+
+    public string AwardingOrganisationLabel { get; set; } = string.Empty;
+
+    public string InformationMessage { get; set; } = string.Empty;
+
+    public string CtaButtonText { get; set; } = string.Empty;
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
index 2eb740f9..3b5c10c7 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
@@ -29,7 +29,8 @@ private readonly Dictionary<object, string> _contentTypes
               { typeof(DateQuestionPage), ContentTypes.DateQuestionPage },
               { typeof(DropdownQuestionPage), ContentTypes.DropdownQuestionPage },
               { typeof(QualificationListPage), ContentTypes.QualificationListPage },
-              { typeof(ConfirmQualificationPage), ContentTypes.ConfirmQualificationPage }
+              { typeof(ConfirmQualificationPage), ContentTypes.ConfirmQualificationPage },
+              { typeof(CheckAdditionalRequirementsPage), ContentTypes.CheckAdditionalRequirementsPage }
           };
 
     public async Task<StartPage?> GetStartPage()
@@ -194,6 +195,18 @@ public async Task<List<Qualification>> GetQualifications()
         return confirmQualificationEntities.First();
     }
 
+    public async Task<CheckAdditionalRequirementsPage?> GetCheckAdditionalRequirementsPage()
+    {
+        var checkAdditionalRequirementsPageEntities = await GetEntriesByType<CheckAdditionalRequirementsPage>();
+        if (checkAdditionalRequirementsPageEntities is null || !checkAdditionalRequirementsPageEntities.Any())
+        {
+            logger.LogWarning("No CheckAdditionalRequirementsPage entry returned");
+            return default;
+        }
+
+        return checkAdditionalRequirementsPageEntities.First();
+    }
+
     public async Task<QualificationListPage?> GetQualificationListPage()
     {
         var qualificationListPageEntities = await GetEntriesByType<QualificationListPage>();
diff --git a/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs b/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
index 43562633..c87ed566 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
@@ -33,4 +33,6 @@ public interface IContentService
     Task<QualificationListPage?> GetQualificationListPage();
 
     Task<ConfirmQualificationPage?> GetConfirmQualificationPage();
+
+    Task<CheckAdditionalRequirementsPage?> GetCheckAdditionalRequirementsPage();
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index 7dd15819..884f73df 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -281,6 +281,25 @@ public Task<List<Qualification>> GetQualifications()
                                      });
     }
 
+    public async Task<CheckAdditionalRequirementsPage?> GetCheckAdditionalRequirementsPage()
+    {
+        return await Task.FromResult(new CheckAdditionalRequirementsPage
+               {
+                   Heading = "Check the additional requirements",
+                   BackButton = new NavigationLink
+                                {
+                                    DisplayText = "Back",
+                                    Href = "/",
+                                    OpenInNewTab = false
+                                },
+                   CtaButtonText = "Get result",
+                   AwardingOrganisationLabel = "Awarding organisation",
+                   QualificationLabel = "Qualification",
+                   QualificationLevelLabel = "Qualification level",
+                   InformationMessage = "Your result is dependent on the accuracy of the answers you have provided"
+               });
+    }
+
     public async Task<StartPage?> GetStartPage()
     {
         var preCtaButtonContent =
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentServiceTests.cs
index 8365546f..ff7cf53f 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentServiceTests.cs
@@ -901,4 +901,38 @@ public async Task GetPage_WhenContentfulGetEntriesByTypeThrows_LogsError()
 
         _logger.VerifyError($"Exception trying to retrieve {nameof(StartPage)} from Contentful.");
     }
+    
+    [TestMethod]
+    public async Task GetCheckAdditionalRequirementsPage_ReturnsPage()
+    {
+        var page = new CheckAdditionalRequirementsPage { Heading = "Test heading" };
+
+        _clientMock.Setup(c =>
+                              c.GetEntriesByType(It.IsAny<string>(),
+                                                 It.IsAny<QueryBuilder<CheckAdditionalRequirementsPage>>(),
+                                                 It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new ContentfulCollection<CheckAdditionalRequirementsPage> { Items = [page] });
+
+        var service = new ContentfulContentService(_clientMock.Object, _logger.Object);
+
+        var result = await service.GetCheckAdditionalRequirementsPage();
+
+        result.Should().Be(page);
+    }
+
+    [TestMethod]
+    public async Task GetCheckAdditionalRequirementsPage_ContentfulHasNoPage_ReturnsNull()
+    {
+        _clientMock.Setup(c =>
+                              c.GetEntriesByType(It.IsAny<string>(),
+                                                 It.IsAny<QueryBuilder<CheckAdditionalRequirementsPage>>(),
+                                                 It.IsAny<CancellationToken>()))
+                   .ReturnsAsync(new ContentfulCollection<CheckAdditionalRequirementsPage> { Items = [] });
+
+        var service = new ContentfulContentService(_clientMock.Object, _logger.Object);
+
+        var result = await service.GetCheckAdditionalRequirementsPage();
+
+        result.Should().BeNull();
+    }
 }
\ No newline at end of file

From 41ea67a090fa19be918bb1161ee549c1a1b67cdd Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Mon, 22 Jul 2024 15:00:42 +0100
Subject: [PATCH 02/14] Added in extra logic for the view and created the post
 method

---
 .../Entities/AdditionalRequirementQuestion.cs |   2 +
 .../CheckAdditionalRequirementsPage.cs        |  16 ++-
 .../Services/ContentfulContentService.cs      |   1 +
 .../Attributes/AnswerValidationAttribute.cs   |  27 ++++
 .../CheckAdditionalRequirementsController.cs  | 129 ++++++++++++++++++
 .../ConfirmQualificationController.cs         |  39 +++---
 .../QualificationDetailsController.cs         |   2 -
 .../AdditionalRequirementQuestionModel.cs     |   6 +-
 .../CheckAdditionalRequirementsPageModel.cs   |  43 ++++++
 .../Content/QuestionModels/OptionModel.cs     |   8 ++
 .../QuestionModels/RadioQuestionModel.cs      |   7 -
 .../Models/UserJourneyModel.cs                |   2 +
 .../IUserJourneyCookieService.cs              |   2 +
 .../UserJourneyCookieService.cs               |  15 ++
 .../CheckAdditionalRequirements/Index.cshtml  | 108 +++++++++++++++
 .../ConfirmQualificationControllerTests.cs    | 108 ++++++---------
 .../Services/UserJourneyCookieServiceTests.cs |  37 +++++
 17 files changed, 447 insertions(+), 105 deletions(-)
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Attributes/AnswerValidationAttribute.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Models/Content/CheckAdditionalRequirementsPageModel.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/OptionModel.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml

diff --git a/src/Dfe.EarlyYearsQualification.Content/Entities/AdditionalRequirementQuestion.cs b/src/Dfe.EarlyYearsQualification.Content/Entities/AdditionalRequirementQuestion.cs
index 66b00c92..d8f851e6 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Entities/AdditionalRequirementQuestion.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Entities/AdditionalRequirementQuestion.cs
@@ -15,4 +15,6 @@ public class AdditionalRequirementQuestion
     public string ConfirmationStatement { get; set; } = string.Empty;
 
     public bool AnswerToBeFullAndRelevant { get; set; }
+
+    public List<Option> Answers { get; set; } = [];
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs b/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs
index 7fdab55c..7c533ef8 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Entities/CheckAdditionalRequirementsPage.cs
@@ -2,17 +2,21 @@ namespace Dfe.EarlyYearsQualification.Content.Entities;
 
 public class CheckAdditionalRequirementsPage
 {
-    public string Heading { get; set; } = string.Empty;
+    public string Heading { get; init; } = string.Empty;
 
     public NavigationLink? BackButton { get; init; }
 
-    public string QualificationLabel { get; set; } = string.Empty;
+    public string QualificationLabel { get; init; } = string.Empty;
 
-    public string QualificationLevelLabel { get; set; } = string.Empty;
+    public string QualificationLevelLabel { get; init; } = string.Empty;
 
-    public string AwardingOrganisationLabel { get; set; } = string.Empty;
+    public string AwardingOrganisationLabel { get; init; } = string.Empty;
 
-    public string InformationMessage { get; set; } = string.Empty;
+    public string InformationMessage { get; init; } = string.Empty;
 
-    public string CtaButtonText { get; set; } = string.Empty;
+    public string CtaButtonText { get; init; } = string.Empty;
+
+    public string QuestionSectionHeading { get; init; } = string.Empty;
+
+    public string ErrorMessage { get; init; } = string.Empty;
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
index 3b5c10c7..a1abe60d 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
@@ -102,6 +102,7 @@ public async Task<List<NavigationLink>> GetNavigationLinks()
     public async Task<Qualification?> GetQualificationById(string qualificationId)
     {
         var queryBuilder = new QueryBuilder<Qualification>().ContentTypeIs(_contentTypes[typeof(Qualification)])
+                                                            .Include(2)
                                                             .FieldEquals("fields.qualificationId",
                                                                          qualificationId.ToUpper());
         var qualifications = await GetEntriesByType(queryBuilder);
diff --git a/src/Dfe.EarlyYearsQualification.Web/Attributes/AnswerValidationAttribute.cs b/src/Dfe.EarlyYearsQualification.Web/Attributes/AnswerValidationAttribute.cs
new file mode 100644
index 00000000..c651b170
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Attributes/AnswerValidationAttribute.cs
@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Dfe.EarlyYearsQualification.Web.Attributes;
+
+[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
+public class AnswerValidationAttribute : ValidationAttribute
+{
+    protected override ValidationResult? IsValid(object? value, ValidationContext validationContext)
+    {
+        if (value is not Dictionary<string, string> dictionary)
+        {
+            return new ValidationResult("Object is not of type Dictionary<string, string>()");
+        }
+
+        if (dictionary.Count == 0)
+        {
+            return new ValidationResult("Answers are required");
+        }
+
+        foreach (var keyValuePair in dictionary.Where(keyValuePair => string.IsNullOrEmpty(keyValuePair.Value)))
+        {
+            return new ValidationResult($"Value is required for key: {keyValuePair.Key}");
+        }
+        
+        return ValidationResult.Success;
+    }
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs
new file mode 100644
index 00000000..9f0b67de
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs
@@ -0,0 +1,129 @@
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Dfe.EarlyYearsQualification.Content.Renderers.Entities;
+using Dfe.EarlyYearsQualification.Content.Services;
+using Dfe.EarlyYearsQualification.Web.Controllers.Base;
+using Dfe.EarlyYearsQualification.Web.Models.Content;
+using Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
+using Dfe.EarlyYearsQualification.Web.Services.UserJourneyCookieService;
+using Microsoft.AspNetCore.Mvc;
+
+namespace Dfe.EarlyYearsQualification.Web.Controllers;
+
+[Route("qualifications/check-additional-questions")]
+public class CheckAdditionalRequirementsController(
+    ILogger<ConfirmQualificationController> logger,
+    IContentService contentService,
+    IHtmlRenderer htmlRenderer,
+    IUserJourneyCookieService userJourneyCookieService)
+    : ServiceController
+{
+    [HttpGet("{qualificationId}")]
+    public async Task<IActionResult> Index(string qualificationId)
+    {
+        if (ModelState.IsValid) return await GetResponse(qualificationId);
+        
+        logger.LogError("No qualificationId passed in");
+        return RedirectToAction("Index", "Error");
+
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Post([FromForm]CheckAdditionalRequirementsPageModel model)
+    {
+        if (ModelState.IsValid)
+        {
+            userJourneyCookieService.SetAdditionalQuestionsAnswers(model.Answers);
+            return RedirectToAction("Index", "QualificationDetails",
+                                    new { model.QualificationId });
+        }
+        
+        model.HasErrors = true;
+        return await GetResponse(model.QualificationId, model);
+    }
+
+    private async Task<IActionResult> GetResponse(string qualificationId,
+                                                  CheckAdditionalRequirementsPageModel? model = null)
+    {
+        var qualification = await contentService.GetQualificationById(qualificationId);
+        if (qualification is null)
+        {
+            var loggedQualificationId = qualificationId.Replace(Environment.NewLine, "");
+            logger.LogError("Could not find details for qualification with ID: {QualificationId}",
+                            loggedQualificationId);
+
+            return RedirectToAction("Index", "Error");
+        }
+
+        if (qualification.AdditionalRequirementQuestions is null || qualification.AdditionalRequirementQuestions.Count == 0)
+        {
+            var loggedQualificationId = qualificationId.Replace(Environment.NewLine, "");
+            logger.LogInformation("QualificationId has no additional requirement questions: {QualificationId}",
+                                  loggedQualificationId);
+            return RedirectToAction("Index", "QualificationDetails",
+                                    new { qualificationId });
+        }
+        
+        var content = await contentService.GetCheckAdditionalRequirementsPage();
+        if (content is null)
+        {
+            logger.LogError("No content for the cookies page");
+            return RedirectToAction("Index", "Error");
+        }
+
+        var mappedModel = await MapModel(content, qualification, model);
+
+        return View("Index", mappedModel);
+    }
+
+    private async Task<CheckAdditionalRequirementsPageModel> MapModel(CheckAdditionalRequirementsPage content, Qualification qualification,
+                                                                      CheckAdditionalRequirementsPageModel? model = null)
+    {
+        var mappedModel = model ?? new CheckAdditionalRequirementsPageModel();
+        mappedModel.QualificationId = qualification.QualificationId;
+        mappedModel.AwardingOrganisation = qualification.AwardingOrganisationTitle;
+        mappedModel.AwardingOrganisationLabel = content.AwardingOrganisationLabel;
+        mappedModel.CtaButtonText = content.CtaButtonText;
+        mappedModel.QualificationLevel = qualification.QualificationLevel;
+        mappedModel.QualificationLabel = content.QualificationLabel;
+        mappedModel.QualificationName = qualification.QualificationName;
+        mappedModel.Heading = content.Heading;
+        mappedModel.InformationMessage = content.InformationMessage;
+        mappedModel.QualificationLevelLabel = content.QualificationLevelLabel;
+        mappedModel.QuestionSectionHeading = content.QuestionSectionHeading;
+        mappedModel.BackButton = content.BackButton;
+        mappedModel.AdditionalRequirementQuestions =
+            await MapAdditionalRequirementQuestions(qualification.AdditionalRequirementQuestions!);
+        mappedModel.Answers = MapQuestionsToDictionary(qualification.AdditionalRequirementQuestions!);
+        mappedModel.ErrorMessage = content.ErrorMessage;
+        return mappedModel;
+    }
+    
+    private async Task<List<AdditionalRequirementQuestionModel>> MapAdditionalRequirementQuestions(List<AdditionalRequirementQuestion> additionalRequirementQuestions)
+    {
+        var results = new List<AdditionalRequirementQuestionModel>();
+
+        foreach (var additionalRequirementQuestion in additionalRequirementQuestions)
+        {
+            results.Add(new AdditionalRequirementQuestionModel
+                        {
+                            Question = additionalRequirementQuestion.Question,
+                            HintText = additionalRequirementQuestion.HintText,
+                            DetailsHeading = additionalRequirementQuestion.DetailsHeading,
+                            DetailsContent = await htmlRenderer.ToHtml(additionalRequirementQuestion.DetailsContent),
+                            Options = MapOptions(additionalRequirementQuestion.Answers)
+                        });
+        }
+        
+        return results;
+    }
+
+    private static List<OptionModel> MapOptions(List<Option> options)
+    {
+        return options.Select(option => new OptionModel { Label = option.Label, Value = option.Value }).ToList();
+    }
+    
+    private static Dictionary<string, string> MapQuestionsToDictionary(List<AdditionalRequirementQuestion> additionalRequirementQuestions)
+    {
+        return additionalRequirementQuestions.ToDictionary(additionalRequirementQuestion => additionalRequirementQuestion.Question, additionalRequirementQuestion => string.Empty);
+    }
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
index f1dab374..40290a34 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
@@ -48,28 +48,12 @@ public async Task<IActionResult> Index(string qualificationId)
     [HttpPost]
     public async Task<IActionResult> Confirm(ConfirmQualificationPageModel model)
     {
-        if (ModelState.IsValid)
-        {
-            return model.ConfirmQualificationAnswer == "yes"
-                       ? RedirectToAction("Index", "QualificationDetails",
-                                          new { qualificationId = model.QualificationId })
-                       : RedirectToAction("Get", "QualificationDetails");
-        }
-
-        var content = await contentService.GetConfirmQualificationPage();
-
-        if (content is null)
-        {
-            logger.LogError("No content for the cookies page");
-            return RedirectToAction("Index", "Error");
-        }
-
         if (string.IsNullOrEmpty(model.QualificationId))
         {
             logger.LogError("No qualification id provided");
             return RedirectToAction("Index", "Error");
         }
-
+        
         var qualification = await contentService.GetQualificationById(model.QualificationId);
         if (qualification is null)
         {
@@ -79,6 +63,27 @@ public async Task<IActionResult> Confirm(ConfirmQualificationPageModel model)
 
             return RedirectToAction("Index", "Error");
         }
+        
+        if (ModelState.IsValid)
+        {
+            var hasAdditionalQuestions = qualification.AdditionalRequirementQuestions is not null &&
+                                         qualification.AdditionalRequirementQuestions.Count > 0;
+            return model.ConfirmQualificationAnswer == "yes" && hasAdditionalQuestions 
+                       ? RedirectToAction("Index", "CheckAdditionalRequirements", 
+                                          new { qualificationId = model.QualificationId }) 
+                           : model.ConfirmQualificationAnswer == "yes"
+                           ? RedirectToAction("Index", "QualificationDetails",
+                                              new { qualificationId = model.QualificationId })
+                           : RedirectToAction("Get", "QualificationDetails");
+        }
+
+        var content = await contentService.GetConfirmQualificationPage();
+
+        if (content is null)
+        {
+            logger.LogError("No content for the cookies page");
+            return RedirectToAction("Index", "Error");
+        }
 
         model = Map(content, qualification);
         model.HasErrors = true;
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/QualificationDetailsController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/QualificationDetailsController.cs
index ce009697..d69f81d4 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/QualificationDetailsController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/QualificationDetailsController.cs
@@ -215,8 +215,6 @@ await govUkInsetTextRenderer.ToHtml(content.CheckAnotherQualificationText),
                             HintText = additionalRequirementQuestion.HintText,
                             DetailsHeading = additionalRequirementQuestion.DetailsHeading,
                             DetailsContent = await htmlRenderer.ToHtml(additionalRequirementQuestion.DetailsContent),
-                            ConfirmationStatement = additionalRequirementQuestion.ConfirmationStatement,
-                            AnswerToBeFullAndRelevant = additionalRequirementQuestion.AnswerToBeFullAndRelevant
                         });
         }
         
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/AdditionalRequirementQuestionModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/AdditionalRequirementQuestionModel.cs
index 8013994d..46c203ad 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/Content/AdditionalRequirementQuestionModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/AdditionalRequirementQuestionModel.cs
@@ -1,3 +1,5 @@
+using Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
+
 namespace Dfe.EarlyYearsQualification.Web.Models.Content;
 
 public class AdditionalRequirementQuestionModel
@@ -10,7 +12,5 @@ public class AdditionalRequirementQuestionModel
 
     public string DetailsContent { get; set; } = string.Empty;
 
-    public string ConfirmationStatement { get; set; } = string.Empty;
-
-    public bool AnswerToBeFullAndRelevant { get; set; }
+    public List<OptionModel> Options { get; init; } = [];
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/CheckAdditionalRequirementsPageModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/CheckAdditionalRequirementsPageModel.cs
new file mode 100644
index 00000000..05f49aec
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/CheckAdditionalRequirementsPageModel.cs
@@ -0,0 +1,43 @@
+using System.ComponentModel.DataAnnotations;
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Dfe.EarlyYearsQualification.Web.Attributes;
+
+namespace Dfe.EarlyYearsQualification.Web.Models.Content;
+
+public class CheckAdditionalRequirementsPageModel
+{
+    [Required]
+    public string QualificationId { get; set; } = string.Empty;
+    
+    public string Heading { get; set; } = string.Empty;
+
+    public string QualificationLabel { get; set; } = string.Empty;
+
+    public string QualificationName { get; set; } = string.Empty;
+
+    public string QualificationLevelLabel { get; set; } = string.Empty;
+
+    public int QualificationLevel { get; set; }
+
+    public string AwardingOrganisationLabel { get; set; } = string.Empty;
+
+    public string AwardingOrganisation { get; set; } = string.Empty;
+
+    public string QuestionSectionHeading { get; set; } = string.Empty;
+
+    public string InformationMessage { get; set; } = string.Empty;
+
+    public string CtaButtonText { get; set; } = string.Empty;
+    
+    public NavigationLink? BackButton { get; set; }
+
+    public List<AdditionalRequirementQuestionModel> AdditionalRequirementQuestions { get; set; } = [];
+
+    [AnswerValidation]
+    // ReSharper disable once PropertyCanBeMadeInitOnly.Global
+    public Dictionary<string, string> Answers { get; set; } = [];
+    
+    public bool HasErrors { get; set; }
+
+    public string ErrorMessage { get; set; } = string.Empty;
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/OptionModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/OptionModel.cs
new file mode 100644
index 00000000..6f14d6ab
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/OptionModel.cs
@@ -0,0 +1,8 @@
+namespace Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
+
+public class OptionModel
+{
+    public string Label { get; init; } = string.Empty;
+
+    public string Value { get; init; } = string.Empty;
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/RadioQuestionModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/RadioQuestionModel.cs
index ce2ca754..072793b5 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/RadioQuestionModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/RadioQuestionModel.cs
@@ -11,11 +11,4 @@ public class RadioQuestionModel : BaseQuestionModel
     public string AdditionalInformationHeader { get; set; } = string.Empty;
 
     public string AdditionalInformationBody { get; set; } = string.Empty;
-}
-
-public class OptionModel
-{
-    public string Label { get; init; } = string.Empty;
-
-    public string Value { get; init; } = string.Empty;
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs
index bdfaae72..94657d0b 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs
@@ -8,4 +8,6 @@ public class UserJourneyModel
     public string WhatIsTheAwardingOrganisation { get; set; } = string.Empty;
 
     public string SearchCriteria { get; set; } = string.Empty;
+
+    public Dictionary<string, string>? AdditionalQuestionsAnswers { get; set; }
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs
index 9387fd2c..2bff30b7 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs
@@ -8,6 +8,7 @@ public interface IUserJourneyCookieService
     public void SetWhenWasQualificationAwarded(string date);
     public void SetLevelOfQualification(string level);
     public void SetAwardingOrganisation(string awardingOrganisation);
+    public void SetAdditionalQuestionsAnswers(Dictionary<string, string> additionalQuestionsAnswers);
     
     public void SetQualificationNameSearchCriteria(string searchCriteria);
     public UserJourneyModel GetUserJourneyModelFromCookie();
@@ -19,4 +20,5 @@ public interface IUserJourneyCookieService
     public string? GetAwardingOrganisation();
 
     public string? GetSearchCriteria();
+    public Dictionary<string, string>? GetAdditionalQuestionsAnswers();
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
index 729700b7..3e5ad9eb 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
@@ -51,6 +51,15 @@ public void SetAwardingOrganisation(string awardingOrganisation)
         SetJourneyCookie(model);
     }
 
+    public void SetAdditionalQuestionsAnswers(Dictionary<string, string> additionalQuestionsAnswers)
+    {
+        var model = GetUserJourneyModelFromCookie();
+
+        model.AdditionalQuestionsAnswers = additionalQuestionsAnswers;
+
+        SetJourneyCookie(model);
+    }
+
     public void SetQualificationNameSearchCriteria(string searchCriteria)
     {
         var model = GetUserJourneyModelFromCookie();
@@ -155,6 +164,12 @@ public void ResetUserJourneyCookie()
         return searchCriteria;
     }
 
+    public Dictionary<string, string>? GetAdditionalQuestionsAnswers()
+    {
+        var cookie = GetUserJourneyModelFromCookie();
+        return cookie.AdditionalQuestionsAnswers;
+    }
+
     private void SetJourneyCookie(UserJourneyModel model)
     {
         var serializedCookie = JsonSerializer.Serialize(model);
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
new file mode 100644
index 00000000..35167726
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
@@ -0,0 +1,108 @@
+@model Dfe.EarlyYearsQualification.Web.Models.Content.CheckAdditionalRequirementsPageModel
+
+@{
+    ViewData["Title"] = $"Check additional requirements - {Model.QualificationId}";
+}
+
+@section BeforeMainContent {
+    @{
+        await Html.RenderPartialAsync("Partials/BackButton", Model.BackButton);
+    }
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop">
+        <h1 class="govuk-heading-xl">@Model.Heading</h1>
+        <dl class="govuk-summary-list">
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    @Model.QualificationLabel
+                </dt>
+                <dd class="govuk-summary-list__value" id="qualification-name-value">
+                    @Model.QualificationName
+                </dd>
+            </div>
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    @Model.QualificationLevelLabel
+                </dt>
+                <dd class="govuk-summary-list__value" id="qualification-level-value">
+                    @Model.QualificationLevel
+                </dd>
+            </div>
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    @Model.AwardingOrganisationLabel
+                </dt>
+                <dd class="govuk-summary-list__value" id="awarding-organisation-value">
+                    @Model.AwardingOrganisation
+                </dd>
+            </div>
+        </dl>
+        <form id="check-additional-requirements" asp-controller="CheckAdditionalRequirements" asp-action="Post" method="post">
+            <input type="hidden" name="qualificationId" value="@Model.QualificationId">
+            <div id="confirm-qualification-form-group" class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
+                <fieldset class="govuk-fieldset" role="group" aria-describedby="confirm-qualification-choice-error">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+                        <h4 id="radio-heading" class="govuk-heading-m">@Model.QuestionSectionHeading</h4>
+                    </legend>
+            
+                    @if (Model.HasErrors)
+                    {
+                        <p id="confirm-qualification-choice-error" class="govuk-error-message">
+                            <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
+                        </p>
+                    }
+                    
+                    @for (var qi = 0; qi < Model.AdditionalRequirementQuestions.Count; qi++)
+                    {
+                        var question = Model.AdditionalRequirementQuestions[qi];
+                        <div class="govuk-form-group">
+                            <h3 class="govuk-heading-s">@question.Question</h3>
+                            @if (!string.IsNullOrEmpty(question.HintText))
+                            {
+                                <p>@question.HintText</p>
+                            }
+                            @if (!string.IsNullOrEmpty(question.DetailsHeading) && !string.IsNullOrEmpty(question.DetailsContent))
+                            {
+                                <details class="govuk-details">
+                                    <summary class="govuk-details__summary">
+                                        <span class="govuk-details__summary-text">
+                                            @question.DetailsHeading
+                                        </span>
+                                    </summary>
+                                    <div class="govuk-details__text">
+                                        @Html.Raw(question.DetailsContent)
+                                    </div>
+                                </details>
+                            }
+                            @for (var i = 0; i < question.Options.Count; i++)
+                            {
+                                var option = question.Options[i];
+                                var id = $"{option.Value}_{qi}_{i}";
+                                <div class="govuk-radios__item">
+                                    @Html.RadioButtonFor(x => x.Answers[question.Question], option.Value, new { @class = "govuk-radios__input", id })
+                                    <label class="govuk-label govuk-radios__label" for="@id">
+                                        @option.Label
+                                    </label>
+                                </div>
+                            }
+                        </div>
+                    }
+                </fieldset>
+            </div>
+            <div class="govuk-warning-text">
+                <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
+                <strong class="govuk-warning-text__text">
+                    <span class="govuk-visually-hidden">Warning</span>
+                    @Model.InformationMessage
+                </strong>
+            </div>
+            <div class="govuk-form-group">
+                <button id="additional-requirement-button" class="govuk-button" data-module="govuk-button">
+                    @Model.CtaButtonText
+                </button>
+            </div>
+        </form>
+    </div>
+</div>
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs
index 40b34be2..f28c4092 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs
@@ -205,12 +205,15 @@ public async Task Post_InvalidModel_CantGetPageContent_LogsAndReturnsError()
         var mockContentService = new Mock<IContentService>();
 
         mockContentService.Setup(x => x.GetConfirmQualificationPage()).ReturnsAsync(default(ConfirmQualificationPage?));
+        mockContentService.Setup(x => x.GetQualificationById("Some ID")).ReturnsAsync(new Qualification("Some ID",
+         "Qualification Name", "NCFE", 2, "2014", "2019",
+         "ABC/547/900", "additional requirements", null, null));
 
         var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
 
         controller.ModelState.AddModelError("test", "error");
 
-        var result = await controller.Confirm(new ConfirmQualificationPageModel());
+        var result = await controller.Confirm(new ConfirmQualificationPageModel() { QualificationId = "Some ID"});
 
         result.Should().BeOfType<RedirectToActionResult>();
 
@@ -228,43 +231,8 @@ public async Task Post_InvalidModel_NoQualificationId_LogsAndReturnsError()
         var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
         var mockContentService = new Mock<IContentService>();
 
-        mockContentService.Setup(x => x.GetConfirmQualificationPage()).ReturnsAsync(new ConfirmQualificationPage
-                 {
-                     QualificationLabel = "Test qualification label",
-                     BackButton = new NavigationLink
-                                  {
-                                      DisplayText = "Test back button",
-                                      OpenInNewTab = false,
-                                      Href = "/qualifications"
-                                  },
-                     ErrorText = "Test error text",
-                     ButtonText = "Test button text",
-                     LevelLabel = "Test level label",
-                     DateAddedLabel = "Test date added label",
-                     Heading = "Test heading",
-                     Options =
-                     [
-                         new Option
-                         {
-                             Label = "yes",
-                             Value = "yes"
-                         },
-                         new Option
-                         {
-                             Label = "no",
-                             Value = "no"
-                         }
-                     ],
-                     RadioHeading = "Test radio heading",
-                     AwardingOrganisationLabel = "Test awarding organisation label",
-                     ErrorBannerHeading = "Test error banner heading",
-                     ErrorBannerLink = "Test error banner link"
-                 });
-
         var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
 
-        controller.ModelState.AddModelError("test", "error");
-
         var result = await controller.Confirm(new ConfirmQualificationPageModel());
 
         result.Should().BeOfType<RedirectToActionResult>();
@@ -283,39 +251,6 @@ public async Task Post_InvalidModel_CantFindQualificationId_LogsAndReturnsError(
         var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
         var mockContentService = new Mock<IContentService>();
 
-        mockContentService.Setup(x => x.GetConfirmQualificationPage()).ReturnsAsync(new ConfirmQualificationPage
-                 {
-                     QualificationLabel = "Test qualification label",
-                     BackButton = new NavigationLink
-                                  {
-                                      DisplayText = "Test back button",
-                                      OpenInNewTab = false,
-                                      Href = "/qualifications"
-                                  },
-                     ErrorText = "Test error text",
-                     ButtonText = "Test button text",
-                     LevelLabel = "Test level label",
-                     DateAddedLabel = "Test date added label",
-                     Heading = "Test heading",
-                     Options =
-                     [
-                         new Option
-                         {
-                             Label = "yes",
-                             Value = "yes"
-                         },
-                         new Option
-                         {
-                             Label = "no",
-                             Value = "no"
-                         }
-                     ],
-                     RadioHeading = "Test radio heading",
-                     AwardingOrganisationLabel = "Test awarding organisation label",
-                     ErrorBannerHeading = "Test error banner heading",
-                     ErrorBannerLink = "Test error banner link"
-                 });
-
         mockContentService.Setup(x => x.GetQualificationById("Some ID")).ReturnsAsync(default(Qualification?));
 
         var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
@@ -435,11 +370,41 @@ public async Task Post_InvalidModel_BuildsModelWithHasErrorsAndReturns()
     }
 
     [TestMethod]
-    public async Task Post_ValidModel_PassedYes_RedirectsToQualificaitonDetailsAction()
+    public async Task Post_ValidModel_PassedYesAndQualificationHasAdditionalRequirements_RedirectsToCheckAdditionalRequirements()
     {
         var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
         var mockContentService = new Mock<IContentService>();
+        var additionalRequirements = new List<AdditionalRequirementQuestion> { new () };
+        mockContentService.Setup(x => x.GetQualificationById("TEST-123")).ReturnsAsync(new Qualification("Some ID",
+         "Qualification Name", "NCFE", 2, "2014", "2019",
+         "ABC/547/900", "additional requirements", additionalRequirements, null));
+        
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+
+        var result = await controller.Confirm(new ConfirmQualificationPageModel
+                                              {
+                                                  QualificationId = "TEST-123",
+                                                  ConfirmQualificationAnswer = "yes"
+                                              });
 
+        result.Should().BeOfType<RedirectToActionResult>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Index");
+        actionResult.ControllerName.Should().Be("CheckAdditionalRequirements");
+        actionResult.RouteValues.Should().ContainSingle("qualificationId", "TEST-123");
+    }
+    
+    [TestMethod]
+    public async Task Post_ValidModel_PassedYes_RedirectsToQualificationDetailsAction()
+    {
+        var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
+        var mockContentService = new Mock<IContentService>();
+        mockContentService.Setup(x => x.GetQualificationById("TEST-123")).ReturnsAsync(new Qualification("Some ID",
+         "Qualification Name", "NCFE", 2, "2014", "2019",
+         "ABC/547/900", "additional requirements", null, null));
+        
         var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
 
         var result = await controller.Confirm(new ConfirmQualificationPageModel
@@ -462,6 +427,9 @@ public async Task Post_ValidModel_PassedAnythingButYes_RedirectsBackToTheQualifi
     {
         var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
         var mockContentService = new Mock<IContentService>();
+        mockContentService.Setup(x => x.GetQualificationById("TEST-123")).ReturnsAsync(new Qualification("Some ID",
+         "Qualification Name", "NCFE", 2, "2014", "2019",
+         "ABC/547/900", "additional requirements", null, null));
 
         var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
 
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
index 6cc9a92d..1361cbd1 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
@@ -389,6 +389,43 @@ public void GetSearchCriteria_CookieHasValidValue_ReturnsValue()
         searchCriteria.Should().Be("Test");
     }
 
+    [TestMethod]
+    public void SetAdditionalQuestionsAnswers_DictionaryProvided_SetsCookie()
+    {
+        var mockHttpContextAccessor = SetHttpContextWithExistingCookie(new UserJourneyModel());
+        var mockLogger = new Mock<ILogger<UserJourneyCookieService>>();
+
+        var service = new UserJourneyCookieService(mockHttpContextAccessor.Object, mockLogger.Object);
+
+        Dictionary<string, string> dictionary = new() { { "This is a test question", "Answer" } };
+        service.SetAdditionalQuestionsAnswers(dictionary);
+
+        var serialisedModelToCheck = JsonSerializer.Serialize(new UserJourneyModel
+                                                              {
+                                                                  AdditionalQuestionsAnswers = dictionary
+                                                              });
+
+        CheckSerializedModelWasSet(mockHttpContextAccessor, serialisedModelToCheck);
+    }
+    
+    [TestMethod]
+    public void SetAdditionalQuestionsAnswers_CookieHasValidValue_ReturnsValue()
+    {
+        Dictionary<string, string> dictionary = new() { { "This is a test question", "Answer" } };
+        var existingModel = new UserJourneyModel
+                            {
+                                AdditionalQuestionsAnswers = dictionary
+                            };
+        var mockHttpContextAccessor = SetHttpContextWithExistingCookie(existingModel);
+        var mockLogger = new Mock<ILogger<UserJourneyCookieService>>();
+
+        var service = new UserJourneyCookieService(mockHttpContextAccessor.Object, mockLogger.Object);
+
+        var additionalQuestionsAnswers = service.GetAdditionalQuestionsAnswers();
+
+        additionalQuestionsAnswers.Should().Equal(dictionary);
+    }
+
     private static Mock<IHttpContextAccessor> SetHttpContextWithExistingCookie(object? model)
     {
         var serializedModel = JsonSerializer.Serialize(model);

From 3e6ba46dd90bcd5ac8799dd7d2c809ca544a8a7a Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Mon, 22 Jul 2024 15:41:22 +0100
Subject: [PATCH 03/14] Added additional unit tests

---
 .../Content/MockContentfulService.cs          |  4 +-
 .../AnswerValidationAttributeTests.cs         | 64 +++++++++++++++++++
 .../Mocks/MockContentfulServiceTests.cs       | 24 +++++++
 3 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 tests/Dfe.EarlyYearsQualification.UnitTests/Attributes/AnswerValidationAttributeTests.cs

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index 884f73df..68c72a1e 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -296,7 +296,9 @@ public Task<List<Qualification>> GetQualifications()
                    AwardingOrganisationLabel = "Awarding organisation",
                    QualificationLabel = "Qualification",
                    QualificationLevelLabel = "Qualification level",
-                   InformationMessage = "Your result is dependent on the accuracy of the answers you have provided"
+                   InformationMessage = "Your result is dependent on the accuracy of the answers you have provided",
+                   ErrorMessage = "This is a test error message",
+                   QuestionSectionHeading = "This is the question section heading"
                });
     }
 
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Attributes/AnswerValidationAttributeTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Attributes/AnswerValidationAttributeTests.cs
new file mode 100644
index 00000000..072fc546
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Attributes/AnswerValidationAttributeTests.cs
@@ -0,0 +1,64 @@
+using System.ComponentModel.DataAnnotations;
+using Dfe.EarlyYearsQualification.Web.Attributes;
+using FluentAssertions;
+
+namespace Dfe.EarlyYearsQualification.UnitTests.Attributes;
+
+[TestClass]
+public class AnswerValidationAttributeTests
+{
+    [TestMethod]
+    public void IsValid_InvalidObject_ReturnsErrorMessage()
+    {
+        var model = new InvalidPropertyModel();
+        List<ValidationResult> validationResults = []; 
+        var result = Validator.TryValidateObject(model, new ValidationContext(model, null, null), validationResults, true );
+        result.Should().BeFalse();
+        validationResults.Count.Should().Be(1);
+        validationResults[0].ErrorMessage.Should().Be("Object is not of type Dictionary<string, string>()");
+    }
+    
+    [TestMethod]
+    public void IsValid_DictionaryHasNoKeys_ReturnsErrorMessage()
+    {
+        var model = new ValidPropertyModel();
+        List<ValidationResult> validationResults = []; 
+        var result = Validator.TryValidateObject(model, new ValidationContext(model, null, null), validationResults, true );
+        result.Should().BeFalse();
+        validationResults.Count.Should().Be(1);
+        validationResults[0].ErrorMessage.Should().Be("Answers are required");
+    }
+    
+    [TestMethod]
+    public void IsValid_DictionaryHasMissingValue_ReturnsErrorMessage()
+    {
+        var model = new ValidPropertyModel();
+        model.Answers.Add("Test Key", "");
+        List<ValidationResult> validationResults = []; 
+        var result = Validator.TryValidateObject(model, new ValidationContext(model, null, null), validationResults, true );
+        result.Should().BeFalse();
+        validationResults.Count.Should().Be(1);
+        validationResults[0].ErrorMessage.Should().Be("Value is required for key: Test Key");
+    }
+    
+    [TestMethod]
+    public void IsValid_NoIssues_ReturnsSuccessMessage()
+    {
+        var model = new ValidPropertyModel();
+        model.Answers.Add("Test Key", "Test");
+        List<ValidationResult> validationResults = []; 
+        var result = Validator.TryValidateObject(model, new ValidationContext(model, null, null), validationResults, true );
+        result.Should().BeTrue();
+        validationResults.Count.Should().Be(0);
+    }
+}
+
+internal class InvalidPropertyModel
+{
+    [AnswerValidation] public string Answers { get; set; } = string.Empty;
+}
+
+internal class ValidPropertyModel
+{
+    [AnswerValidation] public Dictionary<string,string> Answers { get; set; } = [];
+}
\ No newline at end of file
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
index e7ada942..b19a0ed3 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -355,4 +355,28 @@ public async Task GetCookiesBannerContent_ReturnsExpectedDetails()
         result.RejectButtonText.Should().NotBeNullOrEmpty();
         result.RejectedCookiesContent.Should().NotBeNull();
     }
+
+    [TestMethod]
+    public async Task GetCheckAdditionalRequirementsPageContent_ReturnsExpectedDetails()
+    {
+        var contentfulService = new MockContentfulService();
+        var result = await contentfulService.GetCheckAdditionalRequirementsPage();
+
+        result.Should().NotBeNull();
+        result.Should().BeAssignableTo<CheckAdditionalRequirementsPage>();
+        result!.BackButton.Should().BeEquivalentTo(new NavigationLink
+                                                          {
+                                                              DisplayText = "Back",
+                                                              OpenInNewTab = false,
+                                                              Href = "/"
+                                                          });
+        result.ErrorMessage.Should().NotBeNullOrEmpty();
+        result.Heading.Should().NotBeNullOrEmpty();
+        result.InformationMessage.Should().NotBeNullOrEmpty();
+        result.QualificationLabel.Should().NotBeNullOrEmpty();
+        result.AwardingOrganisationLabel.Should().NotBeNullOrEmpty();
+        result.CtaButtonText.Should().NotBeNullOrEmpty();
+        result.QualificationLevelLabel.Should().NotBeNullOrEmpty();
+        result.QuestionSectionHeading.Should().NotBeNullOrEmpty();
+    }
 }
\ No newline at end of file

From 5d08bd528fa21308e2a5e1af2d10854749838fac Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Mon, 22 Jul 2024 16:27:40 +0100
Subject: [PATCH 04/14] Initial commit of the controller tests for the index
 method

---
 .../CheckAdditionalRequirementsController.cs  |   4 +-
 ...ckAdditionalRequirementsControllerTests.cs | 222 ++++++++++++++++++
 2 files changed, 224 insertions(+), 2 deletions(-)
 create mode 100644 tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs

diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs
index 9f0b67de..6d976e2f 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/CheckAdditionalRequirementsController.cs
@@ -11,7 +11,7 @@ namespace Dfe.EarlyYearsQualification.Web.Controllers;
 
 [Route("qualifications/check-additional-questions")]
 public class CheckAdditionalRequirementsController(
-    ILogger<ConfirmQualificationController> logger,
+    ILogger<CheckAdditionalRequirementsController> logger,
     IContentService contentService,
     IHtmlRenderer htmlRenderer,
     IUserJourneyCookieService userJourneyCookieService)
@@ -66,7 +66,7 @@ private async Task<IActionResult> GetResponse(string qualificationId,
         var content = await contentService.GetCheckAdditionalRequirementsPage();
         if (content is null)
         {
-            logger.LogError("No content for the cookies page");
+            logger.LogError("No content for the check additional requirements page");
             return RedirectToAction("Index", "Error");
         }
 
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs
new file mode 100644
index 00000000..1b012d37
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs
@@ -0,0 +1,222 @@
+using Contentful.Core.Models;
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Dfe.EarlyYearsQualification.Content.Renderers.Entities;
+using Dfe.EarlyYearsQualification.Content.Services;
+using Dfe.EarlyYearsQualification.UnitTests.Extensions;
+using Dfe.EarlyYearsQualification.Web.Controllers;
+using Dfe.EarlyYearsQualification.Web.Models.Content;
+using Dfe.EarlyYearsQualification.Web.Services.UserJourneyCookieService;
+using FluentAssertions;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+
+namespace Dfe.EarlyYearsQualification.UnitTests.Controllers;
+
+[TestClass]
+public class CheckAdditionalRequirementsControllerTests
+{
+    [TestMethod]
+    public async Task Index_ModelStateInValid_RedirectsToErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+        controller.ModelState.AddModelError("test", "error");
+
+        var result = await controller.Index("");
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("No qualificationId passed in");
+    }
+    
+    [TestMethod]
+    public async Task Index_UnableToFindQualification_RedirectsToErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(value: null).Verifiable();
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        var result = await controller.Index("Test-123");
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("Error");
+        
+        mockContentService.VerifyAll();
+        mockLogger.VerifyError("Could not find details for qualification with ID: Test-123");
+    }
+    
+    [TestMethod]
+    public async Task Index_QualificationHasNullAdditionalRequirements_RedirectsToQualificationDetailsPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(CreateQualification(null));
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        var result = await controller.Index("Test-123");
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("QualificationDetails");
+    }
+    
+    [TestMethod]
+    public async Task Index_PageContentIsNull_RedirectsToErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(CreateQualification(CreateAdditionalRequirementQuestions()));
+        mockContentService.Setup(x => x.GetCheckAdditionalRequirementsPage()).ReturnsAsync(value: null);
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        var result = await controller.Index("Test-123");
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("Error");
+        
+        mockContentService.VerifyAll();
+        mockLogger.VerifyError("No content for the check additional requirements page");
+    }
+    
+    [TestMethod]
+    public async Task Index_PageContentIsReturned_MapsModelAndReturnsView()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        var qualification = CreateQualification(CreateAdditionalRequirementQuestions());
+        var pageContent = CreatePageContent();
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(qualification);
+        mockContentService.Setup(x => x.GetCheckAdditionalRequirementsPage()).ReturnsAsync(pageContent);
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        var result = await controller.Index("Test-123");
+
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+        resultType!.ViewName.Should().Be("Index");
+
+        resultType.Model.Should().NotBeNull();
+        resultType.Model.Should().BeAssignableTo<CheckAdditionalRequirementsPageModel>();
+        
+        var model = resultType.Model as CheckAdditionalRequirementsPageModel;
+        model!.Heading.Should().BeSameAs(pageContent.Heading);
+        model.AwardingOrganisationLabel.Should().BeSameAs(pageContent.AwardingOrganisationLabel);
+        model.AwardingOrganisation.Should().BeSameAs(qualification.AwardingOrganisationTitle);
+        model.BackButton.Should().BeSameAs(pageContent.BackButton);
+        model.Answers.Should().NotBeNull();
+        model.Answers.Count.Should().Be(qualification.AdditionalRequirementQuestions!.Count);
+        model.ErrorMessage.Should().BeSameAs(pageContent.ErrorMessage);
+        model.InformationMessage.Should().BeSameAs(pageContent.InformationMessage);
+        model.QualificationId.Should().BeSameAs(qualification.QualificationId);
+        model.QualificationLevel.Should().Be(qualification.QualificationLevel);
+        model.QualificationLevelLabel.Should().Be(pageContent.QualificationLevelLabel);
+        model.QualificationLabel.Should().BeSameAs(pageContent.QualificationLabel);
+        model.QualificationName.Should().BeSameAs(qualification.QualificationName);
+        model.CtaButtonText.Should().BeSameAs(pageContent.CtaButtonText);
+        model.QuestionSectionHeading.Should().BeSameAs(pageContent.QuestionSectionHeading);
+        model.AdditionalRequirementQuestions.Should().NotBeNull();
+        model.AdditionalRequirementQuestions.Count.Should().Be(qualification.AdditionalRequirementQuestions.Count);
+    }
+
+    private static Qualification CreateQualification(List<AdditionalRequirementQuestion>? additionalRequirementQuestions)
+    {
+        return new Qualification("Test-123", "Test name", "Awarding Org",
+                                 3, "Aug-14", null, "ABC/123/789", "Additional requirements",
+                                 additionalRequirementQuestions, new List<RatioRequirement>());
+    }
+
+    private static List<AdditionalRequirementQuestion> CreateAdditionalRequirementQuestions()
+    {
+        return
+        [
+            new AdditionalRequirementQuestion
+            {
+                Question = "Test question",
+                Answers =
+                [
+                    new Option
+                    {
+                        Label = "Yes",
+                        Value = "yes"
+                    },
+                    new Option
+                    {
+                        Label = "No",
+                        Value = "no"
+                    }
+                ],
+                DetailsContent = new Document(),
+                DetailsHeading = "Details heading",
+                HintText = "Hint text",
+                ConfirmationStatement = "Confirmation statement",
+                AnswerToBeFullAndRelevant = true
+            }
+        ];
+    }
+
+    private static CheckAdditionalRequirementsPage CreatePageContent()
+    {
+        return new CheckAdditionalRequirementsPage
+               {
+                   QualificationLabel = "Qualification",
+                   BackButton = new NavigationLink
+                                {
+                                    DisplayText = "Back",
+                                    OpenInNewTab = false,
+                                    Href = "/"
+                                },
+                   AwardingOrganisationLabel = "Awarding organisation",
+                   Heading = "This is the heading",
+                   ErrorMessage = "This is an error",
+                   InformationMessage = "This is the information message",
+                   CtaButtonText = "Get result",
+                   QualificationLevelLabel = "Qualification level",
+                   QuestionSectionHeading = "Answer the following questions"
+               };
+    }
+}
\ No newline at end of file

From 7790d4efc2e0064e95b447b87b54fc8da93effb4 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 08:34:07 +0100
Subject: [PATCH 05/14] Added additional tests for the POST method

---
 ...ckAdditionalRequirementsControllerTests.cs | 151 ++++++++++++++++++
 1 file changed, 151 insertions(+)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs
index 1b012d37..81f40b97 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/CheckAdditionalRequirementsControllerTests.cs
@@ -161,6 +161,157 @@ public async Task Index_PageContentIsReturned_MapsModelAndReturnsView()
         model.QuestionSectionHeading.Should().BeSameAs(pageContent.QuestionSectionHeading);
         model.AdditionalRequirementQuestions.Should().NotBeNull();
         model.AdditionalRequirementQuestions.Count.Should().Be(qualification.AdditionalRequirementQuestions.Count);
+        model.HasErrors.Should().BeFalse();
+    }
+
+    [TestMethod]
+    public async Task Post_ModelStateIsValid_RedirectsToQualificationDetails()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        var result = await controller.Post(new CheckAdditionalRequirementsPageModel { QualificationId = "Test-123" });
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("QualificationDetails");
+        resultType.RouteValues.Should().ContainSingle("qualificationId", "Test-123");
+        mockUserJourneyCookieService.Verify(x => x.SetAdditionalQuestionsAnswers(It.IsAny<Dictionary<string,string>>()), Times.Once);
+    }
+    
+    [TestMethod]
+    public async Task Post_UnableToFindQualification_RedirectsToErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(value: null).Verifiable();
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        controller.ModelState.AddModelError("test", "test");
+        var result = await controller.Post(new CheckAdditionalRequirementsPageModel { QualificationId = "Test-123" });
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("Error");
+        
+        mockContentService.VerifyAll();
+        mockLogger.VerifyError("Could not find details for qualification with ID: Test-123");
+    }
+    
+    [TestMethod]
+    public async Task Post_QualificationHasNullAdditionalRequirements_RedirectsToQualificationDetailsPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(CreateQualification(null));
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        controller.ModelState.AddModelError("test", "test");
+        var result = await controller.Post(new CheckAdditionalRequirementsPageModel { QualificationId = "Test-123" });
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("QualificationDetails");
+    }
+    
+    [TestMethod]
+    public async Task Post_PageContentIsNull_RedirectsToErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(CreateQualification(CreateAdditionalRequirementQuestions()));
+        mockContentService.Setup(x => x.GetCheckAdditionalRequirementsPage()).ReturnsAsync(value: null);
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        controller.ModelState.AddModelError("test", "test");
+        var result = await controller.Post(new CheckAdditionalRequirementsPageModel { QualificationId = "Test-123" });
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("Error");
+        
+        mockContentService.VerifyAll();
+        mockLogger.VerifyError("No content for the check additional requirements page");
+    }
+    
+        [TestMethod]
+    public async Task Post_PageContentIsReturned_MapsModelAndReturnsView()
+    {
+        var mockLogger = new Mock<ILogger<CheckAdditionalRequirementsController>>();
+        var mockHtmlRenderer = new Mock<IHtmlRenderer>();
+        var mockContentService = new Mock<IContentService>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        var qualification = CreateQualification(CreateAdditionalRequirementQuestions());
+        var pageContent = CreatePageContent();
+        mockContentService.Setup(x => x.GetQualificationById("Test-123")).ReturnsAsync(qualification);
+        mockContentService.Setup(x => x.GetCheckAdditionalRequirementsPage()).ReturnsAsync(pageContent);
+        
+        var controller = new CheckAdditionalRequirementsController(mockLogger.Object, mockContentService.Object, mockHtmlRenderer.Object,
+                                                                   mockUserJourneyCookieService.Object);
+
+        controller.ModelState.AddModelError("test", "test");
+        var result = await controller.Post(new CheckAdditionalRequirementsPageModel { QualificationId = "Test-123" });
+
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+        resultType!.ViewName.Should().Be("Index");
+
+        resultType.Model.Should().NotBeNull();
+        resultType.Model.Should().BeAssignableTo<CheckAdditionalRequirementsPageModel>();
+        
+        var model = resultType.Model as CheckAdditionalRequirementsPageModel;
+        model!.Heading.Should().BeSameAs(pageContent.Heading);
+        model.AwardingOrganisationLabel.Should().BeSameAs(pageContent.AwardingOrganisationLabel);
+        model.AwardingOrganisation.Should().BeSameAs(qualification.AwardingOrganisationTitle);
+        model.BackButton.Should().BeSameAs(pageContent.BackButton);
+        model.Answers.Should().NotBeNull();
+        model.Answers.Count.Should().Be(qualification.AdditionalRequirementQuestions!.Count);
+        model.ErrorMessage.Should().BeSameAs(pageContent.ErrorMessage);
+        model.InformationMessage.Should().BeSameAs(pageContent.InformationMessage);
+        model.QualificationId.Should().BeSameAs(qualification.QualificationId);
+        model.QualificationLevel.Should().Be(qualification.QualificationLevel);
+        model.QualificationLevelLabel.Should().Be(pageContent.QualificationLevelLabel);
+        model.QualificationLabel.Should().BeSameAs(pageContent.QualificationLabel);
+        model.QualificationName.Should().BeSameAs(qualification.QualificationName);
+        model.CtaButtonText.Should().BeSameAs(pageContent.CtaButtonText);
+        model.QuestionSectionHeading.Should().BeSameAs(pageContent.QuestionSectionHeading);
+        model.AdditionalRequirementQuestions.Should().NotBeNull();
+        model.AdditionalRequirementQuestions.Count.Should().Be(qualification.AdditionalRequirementQuestions.Count);
+        model.HasErrors.Should().BeTrue();
     }
 
     private static Qualification CreateQualification(List<AdditionalRequirementQuestion>? additionalRequirementQuestions)

From 5c6a551e560fe7aa4e0a77b7930602787356f3b4 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 08:48:43 +0100
Subject: [PATCH 06/14] Added additional requirement questions to the mock

---
 .../Content/MockContentfulService.cs          | 27 ++++++++++++++++++-
 .../Mocks/MockContentfulServiceTests.cs       | 13 +++++++++
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index 68c72a1e..f892e091 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -161,7 +161,32 @@ public async Task<List<NavigationLink>> GetNavigationLinks()
                                                        "2021",
                                                        "603/5829/4",
                                                        "The course must be assessed within the EYFS in an Early Years setting in England. Please note that the name of this qualification changed in February 2023. Qualifications achieved under either name are full and relevant provided that the start date for the qualification aligns with the date of the name change.",
-                                                       null,
+                                                       new List<AdditionalRequirementQuestion>
+                                                       {
+                                                           new()
+                                                           {
+                                                               Question = "Test question",
+                                                               HintText = "This is the hint text",
+                                                               DetailsHeading = "This is the details heading",
+                                                               DetailsContent = ContentfulContentHelper.Paragraph("This is the details content"),
+                                                               Answers =
+                                                               [
+                                                                   new Option
+                                                                   {
+                                                                       Label = "Yes",
+                                                                       Value = "yes"
+                                                                   },
+
+                                                                   new Option
+                                                                   {
+                                                                       Label = "No",
+                                                                       Value = "no"
+                                                                   }
+                                                               ],
+                                                               ConfirmationStatement = "This is the confirmation statement",
+                                                               AnswerToBeFullAndRelevant = true
+                                                           }
+                                                       },
                                                        null
                                                       ));
     }
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
index b19a0ed3..96a77128 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -126,6 +126,19 @@ public async Task GetQualificationById_ReturnsExpectedDetails()
         result.QualificationName.Should().NotBeNullOrEmpty();
         result.QualificationNumber.Should().NotBeNullOrEmpty();
         result.ToWhichYear.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions.Should().NotBeNull();
+        result.AdditionalRequirementQuestions!.Count.Should().Be(1);
+        result.AdditionalRequirementQuestions[0].Question.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].HintText.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].ConfirmationStatement.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].DetailsHeading.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].DetailsHeading.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].Answers.Should().NotBeNull();
+        result.AdditionalRequirementQuestions[0].Answers.Count.Should().Be(2);
+        result.AdditionalRequirementQuestions[0].Answers[0].Label.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].Answers[0].Value.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].Answers[1].Label.Should().NotBeNullOrEmpty();
+        result.AdditionalRequirementQuestions[0].Answers[1].Value.Should().NotBeNullOrEmpty();
     }
 
     [TestMethod]

From eac9f528637eed826195d39ec344c20c5307a7d4 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 09:18:38 +0100
Subject: [PATCH 07/14] Fixed e2e tests

---
 .../Content/MockContentfulFilterService.cs       |  2 +-
 .../.pa11yci-ubuntu.js                           |  1 +
 .../cypress/e2e/journey/back-button-spec.cy.js   | 16 ++++++++++++----
 .../cypress/e2e/journey/journey-spec.cy.js       | 14 +++++++++++---
 .../cypress/e2e/shared/urls-to-check.js          |  6 +++++-
 5 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs
index e81657dc..a7d20388 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs
@@ -12,7 +12,7 @@ public Task<List<Qualification>> GetFilteredQualifications(int? level, int? star
             {
                 CreateQualification("EYQ-100", "CACHE", 2, null, "Aug-19"),
                 CreateQualification("EYQ-101", "NCFE", 2, "Sep-14", "Aug-19"),
-                CreateQualification("EYQ-102", "Pearson", 3, "Sep-14", "Aug-19"),
+                CreateQualification("EYQ-240", "Pearson", 3, "Sep-14", "Aug-19"),
                 CreateQualification("EYQ-103", "NCFE", 3, "Sep-14", "Aug-19"),
                 CreateQualification("EYQ-104", "City & Guilds", 4, "Sep-14", "Aug-19"),
                 CreateQualification("EYQ-105", "Montessori Centre International", 4, "Sep-14", "Aug-19"),
diff --git a/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js b/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js
index 6f3f7bb6..1dcf5578 100644
--- a/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js
+++ b/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js
@@ -19,6 +19,7 @@ var config = {
         "http://localhost:5000/qualifications",
         "http://localhost:5000/confirm-qualification/eyq-240",
         "http://localhost:5000/qualifications/qualification-details/eyq-240",
+        "http://localhost:5000/qualifications/check-additional-questions/eyq-240",
         "http://localhost:5000/advice/level-2-qualifications-started-between-1-sept-2014-and-31-aug-2019",
         "http://localhost:5000/advice/qualification-outside-the-united-kingdom",
         "http://localhost:5000/advice/qualifications-achieved-in-scotland",
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/back-button-spec.cy.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/back-button-spec.cy.js
index ace8daab..7cbf81d7 100644
--- a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/back-button-spec.cy.js
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/back-button-spec.cy.js
@@ -42,22 +42,30 @@ describe('A spec used to test the main back button route through the journey', (
         cy.get('#awarding-organisation-select').select(1); // first no-default item in the list
         cy.get('button[id="question-submit"]').click();
 
-        // qualifications page (This is only a temporary page) - click a qualification in the list to move us on
+        // qualifications page - click a qualification in the list to move us on
         cy.location().should((loc) => {
             expect(loc.pathname).to.eq('/qualifications');
         })
 
-        cy.get('a[href="/confirm-qualification/EYQ-102"]').click();
+        cy.get('a[href="/confirm-qualification/EYQ-240"]').click();
 
         // confirm qualification page
         cy.location().should((loc) => {
-            expect(loc.pathname).to.eq('/confirm-qualification/EYQ-102');
+            expect(loc.pathname).to.eq('/confirm-qualification/EYQ-240');
         })
 
         cy.get('#yes').click();
         cy.get('button[id="confirm-qualification-button"]').click();
 
-        // qualifications page (This is only a temporary page)
+        // check additional questions page
+        cy.location().should((loc) => {
+            expect(loc.pathname).to.eq('/qualifications/check-additional-questions/EYQ-240');
+        })
+
+        cy.get('#yes_0_0').click();
+        cy.get('button[id="additional-requirement-button"]').click();
+
+        // qualifications page
         cy.location().should((loc) => {
             expect(loc.pathname).to.eq('/qualifications/qualification-details/EYQ-240');
         })
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/journey-spec.cy.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/journey-spec.cy.js
index 71c176aa..ec1cbb0c 100644
--- a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/journey-spec.cy.js
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/journey/journey-spec.cy.js
@@ -114,20 +114,28 @@ describe('A spec used to test the various routes through the journey', () => {
     cy.get('#awarding-organisation-select').select(1);  // first no-default item in the list
     cy.get('button[id="question-submit"]').click();
     
-    // qualifications page (This is only a temporary page)
+    // qualifications page
     cy.location().should((loc) => {
       expect(loc.pathname).to.eq('/qualifications');
     })
 
-    cy.get('a[href="/confirm-qualification/EYQ-102"]').click();
+    cy.get('a[href="/confirm-qualification/EYQ-240"]').click();
 
     // confirm qualification page
     cy.location().should((loc) => {
-      expect(loc.pathname).to.eq('/confirm-qualification/EYQ-102');
+      expect(loc.pathname).to.eq('/confirm-qualification/EYQ-240');
     })
 
     cy.get('#yes').click();
     cy.get('button[id="confirm-qualification-button"]').click();
+
+    // check additional questions page
+    cy.location().should((loc) => {
+      expect(loc.pathname).to.eq('/qualifications/check-additional-questions/EYQ-240');
+    })
+
+    cy.get('#yes_0_0').click();
+    cy.get('button[id="additional-requirement-button"]').click();
     
     // qualification details page
     cy.location().should((loc) => {
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/urls-to-check.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/urls-to-check.js
index be146f10..c9c96207 100644
--- a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/urls-to-check.js
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/urls-to-check.js
@@ -9,7 +9,9 @@ export const pages = [
   "/questions/what-level-is-the-qualification",
   "/questions/what-is-the-awarding-organisation",
   "/qualifications",
-  "/qualifications/qualification-details/EYQ-240"
+  "/confirm-qualification/EYQ-240",
+  "/qualifications/qualification-details/EYQ-240",
+  "/qualifications/check-additional-questions/EYQ-240"
 ];
 
 export const pagesWithForms = [
@@ -19,6 +21,8 @@ export const pagesWithForms = [
   "/questions/what-is-the-awarding-organisation",
   "/cookies",
   "/qualifications",
+  "/confirm-qualification/EYQ-240",
+  "/qualifications/check-additional-questions/EYQ-240"
 ];
 
 export const pagesWithoutForms = [

From 4f14d2aafc0216a9541245585c5d75d609fb5130 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 09:24:46 +0100
Subject: [PATCH 08/14] Fixed broken unit test

---
 .../Mocks/MockContentfulFilterServiceTests.cs                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs
index f438d990..0236d996 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs
@@ -11,7 +11,7 @@ public class MockContentfulFilterServiceTests
     // An attribute argument must be a constant expression, 'typeof()' expression or array creation
     // expression of an attribute parameter type
     [DataRow(2, new[] { "EYQ-100", "EYQ-101" })]
-    [DataRow(3, new[] { "EYQ-102", "EYQ-103" })]
+    [DataRow(3, new[] { "EYQ-240", "EYQ-103" })]
     [DataRow(4, new[] { "EYQ-104", "EYQ-105" })]
     [DataRow(5, new[] { "EYQ-106", "EYQ-107" })]
     [DataRow(6, new[] { "EYQ-108", "EYQ-109" })]

From ef41c91fc83768da04c630e58f4d6f9103d63f18 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 10:37:40 +0100
Subject: [PATCH 09/14] Added additional e2e tests

---
 .../CheckAdditionalRequirements/Index.cshtml  | 24 +++++++------
 .../check-additional-questions-spec.cy.js     | 36 +++++++++++++++++++
 2 files changed, 50 insertions(+), 10 deletions(-)
 create mode 100644 tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/check-additional-questions-spec.cy.js

diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
index 35167726..0a305826 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/CheckAdditionalRequirements/Index.cshtml
@@ -12,10 +12,10 @@
 
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-full govuk-grid-column-two-thirds-from-desktop">
-        <h1 class="govuk-heading-xl">@Model.Heading</h1>
+        <h1 class="govuk-heading-xl" id="heading">@Model.Heading</h1>
         <dl class="govuk-summary-list">
             <div class="govuk-summary-list__row">
-                <dt class="govuk-summary-list__key">
+                <dt class="govuk-summary-list__key" id="qualification-name-label">
                     @Model.QualificationLabel
                 </dt>
                 <dd class="govuk-summary-list__value" id="qualification-name-value">
@@ -23,7 +23,7 @@
                 </dd>
             </div>
             <div class="govuk-summary-list__row">
-                <dt class="govuk-summary-list__key">
+                <dt class="govuk-summary-list__key" id="qualification-level-label">
                     @Model.QualificationLevelLabel
                 </dt>
                 <dd class="govuk-summary-list__value" id="qualification-level-value">
@@ -31,7 +31,7 @@
                 </dd>
             </div>
             <div class="govuk-summary-list__row">
-                <dt class="govuk-summary-list__key">
+                <dt class="govuk-summary-list__key" id="awarding-organisation-label">
                     @Model.AwardingOrganisationLabel
                 </dt>
                 <dd class="govuk-summary-list__value" id="awarding-organisation-value">
@@ -49,7 +49,7 @@
             
                     @if (Model.HasErrors)
                     {
-                        <p id="confirm-qualification-choice-error" class="govuk-error-message">
+                        <p id="question-choice-error" class="govuk-error-message">
                             <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
                         </p>
                     }
@@ -57,21 +57,25 @@
                     @for (var qi = 0; qi < Model.AdditionalRequirementQuestions.Count; qi++)
                     {
                         var question = Model.AdditionalRequirementQuestions[qi];
+                        var questionId = $"question_{qi}";
                         <div class="govuk-form-group">
-                            <h3 class="govuk-heading-s">@question.Question</h3>
+                            <h3 class="govuk-heading-s" id="@questionId">@question.Question</h3>
                             @if (!string.IsNullOrEmpty(question.HintText))
                             {
-                                <p>@question.HintText</p>
+                                var hintId = $"{questionId}_hint";
+                                <p id="@hintId">@question.HintText</p>
                             }
                             @if (!string.IsNullOrEmpty(question.DetailsHeading) && !string.IsNullOrEmpty(question.DetailsContent))
                             {
+                                var detailsHeadingId = $"{questionId}_details_heading";
+                                var detailsContentId = $"{questionId}_details_content";
                                 <details class="govuk-details">
                                     <summary class="govuk-details__summary">
-                                        <span class="govuk-details__summary-text">
+                                        <span class="govuk-details__summary-text" id="@detailsHeadingId">
                                             @question.DetailsHeading
                                         </span>
                                     </summary>
-                                    <div class="govuk-details__text">
+                                    <div class="govuk-details__text" id="@detailsContentId">
                                         @Html.Raw(question.DetailsContent)
                                     </div>
                                 </details>
@@ -93,7 +97,7 @@
             </div>
             <div class="govuk-warning-text">
                 <span class="govuk-warning-text__icon" aria-hidden="true">!</span>
-                <strong class="govuk-warning-text__text">
+                <strong class="govuk-warning-text__text" id="additional-requirement-warning">
                     <span class="govuk-visually-hidden">Warning</span>
                     @Model.InformationMessage
                 </strong>
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/check-additional-questions-spec.cy.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/check-additional-questions-spec.cy.js
new file mode 100644
index 00000000..ac31c28d
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/check-additional-questions-spec.cy.js
@@ -0,0 +1,36 @@
+describe("A spec that tests the check additional questions page", () => {
+    beforeEach(() => {
+        cy.setCookie('auth-secret', Cypress.env('auth_secret'));
+    })
+
+    // Mock details found in Dfe.EarlyYearsQualification.Mock.Content.MockContentfulService.  
+    it("Checks the check additional questions details are on the page", () => {
+        cy.visit("/qualifications/check-additional-questions/eyq-240");
+
+        cy.get("#heading").should("contain.text", "Check the additional requirements");
+        cy.get("#qualification-name-label").should("contain.text", "Qualification");
+        cy.get("#qualification-name-value").should("contain.text", "T Level Technical Qualification in Education and Childcare (Specialism - Early Years Educator)");
+        cy.get("#qualification-level-label").should("contain.text", "Qualification level");
+        cy.get("#awarding-organisation-label").should("contain.text", "Awarding organisation");
+        cy.get("#awarding-organisation-value").should("contain.text", "NCFE");
+        cy.get("#question_0").should("contain.text", "Test question");
+        cy.get("#question_0_hint").should("contain.text", "This is the hint text");
+        cy.get("#question_0_details_heading").should("contain.text", "This is the details heading");
+        cy.get("#question_0_details_content").should("contain.text", "This is the details content");
+        cy.get("Label[for='yes_0_0']").should("contain.text", "Yes");
+        cy.get("Label[for='no_0_1']").should("contain.text", "No");
+        cy.get("#additional-requirement-warning").should("contain.text", "Your result is dependent on the accuracy of the answers you have provided");
+        cy.get("#additional-requirement-button").should("contain.text", "Get result");
+    })
+
+    it("Shows errors if user does not select an option", () => {
+        cy.visit("/qualifications/check-additional-questions/eyq-240");
+
+        cy.get("#additional-requirement-button").click();
+
+        cy.get("#question-choice-error").should("be.visible");
+        cy.get("#question-choice-error").should("contain.text", "This is a test error message");
+
+        cy.get(".govuk-form-group--error").should("be.visible");
+    });
+})
\ No newline at end of file

From d0cb7e55e21b7a43e2f41448274053685ce876d8 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 11:22:13 +0100
Subject: [PATCH 10/14] Updated to add in new report generator step to create a
 html file of the code coverage

---
 .github/actions/run-unit-tests/action.yml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/.github/actions/run-unit-tests/action.yml b/.github/actions/run-unit-tests/action.yml
index f9070fdf..3c40cf26 100644
--- a/.github/actions/run-unit-tests/action.yml
+++ b/.github/actions/run-unit-tests/action.yml
@@ -36,6 +36,21 @@ runs:
         path: code-coverage-results.md
         message: |
           Code coverage report
+          
+    - name: Create Html coverage report
+      uses: danielpalme/ReportGenerator-GitHub-Action@5
+      if: github.actor != 'dependabot[bot]' && github.event_name == 'pull_request'
+      with:
+        reports: 'coverage/**/coverage.cobertura.xml'
+        targetdir: 'CoverageReports'
+        reporttypes: 'Html'
+        
+    - name: Upload coverage reports
+      uses: actions/upload-artifact@v4
+      if: github.actor != 'dependabot[bot]' && github.event_name == 'pull_request'
+      with:
+        name: CoverageReports
+        path: CoverageReports
     
     - name: Write to Job Summary
       shell: bash

From 4a0ee276af9e5c0350862afa63f5e266e70cdde7 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 11:29:25 +0100
Subject: [PATCH 11/14] Updated version

---
 .github/actions/run-unit-tests/action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/actions/run-unit-tests/action.yml b/.github/actions/run-unit-tests/action.yml
index 3c40cf26..45201fbb 100644
--- a/.github/actions/run-unit-tests/action.yml
+++ b/.github/actions/run-unit-tests/action.yml
@@ -38,7 +38,7 @@ runs:
           Code coverage report
           
     - name: Create Html coverage report
-      uses: danielpalme/ReportGenerator-GitHub-Action@5
+      uses: danielpalme/ReportGenerator-GitHub-Action@5.3.8
       if: github.actor != 'dependabot[bot]' && github.event_name == 'pull_request'
       with:
         reports: 'coverage/**/coverage.cobertura.xml'

From 9b5dfbbeeca2fac5d6735d154aa2a362fb40ea82 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 11:52:04 +0100
Subject: [PATCH 12/14] Added a few more unit tests

---
 .../Mocks/MockContentfulServiceTests.cs       | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
index 96a77128..1aa821a6 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -45,6 +45,45 @@ public async Task GetAdvicePage_Level2SeptAndAug_ReturnsExpectedDetails()
         result.Body!.Content[0].Should().BeAssignableTo<Paragraph>()
               .Which.Content.Should().ContainSingle(x => ((Text)x).Value == "Test Advice Page Body");
     }
+    
+    [TestMethod]
+    public async Task GetAdvicePage_QualificationsAchievedInScotland_ReturnsExpectedDetails()
+    {
+        var contentfulService = new MockContentfulService();
+
+        var result = await contentfulService.GetAdvicePage(AdvicePages.QualificationsAchievedInScotland);
+        result.Should().NotBeNull();
+        result.Should().BeAssignableTo<AdvicePage>();
+        result!.Heading.Should().Be("Qualifications achieved in Scotland");
+        result.Body!.Content[0].Should().BeAssignableTo<Paragraph>()
+              .Which.Content.Should().ContainSingle(x => ((Text)x).Value == "Test Advice Page Body");
+    }
+    
+    [TestMethod]
+    public async Task GetAdvicePage_QualificationsAchievedInWales_ReturnsExpectedDetails()
+    {
+        var contentfulService = new MockContentfulService();
+
+        var result = await contentfulService.GetAdvicePage(AdvicePages.QualificationsAchievedInWales);
+        result.Should().NotBeNull();
+        result.Should().BeAssignableTo<AdvicePage>();
+        result!.Heading.Should().Be("Qualifications achieved in Wales");
+        result.Body!.Content[0].Should().BeAssignableTo<Paragraph>()
+              .Which.Content.Should().ContainSingle(x => ((Text)x).Value == "Test Advice Page Body");
+    }
+    
+    [TestMethod]
+    public async Task GetAdvicePage_QualificationsAchievedInNorthernIreland_ReturnsExpectedDetails()
+    {
+        var contentfulService = new MockContentfulService();
+
+        var result = await contentfulService.GetAdvicePage(AdvicePages.QualificationsAchievedInNorthernIreland);
+        result.Should().NotBeNull();
+        result.Should().BeAssignableTo<AdvicePage>();
+        result!.Heading.Should().Be("Qualifications achieved in Northern Ireland");
+        result.Body!.Content[0].Should().BeAssignableTo<Paragraph>()
+              .Which.Content.Should().ContainSingle(x => ((Text)x).Value == "Test Advice Page Body");
+    }
 
     [TestMethod]
     public async Task GetAdvicePage_UnknownEntryId_ReturnsException()

From 33c1c354fa9c416e1779bc7c3e1315ed87a78269 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 11:56:49 +0100
Subject: [PATCH 13/14] Added ratio requirement to mock result

---
 .../Content/MockContentfulService.cs                         | 5 ++++-
 .../Mocks/MockContentfulServiceTests.cs                      | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index f892e091..6f79b7c7 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -187,7 +187,10 @@ public async Task<List<NavigationLink>> GetNavigationLinks()
                                                                AnswerToBeFullAndRelevant = true
                                                            }
                                                        },
-                                                       null
+                                                       new List<RatioRequirement>()
+                                                       {
+                                                           new() { RatioRequirementName = "Level 2 ratio requirements" }
+                                                       }
                                                       ));
     }
 
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
index 1aa821a6..7671d83e 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -178,6 +178,9 @@ public async Task GetQualificationById_ReturnsExpectedDetails()
         result.AdditionalRequirementQuestions[0].Answers[0].Value.Should().NotBeNullOrEmpty();
         result.AdditionalRequirementQuestions[0].Answers[1].Label.Should().NotBeNullOrEmpty();
         result.AdditionalRequirementQuestions[0].Answers[1].Value.Should().NotBeNullOrEmpty();
+        result.RatioRequirements.Should().NotBeNullOrEmpty();
+        result.RatioRequirements!.Count.Should().Be(1);
+        result.RatioRequirements[0].RatioRequirementName.Should().Be("Level 2 ratio requirements");
     }
 
     [TestMethod]

From 26e4b20895baaf6d6798ebd5de826b9cab84f488 Mon Sep 17 00:00:00 2001
From: Sam Carter <sam.carter@education.gov.uk>
Date: Tue, 23 Jul 2024 12:09:16 +0100
Subject: [PATCH 14/14] Added additional checks to the qualification mock

---
 .../Mocks/MockContentfulServiceTests.cs       | 28 +++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
index 7671d83e..dfd501cd 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -181,6 +181,34 @@ public async Task GetQualificationById_ReturnsExpectedDetails()
         result.RatioRequirements.Should().NotBeNullOrEmpty();
         result.RatioRequirements!.Count.Should().Be(1);
         result.RatioRequirements[0].RatioRequirementName.Should().Be("Level 2 ratio requirements");
+        result.RatioRequirements[0].FullAndRelevantForLevel2Before2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel2After2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel3Before2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel3After2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel4Before2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel4After2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel5Before2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel5After2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel6Before2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel6After2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel7Before2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForLevel7After2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForQtsEtcBefore2014.Should().BeFalse();
+        result.RatioRequirements[0].FullAndRelevantForQtsEtcAfter2014.Should().BeFalse();
+        result.RatioRequirements[0].RequirementForLevel2Before2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel2After2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel3Before2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel3After2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel4Before2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel4After2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel5Before2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel5After2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel6Before2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel6After2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel7Before2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForLevel7After2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForQtsEtcBefore2014.Should().BeNull();
+        result.RatioRequirements[0].RequirementForQtsEtcAfter2014.Should().BeNull();
     }
 
     [TestMethod]