From 703354ea49deecea46a520357c46dd05a8b34f89 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Wed, 26 Jun 2024 16:32:07 +0100
Subject: [PATCH 1/6] basic implementation of new confirm qualification page

---
 .../Entities/ConfirmQualificationPage.cs      | 16 ++++
 .../Services/ContentfulContentService.cs      | 15 +++-
 .../Services/IContentService.cs               |  2 +
 .../Content/MockContentfulService.cs          |  5 ++
 .../ConfirmQualificationController.cs         | 82 +++++++++++++++++
 .../Content/ConfirmQualificationPageModel.cs  | 25 ++++++
 .../Views/ConfirmQualification/index.cshtml   | 87 +++++++++++++++++++
 .../Views/QualificationDetails/Get.cshtml     |  2 +-
 .../Components/CookiesBanner/Default.cshtml   |  2 +-
 9 files changed, 233 insertions(+), 3 deletions(-)
 create mode 100644 src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml

diff --git a/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs b/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs
new file mode 100644
index 00000000..ad2a6783
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs
@@ -0,0 +1,16 @@
+namespace Dfe.EarlyYearsQualification.Content.Entities;
+
+public class ConfirmQualificationPage
+{
+    public string Heading { get; init; } = string.Empty;
+    public string QualificationLabel { get; init; } = string.Empty;
+    public string LevelLabel { get; init; } = string.Empty;
+    public string AwardingOrganisationLabel { get; init; } = string.Empty;
+    public string DateAddedLabel { get; init; } = string.Empty;
+    public string RadioHeading { get; init; } = string.Empty;
+    public List<Option> Options { get; init; } = [];
+    public string ErrorBannerHeading { get; init; } = string.Empty;
+    public string ErrorBannerLink { get; init; } = string.Empty;
+    public string ErrorText { get; init; } = string.Empty;
+    public string ButtonText { 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 2fc85f8c..c6b13365 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
@@ -26,7 +26,8 @@ private readonly Dictionary<object, string> _contentTypes
               { typeof(PhaseBanner), "phaseBanner" },
               { typeof(CookiesBanner), "cookiesBanner" },
               { typeof(DateQuestionPage), "dateQuestionPage" },
-              { typeof(DropdownQuestionPage), "dropdownQuestionPage" }
+              { typeof(DropdownQuestionPage), "dropdownQuestionPage" },
+              { typeof(ConfirmQualificationPage), "confirmQualificationPage"}
           };
 
     public async Task<StartPage?> GetStartPage()
@@ -167,6 +168,18 @@ public async Task<List<Qualification>> GetQualifications()
         return qualifications!.ToList();
     }
 
+    public async Task<ConfirmQualificationPage?> GetConfirmQualificationPage()
+    {
+        var confirmQualificationEntities = await GetEntriesByType<ConfirmQualificationPage>();
+        if (confirmQualificationEntities is null || !confirmQualificationEntities.Any())
+        {
+            logger.LogWarning("No confirm qualification page entry returned");
+            return default;
+        }
+
+        return confirmQualificationEntities.First();
+    }
+
     private async Task<T?> GetEntryById<T>(string entryId)
     {
         try
diff --git a/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs b/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
index e873d887..a7119c6c 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
@@ -29,4 +29,6 @@ public interface IContentService
     Task<DropdownQuestionPage?> GetDropdownQuestionPage(string entryId);
 
     Task<List<Qualification>> GetQualifications();
+
+    Task<ConfirmQualificationPage?> GetConfirmQualificationPage();
 }
\ 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 d64005e4..4a613033 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -183,6 +183,11 @@ public Task<List<Qualification>> GetQualifications()
                                });
     }
 
+    public Task<ConfirmQualificationPage?> GetConfirmQualificationPage()
+    {
+        throw new NotImplementedException();
+    }
+
     public async Task<StartPage?> GetStartPage()
     {
         var preCtaButtonContent =
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
new file mode 100644
index 00000000..19558b9c
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
@@ -0,0 +1,82 @@
+using Dfe.EarlyYearsQualification.Content.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 Microsoft.AspNetCore.Mvc;
+
+namespace Dfe.EarlyYearsQualification.Web.Controllers;
+
+[Route("confirm-qualification")]
+public class ConfirmQualificationController(
+    ILogger<ConfirmQualificationController> logger,
+    IContentService contentService)
+    : ServiceController
+{
+    [HttpGet]
+    [Route("{qualificationId}")]
+    public async Task<IActionResult> Index(string qualificationId)
+    {
+        if (string.IsNullOrEmpty(qualificationId))
+        {
+            return BadRequest();
+        }
+        
+        var content = await contentService.GetConfirmQualificationPage();
+
+        if (content is null)
+        {
+            logger.LogError("No content for the cookies page");
+            return RedirectToAction("Index", "Error");
+        }
+
+        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");
+        }
+
+        var model = Map(content, qualification);
+
+        return View(model);
+    }
+
+    [HttpPost]
+    public IActionResult Confirm(string qualificationId)
+    {
+        if (string.IsNullOrEmpty(qualificationId))
+        {
+            return BadRequest();
+        }
+        
+        return RedirectToAction("Index", "QualificationDetails", new { qualificationId = qualificationId });
+    }
+    
+    private static ConfirmQualificationPageModel Map(ConfirmQualificationPage content, Qualification qualification)
+    {
+        return new ConfirmQualificationPageModel
+               {
+                   Heading = content.Heading,
+                   Options = content.Options.Select(x => new OptionModel { Label = x.Label, Value = x.Value }).ToList(),
+                   ErrorText = content.ErrorText,
+                   LevelLabel = content.LevelLabel,
+                   QualificationLabel = content.QualificationLabel,
+                   RadioHeading = content.RadioHeading,
+                   DateAddedLabel = content.DateAddedLabel,
+                   AwardingOrganisationLabel = content.AwardingOrganisationLabel,
+                   ErrorBannerHeading = content.ErrorBannerHeading,
+                   ErrorBannerLink = content.ErrorBannerLink,
+                   ButtonText = content.ButtonText,
+                   HasErrors = false,
+                   QualificationName = qualification.QualificationName,
+                   QualificationLevel = qualification.QualificationLevel.ToString(),
+                   QualificationId = qualification.QualificationId,
+                   QualificationAwardingOrganisation = qualification.AwardingOrganisationTitle,
+                   QualificationDateAdded = ""
+               };
+    }
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
new file mode 100644
index 00000000..1b58b490
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
@@ -0,0 +1,25 @@
+using Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
+
+namespace Dfe.EarlyYearsQualification.Web.Models.Content;
+
+public class ConfirmQualificationPageModel
+{
+    public string Heading { get; init; } = string.Empty;
+    public string QualificationLabel { get; init; } = string.Empty;
+    public string LevelLabel { get; init; } = string.Empty;
+    public string AwardingOrganisationLabel { get; init; } = string.Empty;
+    public string DateAddedLabel { get; init; } = string.Empty;
+    public string RadioHeading { get; init; } = string.Empty;
+    public List<OptionModel> Options { get; init; } = [];
+    public bool HasErrors { get; set; } = false;
+    public string ErrorBannerHeading { get; init; } = string.Empty;
+    public string ErrorBannerLink { get; init; } = string.Empty;
+    public string ErrorText { get; init; } = string.Empty;
+    public string ConfirmQualificationAnswer => "ConfirmQualificationAnswer";
+    public string ButtonText { get; init; } = string.Empty;
+    public string QualificationId { get; init; } = string.Empty;
+    public string QualificationName { get; init; } = string.Empty;
+    public string QualificationLevel { get; init; } = string.Empty;
+    public string QualificationAwardingOrganisation { get; init; } = string.Empty;
+    public string QualificationDateAdded { get; init; } = string.Empty;
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
new file mode 100644
index 00000000..a5ed2775
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
@@ -0,0 +1,87 @@
+@model Dfe.EarlyYearsQualification.Web.Models.Content.ConfirmQualificationPageModel
+
+@{
+    ViewData["Title"] = "Confirm Qualification";
+}
+
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds-from-desktop">
+        @if (Model.HasErrors)
+        {
+            <div class="govuk-error-summary" data-module="govuk-error-summary">
+                <div role="alert">
+                    <h2 class="govuk-error-summary__title">
+                        @Model.ErrorBannerHeading
+                    </h2>
+                    <div class="govuk-error-summary__body">
+                        <ul class="govuk-list govuk-error-summary__list">
+                            <li>
+                                <a>@Model.ErrorBannerLink</a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            </div>
+        }
+        <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">
+                    @Model.QualificationName
+                </dd>
+            </div>
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    @Model.LevelLabel
+                </dt>
+                <dd class="govuk-summary-list__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">
+                    @Model.QualificationAwardingOrganisation
+                </dd>
+            </div>
+            <div class="govuk-summary-list__row">
+                <dt class="govuk-summary-list__key">
+                    @Model.DateAddedLabel
+                </dt>
+                <dd class="govuk-summary-list__value">
+                    @Model.QualificationDateAdded
+                </dd>
+            </div>
+        </dl>
+        <form id="confirm-qualification" asp-controller="ConfirmQualification" asp-action="Confirm" method="post">
+            <input type="hidden" name="qualificationId" value="@Model.QualificationId">
+            <div id="confirm-qualification-form-group" class="govuk-form-group">
+                <h4 class="govuk-heading-m">@Model.RadioHeading</h4>
+                <fieldset class="govuk-fieldset" role="group" aria-describedby="confirm-qualification-choice-error">
+                    <p id="confirm-qualification-choice-error" class="govuk-error-message" hidden>
+                        <span class="govuk-visually-hidden">Error:</span> @Model.ErrorText
+                    </p>
+                    @foreach (var option in Model.Options)
+                    {
+                        <div class="govuk-radios__item">
+                            @Html.RadioButtonFor(x => x.ConfirmQualificationAnswer, option.Value, new { @class = "govuk-radios__input", id = option.Value })
+                            <label class="govuk-label govuk-radios__label" for="@option.Value">
+                                @option.Label
+                            </label>
+                        </div>
+                    }
+                </fieldset>
+            </div>
+            <div class="govuk-form-group">
+                <button id="confirm-qualification-button" class="govuk-button" data-module="govuk-button">
+                    @Model.ButtonText
+                </button>
+            </div>
+        </form>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
index a7d14f19..20a7517e 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
@@ -49,7 +49,7 @@
             @foreach (var qualification in qualifications)
             {
                 <tr class="govuk-table__row">
-                    <td class="govuk-table__cell">@Html.ActionLink(qualification, "Index", new { qualificationId = qualification })</td>
+                    <td class="govuk-table__cell">@Html.ActionLink(qualification, "Index", "ConfirmQualification", new { qualificationId = qualification })</td>
                 </tr>
             }
             </tbody>
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Shared/Components/CookiesBanner/Default.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Shared/Components/CookiesBanner/Default.cshtml
index ba9bed77..1a8d008b 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/Shared/Components/CookiesBanner/Default.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Shared/Components/CookiesBanner/Default.cshtml
@@ -53,7 +53,7 @@
 }
 else if ((cookie.HasApproved || cookie.IsRejected) && cookie.IsVisible)
 {
-    <form method="post" asp-controller="Cookies" asp-action="HideBanner">
+    <form method="post" asp-controller="CookiesPreference" asp-action="HideBanner">
         <input type="hidden" id="returnUrlHideBanner" name="returnUrl"/>
         <div id="cookies-preference-chosen" class="govuk-cookie-banner" data-nosnippet role="region" aria-label="Cookies on [name of service]">
             <div class="govuk-cookie-banner__message govuk-width-container">

From 0d53cc0d3bb7ae28f76c1ec41f5ebf8a58fa9e35 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Thu, 27 Jun 2024 11:19:21 +0100
Subject: [PATCH 2/6] Added back button, form post logic, and fix from previous
 main merge

---
 .../Entities/ConfirmQualificationPage.cs      |  1 +
 .../Services/ContentfulContentService.cs      |  1 -
 .../ConfirmQualificationController.cs         | 38 ++++++++++++++++---
 .../Content/ConfirmQualificationPageModel.cs  |  5 ++-
 .../Views/ConfirmQualification/index.cshtml   | 17 ++++++---
 5 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs b/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs
index ad2a6783..9b5b653c 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Entities/ConfirmQualificationPage.cs
@@ -13,4 +13,5 @@ public class ConfirmQualificationPage
     public string ErrorBannerLink { get; init; } = string.Empty;
     public string ErrorText { get; init; } = string.Empty;
     public string ButtonText { get; init; } = string.Empty;
+    public NavigationLink? BackButton { get; init; }
 }
\ 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 d908029f..7353ebc3 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
@@ -28,7 +28,6 @@ private readonly Dictionary<object, string> _contentTypes
               { typeof(DateQuestionPage), "dateQuestionPage" },
               { typeof(DropdownQuestionPage), "dropdownQuestionPage" },
               { typeof(ConfirmQualificationPage), "confirmQualificationPage"},
-              { typeof(DropdownQuestionPage), "dropdownQuestionPage" },
               { typeof(QualificationListPage), "qualificationListPage"}
           };
 
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
index 19558b9c..93722374 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
@@ -46,14 +46,41 @@ public async Task<IActionResult> Index(string qualificationId)
     }
 
     [HttpPost]
-    public IActionResult Confirm(string qualificationId)
+    public async Task<IActionResult> Confirm(ConfirmQualificationPageModel model)
     {
-        if (string.IsNullOrEmpty(qualificationId))
+        if (!ModelState.IsValid || string.IsNullOrEmpty(model.ConfirmQualificationAnswer))
         {
-            return BadRequest();
+            var content = await contentService.GetConfirmQualificationPage();
+
+            if (content is null)
+            {
+                logger.LogError("No content for the cookies page");
+                return RedirectToAction("Index", "Error");
+            }
+
+            var qualification = await contentService.GetQualificationById(model.QualificationId);
+            if (qualification is null)
+            {
+                var loggedQualificationId = model.QualificationId.Replace(Environment.NewLine, "");
+                logger.LogError("Could not find details for qualification with ID: {QualificationId}",
+                                loggedQualificationId);
+
+                return RedirectToAction("Index", "Error");
+            }
+
+            model = Map(content, qualification);
+            model.HasErrors = true;
+
+            return View("Index", model);
         }
         
-        return RedirectToAction("Index", "QualificationDetails", new { qualificationId = qualificationId });
+        if (model.ConfirmQualificationAnswer == "yes")
+        {
+            return RedirectToAction("Index", "QualificationDetails", new { qualificationId = model.QualificationId });
+        }
+        
+        return RedirectToAction("Get", "QualificationDetails");
+
     }
     
     private static ConfirmQualificationPageModel Map(ConfirmQualificationPage content, Qualification qualification)
@@ -76,7 +103,8 @@ private static ConfirmQualificationPageModel Map(ConfirmQualificationPage conten
                    QualificationLevel = qualification.QualificationLevel.ToString(),
                    QualificationId = qualification.QualificationId,
                    QualificationAwardingOrganisation = qualification.AwardingOrganisationTitle,
-                   QualificationDateAdded = ""
+                   QualificationDateAdded = qualification.FromWhichYear!,
+                   BackButton = content.BackButton,
                };
     }
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
index 1b58b490..63165471 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
@@ -1,3 +1,5 @@
+using System.ComponentModel.DataAnnotations;
+using Dfe.EarlyYearsQualification.Content.Entities;
 using Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
 
 namespace Dfe.EarlyYearsQualification.Web.Models.Content;
@@ -15,11 +17,12 @@ public class ConfirmQualificationPageModel
     public string ErrorBannerHeading { get; init; } = string.Empty;
     public string ErrorBannerLink { get; init; } = string.Empty;
     public string ErrorText { get; init; } = string.Empty;
-    public string ConfirmQualificationAnswer => "ConfirmQualificationAnswer";
+    [Required] public string? ConfirmQualificationAnswer { get; init; } = string.Empty;
     public string ButtonText { get; init; } = string.Empty;
     public string QualificationId { get; init; } = string.Empty;
     public string QualificationName { get; init; } = string.Empty;
     public string QualificationLevel { get; init; } = string.Empty;
     public string QualificationAwardingOrganisation { get; init; } = string.Empty;
     public string QualificationDateAdded { get; init; } = string.Empty;
+    public NavigationLink? BackButton { get; init; }
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
index a5ed2775..33efab46 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
@@ -4,6 +4,10 @@
     ViewData["Title"] = "Confirm Qualification";
 }
 
+@{
+    await Html.RenderPartialAsync("Partials/BackButton", @Model.BackButton);
+}
+
 <div class="govuk-grid-row">
     <div class="govuk-grid-column-two-thirds-from-desktop">
         @if (Model.HasErrors)
@@ -16,7 +20,7 @@
                     <div class="govuk-error-summary__body">
                         <ul class="govuk-list govuk-error-summary__list">
                             <li>
-                                <a>@Model.ErrorBannerLink</a>
+                                <a href="#confirm-qualification-choice-error">@Model.ErrorBannerLink</a>
                             </li>
                         </ul>
                     </div>
@@ -60,12 +64,15 @@
         </dl>
         <form id="confirm-qualification" asp-controller="ConfirmQualification" asp-action="Confirm" method="post">
             <input type="hidden" name="qualificationId" value="@Model.QualificationId">
-            <div id="confirm-qualification-form-group" class="govuk-form-group">
+            <div id="confirm-qualification-form-group" class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
                 <h4 class="govuk-heading-m">@Model.RadioHeading</h4>
                 <fieldset class="govuk-fieldset" role="group" aria-describedby="confirm-qualification-choice-error">
-                    <p id="confirm-qualification-choice-error" class="govuk-error-message" hidden>
-                        <span class="govuk-visually-hidden">Error:</span> @Model.ErrorText
-                    </p>
+                    @if (Model.HasErrors)
+                    {
+                        <p id="confirm-qualification-choice-error" class="govuk-error-message">
+                            <span class="govuk-visually-hidden">Error:</span> @Model.ErrorText
+                        </p>
+                    }
                     @foreach (var option in Model.Options)
                     {
                         <div class="govuk-radios__item">

From 80b3014d0ae7ebc1c05b78166d4266ee4dedd34e Mon Sep 17 00:00:00 2001
From: RobertGHippo <robert.gammon@education.gov.uk>
Date: Fri, 28 Jun 2024 16:35:17 +0100
Subject: [PATCH 3/6] Check renderer renders appropriate div.

---
 .../Renderers/InsetTextRendererTests.cs       | 72 ++++++++++++++++++-
 1 file changed, 70 insertions(+), 2 deletions(-)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Renderers/InsetTextRendererTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Renderers/InsetTextRendererTests.cs
index 51c0c50e..13fd9330 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Renderers/InsetTextRendererTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Renderers/InsetTextRendererTests.cs
@@ -1,9 +1,11 @@
 using Contentful.Core;
+using Contentful.Core.Configuration;
 using Contentful.Core.Models;
 using Dfe.EarlyYearsQualification.Content.Entities;
 using Dfe.EarlyYearsQualification.Content.Renderers.GovUk;
 using FluentAssertions;
 using Moq;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Dfe.EarlyYearsQualification.UnitTests.Renderers;
@@ -58,7 +60,7 @@ public void InsetTextRenderer_DataTargetIsEmptyCustomNode_NotSupported()
     }
 
     [TestMethod]
-    public void InsetTextRenderer_DataTargetIsCustomNodeWithJObject_OtherId_Supported()
+    public void InsetTextRenderer_DataTargetIsCustomNodeWithJObject_OtherId_NotSupported()
     {
         var contentClientMock = new Mock<IContentfulClient>();
 
@@ -95,7 +97,7 @@ public void InsetTextRenderer_DataTargetIsCustomNodeWithJObject_OtherId_Supporte
     }
 
     [TestMethod]
-    public void InsetTextRenderer_DataTargetIsCustomNodeWithJObject_Supported()
+    public void InsetTextRenderer_DataTargetIsCustomNodeWithJObject_IsSupported()
     {
         var contentClientMock = new Mock<IContentfulClient>();
 
@@ -150,4 +152,70 @@ public void InsetTextRenderer_DoesNotSupportHyperlink()
 
         new InsetTextRenderer(contentClientMock.Object).SupportsContent(list).Should().BeFalse();
     }
+
+    [TestMethod]
+    public async Task InsetTextRenderer_RendersDivWithId()
+    {
+        var innerDocument = new Document { Content = [] };
+        // ...we haven't worked out yet how to test this _with_ inner content,
+        // there is some Contentful SDK inner magic involved that is hard to replicate.
+
+        var govUkInsetTextModel = new GovUkInsetTextModel
+                                  {
+                                      Content = JObject.FromObject(innerDocument),
+                                      Sys =
+                                      {
+                                          ContentType = new ContentType
+                                                        {
+                                                            SystemProperties = new SystemProperties
+                                                                               {
+                                                                                   Id = "govUkInsetText"
+                                                                               }
+                                                        }
+                                      }
+                                  };
+
+        var jObject = JObject.FromObject(govUkInsetTextModel);
+
+        var customNode = new CustomNode
+                         {
+                             JObject = jObject
+                         };
+
+        var content = new EntryStructure
+                      {
+                          Data = new EntryStructureData
+                                 {
+                                     Target = customNode
+                                 }
+                      };
+
+        var renderer = new InsetTextRenderer(CreateMockContentfulContentClient());
+
+        var result = await renderer.RenderAsync(content);
+
+        result.Should().Be("<div class=\"govuk-inset-text\"></div>");
+    }
+
+    private static IContentfulClient CreateMockContentfulContentClient()
+    {
+        var contentClientMock = new Mock<IContentfulClient>();
+
+        var serializerSettings = new JsonSerializerSettings
+                                 {
+                                     Converters =
+                                     [
+                                         new AssetJsonConverter(),
+                                         new ContentJsonConverter()
+                                     ],
+                                     TypeNameHandling = TypeNameHandling.All
+                                 }; // This is what a real ContentfulClient would have
+
+        contentClientMock.SetupGet(c => c.SerializerSettings)
+                         .Returns(serializerSettings);
+
+        contentClientMock.SetupGet(c => c.ResolveEntriesSelectively).Returns(true);
+
+        return contentClientMock.Object;
+    }
 }
\ No newline at end of file

From 6a89fe23c7bc6f6c8eccf832b2ad91bcf9f7ffb3 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Mon, 1 Jul 2024 14:16:37 +0100
Subject: [PATCH 4/6] added new unit tests

---
 .../Content/MockContentfulService.cs          |  35 +-
 .../ConfirmQualificationController.cs         |  16 +-
 .../Content/ConfirmQualificationPageModel.cs  |   2 +-
 .../ConfirmQualificationControllerTests.cs    | 480 ++++++++++++++++++
 .../Mocks/MockContentfulServiceTests.cs       |  38 ++
 5 files changed, 560 insertions(+), 11 deletions(-)
 create mode 100644 tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index eaec5bec..747e182f 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -215,9 +215,40 @@ public Task<List<Qualification>> GetQualifications()
                                    });
     }
 
-    public Task<ConfirmQualificationPage?> GetConfirmQualificationPage()
+    public async Task<ConfirmQualificationPage?> GetConfirmQualificationPage()
     {
-        throw new NotImplementedException();
+        return await Task.FromResult(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"
+               });
     }
 
     public async Task<StartPage?> GetStartPage()
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
index 93722374..dfea8c82 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/ConfirmQualificationController.cs
@@ -48,7 +48,7 @@ public async Task<IActionResult> Index(string qualificationId)
     [HttpPost]
     public async Task<IActionResult> Confirm(ConfirmQualificationPageModel model)
     {
-        if (!ModelState.IsValid || string.IsNullOrEmpty(model.ConfirmQualificationAnswer))
+        if (!ModelState.IsValid)
         {
             var content = await contentService.GetConfirmQualificationPage();
 
@@ -58,6 +58,12 @@ public async Task<IActionResult> Confirm(ConfirmQualificationPageModel model)
                 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)
             {
@@ -74,13 +80,7 @@ public async Task<IActionResult> Confirm(ConfirmQualificationPageModel model)
             return View("Index", model);
         }
         
-        if (model.ConfirmQualificationAnswer == "yes")
-        {
-            return RedirectToAction("Index", "QualificationDetails", new { qualificationId = model.QualificationId });
-        }
-        
-        return RedirectToAction("Get", "QualificationDetails");
-
+        return model.ConfirmQualificationAnswer == "yes" ? RedirectToAction("Index", "QualificationDetails", new { qualificationId = model.QualificationId }) : RedirectToAction("Get", "QualificationDetails");
     }
     
     private static ConfirmQualificationPageModel Map(ConfirmQualificationPage content, Qualification qualification)
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
index 63165471..641c8a15 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/ConfirmQualificationPageModel.cs
@@ -19,7 +19,7 @@ public class ConfirmQualificationPageModel
     public string ErrorText { get; init; } = string.Empty;
     [Required] public string? ConfirmQualificationAnswer { get; init; } = string.Empty;
     public string ButtonText { get; init; } = string.Empty;
-    public string QualificationId { get; init; } = string.Empty;
+    [Required] public string QualificationId { get; init; } = string.Empty;
     public string QualificationName { get; init; } = string.Empty;
     public string QualificationLevel { get; init; } = string.Empty;
     public string QualificationAwardingOrganisation { get; init; } = string.Empty;
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs
new file mode 100644
index 00000000..5457e20d
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/ConfirmQualificationControllerTests.cs
@@ -0,0 +1,480 @@
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Dfe.EarlyYearsQualification.Content.Services;
+using Dfe.EarlyYearsQualification.UnitTests.Extensions;
+using Dfe.EarlyYearsQualification.Web.Controllers;
+using Dfe.EarlyYearsQualification.Web.Models.Content;
+using FluentAssertions;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using Moq;
+
+namespace Dfe.EarlyYearsQualification.UnitTests.Controllers;
+
+[TestClass]
+public class ConfirmQualificationControllerTests
+{
+    [TestMethod]
+    [DataRow(null)]
+    [DataRow("")]
+    public async Task Index_NullOrEmptyIdPassed_ReturnsBadRequest(string id)
+    {
+        var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
+        var mockContentService = new Mock<IContentService>();
+
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+
+        var result = await controller.Index(id);
+
+        result.Should().NotBeNull();
+        result.Should().BeOfType(typeof(BadRequestResult));
+    }
+
+    [TestMethod]
+    public async Task Index_ContentServiceCantFindPageDetails_LogsAndReturnsErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
+        var mockContentService = new Mock<IContentService>();
+
+        mockContentService.Setup(x => x.GetConfirmQualificationPage()).ReturnsAsync(default(ConfirmQualificationPage?));
+        
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+        
+        var result = await controller.Index("Some ID");
+        
+        result.Should().BeOfType<RedirectToActionResult>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Index");
+        actionResult.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("No content for the cookies page");
+    }
+
+    [TestMethod]
+    public async Task Index_CantFindQualification_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);
+        
+        var result = await controller.Index("Some ID");
+        
+        result.Should().BeOfType<RedirectToActionResult>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Index");
+        actionResult.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("Could not find details for qualification with ID: Some ID");
+    }
+
+    [TestMethod]
+    public async Task Index_PageDetailsAndQualificationFound_MapsModelAndReturnsView()
+    {
+        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(new Qualification("Some ID", "Qualification Name", "NCFE", 2, "2014", "2019",
+         "ABC/547/900", "additional requirements"));
+        
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+        
+        var result = await controller.Index("Some ID");
+        
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+
+        var model = resultType!.Model as ConfirmQualificationPageModel;
+        model.Should().NotBeNull();
+
+        model!.BackButton.Should().BeEquivalentTo(new NavigationLink
+                                                 {
+                                                     DisplayText = "Test back button",
+                                                     OpenInNewTab = false,
+                                                     Href = "/qualifications"
+                                                 });
+        model.HasErrors.Should().BeFalse();
+        model.Options.Should().BeEquivalentTo([
+                                                  new Option
+                                                  {
+                                                      Label = "yes",
+                                                      Value = "yes"
+                                                  },
+                                                  new Option
+                                                  {
+                                                      Label = "no",
+                                                      Value = "no"
+                                                  }
+                                              ]);
+        model.Heading.Should().Be("Test heading");
+        model.ButtonText.Should().Be("Test button text");
+        model.ErrorText.Should().Be("Test error text");
+        model.LevelLabel.Should().Be("Test level label");
+        model.QualificationId.Should().Be("Some ID");
+        model.QualificationLabel.Should().Be("Test qualification label");
+        model.QualificationLevel.Should().Be("2");
+        model.QualificationName.Should().Be("Qualification Name");
+        model.RadioHeading.Should().Be("Test radio heading");
+        model.AwardingOrganisationLabel.Should().Be("Test awarding organisation label");
+        model.ConfirmQualificationAnswer.Should().Be(string.Empty);
+        model.DateAddedLabel.Should().Be("Test date added label");
+        model.ErrorBannerHeading.Should().Be("Test error banner heading");
+        model.ErrorBannerLink.Should().Be("Test error banner link");
+        model.QualificationAwardingOrganisation.Should().Be("NCFE");
+        model.QualificationDateAdded.Should().Be("2014");
+    }
+
+    [TestMethod]
+    public async Task Post_InvalidModel_CantGetPageContent_LogsAndReturnsError()
+    {
+        var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
+        var mockContentService = new Mock<IContentService>();
+
+        mockContentService.Setup(x => x.GetConfirmQualificationPage()).ReturnsAsync(default(ConfirmQualificationPage?));
+        
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+
+        controller.ModelState.AddModelError("test", "error");
+        
+        var result = await controller.Confirm(new ConfirmQualificationPageModel());
+        
+        result.Should().BeOfType<RedirectToActionResult>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Index");
+        actionResult.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("No content for the cookies page");
+    }
+
+    [TestMethod]
+    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>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Index");
+        actionResult.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("No qualification id provided");
+    }
+
+    [TestMethod]
+    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);
+        
+        controller.ModelState.AddModelError("test", "error");
+        
+        var result = await controller.Confirm(new ConfirmQualificationPageModel()
+                                              {
+                                                  QualificationId = "Some ID"
+                                              });
+        
+        result.Should().BeOfType<RedirectToActionResult>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Index");
+        actionResult.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("Could not find details for qualification with ID: Some ID");
+    }
+
+    [TestMethod]
+    public async Task Post_InvalidModel_BuildsModelWithHasErrorsAndReturns()
+    {
+        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(new Qualification("Some ID", "Qualification Name", "NCFE", 2, "2014", "2019",
+         "ABC/547/900", "additional requirements"));
+        
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+        
+        controller.ModelState.AddModelError("test", "error");
+        
+        var result = await controller.Confirm(new ConfirmQualificationPageModel()
+                                              {
+                                                  QualificationId = "Some ID",
+                                              });
+        
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+
+        var model = resultType!.Model as ConfirmQualificationPageModel;
+        model.Should().NotBeNull();
+
+        model!.BackButton.Should().BeEquivalentTo(new NavigationLink
+                                                 {
+                                                     DisplayText = "Test back button",
+                                                     OpenInNewTab = false,
+                                                     Href = "/qualifications"
+                                                 });
+        model.HasErrors.Should().BeTrue();
+        model.Options.Should().BeEquivalentTo([
+                                                  new Option
+                                                  {
+                                                      Label = "yes",
+                                                      Value = "yes"
+                                                  },
+                                                  new Option
+                                                  {
+                                                      Label = "no",
+                                                      Value = "no"
+                                                  }
+                                              ]);
+        model.Heading.Should().Be("Test heading");
+        model.ButtonText.Should().Be("Test button text");
+        model.ErrorText.Should().Be("Test error text");
+        model.LevelLabel.Should().Be("Test level label");
+        model.QualificationId.Should().Be("Some ID");
+        model.QualificationLabel.Should().Be("Test qualification label");
+        model.QualificationLevel.Should().Be("2");
+        model.QualificationName.Should().Be("Qualification Name");
+        model.RadioHeading.Should().Be("Test radio heading");
+        model.AwardingOrganisationLabel.Should().Be("Test awarding organisation label");
+        model.ConfirmQualificationAnswer.Should().Be(string.Empty);
+        model.DateAddedLabel.Should().Be("Test date added label");
+        model.ErrorBannerHeading.Should().Be("Test error banner heading");
+        model.ErrorBannerLink.Should().Be("Test error banner link");
+        model.QualificationAwardingOrganisation.Should().Be("NCFE");
+        model.QualificationDateAdded.Should().Be("2014");
+    }
+
+    [TestMethod]
+    public async Task Post_ValidModel_PassedYes_RedirectsToQualificaitonDetailsAction()
+    {
+        var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
+        var mockContentService = new Mock<IContentService>();
+
+        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("QualificationDetails");
+        actionResult.RouteValues.Should().ContainSingle("qualificationId", "TEST-123");
+    }
+    
+    [TestMethod]
+    public async Task Post_ValidModel_PassedAnythingButYes_RedirectsBackToTheQualificationDetailsAction()
+    {
+        var mockLogger = new Mock<ILogger<ConfirmQualificationController>>();
+        var mockContentService = new Mock<IContentService>();
+
+        var controller = new ConfirmQualificationController(mockLogger.Object, mockContentService.Object);
+
+        var result = await controller.Confirm(new ConfirmQualificationPageModel
+                                              {
+                                                  QualificationId = "TEST-123",
+                                                  ConfirmQualificationAnswer = "not yes"
+                                              });
+        
+        result.Should().BeOfType<RedirectToActionResult>();
+
+        var actionResult = (RedirectToActionResult)result;
+
+        actionResult.ActionName.Should().Be("Get");
+        actionResult.ControllerName.Should().Be("QualificationDetails");
+    }
+}
\ 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 d6e8220e..e69ae833 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -257,6 +257,44 @@ public async Task GetQualificationListPage_ReturnsCorrectMockData()
                                                   });
     }
 
+    [TestMethod]
+    public async Task GetConfirmQualificationPage_ReturnsCorrectMockData()
+    {
+        var contentfulService = new MockContentfulService();
+
+        var result = await contentfulService.GetConfirmQualificationPage();
+
+        result.Should().NotBeNull();
+        result!.Options.Should().BeEquivalentTo([
+                                                    new Option
+                                                    {
+                                                        Label = "yes",
+                                                        Value = "yes"
+                                                    },
+                                                    new Option
+                                                    {
+                                                        Label = "no",
+                                                        Value = "no"
+                                                    }
+                                                ]);
+        result.BackButton.Should().BeEquivalentTo(new NavigationLink
+                                                  {
+                                                      DisplayText = "Test back button",
+                                                      OpenInNewTab = false,
+                                                      Href = "/qualifications"
+                                                  });
+        result.LevelLabel.Should().Be("Test level label");
+        result.ButtonText.Should().Be("Test button text");
+        result.ErrorText.Should().Be("Test error text");
+        result.Heading.Should().Be("Test heading");
+        result.QualificationLabel.Should().Be("Test qualification label");
+        result.RadioHeading.Should().Be("Test radio heading");
+        result.AwardingOrganisationLabel.Should().Be("Test awarding organisation label");
+        result.DateAddedLabel.Should().Be("Test date added label");
+        result.ErrorBannerHeading.Should().Be("Test error banner heading");
+        result.ErrorBannerLink.Should().Be("Test error banner link");
+    }
+
     [TestMethod]
     public async Task GetStartPage_ReturnsExpectedDetails()
     {

From 9e5fdac4190cd4ecada27bd268151b73d023fe12 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Tue, 2 Jul 2024 10:55:18 +0100
Subject: [PATCH 5/6] added end to end tests and page test

---
 .../Content/MockContentfulService.cs          |  2 +-
 .../Views/ConfirmQualification/index.cshtml   | 16 +++----
 .../e2e/journey/back-button-spec.cy.js        | 18 +++++++-
 .../cypress/e2e/journey/journey-spec.cy.js    | 14 +++++--
 .../pages/confirm-qualification-spec.cy.js    | 42 +++++++++++++++++++
 5 files changed, 78 insertions(+), 14 deletions(-)
 create mode 100644 tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/confirm-qualification-spec.cy.js

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index 747e182f..6d5256b7 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -98,7 +98,7 @@ await Task.FromResult(CreateAdvicePage("Qualifications achieved outside the Unit
                                          BackButton = new NavigationLink
                                                       {
                                                           DisplayText = "TEST",
-                                                          Href = "/qualifications",
+                                                          Href = "/confirm-qualification/eyq-240",
                                                           OpenInNewTab = false
                                                       }
                                      });
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
index 33efab46..115eead4 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/ConfirmQualification/index.cshtml
@@ -12,7 +12,7 @@
     <div class="govuk-grid-column-two-thirds-from-desktop">
         @if (Model.HasErrors)
         {
-            <div class="govuk-error-summary" data-module="govuk-error-summary">
+            <div id="error-banner" class="govuk-error-summary" data-module="govuk-error-summary">
                 <div role="alert">
                     <h2 class="govuk-error-summary__title">
                         @Model.ErrorBannerHeading
@@ -20,16 +20,16 @@
                     <div class="govuk-error-summary__body">
                         <ul class="govuk-list govuk-error-summary__list">
                             <li>
-                                <a href="#confirm-qualification-choice-error">@Model.ErrorBannerLink</a>
+                                <a id="error-banner-link" href="#confirm-qualification-choice-error">@Model.ErrorBannerLink</a>
                             </li>
                         </ul>
                     </div>
                 </div>
             </div>
         }
-        <h1 class="govuk-heading-xl">@Model.Heading</h1>
+        <h1 id="heading" class="govuk-heading-xl">@Model.Heading</h1>
         <dl class="govuk-summary-list">
-            <div class="govuk-summary-list__row">
+            <div id="qualification-name-row" class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
                     @Model.QualificationLabel
                 </dt>
@@ -37,7 +37,7 @@
                     @Model.QualificationName
                 </dd>
             </div>
-            <div class="govuk-summary-list__row">
+            <div id="qualification-level-row" class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
                     @Model.LevelLabel
                 </dt>
@@ -45,7 +45,7 @@
                     @Model.QualificationLevel
                 </dd>
             </div>
-            <div class="govuk-summary-list__row">
+            <div id="qualification-org-row" class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
                     @Model.AwardingOrganisationLabel
                 </dt>
@@ -53,7 +53,7 @@
                     @Model.QualificationAwardingOrganisation
                 </dd>
             </div>
-            <div class="govuk-summary-list__row">
+            <div id="qualification-date-added-row" class="govuk-summary-list__row">
                 <dt class="govuk-summary-list__key">
                     @Model.DateAddedLabel
                 </dt>
@@ -65,7 +65,7 @@
         <form id="confirm-qualification" asp-controller="ConfirmQualification" asp-action="Confirm" 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" : "")">
-                <h4 class="govuk-heading-m">@Model.RadioHeading</h4>
+                <h4 id="radio-heading" class="govuk-heading-m">@Model.RadioHeading</h4>
                 <fieldset class="govuk-fieldset" role="group" aria-describedby="confirm-qualification-choice-error">
                     @if (Model.HasErrors)
                     {
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 aa8144d7..4f196148 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
@@ -47,16 +47,30 @@ describe('A spec used to test the main back button route through the journey', (
             expect(loc.pathname).to.eq('/qualifications');
         })
 
-        cy.get('a[href="/qualifications/qualification-details/eyq-240"]').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-240');
+        })
+
+        cy.get('#yes').click();
+        cy.get('button[id="confirm-qualification-button"]').click();
 
         // qualifications page (This is only a temporary page)
         cy.location().should((loc) => {
-            expect(loc.pathname).to.eq('/qualifications/qualification-details/eyq-240');
+            expect(loc.pathname).to.eq('/qualifications/qualification-details/EYQ-240');
         })
         
         /// Time to go back through the journey!
         cy.get('#back-button').click();
 
+        cy.location().should((loc) => {
+            expect(loc.pathname).to.eq('/confirm-qualification/eyq-240');
+        })
+        
+        cy.get('#back-button').click();
+
         cy.location().should((loc) => {
             expect(loc.pathname).to.eq('/qualifications');
         })
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 59d02400..6764544b 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
@@ -65,11 +65,19 @@ describe('A spec used to test the various routes through the journey', () => {
       expect(loc.pathname).to.eq('/qualifications');
     })
 
-    cy.get('a[href="/qualifications/qualification-details/eyq-240"]').click();
+    cy.get('a[href="/confirm-qualification/eyq-240"]').click();
 
-    // qualifications page (This is only a temporary page)
+    // confirm qualification page
+    cy.location().should((loc) => {
+      expect(loc.pathname).to.eq('/confirm-qualification/eyq-240');
+    })
+
+    cy.get('#yes').click();
+    cy.get('button[id="confirm-qualification-button"]').click();
+    
+    // qualification details page
     cy.location().should((loc) => {
-      expect(loc.pathname).to.eq('/qualifications/qualification-details/eyq-240');
+      expect(loc.pathname).to.eq('/qualifications/qualification-details/EYQ-240');
     })
     
     
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/confirm-qualification-spec.cy.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/confirm-qualification-spec.cy.js
new file mode 100644
index 00000000..dd754c6b
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/confirm-qualification-spec.cy.js
@@ -0,0 +1,42 @@
+describe("A spec that tests the confirm qualification page", () => {
+    beforeEach(() => {
+        cy.setCookie('auth-secret', Cypress.env('auth_secret'));
+    })
+
+    // Mock details found in Dfe.EarlyYearsQualification.Mock.Content.MockContentfulService.
+
+    it("Checks the static page content is on the page", () => {
+        cy.visit("/confirm-qualification/eyq-240");
+
+        cy.get("#heading").should("contain.text", "Test heading");
+        cy.get("#qualification-name-row dt").should("contain.text", "Test qualification label");
+        cy.get("#qualification-level-row dt").should("contain.text", "Test level label");
+        cy.get("#qualification-org-row dt").should("contain.text", "Test awarding organisation label");
+        cy.get("#qualification-date-added-row dt").should("contain.text", "Test date added label");
+        cy.get("#radio-heading").should("contain.text", "Test radio heading");
+
+        cy.get('input[value="yes"]').should("exist");
+        cy.get('input[value="no"]').should("exist");
+        
+        cy.get('label[for="yes"]').should("contain.text", "yes");
+        cy.get('label[for="no"]').should("contain.text", "no");
+        
+        cy.get("#confirm-qualification-button").should("contain.text", "Test button text");
+        
+        cy.get(".govuk-error-summary").should("not.exist");
+        cy.get("#confirm-qualification-choice-error").should("not.exist");
+    });
+    
+    it("Shows errors if user does not select an option", () => {
+        cy.visit("/confirm-qualification/eyq-240");
+
+        cy.get("#confirm-qualification-button").click();
+
+        cy.get(".govuk-error-summary").should("be.visible");
+        cy.get(".govuk-error-summary__title").should("contain.text", "Test error banner heading");
+        cy.get("#error-banner-link").should("contain.text", "Test error banner link");
+        
+        cy.get("#confirm-qualification-choice-error").should("contain.text", "Test error text");
+        cy.get(".govuk-form-group--error").should("be.visible");
+    });
+})
\ No newline at end of file

From cdb0510e4118cf16c0baaf29e1126ff283cc0e60 Mon Sep 17 00:00:00 2001
From: Sam C <156680559+sam-c-dfe@users.noreply.github.com>
Date: Wed, 3 Jul 2024 12:57:47 +0100
Subject: [PATCH 6/6] Added filter logic (#218)

* EYQB-316: Started adding the Content Filter Service

* Initial commit of the filter logic. Started the unit tests and fixed some of the broken tests.

* Updated to add new content type

* Updated to add additional unit tests

* Added new Mock filter service. Updated unit tests

* Created unit tests for the contentful filter service mock

* Changed to select first index in the list

* Added the basic ServiceAccess structure

* Fixed e2e tests

* Adding missing pages to accessibility tests

* Added log message to remove build warning message about unused logger

* Updated to address some of the comments on the PR

* Updated to remove the Various awarding organisations and All higher level institutes awarding organisations

* SonarLint issues and format tidy-up.

---------

Co-authored-by: RobertGHippo <robert.gammon@education.gov.uk>
---
 .../Constants/ContentTypes.cs                 |  18 +
 .../ContentfulContentFilterService.cs         | 135 ++++++++
 .../Services/ContentfulContentService.cs      |  27 +-
 .../Services/IContentFilterService.cs         |   8 +
 .../Content/MockContentfulFilterService.cs    |  43 +++
 .../Content/MockContentfulService.cs          |  28 +-
 .../Dfe.EarlyYearsQualification.Mock.csproj   |   4 -
 .../Extensions/ServiceCollectionExtensions.cs |   3 +-
 .../Controllers/QuestionsController.cs        |  38 ++-
 .../Dfe.EarlyYearsQualification.Web.csproj    |   5 +
 .../Program.cs                                |   3 +-
 .../UserJourneyCookieService.cs               |   1 +
 .../appsettings.json                          |   6 +
 .../.pa11yci-ubuntu.js                        |   6 +-
 .../e2e/journey/back-button-spec.cy.js        |   2 +-
 .../cypress/e2e/journey/journey-spec.cy.js    |   2 +-
 .../Controllers/QuestionsControllerTests.cs   | 136 ++++++--
 .../Mocks/MockContentfulFilterServiceTests.cs |  26 ++
 .../ContentfulContentFilterServiceTests.cs    | 312 ++++++++++++++++++
 .../Setup/MockContentfulSetupTests.cs         |  17 +-
 20 files changed, 748 insertions(+), 72 deletions(-)
 create mode 100644 src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentFilterService.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Content/Services/IContentFilterService.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs
 create mode 100644 tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs
 create mode 100644 tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentFilterServiceTests.cs

diff --git a/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs b/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs
new file mode 100644
index 00000000..ecc4ad58
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Content/Constants/ContentTypes.cs
@@ -0,0 +1,18 @@
+namespace Dfe.EarlyYearsQualification.Content.Constants;
+
+public static class ContentTypes
+{
+    public const string StartPage = "startPage";
+    public const string Qualification = "Qualification";
+    public const string DetailsPage = "detailsPage";
+    public const string AdvicePage = "advicePage";
+    public const string RadioQuestionPage = "radioQuestionPage";
+    public const string AccessibilityStatementPage = "accessibilityStatementPage";
+    public const string NavigationLinks = "navigationLinks";
+    public const string CookiesPage = "cookiesPage";
+    public const string PhaseBanner = "phaseBanner";
+    public const string CookiesBanner = "cookiesBanner";
+    public const string DateQuestionPage = "dateQuestionPage";
+    public const string DropdownQuestionPage = "dropdownQuestionPage";
+    public const string QualificationListPage = "qualificationListPage";
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentFilterService.cs b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentFilterService.cs
new file mode 100644
index 00000000..b84a1fb3
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentFilterService.cs
@@ -0,0 +1,135 @@
+using System.Collections.ObjectModel;
+using System.Globalization;
+using Contentful.Core;
+using Contentful.Core.Models;
+using Contentful.Core.Search;
+using Dfe.EarlyYearsQualification.Content.Constants;
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Microsoft.Extensions.Logging;
+
+namespace Dfe.EarlyYearsQualification.Content.Services;
+
+public class ContentfulContentFilterService(
+    IContentfulClient contentfulClient,
+    ILogger<ContentfulContentFilterService> logger)
+    : IContentFilterService
+{
+    private const int Day = 28;
+    private static readonly DateTimeFormatInfo CurrentFormatInfo = CultureInfo.CurrentCulture.DateTimeFormat;
+
+    private readonly ReadOnlyDictionary<int, string>
+        _months = new(
+                      new Dictionary<int, string>
+                      {
+                          { 1, CurrentFormatInfo.AbbreviatedMonthNames[0] },
+                          { 2, CurrentFormatInfo.AbbreviatedMonthNames[1] },
+                          { 3, CurrentFormatInfo.AbbreviatedMonthNames[2] },
+                          { 4, CurrentFormatInfo.AbbreviatedMonthNames[3] },
+                          { 5, CurrentFormatInfo.AbbreviatedMonthNames[4] },
+                          { 6, CurrentFormatInfo.AbbreviatedMonthNames[5] },
+                          { 7, CurrentFormatInfo.AbbreviatedMonthNames[6] },
+                          { 8, CurrentFormatInfo.AbbreviatedMonthNames[7] },
+                          { 9, CurrentFormatInfo.AbbreviatedMonthNames[8] },
+                          { 10, CurrentFormatInfo.AbbreviatedMonthNames[9] },
+                          { 11, CurrentFormatInfo.AbbreviatedMonthNames[10] },
+                          { 12, CurrentFormatInfo.AbbreviatedMonthNames[11] }
+                      });
+
+    // Used by the unit tests to inject a mock builder that returns the query params
+    public QueryBuilder<Qualification> QueryBuilder { get; init; } = QueryBuilder<Qualification>.New;
+
+    public async Task<List<Qualification>> GetFilteredQualifications(int? level, int? startDateMonth,
+                                                                     int? startDateYear)
+    {
+        logger.LogInformation("Filtering options passed in - level: {Level}, startDateMonth: {StartDateMonth}, startDateYear: {StartDateYear}",
+                              level,
+                              startDateMonth,
+                              startDateYear);
+
+        // create query builder
+        var queryBuilder = QueryBuilder.ContentTypeIs(ContentTypes.Qualification);
+
+        if (level is > 0)
+        {
+            queryBuilder = queryBuilder.FieldEquals("fields.qualificationLevel", level.Value.ToString());
+        }
+
+        // get qualifications
+        ContentfulCollection<Qualification>? qualifications;
+        try
+        {
+            qualifications = await contentfulClient.GetEntries(queryBuilder);
+        }
+        catch (Exception e)
+        {
+            logger.LogError(e, "Error getting qualifications");
+            return [];
+        }
+
+        if (!startDateMonth.HasValue || !startDateYear.HasValue) return qualifications.ToList();
+
+        // apply start date filtering
+        var results = FilterQualificationsByDate(startDateMonth.Value, startDateYear.Value, qualifications);
+
+        return results;
+    }
+
+    private List<Qualification> FilterQualificationsByDate(int startDateMonth, int startDateYear,
+                                                           ContentfulCollection<Qualification> qualifications)
+    {
+        var results = new List<Qualification>();
+        var enteredStartDate = new DateOnly(startDateYear, startDateMonth, Day);
+        foreach (var qualification in qualifications)
+        {
+            var qualificationStartDate = GetQualificationDate(qualification.FromWhichYear);
+            var qualificationEndDate = GetQualificationDate(qualification.ToWhichYear);
+
+            if (qualificationStartDate is not null
+                && qualificationEndDate is not null
+                && enteredStartDate >= qualificationStartDate
+                && enteredStartDate <= qualificationEndDate)
+            {
+                // check start date falls between those dates & add to results
+                results.Add(qualification);
+            }
+            else if (qualificationStartDate is null
+                     && qualificationEndDate is not null
+                     && enteredStartDate <= qualificationEndDate)
+            {
+                // if qualification start date is null, check entered start date is <= ToWhichYear & add to results
+                results.Add(qualification);
+            }
+            else
+            {
+                // if qualification end date is null, check entered start date is >= FromWhichYear & add to results
+                if (enteredStartDate >= qualificationStartDate)
+                {
+                    results.Add(qualification);
+                }
+            }
+        }
+
+        return results;
+    }
+
+    private DateOnly? GetQualificationDate(string? qualificationDate)
+    {
+        if (string.IsNullOrEmpty(qualificationDate) || qualificationDate == "null")
+        {
+            return null;
+        }
+
+        return ConvertToDateTime(qualificationDate);
+    }
+
+    private DateOnly? ConvertToDateTime(string qualificationDate)
+    {
+        var splitQualificationDate = qualificationDate.Split('-');
+        if (splitQualificationDate.Length != 2) return null;
+
+        var month = _months.FirstOrDefault(x => x.Value == splitQualificationDate[0]).Key;
+        var year = Convert.ToInt32(splitQualificationDate[1]) + 2000;
+
+        return new DateOnly(year, month, Day);
+    }
+}
\ 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 e2595708..702883ae 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
@@ -2,6 +2,7 @@
 using Contentful.Core;
 using Contentful.Core.Models;
 using Contentful.Core.Search;
+using Dfe.EarlyYearsQualification.Content.Constants;
 using Dfe.EarlyYearsQualification.Content.Entities;
 using Microsoft.Extensions.Logging;
 
@@ -15,19 +16,19 @@ public class ContentfulContentService(
     private readonly Dictionary<object, string> _contentTypes
         = new()
           {
-              { typeof(StartPage), "startPage" },
-              { typeof(Qualification), "Qualification" },
-              { typeof(DetailsPage), "detailsPage" },
-              { typeof(AdvicePage), "advicePage" },
-              { typeof(RadioQuestionPage), "radioQuestionPage" },
-              { typeof(AccessibilityStatementPage), "accessibilityStatementPage" },
-              { typeof(NavigationLinks), "navigationLinks" },
-              { typeof(CookiesPage), "cookiesPage" },
-              { typeof(PhaseBanner), "phaseBanner" },
-              { typeof(CookiesBanner), "cookiesBanner" },
-              { typeof(DateQuestionPage), "dateQuestionPage" },
-              { typeof(DropdownQuestionPage), "dropdownQuestionPage" },
-              { typeof(QualificationListPage), "qualificationListPage"}
+              { typeof(StartPage), ContentTypes.StartPage },
+              { typeof(Qualification), ContentTypes.Qualification },
+              { typeof(DetailsPage), ContentTypes.DetailsPage },
+              { typeof(AdvicePage), ContentTypes.AdvicePage },
+              { typeof(RadioQuestionPage), ContentTypes.RadioQuestionPage},
+              { typeof(AccessibilityStatementPage), ContentTypes.AccessibilityStatementPage },
+              { typeof(NavigationLinks), ContentTypes.NavigationLinks },
+              { typeof(CookiesPage), ContentTypes.CookiesPage },
+              { typeof(PhaseBanner), ContentTypes.PhaseBanner },
+              { typeof(CookiesBanner), ContentTypes.CookiesBanner },
+              { typeof(DateQuestionPage), ContentTypes.DateQuestionPage },
+              { typeof(DropdownQuestionPage), ContentTypes.DropdownQuestionPage },
+              { typeof(QualificationListPage), ContentTypes.QualificationListPage }
           };
 
     public async Task<StartPage?> GetStartPage()
diff --git a/src/Dfe.EarlyYearsQualification.Content/Services/IContentFilterService.cs b/src/Dfe.EarlyYearsQualification.Content/Services/IContentFilterService.cs
new file mode 100644
index 00000000..388dae64
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/IContentFilterService.cs
@@ -0,0 +1,8 @@
+using Dfe.EarlyYearsQualification.Content.Entities;
+
+namespace Dfe.EarlyYearsQualification.Content.Services;
+
+public interface IContentFilterService
+{
+    Task<List<Qualification>> GetFilteredQualifications(int? level, int? startDateMonth, int? startDateYear);
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs
new file mode 100644
index 00000000..9b3b4ed4
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulFilterService.cs
@@ -0,0 +1,43 @@
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Dfe.EarlyYearsQualification.Content.Services;
+
+namespace Dfe.EarlyYearsQualification.Mock.Content;
+
+public class MockContentfulFilterService : IContentFilterService
+{
+    public Task<List<Qualification>> GetFilteredQualifications(int? level, int? startDateMonth, int? startDateYear)
+    {
+        var qualifications = new List<Qualification>
+                             {
+                                 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-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"),
+                                 CreateQualification("EYQ-106", "Various Awarding Organisations", 5, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-107", "Edexcel (now Pearson Education Ltd)", 5, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-108", "Kent Sussex Montessori Centre", 6, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-109", "NNEB National Nursery Examination Board", 6, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-110", "Various Awarding Organisations", 7, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-111", "City & Guilds", 7, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-112", "Pearson", 8, "Sep-14", "Aug-19"),
+                                 CreateQualification("EYQ-113", "CACHE", 8, "Sep-14", "Aug-19")
+                             };
+
+        return Task.FromResult(qualifications.Where(x => x.QualificationLevel == level).ToList());
+    }
+
+    private static Qualification CreateQualification(string qualificationId, string awardingOrganisation, int level, string? startDate, string endDate)
+    {
+        return new Qualification(
+                                 qualificationId,
+                                 $"{qualificationId}-test",
+                                 awardingOrganisation,
+                                 level,
+                                 startDate,
+                                 endDate,
+                                 "ghi/456/951",
+                                 "additional requirements");
+    }
+}
\ 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 6039d726..0a45e9b0 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -203,16 +203,16 @@ public Task<List<Qualification>> GetQualifications()
 
     public async Task<QualificationListPage?> GetQualificationListPage()
     {
-        return await Task.FromResult(new QualificationListPage()
-                                   {
-                                       Header = "Test Header",
-                                       BackButton = new NavigationLink()
-                                                    {
-                                                        DisplayText = "TEST",
-                                                        Href = "/questions/what-is-the-awarding-organisation",
-                                                        OpenInNewTab = false
-                                                    }
-                                   });
+        return await Task.FromResult(new QualificationListPage
+                                     {
+                                         Header = "Test Header",
+                                         BackButton = new NavigationLink
+                                                      {
+                                                          DisplayText = "TEST",
+                                                          Href = "/questions/what-is-the-awarding-organisation",
+                                                          OpenInNewTab = false
+                                                      }
+                                     });
     }
 
     public async Task<StartPage?> GetStartPage()
@@ -291,10 +291,12 @@ private static RadioQuestionPage CreateWhatLevelIsTheQualificationPage()
                               Label = "Level 3", Value = "3"
                           }
                       };
-        return CreateRadioQuestionPage("What level is the qualification?", options, "/questions/when-was-the-qualification-started");
+        return CreateRadioQuestionPage("What level is the qualification?", options,
+                                       "/questions/when-was-the-qualification-started");
     }
 
-    private static RadioQuestionPage CreateRadioQuestionPage(string question, List<Option> options, string backButtonURL)
+    private static RadioQuestionPage CreateRadioQuestionPage(string question, List<Option> options,
+                                                             string backButtonUrl)
     {
         return new RadioQuestionPage
                {
@@ -305,7 +307,7 @@ private static RadioQuestionPage CreateRadioQuestionPage(string question, List<O
                    BackButton = new NavigationLink
                                 {
                                     DisplayText = "TEST",
-                                    Href = backButtonURL,
+                                    Href = backButtonUrl,
                                     OpenInNewTab = false
                                 }
                };
diff --git a/src/Dfe.EarlyYearsQualification.Mock/Dfe.EarlyYearsQualification.Mock.csproj b/src/Dfe.EarlyYearsQualification.Mock/Dfe.EarlyYearsQualification.Mock.csproj
index ec15001b..e334f98d 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Dfe.EarlyYearsQualification.Mock.csproj
+++ b/src/Dfe.EarlyYearsQualification.Mock/Dfe.EarlyYearsQualification.Mock.csproj
@@ -6,10 +6,6 @@
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <ItemGroup>
-        <Folder Include="Content/"/>
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="..\Dfe.EarlyYearsQualification.Content\Dfe.EarlyYearsQualification.Content.csproj"/>
     </ItemGroup>
diff --git a/src/Dfe.EarlyYearsQualification.Mock/Extensions/ServiceCollectionExtensions.cs b/src/Dfe.EarlyYearsQualification.Mock/Extensions/ServiceCollectionExtensions.cs
index 6edddc09..3cc4faad 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Extensions/ServiceCollectionExtensions.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Extensions/ServiceCollectionExtensions.cs
@@ -6,9 +6,10 @@ namespace Dfe.EarlyYearsQualification.Mock.Extensions;
 
 public static class ServiceCollectionExtensions
 {
-    public static IServiceCollection AddMockContentfulService(this IServiceCollection services)
+    public static IServiceCollection AddMockContentfulServices(this IServiceCollection services)
     {
         services.AddSingleton<IContentService, MockContentfulService>();
+        services.AddSingleton<IContentFilterService, MockContentfulFilterService>();
         return services;
     }
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
index d08366b0..5227f151 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
@@ -16,7 +16,8 @@ public class QuestionsController(
     ILogger<QuestionsController> logger,
     IContentService contentService,
     IHtmlRenderer renderer,
-    IUserJourneyCookieService userJourneyCookieService)
+    IUserJourneyCookieService userJourneyCookieService,
+    IContentFilterService contentFilterService)
     : ServiceController
 {
     private const string Questions = "Questions";
@@ -127,7 +128,7 @@ public async Task<IActionResult> WhatIsTheAwardingOrganisation()
             return RedirectToAction("Index", "Error");
         }
 
-        var qualifications = await contentService.GetQualifications();
+        var qualifications = await GetFilteredQualifications();
 
         var model = MapDropdownModel(new DropdownQuestionModel(), questionPage, qualifications, nameof(this.WhatIsTheAwardingOrganisation),
                                  Questions);
@@ -143,7 +144,7 @@ public async Task<IActionResult> WhatIsTheAwardingOrganisation(DropdownQuestionM
             var questionPage = await contentService.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation);
             if (questionPage is not null)
             {
-                var qualifications = await contentService.GetQualifications();
+                var qualifications = await GetFilteredQualifications();
                 
                 model = MapDropdownModel(model, questionPage, qualifications, nameof(this.WhatIsTheAwardingOrganisation),
                                          Questions);
@@ -157,6 +158,30 @@ public async Task<IActionResult> WhatIsTheAwardingOrganisation(DropdownQuestionM
         
         return RedirectToAction("Get", "QualificationDetails");
     }
+    
+    private async Task<List<Qualification>> GetFilteredQualifications()
+    {
+        var cookie = userJourneyCookieService.GetUserJourneyModelFromCookie();
+        
+        int? level = null;
+        if (int.TryParse(cookie.LevelOfQualification, out var parsedLevel))
+        {
+            level = parsedLevel;
+        }
+
+        int? startDateMonth = null;
+        int? startDateYear = null;
+        var qualificationAwardedDateSplit = cookie.WhenWasQualificationAwarded.Split('/');
+        if (qualificationAwardedDateSplit.Length == 2 
+            && int.TryParse(qualificationAwardedDateSplit[0], out var parsedStartMonth) 
+            && int.TryParse(qualificationAwardedDateSplit[1], out var parsedStartYear))
+        {
+            startDateMonth = parsedStartMonth;
+            startDateYear = parsedStartYear;
+        }
+        
+        return await contentFilterService.GetFilteredQualifications(level, startDateMonth, startDateYear);
+    }
 
     private async Task<IActionResult> GetRadioView(string questionPageId, string actionName, string controllerName)
     {
@@ -205,7 +230,12 @@ private static DateQuestionModel MapDateModel(DateQuestionModel model, DateQuest
     private static DropdownQuestionModel MapDropdownModel(DropdownQuestionModel model, DropdownQuestionPage question, List<Qualification> qualifications, string actionName,
                                                           string controllerName)
     {
-        var uniqueAwardingOrganisations = qualifications.Select(x => x.AwardingOrganisationTitle).Distinct().Order().ToList();
+        var awardingOrganisationExclusions = new [] { "All Higher Education Institutes", "Various Awarding Organisations" };
+        var uniqueAwardingOrganisations = qualifications.Select(x => x.AwardingOrganisationTitle)
+                                                        .Distinct()
+                                                        .Where(x => !awardingOrganisationExclusions.Any(x.Contains))
+                                                        .Order()
+                                                        .ToList();
         
         model.ActionName = actionName;
         model.ControllerName = controllerName;
diff --git a/src/Dfe.EarlyYearsQualification.Web/Dfe.EarlyYearsQualification.Web.csproj b/src/Dfe.EarlyYearsQualification.Web/Dfe.EarlyYearsQualification.Web.csproj
index be0b1551..e83c84e7 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Dfe.EarlyYearsQualification.Web.csproj
+++ b/src/Dfe.EarlyYearsQualification.Web/Dfe.EarlyYearsQualification.Web.csproj
@@ -24,4 +24,9 @@
         <ProjectReference Include="..\Dfe.EarlyYearsQualification.Mock\Dfe.EarlyYearsQualification.Mock.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <Folder Include="Views\Shared\Components\BackButton\" />
+      <Folder Include="Views\Shared\Partials\" />
+    </ItemGroup>
+
 </Project>
diff --git a/src/Dfe.EarlyYearsQualification.Web/Program.cs b/src/Dfe.EarlyYearsQualification.Web/Program.cs
index d362cf0b..a2bc4026 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Program.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Program.cs
@@ -44,11 +44,12 @@
 
 if (builder.Configuration.GetValue<bool>("UseMockContentful"))
 {
-    builder.Services.AddMockContentfulService();
+    builder.Services.AddMockContentfulServices();
 }
 else
 {
     builder.Services.AddTransient<IContentService, ContentfulContentService>();
+    builder.Services.AddTransient<IContentFilterService, ContentfulContentFilterService>();
 }
 
 builder.Services.AddModelRenderers();
diff --git a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
index b235134a..3e4bf33e 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
@@ -65,6 +65,7 @@ public UserJourneyModel GetUserJourneyModelFromCookie()
         }
         catch
         {
+            logger.LogWarning("Failed to deserialize cookie");
             ResetUserJourneyCookie();
             return new UserJourneyModel();
         }
diff --git a/src/Dfe.EarlyYearsQualification.Web/appsettings.json b/src/Dfe.EarlyYearsQualification.Web/appsettings.json
index c79e07bb..1075966b 100644
--- a/src/Dfe.EarlyYearsQualification.Web/appsettings.json
+++ b/src/Dfe.EarlyYearsQualification.Web/appsettings.json
@@ -15,6 +15,12 @@
   "KeyVault": {
     "Endpoint": "https://s202d01-eyquals-kv.vault.azure.net/"
   },
+  "ServiceAccess": {
+    "IsPublic": false,
+    "Keys": [
+      ""
+    ]
+  },
   "Storage": {
     "ConnectionString": "Retrieved from KeyVault"
   },
diff --git a/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js b/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js
index f20c793a..2ebb5b25 100644
--- a/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js
+++ b/tests/Dfe.EarlyYearsQualification.AccessibilityTests/.pa11yci-ubuntu.js
@@ -11,10 +11,12 @@ var config = {
     urls: [
         "http://localhost:5000/",
         "http://localhost:5000/qualifications/qualification-details/eyq-240",
-        "http://localhost:5000/questions/where-was-the-qualification-awarded",
+        "http://localhost:5000/advice/level-2-qualifications-started-between-1-sept-2014-&-31-aug-2019",
         "http://localhost:5000/advice/qualification-outside-the-united-kingdom",
+        "http://localhost:5000/questions/where-was-the-qualification-awarded",
         "http://localhost:5000/questions/when-was-the-qualification-started",
-        "http://localhost:5000/questions/what-level-is-the-qualification"
+        "http://localhost:5000/questions/what-level-is-the-qualification",
+        "http://localhost:5000/questions/what-is-the-awarding-organisation"
     ]
 };
 
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 aa8144d7..0621da6f 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
@@ -39,7 +39,7 @@ describe('A spec used to test the main back button route through the journey', (
             expect(loc.pathname).to.eq('/questions/what-is-the-awarding-organisation');
         })
 
-        cy.get('#awarding-organisation-select').select('A awarding organisation');
+        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
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 59d02400..9a6aaca8 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
@@ -57,7 +57,7 @@ describe('A spec used to test the various routes through the journey', () => {
       expect(loc.pathname).to.eq('/questions/what-is-the-awarding-organisation');
     })
     
-    cy.get('#awarding-organisation-select').select('A awarding organisation');
+    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)
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
index f98a8666..9c12a1c4 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
@@ -7,6 +7,7 @@
 using Dfe.EarlyYearsQualification.UnitTests.Extensions;
 using Dfe.EarlyYearsQualification.Web.Constants;
 using Dfe.EarlyYearsQualification.Web.Controllers;
+using Dfe.EarlyYearsQualification.Web.Models;
 using Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
 using Dfe.EarlyYearsQualification.Web.Services.UserJourneyCookieService;
 using FluentAssertions;
@@ -26,11 +27,12 @@ public async Task WhereWasTheQualificationAwarded_ContentServiceReturnsNoQuestio
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         mockContentService.Setup(x => x.GetRadioQuestionPage(QuestionPages.WhereWasTheQualificationAwarded))
                           .ReturnsAsync((RadioQuestionPage?)default).Verifiable();
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhereWasTheQualificationAwarded();
 
@@ -54,6 +56,7 @@ public async Task WhereWasTheQualificationAwarded_ContentServiceReturnsQuestionP
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         var questionPage = new RadioQuestionPage
                            {
@@ -64,7 +67,7 @@ public async Task WhereWasTheQualificationAwarded_ContentServiceReturnsQuestionP
         mockContentService.Setup(x => x.GetRadioQuestionPage(QuestionPages.WhereWasTheQualificationAwarded))
                           .ReturnsAsync(questionPage);
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhereWasTheQualificationAwarded();
 
@@ -91,8 +94,9 @@ public async Task Post_WhereWasTheQualificationAwarded_InvalidModel_ReturnsQuest
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         controller.ModelState.AddModelError("option", "test error");
         var result = await controller.WhereWasTheQualificationAwarded(new RadioQuestionModel());
@@ -114,8 +118,9 @@ public async Task Post_WhereWasTheQualificationAwarded_PassInOutsideUk_Redirects
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result =
             await controller.WhereWasTheQualificationAwarded(new RadioQuestionModel
@@ -139,8 +144,9 @@ public async Task Post_WhereWasTheQualificationAwarded_PassInEngland_RedirectsTo
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result =
             await controller.WhereWasTheQualificationAwarded(new RadioQuestionModel { Option = Options.England });
@@ -162,6 +168,7 @@ public async Task WhenWasTheQualificationStarted_ReturnsView()
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         var questionPage = new DateQuestionPage
                            {
@@ -175,7 +182,7 @@ public async Task WhenWasTheQualificationStarted_ReturnsView()
         mockContentService.Setup(x => x.GetDateQuestionPage(QuestionPages.WhenWasTheQualificationStarted))
                           .ReturnsAsync(questionPage);
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhenWasTheQualificationStarted();
 
@@ -205,11 +212,12 @@ public async Task WhenWasTheQualificationStarted_CantFindContentfulPage_ReturnsE
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         mockContentService.Setup(x => x.GetDateQuestionPage(QuestionPages.WhenWasTheQualificationStarted))
                           .ReturnsAsync((DateQuestionPage?)default).Verifiable();
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhenWasTheQualificationStarted();
 
@@ -230,8 +238,9 @@ public async Task Post_WhenWasTheQualificationStarted_InvalidModel_ReturnsDateQu
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         controller.ModelState.AddModelError("option", "test error");
         var result = await controller.WhenWasTheQualificationStarted(new DateQuestionModel());
@@ -258,6 +267,7 @@ public async Task Post_WhenWasTheQualificationStarted_PassedInvalidValues_Return
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         var questionPage = new DateQuestionPage
                            {
@@ -271,7 +281,7 @@ public async Task Post_WhenWasTheQualificationStarted_PassedInvalidValues_Return
         mockContentService.Setup(x => x.GetDateQuestionPage(QuestionPages.WhenWasTheQualificationStarted))
                           .ReturnsAsync(questionPage);
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhenWasTheQualificationStarted(new DateQuestionModel
                                                                      {
@@ -303,6 +313,7 @@ public async Task Post_WhenWasTheQualificationStarted_YearProvidedIsNextYear_Ret
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         var questionPage = new DateQuestionPage
                            {
@@ -316,7 +327,7 @@ public async Task Post_WhenWasTheQualificationStarted_YearProvidedIsNextYear_Ret
         mockContentService.Setup(x => x.GetDateQuestionPage(QuestionPages.WhenWasTheQualificationStarted))
                           .ReturnsAsync(questionPage);
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhenWasTheQualificationStarted(new DateQuestionModel
                                                                      {
@@ -348,8 +359,9 @@ public async Task Post_WhenWasTheQualificationStarted_ValidModel_ReturnsRedirect
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhenWasTheQualificationStarted(new DateQuestionModel
                                                                      {
@@ -374,11 +386,12 @@ public async Task WhatLevelIsTheQualification_ContentServiceReturnsNoQuestionPag
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         mockContentService.Setup(x => x.GetRadioQuestionPage(QuestionPages.WhatLevelIsTheQualification))
                           .ReturnsAsync((RadioQuestionPage?)default).Verifiable();
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhatLevelIsTheQualification();
 
@@ -402,6 +415,7 @@ public async Task WhatLevelIsTheQualification_ContentServiceReturnsQuestionPage_
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         var questionPage = new RadioQuestionPage
                            {
@@ -416,7 +430,7 @@ public async Task WhatLevelIsTheQualification_ContentServiceReturnsQuestionPage_
 
         mockRenderer.Setup(x => x.ToHtml(It.IsAny<Document>())).ReturnsAsync("Test html body");
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhatLevelIsTheQualification();
 
@@ -447,8 +461,9 @@ public async Task Post_WhatLevelIsTheQualification_InvalidModel_ReturnsQuestionP
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         controller.ModelState.AddModelError("option", "test error");
         var result = await controller.WhatLevelIsTheQualification(new RadioQuestionModel());
@@ -470,8 +485,9 @@ public async Task Post_WhatLevelIsTheQualification_ReturnsRedirectResponse()
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhatLevelIsTheQualification(new RadioQuestionModel
                                                                   {
@@ -495,11 +511,12 @@ public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsNoQuestionP
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
                           .ReturnsAsync((DropdownQuestionPage?)default).Verifiable();
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhatIsTheAwardingOrganisation();
 
@@ -523,6 +540,7 @@ public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQuestionPag
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
         var questionPage = new DropdownQuestionPage
                            {
@@ -537,9 +555,11 @@ public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQuestionPag
         mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
                           .ReturnsAsync(questionPage);
 
-        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync([]);
+        mockUserJourneyCookieService.Setup(x => x.GetUserJourneyModelFromCookie()).Returns(new UserJourneyModel());
+        mockContentFilterService.Setup(x => x.GetFilteredQualifications(It.IsAny<int?>(), It.IsAny<int?>(), It.IsAny<int?>()))
+                                .ReturnsAsync([]);
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhatIsTheAwardingOrganisation();
 
@@ -569,6 +589,7 @@ public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQualificati
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
 
         var questionPage = new DropdownQuestionPage
                            {
@@ -597,9 +618,11 @@ public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQualificati
                                                          null, null, null)
                                    };
         
-        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync(listOfQualifications);
+        mockUserJourneyCookieService.Setup(x => x.GetUserJourneyModelFromCookie()).Returns(new UserJourneyModel());
+        mockContentFilterService.Setup(x => x.GetFilteredQualifications(It.IsAny<int?>(), It.IsAny<int?>(), It.IsAny<int?>()))
+                                .ReturnsAsync(listOfQualifications);
 
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var result = await controller.WhatIsTheAwardingOrganisation();
 
@@ -624,6 +647,62 @@ public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQualificati
         model.Values[5].Text.Should().Be("E awarding organisation");
     }
     
+    [TestMethod]
+    public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQualificationsWithVariousOrHigherEducation_FiltersThemOutOfResponse()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
+
+        var questionPage = new DropdownQuestionPage
+                           {
+                               DefaultText = "Test default text"
+                           };
+        
+        mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
+                          .ReturnsAsync(questionPage);
+
+        var listOfQualifications = new List<Qualification>
+                                   {
+                                       new("1", "TEST",
+                                           "D awarding organisation", 123, null,
+                                           null, null, null),
+                                       new("2", "TEST",
+                                                         "E awarding organisation", 123, null,
+                                                         null, null, null),
+                                       new("3", "TEST",
+                                                         "Various Awarding Organisations", 123, null,
+                                                         null, null, null),
+                                       new("4", "TEST",
+                                                         "All Higher Education Institutes", 123, null,
+                                                         null, null, null)
+                                   };
+        
+        mockUserJourneyCookieService.Setup(x => x.GetUserJourneyModelFromCookie()).Returns(new UserJourneyModel());
+        mockContentFilterService.Setup(x => x.GetFilteredQualifications(It.IsAny<int?>(), It.IsAny<int?>(), It.IsAny<int?>()))
+                                .ReturnsAsync(listOfQualifications);
+
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
+
+        var result = await controller.WhatIsTheAwardingOrganisation();
+
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+
+        var model = resultType!.Model as DropdownQuestionModel;
+        model.Should().NotBeNull();
+        model!.Values.Should().NotBeNull();
+
+        // Count here includes default value added in mapping
+        model.Values.Count.Should().Be(3);
+        model.Values[1].Text.Should().Be("D awarding organisation");
+        model.Values[2].Text.Should().Be("E awarding organisation");
+    }
+    
     [TestMethod]
     public async Task Post_WhatIsTheAwardingOrganisation_InvalidModel_ReturnsQuestionPage()
     {
@@ -631,8 +710,9 @@ public async Task Post_WhatIsTheAwardingOrganisation_InvalidModel_ReturnsQuestio
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var questionPage = new DropdownQuestionPage
                            {
@@ -646,8 +726,9 @@ public async Task Post_WhatIsTheAwardingOrganisation_InvalidModel_ReturnsQuestio
         
         mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
                           .ReturnsAsync(questionPage);
-        
-        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync([]);
+
+        mockUserJourneyCookieService.Setup(x => x.GetUserJourneyModelFromCookie()).Returns(new UserJourneyModel());
+        mockContentFilterService.Setup(x => x.GetFilteredQualifications(It.IsAny<int?>(), It.IsAny<int?>(), It.IsAny<int?>())).ReturnsAsync([]);
         
         controller.ModelState.AddModelError("option", "test error");
         var result = await controller.WhatIsTheAwardingOrganisation(new DropdownQuestionModel());
@@ -674,8 +755,9 @@ public async Task Post_WhatIsTheAwardingOrganisation_NoValueSelectedAndNotInList
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
         
         var result = await controller.WhatIsTheAwardingOrganisation(new DropdownQuestionModel
                                                                     {
@@ -700,8 +782,9 @@ public async Task Post_WhatIsTheAwardingOrganisation_AwardingOrgPassedIn_SetsJou
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var questionPage = new DropdownQuestionPage
                            {
@@ -743,8 +826,9 @@ public async Task Post_WhatIsTheAwardingOrganisation_NotInTheListPassedIn_DoesNo
         var mockContentService = new Mock<IContentService>();
         var mockRenderer = new Mock<IHtmlRenderer>();
         var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        var mockContentFilterService = new Mock<IContentFilterService>();
         
-        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object, mockContentFilterService.Object);
 
         var questionPage = new DropdownQuestionPage
                            {
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs
new file mode 100644
index 00000000..9a51be98
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulFilterServiceTests.cs
@@ -0,0 +1,26 @@
+using Dfe.EarlyYearsQualification.Mock.Content;
+using FluentAssertions;
+
+namespace Dfe.EarlyYearsQualification.UnitTests.Mocks;
+
+[TestClass]
+public class MockContentfulFilterServiceTests
+{
+    [TestMethod]
+    [DataRow(2, new [] { "EYQ-100", "EYQ-101" })]
+    [DataRow(3, new [] { "EYQ-102", "EYQ-103" })]
+    [DataRow(4, new [] { "EYQ-104", "EYQ-105" })]
+    [DataRow(5, new [] { "EYQ-106", "EYQ-107" })]
+    [DataRow(6, new [] { "EYQ-108", "EYQ-109" })]
+    [DataRow(7, new [] { "EYQ-110", "EYQ-111" })]
+    [DataRow(8, new [] { "EYQ-112", "EYQ-113" })]
+    public async Task GetFilteredQualifications_PassInLevel_ReturnsQualifications(int level, string[] expectedQualifications)
+    {
+        var mockContentFilterService = new MockContentfulFilterService();
+        var results = await mockContentFilterService.GetFilteredQualifications(level, null, null);
+
+        results.Count.Should().Be(2);
+        results[0].QualificationId.Should().Be(expectedQualifications[0]);
+        results[1].QualificationId.Should().Be(expectedQualifications[1]);
+    }
+}
\ No newline at end of file
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentFilterServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentFilterServiceTests.cs
new file mode 100644
index 00000000..8ebed119
--- /dev/null
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/ContentfulContentFilterServiceTests.cs
@@ -0,0 +1,312 @@
+using Contentful.Core;
+using Contentful.Core.Models;
+using Contentful.Core.Search;
+using Dfe.EarlyYearsQualification.Content.Entities;
+using Dfe.EarlyYearsQualification.Content.Services;
+using FluentAssertions;
+using Microsoft.Extensions.Logging;
+using Moq;
+
+namespace Dfe.EarlyYearsQualification.UnitTests.Services;
+
+[TestClass]
+public class ContentfulContentFilterServiceTests
+{
+    [TestMethod]
+    public async Task GetFilteredQualifications_PassInNullParameters_ReturnsAllQualifications()
+    {
+        var results = new ContentfulCollection<Qualification>
+                      {
+                          Items = new[]
+                                  {
+                                      new Qualification(
+                                                        "EYQ-123",
+                                                        "test",
+                                                        "NCFE",
+                                                        4,
+                                                        "Apr-15",
+                                                        "Aug-19",
+                                                        "abc/123/987",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-741",
+                                                        "test",
+                                                        "Pearson",
+                                                        3,
+                                                        null,
+                                                        "Aug-19",
+                                                        "def/456/951",
+                                                        "requirements")
+                                  }
+                      };
+        var mockContentfulClient = new Mock<IContentfulClient>();
+        mockContentfulClient.Setup(x => x.GetEntries(
+                                                     It.IsAny<QueryBuilder<Qualification>>(),
+                                                     It.IsAny<CancellationToken>()))
+                            .ReturnsAsync(results);
+
+        var mockQueryBuilder = new MockQueryBuilder();
+        var mockLogger = new Mock<ILogger<ContentfulContentFilterService>>();
+        var filterService = new ContentfulContentFilterService(mockContentfulClient.Object, mockLogger.Object)
+                            {
+                                QueryBuilder = mockQueryBuilder
+                            };
+
+        var filteredQualifications = await filterService.GetFilteredQualifications(null, null, null);
+
+        filteredQualifications.Should().NotBeNull();
+        filteredQualifications.Count.Should().Be(2);
+        var queryString = mockQueryBuilder.GetQueryString();
+        queryString.Count.Should().Be(1);
+        queryString.Should().Contain("content_type", "Qualification");
+    }
+
+    [TestMethod]
+    public async Task GetFilteredQualifications_PassInLevel_ClientContainsLevelInQuery()
+    {
+        var results = new ContentfulCollection<Qualification>
+                      {
+                          Items = new[]
+                                  {
+                                      new Qualification(
+                                                        "EYQ-123",
+                                                        "test",
+                                                        "NCFE",
+                                                        4,
+                                                        "Apr-15",
+                                                        "Aug-19",
+                                                        "abc/123/987",
+                                                        "requirements")
+                                  }
+                      };
+
+        var mockContentfulClient = new Mock<IContentfulClient>();
+        mockContentfulClient.Setup(x => x.GetEntries(
+                                                     It.IsAny<QueryBuilder<Qualification>>(),
+                                                     It.IsAny<CancellationToken>()))
+                            .ReturnsAsync(results);
+
+        var mockQueryBuilder = new MockQueryBuilder();
+        var mockLogger = new Mock<ILogger<ContentfulContentFilterService>>();
+        var filterService = new ContentfulContentFilterService(mockContentfulClient.Object, mockLogger.Object)
+                            {
+                                QueryBuilder = mockQueryBuilder
+                            };
+
+        await filterService.GetFilteredQualifications(4, null, null);
+
+        var queryString = mockQueryBuilder.GetQueryString();
+        queryString.Count.Should().Be(2);
+        queryString.Should().Contain("content_type", "Qualification");
+        queryString.Should().Contain("fields.qualificationLevel", "4");
+    }
+
+    [TestMethod]
+    public async Task GetFilteredQualifications_PassInLevelMonthAndNullParameters_ReturnsAllQualifications()
+    {
+        var results = new ContentfulCollection<Qualification>
+                      {
+                          Items = new[]
+                                  {
+                                      new Qualification(
+                                                        "EYQ-123",
+                                                        "test",
+                                                        "NCFE",
+                                                        4,
+                                                        "Apr-15",
+                                                        "Aug-19",
+                                                        "abc/123/987",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-741",
+                                                        "test",
+                                                        "Pearson",
+                                                        4,
+                                                        null,
+                                                        "Aug-19",
+                                                        "def/456/951",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-752",
+                                                        "test",
+                                                        "CACHE",
+                                                        4,
+                                                        "Sep-21",
+                                                        null,
+                                                        "ghi/456/951",
+                                                        "requirements")
+                                  }
+                      };
+        var mockContentfulClient = new Mock<IContentfulClient>();
+        mockContentfulClient.Setup(x => x.GetEntries(
+                                                     It.IsAny<QueryBuilder<Qualification>>(),
+                                                     It.IsAny<CancellationToken>()))
+                            .ReturnsAsync(results);
+
+        var mockQueryBuilder = new MockQueryBuilder();
+        var mockLogger = new Mock<ILogger<ContentfulContentFilterService>>();
+        var filterService = new ContentfulContentFilterService(mockContentfulClient.Object, mockLogger.Object)
+                            {
+                                QueryBuilder = mockQueryBuilder
+                            };
+
+        var filteredQualifications = await filterService.GetFilteredQualifications(4, 9, null);
+
+        filteredQualifications.Should().NotBeNull();
+        filteredQualifications.Count.Should().Be(3);
+        filteredQualifications[0].QualificationId.Should().Be("EYQ-123");
+        filteredQualifications[1].QualificationId.Should().Be("EYQ-741");
+        filteredQualifications[2].QualificationId.Should().Be("EYQ-752");
+    }
+
+    [TestMethod]
+    public async Task GetFilteredQualifications_PassInLevelNullAndYearParameters_ReturnsAllQualifications()
+    {
+        var results = new ContentfulCollection<Qualification>
+                      {
+                          Items = new[]
+                                  {
+                                      new Qualification(
+                                                        "EYQ-123",
+                                                        "test",
+                                                        "NCFE",
+                                                        4,
+                                                        "Apr-15",
+                                                        "Aug-19",
+                                                        "abc/123/987",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-741",
+                                                        "test",
+                                                        "Pearson",
+                                                        4,
+                                                        null,
+                                                        "Aug-19",
+                                                        "def/456/951",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-752",
+                                                        "test",
+                                                        "CACHE",
+                                                        4,
+                                                        "Sep-21",
+                                                        null,
+                                                        "ghi/456/951",
+                                                        "requirements")
+                                  }
+                      };
+        var mockContentfulClient = new Mock<IContentfulClient>();
+        mockContentfulClient.Setup(x => x.GetEntries(
+                                                     It.IsAny<QueryBuilder<Qualification>>(),
+                                                     It.IsAny<CancellationToken>()))
+                            .ReturnsAsync(results);
+
+        var mockQueryBuilder = new MockQueryBuilder();
+        var mockLogger = new Mock<ILogger<ContentfulContentFilterService>>();
+        var filterService = new ContentfulContentFilterService(mockContentfulClient.Object, mockLogger.Object)
+                            {
+                                QueryBuilder = mockQueryBuilder
+                            };
+
+        var filteredQualifications = await filterService.GetFilteredQualifications(4, null, 2014);
+
+        filteredQualifications.Should().NotBeNull();
+        filteredQualifications.Count.Should().Be(3);
+        filteredQualifications[0].QualificationId.Should().Be("EYQ-123");
+        filteredQualifications[1].QualificationId.Should().Be("EYQ-741");
+        filteredQualifications[2].QualificationId.Should().Be("EYQ-752");
+    }
+
+    [TestMethod]
+    public async Task GetFilteredQualifications_FilterOnDates_ReturnsFilteredQualifications()
+    {
+        var results = new ContentfulCollection<Qualification>
+                      {
+                          Items = new[]
+                                  {
+                                      new Qualification(
+                                                        "EYQ-123",
+                                                        "test",
+                                                        "NCFE",
+                                                        4,
+                                                        "Apr-15",
+                                                        "Aug-19",
+                                                        "abc/123/987",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-741",
+                                                        "test",
+                                                        "Pearson",
+                                                        4,
+                                                        null,
+                                                        "Sep-19",
+                                                        "def/456/951",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-746",
+                                                        "test",
+                                                        "CACHE",
+                                                        4,
+                                                        "Sep-15",
+                                                        null,
+                                                        "ghi/456/951",
+                                                        "requirements"),
+                                      new Qualification(
+                                                        "EYQ-752",
+                                                        "test",
+                                                        "CACHE",
+                                                        4,
+                                                        "Sep-21",
+                                                        null,
+                                                        "ghi/456/951",
+                                                        "requirements")
+                                  }
+                      };
+        var mockContentfulClient = new Mock<IContentfulClient>();
+        mockContentfulClient.Setup(x => x.GetEntries(
+                                                     It.IsAny<QueryBuilder<Qualification>>(),
+                                                     It.IsAny<CancellationToken>()))
+                            .ReturnsAsync(results);
+
+        var mockQueryBuilder = new MockQueryBuilder();
+        var mockLogger = new Mock<ILogger<ContentfulContentFilterService>>();
+        var filterService = new ContentfulContentFilterService(mockContentfulClient.Object, mockLogger.Object)
+                            {
+                                QueryBuilder = mockQueryBuilder
+                            };
+
+        var filteredQualifications = await filterService.GetFilteredQualifications(4, 5, 2016);
+
+        filteredQualifications.Should().NotBeNull();
+        filteredQualifications.Count.Should().Be(3);
+        filteredQualifications[0].QualificationId.Should().Be("EYQ-123");
+        filteredQualifications[1].QualificationId.Should().Be("EYQ-741");
+        filteredQualifications[2].QualificationId.Should().Be("EYQ-746");
+    }
+
+    [TestMethod]
+    public async Task GetFilteredQualifications_ContentfulClientThrowsException_ReturnsEmptyList()
+    {
+        var mockContentfulClient = new Mock<IContentfulClient>();
+        mockContentfulClient.Setup(x => x.GetEntries(
+                                                     It.IsAny<QueryBuilder<Qualification>>(),
+                                                     It.IsAny<CancellationToken>()))
+                            .ThrowsAsync(new Exception());
+
+        var mockLogger = new Mock<ILogger<ContentfulContentFilterService>>();
+        var filterService = new ContentfulContentFilterService(mockContentfulClient.Object, mockLogger.Object);
+
+        var filteredQualifications = await filterService.GetFilteredQualifications(4, 5, 2016);
+
+        filteredQualifications.Should().NotBeNull();
+        filteredQualifications.Should().BeEmpty();
+    }
+}
+
+public class MockQueryBuilder : QueryBuilder<Qualification>
+{
+    public List<KeyValuePair<string, string>> GetQueryString()
+    {
+        return _querystringValues;
+    }
+}
\ No newline at end of file
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Setup/MockContentfulSetupTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Setup/MockContentfulSetupTests.cs
index 513f9b6f..b3e79a7b 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Setup/MockContentfulSetupTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Setup/MockContentfulSetupTests.cs
@@ -16,12 +16,12 @@ public void MockContentfulSetup_IsFluent()
         var services = new ServiceCollection();
 
         // ReSharper disable once InvokeAsExtensionMethod
-        ServiceCollectionExtensions.AddMockContentfulService(services)
+        ServiceCollectionExtensions.AddMockContentfulServices(services)
                                    .Should().BeSameAs(services);
     }
 
     [TestMethod]
-    public void MockContentfulSetup_AddsMockContentfulSingleton()
+    public void MockContentfulSetup_AddsMockContentfulSingletons()
     {
         var serviceList = new List<ServiceDescriptor>();
 
@@ -30,13 +30,18 @@ public void MockContentfulSetup_AddsMockContentfulSingleton()
                 .Callback((ServiceDescriptor d) => serviceList.Add(d));
 
         // ReSharper disable once InvokeAsExtensionMethod
-        _ = ServiceCollectionExtensions.AddMockContentfulService(services.Object);
-
-        serviceList.Count.Should().Be(1);
-        var service = serviceList.Single();
+        _ = ServiceCollectionExtensions.AddMockContentfulServices(services.Object);
 
+        serviceList.Count.Should().Be(2);
+        
+        var service = serviceList.First();
         service.ImplementationType.Should().Be(typeof(MockContentfulService));
         service.ServiceType.Should().Be(typeof(IContentService));
         service.Lifetime.Should().Be(ServiceLifetime.Singleton);
+        
+        var filterService = serviceList[1];
+        filterService.ImplementationType.Should().Be(typeof(MockContentfulFilterService));
+        filterService.ServiceType.Should().Be(typeof(IContentFilterService));
+        filterService.Lifetime.Should().Be(ServiceLifetime.Singleton);
     }
 }
\ No newline at end of file