From 6deadb496a980a8019a5c1af3567896c90f41ff9 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Thu, 20 Jun 2024 10:26:26 +0100
Subject: [PATCH 1/8] Added new awarding organisation page, along with new
 dropdown page type in contentful

---
 .../Constants/QuestionPages.cs                |  7 ++
 .../Entities/DropdownQuestionPage.cs          | 16 +++++
 .../Services/ContentfulContentService.cs      | 22 ++++--
 .../Services/IContentService.cs               |  4 ++
 .../Content/MockContentfulService.cs          | 10 +++
 .../Controllers/QuestionsController.cs        | 70 +++++++++++++++++++
 .../QuestionModels/BaseQuestionModel.cs       |  2 -
 .../QuestionModels/DropdownQuestionModel.cs   | 20 ++++++
 .../Security/SecureHeaderConfiguration.cs     |  7 ++
 .../Views/Questions/Dropdown.cshtml           | 64 +++++++++++++++++
 10 files changed, 215 insertions(+), 7 deletions(-)
 create mode 100644 src/Dfe.EarlyYearsQualification.Content/Entities/DropdownQuestionPage.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs
 create mode 100644 src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml

diff --git a/src/Dfe.EarlyYearsQualification.Content/Constants/QuestionPages.cs b/src/Dfe.EarlyYearsQualification.Content/Constants/QuestionPages.cs
index 5024a7ff..9078d65c 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Constants/QuestionPages.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Constants/QuestionPages.cs
@@ -21,4 +21,11 @@ public static class QuestionPages
     ///     Entry ID for the "When was the qualification started" question page.
     /// </summary>
     public const string WhenWasTheQualificationStarted = "2o331MBr0R6nsZNBem4yvk";
+    
+    //// Dropdown Pages
+
+    /// <summary>
+    ///     Entry ID for the "What is the awarding organisation" question page.
+    /// </summary>
+    public const string WhatIsTheAwardingOrganisation = "7A9txhwSGFrgh3Ye9k5PJ9";
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Content/Entities/DropdownQuestionPage.cs b/src/Dfe.EarlyYearsQualification.Content/Entities/DropdownQuestionPage.cs
new file mode 100644
index 00000000..68373534
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Content/Entities/DropdownQuestionPage.cs
@@ -0,0 +1,16 @@
+namespace Dfe.EarlyYearsQualification.Content.Entities;
+
+public class DropdownQuestionPage
+{
+    public string Question { get; init; } = string.Empty;
+
+    public string CtaButtonText { get; init; } = string.Empty;
+
+    public string ErrorMessage { get; init; } = string.Empty;
+
+    public string DropdownHeading { get; init; } = string.Empty;
+
+    public string NotInListText { get; init; } = string.Empty;
+
+    public string DefaultText { 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 2514019a..7c5cc700 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/ContentfulContentService.cs
@@ -25,7 +25,8 @@ private readonly Dictionary<object, string> _contentTypes
               { typeof(CookiesPage), "cookiesPage" },
               { typeof(PhaseBanner), "phaseBanner" },
               { typeof(CookiesBanner), "cookiesBanner" },
-              { typeof(DateQuestionPage), "dateQuestionPage" }
+              { typeof(DateQuestionPage), "dateQuestionPage" },
+              { typeof(DropdownQuestionPage), "dropdownQuestionPage" }
           };
 
     public async Task<StartPage?> GetStartPage()
@@ -126,10 +127,15 @@ private readonly Dictionary<object, string> _contentTypes
         return await GetEntryById<RadioQuestionPage>(entryId);
     }
 
-      public async Task<DateQuestionPage?> GetDateQuestionPage(string entryId)
-      {
-          return await GetEntryById<DateQuestionPage>(entryId);
-      }
+    public async Task<DateQuestionPage?> GetDateQuestionPage(string entryId) 
+    {
+        return await GetEntryById<DateQuestionPage>(entryId);
+    }
+    
+    public async Task<DropdownQuestionPage?> GetDropdownQuestionPage(string entryId) 
+    {
+        return await GetEntryById<DropdownQuestionPage>(entryId);
+    }
 
     public async Task<PhaseBanner?> GetPhaseBannerContent()
     {
@@ -155,6 +161,12 @@ private readonly Dictionary<object, string> _contentTypes
         return cookiesBannerEntry.First();
     }
 
+    public async Task<List<Qualification>> GetQualifications()
+    {
+        var qualifications = await GetEntriesByType<Qualification>();
+        return qualifications!.ToList();
+    }
+
     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 b4d4cf70..92bb3ce6 100644
--- a/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
+++ b/src/Dfe.EarlyYearsQualification.Content/Services/IContentService.cs
@@ -25,4 +25,8 @@ public interface IContentService
     Task<CookiesBanner?> GetCookiesBannerContent();
 
     Task<DateQuestionPage?> GetDateQuestionPage(string entryId);
+
+    Task<DropdownQuestionPage?> GetDropdownQuestionPage(string entryId);
+
+    Task<List<Qualification>> GetQualifications();
 }
\ 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 080bda7e..7a9263a2 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -149,6 +149,16 @@ await Task.FromResult(CreateDateQuestionPage()),
                };
     }
 
+    public Task<DropdownQuestionPage?> GetDropdownQuestionPage(string entryId)
+    {
+        throw new NotImplementedException();
+    }
+
+    public Task<List<Qualification>> GetQualifications()
+    {
+        throw new NotImplementedException();
+    }
+
     public async Task<StartPage?> GetStartPage()
     {
         var preCtaButtonContent =
diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
index ce7d50b3..14e6355e 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
@@ -7,6 +7,7 @@
 using Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
 using Dfe.EarlyYearsQualification.Web.Services.UserJourneyCookieService;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Rendering;
 
 namespace Dfe.EarlyYearsQualification.Web.Controllers;
 
@@ -113,6 +114,44 @@ public async Task<IActionResult> WhatLevelIsTheQualification(RadioQuestionModel
         
         userJourneyCookieService.SetLevelOfQualification(model.Option!);
 
+        return RedirectToAction(nameof(this.WhatIsTheAwardingOrganisation));
+    }
+    
+    [HttpGet("what-is-the-awarding-organisation")]
+    public async Task<IActionResult> WhatIsTheAwardingOrganisation()
+    {
+        var questionPage = await contentService.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation);
+        if (questionPage is null)
+        {
+            logger.LogError("No content for the question page");
+            return RedirectToAction("Index", "Error");
+        }
+
+        var qualifications = await contentService.GetQualifications();
+
+        var model = MapDropdownModel(new DropdownQuestionModel(), questionPage, qualifications, nameof(this.WhatIsTheAwardingOrganisation),
+                                 Questions);
+        return View("Dropdown", model);
+    }
+    
+    [HttpPost("what-is-the-awarding-organisation")]
+    public async Task<IActionResult> WhatIsTheAwardingOrganisation(DropdownQuestionModel model)
+    {
+        if (!ModelState.IsValid || (string.IsNullOrEmpty(model.SelectedValue) && !model.NotInTheList))
+        {
+            var questionPage = await contentService.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation);
+            if (questionPage is not null)
+            {
+                var qualifications = await contentService.GetQualifications();
+                
+                model = MapDropdownModel(model, questionPage, qualifications, nameof(this.WhatIsTheAwardingOrganisation),
+                                         Questions);
+                model.HasErrors = true;
+            }
+
+            return View("Dropdown", model);
+        }
+        
         return RedirectToAction("Get", "QualificationDetails");
     }
 
@@ -157,4 +196,35 @@ private static DateQuestionModel MapDateModel(DateQuestionModel model, DateQuest
         model.YearLabel = question.YearLabel;
         return model;
     }
+
+    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();
+        
+        model.ActionName = actionName;
+        model.ControllerName = controllerName;
+        model.CtaButtonText = question.CtaButtonText;
+        model.ErrorMessage = question.ErrorMessage;
+        model.Question = question.Question;
+        model.DropdownHeading = question.DropdownHeading;
+        model.NotInListText = question.NotInListText;
+        
+        model.Values.Add(new SelectListItem()
+                         {
+                             Text = question.DefaultText,
+                             Value = ""
+                         });
+       
+       foreach (var awardingOrg in uniqueAwardingOrganisations)
+       {
+           model.Values.Add(new SelectListItem()
+                            {
+                                Value = awardingOrg,
+                                Text = awardingOrg
+                            });
+       }
+
+       return model;
+    }
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/BaseQuestionModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/BaseQuestionModel.cs
index ed49e5d4..5836baad 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/BaseQuestionModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/BaseQuestionModel.cs
@@ -13,6 +13,4 @@ public abstract class BaseQuestionModel
     public string ErrorMessage { get; set; } = string.Empty;
 
     public bool HasErrors { get; set; }
-
-    
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs
new file mode 100644
index 00000000..3a2c4f2d
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs
@@ -0,0 +1,20 @@
+using Microsoft.AspNetCore.Mvc.Rendering;
+
+namespace Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
+
+public class DropdownQuestionModel : BaseQuestionModel
+{
+    public string SelectedValue { get; set; } = string.Empty;
+
+    public List<SelectListItem> Values { get; set; } = [];
+
+    public string DropdownHeading { get; set; } = string.Empty;
+
+    public string NotInListText { get; set; } = string.Empty;
+
+    public string DropdownId { get; init; } = "awarding-organisation-select";
+
+    public string CheckboxId { get; init; } = "awarding-organisation-not-in-list";
+    
+    public bool NotInTheList { get; set; }
+}
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs b/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
index c09d5424..7ba4d05b 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
@@ -40,6 +40,12 @@ public static SecureHeadersMiddlewareConfiguration CustomConfiguration()
                                               CommandType = CspCommandType.Directive,
                                               DirectiveOrUri = "sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms="
                                           };
+            
+        var dropdownPageCheckbox = new ContentSecurityPolicyElement
+                                       {
+                                           CommandType = CspCommandType.Directive,
+                                           DirectiveOrUri = "sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc="
+                                       };
 
         var unsafeHashesElement = new ContentSecurityPolicyElement
                                   { CommandType = CspCommandType.Directive, DirectiveOrUri = "unsafe-hashes" };
@@ -49,6 +55,7 @@ public static SecureHeadersMiddlewareConfiguration CustomConfiguration()
         configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(cookiesPageShaCspElement);
         configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(windowLocationShaCspElement);
         configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(unsafeHashesElement);
+        configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(dropdownPageCheckbox);
         configuration.ContentSecurityPolicyConfiguration.FrameAncestors.Add(contentfulCspElement);
         return configuration;
     }
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
new file mode 100644
index 00000000..c192e69b
--- /dev/null
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
@@ -0,0 +1,64 @@
+@model Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels.DropdownQuestionModel
+
+@{
+    ViewData["Title"] = "Questions";
+}
+
+<script>
+    document.addEventListener('DOMContentLoaded', function() {
+        let checkbox = document.getElementById('awarding-organisation-not-in-list');
+        let dropdown = document.getElementById('@Model.DropdownId');
+
+        checkbox.addEventListener('click', function() {
+            dropdown.disabled = !!checkbox.checked;
+        });
+    });
+</script>
+
+<a href="javascript:window.history.back()" class="govuk-back-link">Back</a>
+<div class="govuk-grid-row">
+    <div class="govuk-grid-column-two-thirds">
+      <div class="govuk-form-group @(Model.HasErrors ? "govuk-form-group--error" : "")">
+        @using (Html.BeginForm(Model.ActionName, Model.ControllerName, FormMethod.Post))
+            {
+                <fieldset class="govuk-fieldset govuk-!-margin-bottom-4">
+                    <legend class="govuk-fieldset__legend govuk-fieldset__legend--l">
+                        <h1 class="govuk-fieldset__heading" id="question">
+                            @Model.Question
+                        </h1>
+                    </legend>
+
+                    @if (Model.HasErrors)
+                    {
+                        <p id="date-error" class="govuk-error-message">
+                            <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
+                        </p>
+                    }
+                    
+                </fieldset>
+                
+                <h1 class="govuk-label-wrapper">
+                    @Html.LabelFor(x => x.DropdownId, Model.DropdownHeading, new { @class = "govuk-label govuk-fieldset__legend--m" })
+                </h1>
+                
+                <div class="govuk-form-group">
+                    @Html.DropDownListFor(x => x.SelectedValue, Model.Values, new { @class = "govuk-select", id = Model.DropdownId })
+                </div>
+                <div class="govuk-form-group">
+                    <div class="govuk-checkboxes__item">
+                        <input class="govuk-checkboxes__input" id="@Model.CheckboxId" name="awarding-organisation" type="checkbox">
+                        <label class="govuk-label govuk-checkboxes__label" for="@Model.CheckboxId">
+                            @Model.NotInListText
+                        </label>
+                    </div>
+                </div>
+
+                <div class="govuk-form-group">
+                    <button id="question-submit" type="submit" class="govuk-button" data-module="govuk-button">
+                        @Model.CtaButtonText
+                    </button>
+                </div>
+                }
+            </div>
+    </div>
+</div>
\ No newline at end of file

From ef78444be5a79717cd68645f20ac2a58ffc4ed86 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Thu, 20 Jun 2024 14:31:14 +0100
Subject: [PATCH 2/8] finished implementation of new awarding organisation page
 - now saving selection to user journey and displaying on qualification list
 page

---
 .../Controllers/QuestionsController.cs              |  3 +++
 .../Content/QuestionModels/DropdownQuestionModel.cs |  8 ++++----
 .../Models/UserJourneyModel.cs                      |  1 +
 .../IUserJourneyCookieService.cs                    |  1 +
 .../UserJourneyCookieService.cs                     |  9 +++++++++
 .../Views/QualificationDetails/Get.cshtml           |  5 +++++
 .../Views/Questions/Dropdown.cshtml                 | 13 ++++++-------
 .../Controllers/QuestionsControllerTests.cs         |  3 +--
 8 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs b/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
index 14e6355e..585c3c1e 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Controllers/QuestionsController.cs
@@ -131,6 +131,7 @@ public async Task<IActionResult> WhatIsTheAwardingOrganisation()
 
         var model = MapDropdownModel(new DropdownQuestionModel(), questionPage, qualifications, nameof(this.WhatIsTheAwardingOrganisation),
                                  Questions);
+        
         return View("Dropdown", model);
     }
     
@@ -152,6 +153,8 @@ public async Task<IActionResult> WhatIsTheAwardingOrganisation(DropdownQuestionM
             return View("Dropdown", model);
         }
         
+        userJourneyCookieService.SetAwardingOrganisation(model.NotInTheList ? string.Empty : model.SelectedValue);
+        
         return RedirectToAction("Get", "QualificationDetails");
     }
 
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs
index 3a2c4f2d..180e5ae7 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/Content/QuestionModels/DropdownQuestionModel.cs
@@ -4,17 +4,17 @@ namespace Dfe.EarlyYearsQualification.Web.Models.Content.QuestionModels;
 
 public class DropdownQuestionModel : BaseQuestionModel
 {
-    public string SelectedValue { get; set; } = string.Empty;
+    public string SelectedValue { get; init; } = string.Empty;
 
-    public List<SelectListItem> Values { get; set; } = [];
+    public List<SelectListItem> Values { get; init; } = [];
 
     public string DropdownHeading { get; set; } = string.Empty;
 
     public string NotInListText { get; set; } = string.Empty;
-
+    
     public string DropdownId { get; init; } = "awarding-organisation-select";
 
     public string CheckboxId { get; init; } = "awarding-organisation-not-in-list";
     
-    public bool NotInTheList { get; set; }
+    public bool NotInTheList { get; init; }
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs b/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs
index 4dc4e818..9a9a9c3d 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Models/UserJourneyModel.cs
@@ -5,4 +5,5 @@ public class UserJourneyModel
   public string WhereWasQualificationAwarded { get; set; } = string.Empty;
   public string WhenWasQualificationAwarded { get; set; } = string.Empty;
   public string LevelOfQualification { get; set; } = string.Empty;
+  public string WhatIsTheAwardingOrganisation { get; set; } = string.Empty;
 }
\ No newline at end of file
diff --git a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs
index efdfb3d7..fe04f9e0 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/IUserJourneyCookieService.cs
@@ -7,6 +7,7 @@ public interface IUserJourneyCookieService
     public void SetWhereWasQualificationAwarded(string location);
     public void SetWhenWasQualificationAwarded(string date);
     public void SetLevelOfQualification(string level);
+    public void SetAwardingOrganisation(string awardingOrganisation);
     public UserJourneyModel GetUserJourneyModelFromCookie();
     public void ResetUserJourneyCookie();
 }
diff --git a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
index 88b711be..b221477f 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
@@ -40,6 +40,15 @@ public void SetLevelOfQualification(string level)
         SetJourneyCookie(model);
     }
 
+    public void SetAwardingOrganisation(string awardingOrganisation)
+    {
+        var model = GetUserJourneyModelFromCookie();
+
+        model.WhatIsTheAwardingOrganisation = awardingOrganisation;
+        
+        SetJourneyCookie(model);
+    }
+
     public UserJourneyModel GetUserJourneyModelFromCookie()
     {
         var cookie = context.HttpContext?.Request.Cookies[CookieKeyNames.UserJourneyKey];
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
index 04c02f32..a7d14f19 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/QualificationDetails/Get.cshtml
@@ -26,6 +26,11 @@
             {
                 <li>@Model.LevelOfQualification</li>
             }
+
+            @if (!string.IsNullOrEmpty(Model.WhatIsTheAwardingOrganisation))
+            {
+                <li>@Model.WhatIsTheAwardingOrganisation</li>
+            }
         </ul>
         
         <p class="govuk-body">
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
index c192e69b..cdf10d02 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
@@ -6,7 +6,7 @@
 
 <script>
     document.addEventListener('DOMContentLoaded', function() {
-        let checkbox = document.getElementById('awarding-organisation-not-in-list');
+        let checkbox = document.getElementById('@Model.CheckboxId');
         let dropdown = document.getElementById('@Model.DropdownId');
 
         checkbox.addEventListener('click', function() {
@@ -38,18 +38,17 @@
                 </fieldset>
                 
                 <h1 class="govuk-label-wrapper">
-                    @Html.LabelFor(x => x.DropdownId, Model.DropdownHeading, new { @class = "govuk-label govuk-fieldset__legend--m" })
+                    @Html.Label(Model.DropdownId, Model.DropdownHeading, new { @class = "govuk-label govuk-fieldset__legend--m" })
                 </h1>
                 
                 <div class="govuk-form-group">
-                    @Html.DropDownListFor(x => x.SelectedValue, Model.Values, new { @class = "govuk-select", id = Model.DropdownId })
+                    @Html.DropDownListFor(x => x.SelectedValue, Model.Values, new { @class = Model.HasErrors ? "govuk-select govuk-select--error" : "govuk-select", id = Model.DropdownId })
                 </div>
+                
                 <div class="govuk-form-group">
                     <div class="govuk-checkboxes__item">
-                        <input class="govuk-checkboxes__input" id="@Model.CheckboxId" name="awarding-organisation" type="checkbox">
-                        <label class="govuk-label govuk-checkboxes__label" for="@Model.CheckboxId">
-                            @Model.NotInListText
-                        </label>
+                        @Html.CheckBoxFor(x => x.NotInTheList, new { @class = "govuk-checkboxes__input", id=Model.CheckboxId, name="awarding-organisation" })
+                        @Html.Label(Model.CheckboxId, Model.NotInListText, new { @class = "govuk-label govuk-checkboxes__label" })
                     </div>
                 </div>
 
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
index 72d3e704..ecbfa89c 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
@@ -483,8 +483,7 @@ public async Task Post_WhatLevelIsTheQualification_ReturnsRedirectResponse()
         var resultType = result as RedirectToActionResult;
         resultType.Should().NotBeNull();
 
-        resultType!.ActionName.Should().Be("Get");
-        resultType.ControllerName.Should().Be("QualificationDetails");
+        resultType!.ActionName.Should().Be("WhatIsTheAwardingOrganisation");
         
         mockUserJourneyCookieService.Verify(x => x.SetLevelOfQualification("2"), Times.Once);
     }

From 2d87d7f89e48d9c82bd25e5a7b67ef9e3c5850c5 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Thu, 20 Jun 2024 16:47:08 +0100
Subject: [PATCH 3/8] added unit tests for the new awarding org page

---
 .../Controllers/QuestionsControllerTests.cs   | 291 ++++++++++++++++++
 .../Services/UserJourneyCookieServiceTests.cs |  21 +-
 2 files changed, 311 insertions(+), 1 deletion(-)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
index ecbfa89c..10d7a1c2 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
@@ -487,4 +487,295 @@ public async Task Post_WhatLevelIsTheQualification_ReturnsRedirectResponse()
         
         mockUserJourneyCookieService.Verify(x => x.SetLevelOfQualification("2"), Times.Once);
     }
+    
+    [TestMethod]
+    public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsNoQuestionPage_RedirectsToErrorPage()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
+                          .ReturnsAsync((DropdownQuestionPage?)default).Verifiable();
+
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+
+        var result = await controller.WhatIsTheAwardingOrganisation();
+
+        mockContentService.VerifyAll();
+
+        result.Should().NotBeNull();
+
+        var resultType = result as RedirectToActionResult;
+        result.Should().NotBeNull();
+
+        resultType!.ActionName.Should().Be("Index");
+        resultType.ControllerName.Should().Be("Error");
+
+        mockLogger.VerifyError("No content for the question page");
+    }
+
+    [TestMethod]
+    public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQuestionPage_ReturnsQuestionModel()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        var questionPage = new DropdownQuestionPage()
+                           {
+                               Question = "Test question",
+                               CtaButtonText = "Continue",
+                               ErrorMessage = "Test error message",
+                               DropdownHeading = "Test dropdown heading",
+                               NotInListText = "Test not in the list text",
+                               DefaultText = "Test default text"
+                           };
+        
+        mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
+                          .ReturnsAsync(questionPage);
+
+        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync([]);
+
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.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!.Question.Should().Be(questionPage.Question);
+        model.CtaButtonText.Should().Be(questionPage.CtaButtonText);
+        model.ErrorMessage.Should().Be(questionPage.ErrorMessage);
+        model.DropdownHeading.Should().Be(questionPage.DropdownHeading);
+        model.HasErrors.Should().BeFalse();
+        model.Values.Count().Should().Be(1);
+        model.Values.First().Text.Should().Be(questionPage.DefaultText);
+        model.Values.First().Value.Should().BeEmpty();
+        model.NotInListText.Should().Be(questionPage.NotInListText);
+    }
+    
+    [TestMethod]
+    public async Task WhatIsTheAwardingOrganisation_ContentServiceReturnsQualifications_OrdersAwardingOrganisationsInModel()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+
+        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, null),
+                                       new("2", "TEST",
+                                                         "E awarding organisation", 123, null,
+                                                         null, null, null, null),
+                                       new("3", "TEST",
+                                                         "A awarding organisation", 123, null,
+                                                         null, null, null, null),
+                                       new("4", "TEST",
+                                                         "C awarding organisation", 123, null,
+                                                         null, null, null, null),
+                                       new("5", "TEST",
+                                                         "B awarding organisation", 123, null,
+                                                         null, null, null, null)
+                                   };
+        
+        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync(listOfQualifications);
+
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.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(6);
+        model.Values.First().Text.Should().Be(questionPage.DefaultText);
+        model.Values.First().Value.Should().BeEmpty();
+
+        model.Values[1].Text.Should().Be("A awarding organisation");
+        model.Values[2].Text.Should().Be("B awarding organisation");
+        model.Values[3].Text.Should().Be("C awarding organisation");
+        model.Values[4].Text.Should().Be("D awarding organisation");
+        model.Values[5].Text.Should().Be("E awarding organisation");
+    }
+    
+    [TestMethod]
+    public async Task Post_WhatIsTheAwardingOrganisation_InvalidModel_ReturnsQuestionPage()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+
+        var questionPage = new DropdownQuestionPage()
+                           {
+                               Question = "Test question",
+                               CtaButtonText = "Continue",
+                               ErrorMessage = "Test error message",
+                               DropdownHeading = "Test dropdown heading",
+                               NotInListText = "Test not in the list text",
+                               DefaultText = "Test default text"
+                           };
+        
+        mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
+                          .ReturnsAsync(questionPage);
+        
+        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync([]);
+        
+        controller.ModelState.AddModelError("option", "test error");
+        var result = await controller.WhatIsTheAwardingOrganisation(new DropdownQuestionModel());
+
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+
+        resultType!.ViewName.Should().Be("Dropdown");
+        
+        var model = resultType!.Model as DropdownQuestionModel;
+        model.Should().NotBeNull();
+
+        model!.HasErrors.Should().BeTrue();
+        
+        mockUserJourneyCookieService.Verify(x => x.SetAwardingOrganisation(It.IsAny<string>()), Times.Never);
+    }
+    
+    [TestMethod]
+    public async Task Post_WhatIsTheAwardingOrganisation_NoValueSelectedAndNotInListNotSelected_ReturnsQuestionPage()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+        
+        var result = await controller.WhatIsTheAwardingOrganisation(new DropdownQuestionModel()
+                                                                    {
+                                                                        SelectedValue = string.Empty,
+                                                                        NotInTheList = false
+                                                                    });
+
+        result.Should().NotBeNull();
+
+        var resultType = result as ViewResult;
+        resultType.Should().NotBeNull();
+        
+        resultType!.ViewName.Should().Be("Dropdown");
+        
+        mockUserJourneyCookieService.Verify(x => x.SetAwardingOrganisation(It.IsAny<string>()), Times.Never);
+    }
+    
+    [TestMethod]
+    public async Task Post_WhatIsTheAwardingOrganisation_AwardingOrgPassedIn_SetsJourneyCookieAndRedirectsToTheQualificationListPage()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+
+        var questionPage = new DropdownQuestionPage()
+                           {
+                               Question = "Test question",
+                               CtaButtonText = "Continue",
+                               ErrorMessage = "Test error message",
+                               DropdownHeading = "Test dropdown heading",
+                               NotInListText = "Test not in the list text",
+                               DefaultText = "Test default text"
+                           };
+        
+        mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
+                          .ReturnsAsync(questionPage);
+        
+        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync([]);
+        
+        var result = await controller.WhatIsTheAwardingOrganisation(new DropdownQuestionModel()
+                                                                    {
+                                                                        SelectedValue = "Some Awarding Organisation",
+                                                                        NotInTheList = false
+                                                                    });
+
+        result.Should().NotBeNull();
+
+        result.Should().NotBeNull();
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+
+        resultType!.ActionName.Should().Be("Get");
+        resultType.ControllerName.Should().Be("QualificationDetails");
+        
+        mockUserJourneyCookieService.Verify(x => x.SetAwardingOrganisation("Some Awarding Organisation"), Times.Once);
+    }
+    
+    [TestMethod]
+    public async Task Post_WhatIsTheAwardingOrganisation_NotInTheListPassedIn_DoesNotSetsJourneyCookieAndRedirectsToTheQualificationListPage()
+    {
+        var mockLogger = new Mock<ILogger<QuestionsController>>();
+        var mockContentService = new Mock<IContentService>();
+        var mockRenderer = new Mock<IHtmlRenderer>();
+        var mockUserJourneyCookieService = new Mock<IUserJourneyCookieService>();
+        
+        var controller = new QuestionsController(mockLogger.Object, mockContentService.Object, mockRenderer.Object, mockUserJourneyCookieService.Object);
+
+        var questionPage = new DropdownQuestionPage()
+                           {
+                               Question = "Test question",
+                               CtaButtonText = "Continue",
+                               ErrorMessage = "Test error message",
+                               DropdownHeading = "Test dropdown heading",
+                               NotInListText = "Test not in the list text",
+                               DefaultText = "Test default text"
+                           };
+        
+        mockContentService.Setup(x => x.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation))
+                          .ReturnsAsync(questionPage);
+        
+        mockContentService.Setup(x => x.GetQualifications()).ReturnsAsync([]);
+        
+        var result = await controller.WhatIsTheAwardingOrganisation(new DropdownQuestionModel()
+                                                                    {
+                                                                        SelectedValue = "",
+                                                                        NotInTheList = true
+                                                                    });
+
+        result.Should().NotBeNull();
+
+        result.Should().NotBeNull();
+        var resultType = result as RedirectToActionResult;
+        resultType.Should().NotBeNull();
+
+        resultType!.ActionName.Should().Be("Get");
+        resultType.ControllerName.Should().Be("QualificationDetails");
+        
+        mockUserJourneyCookieService.Verify(x => x.SetAwardingOrganisation(string.Empty), Times.Once);
+    }
 }
\ No newline at end of file
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
index 6a1cd08f..bbb1440a 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
@@ -68,6 +68,25 @@ public void SetLevelOfQualification_StringProvided_SetsCookieCorrectly()
         
         CheckSerializedModelWasSet(mockHttpContextAccessor, serialisedModelToCheck);
     }
+    
+    [TestMethod]
+    public void SetAwardingOrganisation_StringProvided_SetsCookieCorrectly()
+    {
+        var modelInCookie = new UserJourneyModel();
+        var mockHttpContextAccessor = SetHttpContextWithExistingCookie(modelInCookie);
+        var mockLogger = new Mock<ILogger<UserJourneyCookieService>>();
+        
+        var service = new UserJourneyCookieService(mockHttpContextAccessor.Object, mockLogger.Object);
+        
+        service.SetAwardingOrganisation("some test string");
+        
+        var serialisedModelToCheck = JsonSerializer.Serialize(new UserJourneyModel()
+                                                              {
+                                                                  WhatIsTheAwardingOrganisation = "some test string"
+                                                              });
+        
+        CheckSerializedModelWasSet(mockHttpContextAccessor, serialisedModelToCheck);
+    }
 
     [TestMethod]
     public void GetUserJourneyModelFromCookie_NoCookiePresent_SetsBaseModelAsCookie()
@@ -83,7 +102,7 @@ public void GetUserJourneyModelFromCookie_NoCookiePresent_SetsBaseModelAsCookie(
         model.WhenWasQualificationAwarded.Should().BeEmpty();
         model.WhereWasQualificationAwarded.Should().BeEmpty();
 
-        var serialisedModelToCheck = JsonSerializer.Serialize(model);
+        var serialisedModelToCheck = JsonSerializer.Serialize(new UserJourneyModel());
         CheckSerializedModelWasSet(mockHttpContextAccessor, serialisedModelToCheck);
     }
     

From f550dad917199b777d250aa5a89117e13a5dce13 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Thu, 20 Jun 2024 16:53:37 +0100
Subject: [PATCH 4/8] removed unnecessary null supression

---
 .../Controllers/QuestionsControllerTests.cs                     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
index 10d7a1c2..294c691a 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Controllers/QuestionsControllerTests.cs
@@ -659,7 +659,7 @@ public async Task Post_WhatIsTheAwardingOrganisation_InvalidModel_ReturnsQuestio
 
         resultType!.ViewName.Should().Be("Dropdown");
         
-        var model = resultType!.Model as DropdownQuestionModel;
+        var model = resultType.Model as DropdownQuestionModel;
         model.Should().NotBeNull();
 
         model!.HasErrors.Should().BeTrue();

From f25d21ab94d3abce7d382054db7914ca8b73c0db Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Thu, 20 Jun 2024 17:01:42 +0100
Subject: [PATCH 5/8] fixed dodgy main merge

---
 .../Security/SecureHeaderConfiguration.cs     | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs b/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
index c09d5424..c6fc5756 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Security/SecureHeaderConfiguration.cs
@@ -41,6 +41,24 @@ public static SecureHeadersMiddlewareConfiguration CustomConfiguration()
                                               DirectiveOrUri = "sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms="
                                           };
 
+        var govukFrontendSupportedElement = new ContentSecurityPolicyElement
+                                            {
+                                                CommandType = CspCommandType.Directive,
+                                                DirectiveOrUri = "sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw="
+                                            };
+        
+        var govukAllMinifiedElement = new ContentSecurityPolicyElement
+                                            {
+                                                CommandType = CspCommandType.Directive,
+                                                DirectiveOrUri = "sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo="
+                                            };
+        
+        var dropdownPageCheckbox = new ContentSecurityPolicyElement
+                                   {
+                                       CommandType = CspCommandType.Directive,
+                                       DirectiveOrUri = "sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc="
+                                   };
+
         var unsafeHashesElement = new ContentSecurityPolicyElement
                                   { CommandType = CspCommandType.Directive, DirectiveOrUri = "unsafe-hashes" };
         var contentfulCspElement = new ContentSecurityPolicyElement
@@ -49,7 +67,11 @@ public static SecureHeadersMiddlewareConfiguration CustomConfiguration()
         configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(cookiesPageShaCspElement);
         configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(windowLocationShaCspElement);
         configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(unsafeHashesElement);
+        configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(govukFrontendSupportedElement);
+        configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(govukAllMinifiedElement);
         configuration.ContentSecurityPolicyConfiguration.FrameAncestors.Add(contentfulCspElement);
+        configuration.ContentSecurityPolicyConfiguration.ScriptSrc.Add(dropdownPageCheckbox);
+        
         return configuration;
     }
 }
\ No newline at end of file

From bbc909081abe257311c304f284917fee4d248840 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Fri, 21 Jun 2024 11:00:49 +0100
Subject: [PATCH 6/8] Added new cypress tests and altered main journey test to
 include new page

---
 .../Content/MockContentfulService.cs          | 41 +++++++++++++++++--
 .../Views/Questions/Dropdown.cshtml           |  2 +-
 .../cypress/e2e/journey/journey-spec.cy.js    | 10 ++++-
 .../cypress/e2e/pages/question-spec.cy.js     | 27 ++++++++++++
 .../e2e/shared/security-header-spec.cy.js     |  6 +--
 5 files changed, 78 insertions(+), 8 deletions(-)

diff --git a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
index 7a9263a2..dd6abeeb 100644
--- a/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
+++ b/src/Dfe.EarlyYearsQualification.Mock/Content/MockContentfulService.cs
@@ -149,14 +149,36 @@ await Task.FromResult(CreateDateQuestionPage()),
                };
     }
 
-    public Task<DropdownQuestionPage?> GetDropdownQuestionPage(string entryId)
+    public async Task<DropdownQuestionPage?> GetDropdownQuestionPage(string entryId)
     {
-        throw new NotImplementedException();
+        return entryId switch
+               {
+                   QuestionPages.WhatIsTheAwardingOrganisation =>
+                       await Task.FromResult(CreateDropdownPage()),
+                   _ => throw new NotImplementedException($"No dropdown question page mock for entry {entryId}")
+               };
     }
 
     public Task<List<Qualification>> GetQualifications()
     {
-        throw new NotImplementedException();
+        return Task.FromResult(new List<Qualification>
+                               {
+                                   new("1", "TEST",
+                                       "A awarding organisation", 123, null,
+                                       null, null, null, null),
+                                   new("2", "TEST",
+                                       "B awarding organisation", 123, null,
+                                       null, null, null, null),
+                                   new("3", "TEST",
+                                       "C awarding organisation", 123, null,
+                                       null, null, null, null),
+                                   new("4", "TEST",
+                                       "D awarding organisation", 123, null,
+                                       null, null, null, null),
+                                   new("5", "TEST",
+                                       "E awarding organisation", 123, null,
+                                       null, null, null, null)
+                               });
     }
 
     public async Task<StartPage?> GetStartPage()
@@ -261,6 +283,19 @@ private static DateQuestionPage CreateDateQuestionPage()
                 QuestionHint = "Test Question Hint"
               };
     }
+
+    private static DropdownQuestionPage CreateDropdownPage()
+    {
+        return new DropdownQuestionPage
+               {
+                   Question = "Test Dropdown Question",
+                   ErrorMessage = "Test Error Message",
+                   CtaButtonText = "Test Button Text",
+                   DefaultText = "Test Default Dropdown Text",
+                   DropdownHeading = "Test Dropdown Heading",
+                   NotInListText = "Test Not In The List"
+               };
+    }
     
     private static AdvicePage CreateAdvicePage(string heading, Document body)
     {
diff --git a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
index cdf10d02..575fd47b 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
+++ b/src/Dfe.EarlyYearsQualification.Web/Views/Questions/Dropdown.cshtml
@@ -30,7 +30,7 @@
 
                     @if (Model.HasErrors)
                     {
-                        <p id="date-error" class="govuk-error-message">
+                        <p id="dropdown-error" class="govuk-error-message">
                             <span class="govuk-visually-hidden">Error:</span> @Model.ErrorMessage
                         </p>
                     }
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 88ac1c5c..323088a0 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
@@ -51,7 +51,15 @@ describe('A spec used to test the various routes through the journey', () => {
     })
     cy.get('#3').click();
     cy.get('button[id="question-submit"]').click();
-
+    
+    // what-is-the-awarding-organisation page
+    cy.location().should((loc) => {
+      expect(loc.pathname).to.eq('/questions/what-is-the-awarding-organisation');
+    })
+    
+    cy.get('#awarding-organisation-select').select('A awarding organisation');
+    cy.get('button[id="question-submit"]').click();
+    
     // qualifications page (This is only a temporary page)
     cy.location().should((loc) => {
       expect(loc.pathname).to.eq('/qualifications');
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/question-spec.cy.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/question-spec.cy.js
index 9aab54c9..7352ef89 100644
--- a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/question-spec.cy.js
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/pages/question-spec.cy.js
@@ -80,4 +80,31 @@ describe("A spec that tests question pages", () => {
         cy.get('#option-error').should("contain.text", "Test error message");
         cy.get(".govuk-form-group").should("have.class", "govuk-form-group--error");
     })
+    
+    /// What is the awarding organisation page
+    it("Checks the content on what-is-the-awarding-organisation page", () => {
+        cy.visit("/questions/what-is-the-awarding-organisation");
+
+        cy.get("#question").should("contain.text", "Test Dropdown Question");
+        cy.get("#awarding-organisation-select").should("exist");
+        cy.get("#awarding-organisation-not-in-list").should("exist");
+        cy.get('button[id="question-submit"]').should("exist");
+    })
+
+    it("shows an error message when a user doesnt select an option from the dropdown list" +
+        "and also does not check 'not in the list' on the what-is-the-awarding-organisation", () => {
+        cy.visit("/questions/what-is-the-awarding-organisation");
+
+        cy.get("#dropdown-error").should("not.exist");
+        cy.get("#awarding-organisation-select").should("not.have.class", "govuk-select--error");
+
+        cy.get('button[id="question-submit"]').click();
+        cy.location().should((loc) => {
+            expect(loc.pathname).to.eq("/questions/what-is-the-awarding-organisation");
+        })
+
+        cy.get('#dropdown-error').should("exist");
+        cy.get('#dropdown-error').should("contain.text", "Test Error Message");
+        cy.get("#awarding-organisation-select").should("have.class", "govuk-select--error");
+    })
 })
\ No newline at end of file
diff --git a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/security-header-spec.cy.js b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/security-header-spec.cy.js
index e4d653e5..d58c6f4d 100644
--- a/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/security-header-spec.cy.js
+++ b/tests/Dfe.EarlyYearsQualification.E2ETests/cypress/e2e/shared/security-header-spec.cy.js
@@ -21,7 +21,7 @@ describe("A spec that checks for security headers in the response", () => {
         );
         expect(response.headers).to.have.property(
           "content-security-policy",
-          "script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=';object-src 'self';frame-ancestors https://app.contentful.com;block-all-mixed-content;upgrade-insecure-requests;"
+          "script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=';object-src 'self';frame-ancestors https://app.contentful.com;block-all-mixed-content;upgrade-insecure-requests;"
         );
         expect(response.headers).to.have.property(
           "cross-origin-resource-policy",
@@ -62,7 +62,7 @@ describe("A spec that checks for security headers in the response", () => {
         );
         expect(response.headers).to.have.property(
           "content-security-policy",
-          "script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=';object-src 'self';frame-ancestors https://app.contentful.com;block-all-mixed-content;upgrade-insecure-requests;"
+          "script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=';object-src 'self';frame-ancestors https://app.contentful.com;block-all-mixed-content;upgrade-insecure-requests;"
         );
         expect(response.headers).to.have.property(
           "cross-origin-resource-policy",
@@ -97,7 +97,7 @@ describe("A spec that checks for security headers in the response", () => {
         );
         expect(response.headers).to.have.property(
           "content-security-policy",
-          "script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=';object-src 'self';frame-ancestors https://app.contentful.com;block-all-mixed-content;upgrade-insecure-requests;"
+          "script-src 'self' 'sha256-2eCA8tPChvVMeSRvRNqlmBco1wRmAKXWVzJ8Vpb9S6Y=' 'sha256-ibd3+9XjZn7Vg7zojLQbgAN/fA220kK9gifwVI944SI=' 'sha256-Om9RNNoMrdmIZzT4Oo7KaozVNUg6zYxVQuq3CPld2Ms=' 'unsafe-hashes' 'sha256-GUQ5ad8JK5KmEWmROf3LZd9ge94daqNvd8xy9YS1iDw=' 'sha256-l5MP+9OapFXGxjKMNj/89ExAW2TvAFFoADrbsmtSJXo=' 'sha256-pwrEcsLN2o+4gQQDR/0sGCITSf0nhhLAzP4h73+5foc=';object-src 'self';frame-ancestors https://app.contentful.com;block-all-mixed-content;upgrade-insecure-requests;"
         );
         expect(response.headers).to.have.property(
           "cross-origin-resource-policy",

From 024e66abd6809d67e3c9a88c129c4eee66a02c12 Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Fri, 21 Jun 2024 12:24:36 +0100
Subject: [PATCH 7/8] added new tests for 100% coverage in user journey cookie
 service and fixed bug with setting null cookie in tests

---
 .../UserJourneyCookieService.cs               | 20 +++-----------
 .../Services/UserJourneyCookieServiceTests.cs | 27 ++++++++++++++++---
 2 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
index b221477f..b235134a 100644
--- a/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
+++ b/src/Dfe.EarlyYearsQualification.Web/Services/UserJourneyCookieService/UserJourneyCookieService.cs
@@ -60,13 +60,8 @@ public UserJourneyModel GetUserJourneyModelFromCookie()
 
         try
         {
-            var journeyCookie = JsonSerializer.Deserialize<UserJourneyModel>(cookie);
-
-            if (journeyCookie != null) return journeyCookie;
-
-            ResetUserJourneyCookie();
-            return new UserJourneyModel();
-
+            var toReturn = JsonSerializer.Deserialize<UserJourneyModel>(cookie);
+            return toReturn!;
         }
         catch
         {
@@ -82,14 +77,7 @@ public void ResetUserJourneyCookie()
 
     private void SetJourneyCookie(UserJourneyModel model)
     {
-        try
-        {
-            var serializedCookie = JsonSerializer.Serialize(model);
-            context.HttpContext?.Response.Cookies.Append(CookieKeyNames.UserJourneyKey, serializedCookie, _options);
-        }
-        catch
-        {
-            logger.LogError("Failed to serialize user journey model");
-        }
+        var serializedCookie = JsonSerializer.Serialize(model);
+        context.HttpContext?.Response.Cookies.Append(CookieKeyNames.UserJourneyKey, serializedCookie, _options);
     }
 }
\ No newline at end of file
diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
index bbb1440a..bcf57851 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Services/UserJourneyCookieServiceTests.cs
@@ -126,6 +126,24 @@ public void GetUserJourneyModelFromCookie_CookieModelSerializesOK_SetsCookieAsPr
         model.WhenWasQualificationAwarded.Should().Be(existingModel.WhenWasQualificationAwarded);
         model.WhereWasQualificationAwarded.Should().Be(existingModel.WhereWasQualificationAwarded);
     }
+    
+    [TestMethod]
+    public void GetUserJourneyModelFromCookie_CookieModelDoesntSerialize_SetsBaseModelAsCookie()
+    {
+        var mockHttpContextAccessor = SetHttpContextWithExistingCookie("test failure");
+        var mockLogger = new Mock<ILogger<UserJourneyCookieService>>();
+        
+        var service = new UserJourneyCookieService(mockHttpContextAccessor.Object, mockLogger.Object);
+
+        var model = service.GetUserJourneyModelFromCookie();
+
+        model.LevelOfQualification.Should().BeEmpty();
+        model.WhenWasQualificationAwarded.Should().BeEmpty();
+        model.WhereWasQualificationAwarded.Should().BeEmpty();
+
+        var serialisedModelToCheck = JsonSerializer.Serialize(new UserJourneyModel());
+        CheckSerializedModelWasSet(mockHttpContextAccessor, serialisedModelToCheck);
+    }
 
     [TestMethod]
     public void ResetUserJourneyCookie_NoCookieSet_AddsBaseModelAsCookie()
@@ -168,9 +186,12 @@ private static Mock<IHttpContextAccessor> SetHttpContextWithExistingCookie(objec
         var requestCookiesMock = new Mock<IRequestCookieCollection>();
         var responseCookiesMock = new Mock<IResponseCookies>();
 
-        requestCookiesMock.Setup(cookiesCollection => cookiesCollection[CookieKeyNames.UserJourneyKey])
-                          .Returns(serializedModel);
-        responseCookiesMock.Setup(x => x.Delete(It.IsAny<string>())).Verifiable();
+        if (model != null)
+        {
+            requestCookiesMock.Setup(cookiesCollection => cookiesCollection[CookieKeyNames.UserJourneyKey])
+                              .Returns(serializedModel);
+            responseCookiesMock.Setup(x => x.Delete(It.IsAny<string>())).Verifiable();
+        }
 
         var httpContextMock = new Mock<IHttpContextAccessor>();
         httpContextMock.Setup(contextAccessor => contextAccessor.HttpContext!.Request.Cookies)

From 23d92f3fa7e220faa33754296d9b177512c6f6dd Mon Sep 17 00:00:00 2001
From: Daniel Clarke <daniel.clarke@education.gov.uk>
Date: Fri, 21 Jun 2024 13:15:11 +0100
Subject: [PATCH 8/8] added tests for new mock content

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

diff --git a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
index d7140e81..3e3835b0 100644
--- a/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
+++ b/tests/Dfe.EarlyYearsQualification.UnitTests/Mocks/MockContentfulServiceTests.cs
@@ -204,6 +204,43 @@ public async Task GetDateQuestionPage_PassInvalidEntryId_ReturnsException()
         await act.Should().ThrowAsync<NotImplementedException>()
                  .WithMessage("No date question page mock for entry Fake_entry_id");
     }
+    
+    [TestMethod]
+    public async Task GetDropdownQuestionPage_PassWhenWasQualificationStartedId_ReturnsExpectedDetails()
+    {
+        var contentfulService = new MockContentfulService();
+
+        var result = await contentfulService.GetDropdownQuestionPage(QuestionPages.WhatIsTheAwardingOrganisation);
+
+        result.Should().NotBeNull();
+        result!.CtaButtonText.Should().Be("Test Button Text");
+        result.ErrorMessage.Should().Be("Test Error Message");
+        result.Question.Should().Be("Test Dropdown Question");
+        result.DefaultText.Should().Be("Test Default Dropdown Text");
+        result.DropdownHeading.Should().Be("Test Dropdown Heading");
+        result.NotInListText.Should().Be("Test Not In The List");
+    }
+
+    [TestMethod]
+    public async Task GetDropdownQuestionPage_PassInvalidEntryId_ReturnsException()
+    {
+        var contentfulService = new MockContentfulService();
+
+        Func<Task> act = () => contentfulService.GetDropdownQuestionPage("Fake_entry_id");
+
+        await act.Should().ThrowAsync<NotImplementedException>()
+                 .WithMessage("No dropdown question page mock for entry Fake_entry_id");
+    }
+
+    [TestMethod]
+    public async Task GetQualifications_ReturnsAListOfQualifications()
+    {
+        var contentfulService = new MockContentfulService();
+
+        var result = await contentfulService.GetQualifications();
+
+        result.Count.Should().Be(5);
+    }
 
     [TestMethod]
     public async Task GetStartPage_ReturnsExpectedDetails()