From 657a217d950b95f17e979eb5485950775ef6a108 Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Thu, 11 Apr 2024 15:35:13 +0100
Subject: [PATCH 1/9] Fix review licence page

https://eaflood.atlassian.net/browse/WATER-4219

Following from the testing of the above ticket, two issues with the page was discovered. The first being where we are meant to display the charge reference billable volume this is actually displaying the charge elements and the second issue being a piece of text missing at the top of the page. This PR is to fix those issues.

From 64defada52d0cbab7fb0be7f968c797b271e5ae8 Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Thu, 11 Apr 2024 16:23:00 +0100
Subject: [PATCH 2/9] Elements in review text

---
 .../two-part-tariff/review-licence.presenter.js     | 13 +++++++++++++
 app/views/bill-runs/review-licence.njk              |  8 ++++++++
 .../review-licence.presenter.test.js                |  1 +
 3 files changed, 22 insertions(+)

diff --git a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
index e31ced1264..e971345fe8 100644
--- a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
+++ b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
@@ -26,12 +26,25 @@ function go (billRun, licence) {
       status: licence[0].status,
       licenceHolder: licence[0].licenceHolder
     },
+    elementsInReview: _elementsInReview(licence[0]),
     matchedReturns: _matchedReturns(licence[0].reviewReturns),
     unmatchedReturns: _unmatchedReturns(licence[0].reviewReturns),
     chargeData: _prepareChargeData(licence, billRun)
   }
 }
 
+function _elementsInReview (licence) {
+  const hasReviewStatus = licence.reviewChargeVersions.some((chargeVersion) => {
+    return chargeVersion.reviewChargeReferences.some((chargeReference) => {
+      return chargeReference.reviewChargeElements.some((chargeElement) => {
+        return chargeElement.status === 'review'
+      })
+    })
+  })
+
+  return `${hasReviewStatus}`
+}
+
 function _accountName (billingAccount) {
   const accountAddress = billingAccount.billingAccountAddresses[0]
 
diff --git a/app/views/bill-runs/review-licence.njk b/app/views/bill-runs/review-licence.njk
index 058277ad8c..08937928e4 100644
--- a/app/views/bill-runs/review-licence.njk
+++ b/app/views/bill-runs/review-licence.njk
@@ -4,6 +4,7 @@
 {% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
 {% from "govuk/components/details/macro.njk" import govukDetails %}
 {% from "macros/review-status-tag.njk" import statusTag %}
+{% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
 
 {% block breadcrumbs %}
   {# Back link #}
@@ -41,6 +42,13 @@
       </a></li>
   </ul>
 
+  {# ------------- Licence in review text --------------- #}
+  {% if elementsInReview === 'true' %}
+    {{ govukInsetText({
+      text: "There are elements in review"
+    }) }}
+  {% endif %}
+
   {# ------------- Charge Periods --------------- #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
diff --git a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
index c86ed5d296..e45ab9a00c 100644
--- a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
+++ b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
@@ -32,6 +32,7 @@ describe('Review Licence presenter', () => {
           status: 'ready',
           licenceHolder: 'Licence Holder Ltd'
         },
+        elementsInReview: 'false',
         matchedReturns: [
           {
             returnId: 'v1:1:01/60/28/3437:17061181:2022-04-01:2023-03-31',

From f4f2218561c8ae995c60a42aa434792a73355269 Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Thu, 11 Apr 2024 17:00:54 +0100
Subject: [PATCH 3/9] Fix true/false

---
 .../review-licence.presenter.js               | 24 +++++++++----------
 app/views/bill-runs/review-licence.njk        |  2 +-
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
index e971345fe8..13d7f5d981 100644
--- a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
+++ b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
@@ -33,18 +33,6 @@ function go (billRun, licence) {
   }
 }
 
-function _elementsInReview (licence) {
-  const hasReviewStatus = licence.reviewChargeVersions.some((chargeVersion) => {
-    return chargeVersion.reviewChargeReferences.some((chargeReference) => {
-      return chargeReference.reviewChargeElements.some((chargeElement) => {
-        return chargeElement.status === 'review'
-      })
-    })
-  })
-
-  return `${hasReviewStatus}`
-}
-
 function _accountName (billingAccount) {
   const accountAddress = billingAccount.billingAccountAddresses[0]
 
@@ -140,6 +128,18 @@ function _contactName (billingAccount) {
   return null
 }
 
+function _elementsInReview (licence) {
+  const hasReviewStatus = licence.reviewChargeVersions.some((chargeVersion) => {
+    return chargeVersion.reviewChargeReferences.some((chargeReference) => {
+      return chargeReference.reviewChargeElements.some((chargeElement) => {
+        return chargeElement.status === 'review'
+      })
+    })
+  })
+
+  return hasReviewStatus
+}
+
 function _financialYear (financialYearEnding) {
   const startYear = financialYearEnding - 1
   const endYear = financialYearEnding
diff --git a/app/views/bill-runs/review-licence.njk b/app/views/bill-runs/review-licence.njk
index 08937928e4..82ee8c9978 100644
--- a/app/views/bill-runs/review-licence.njk
+++ b/app/views/bill-runs/review-licence.njk
@@ -43,7 +43,7 @@
   </ul>
 
   {# ------------- Licence in review text --------------- #}
-  {% if elementsInReview === 'true' %}
+  {% if elementsInReview === true %}
     {{ govukInsetText({
       text: "There are elements in review"
     }) }}

From 9e8dbdaa7e2afc611d3565a71535fffd85333749 Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Thu, 11 Apr 2024 17:04:42 +0100
Subject: [PATCH 4/9] Fix test

---
 .../bill-runs/two-part-tariff/review-licence.presenter.test.js  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
index e45ab9a00c..c8d9e47eca 100644
--- a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
+++ b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
@@ -32,7 +32,7 @@ describe('Review Licence presenter', () => {
           status: 'ready',
           licenceHolder: 'Licence Holder Ltd'
         },
-        elementsInReview: 'false',
+        elementsInReview: false,
         matchedReturns: [
           {
             returnId: 'v1:1:01/60/28/3437:17061181:2022-04-01:2023-03-31',

From 3a95ceb6e44e68de60e74745f52feedff6fe135c Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Mon, 15 Apr 2024 10:55:58 +0100
Subject: [PATCH 5/9] Clean up views

---
 app/views/bill-runs/match-details.njk  | 10 +++++-----
 app/views/bill-runs/review-licence.njk | 16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/bill-runs/match-details.njk b/app/views/bill-runs/match-details.njk
index a8d140b910..c1050fe39f 100644
--- a/app/views/bill-runs/match-details.njk
+++ b/app/views/bill-runs/match-details.njk
@@ -27,7 +27,7 @@
         {{ statusTag(chargeElement.status) }}
       </p>
 
-      {# ------------- Licence nav bars --------------- #}
+      {# Licence nav bars #}
       <ul class="govuk-summary-list__actions-list govuk-!-margin-bottom-3">
         <li class="govuk-summary-list__actions-list-item"><a class="govuk-link govuk-!-font-weight-bold govuk-link--no-visited-state govuk-link--no-underline" href="/licences/{{ licenceId }}#summary">
             Summary
@@ -45,7 +45,7 @@
   <div class="govuk-caption-m"> Financial year {{ financialYear }}</div>
   <h2 class="govuk-heading-m">Charge period {{ chargePeriod }}</h2>
 
-  {# ---------- Billable returns and volume ----------- #}
+  {# Billable returns and volume #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
       <div class="govuk-!-margin-right-6 float-left">
@@ -92,7 +92,7 @@
     </div>
   </div>
 
-  {# ---------- Billable returns button ----------- #}
+  {# Billable returns button #}
   <div class="govuk-grid-row govuk-!-margin-bottom-6">
     <div class="govuk-grid-column-full">
       {{ govukButton({
@@ -103,7 +103,7 @@
   </div>
 
 
-  {# ------------- Matched Returns --------------- #}
+  {# Matched Returns #}
   {% if matchedReturns.length > 0 %}
     {% set tableRows = [] %}
     {% for return in matchedReturns %}
@@ -182,7 +182,7 @@
       }) }}
   {% endif %}
 
-  {# ------------- No Returns --------------- #}
+  {# No Returns #}
   {% if matchedReturns == 0 %}
       <h2 class="govuk-heading-m">No two-part tariff returns</h2>
   {% endif %}
diff --git a/app/views/bill-runs/review-licence.njk b/app/views/bill-runs/review-licence.njk
index 82ee8c9978..ff6654b4ea 100644
--- a/app/views/bill-runs/review-licence.njk
+++ b/app/views/bill-runs/review-licence.njk
@@ -17,7 +17,7 @@
 {% endblock %}
 
 {% block content %}
-  {#  --------------- Main heading  --------------- #}
+  {# Main heading #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
       <span class="govuk-caption-l">{{region}} two-part tariff bill run</span>
@@ -29,7 +29,7 @@
     </div>
   </div>
 
-  {# ------------- Licence nav bars --------------- #}
+  {# Licence nav bars #}
   <ul class="govuk-summary-list__actions-list govuk-!-margin-bottom-3">
     <li class="govuk-summary-list__actions-list-item"><a class="govuk-link govuk-!-font-weight-bold govuk-link--no-visited-state govuk-link--no-underline" href="/licences/{{ licence.licenceId }}#summary">
         Summary
@@ -42,14 +42,14 @@
       </a></li>
   </ul>
 
-  {# ------------- Licence in review text --------------- #}
+  {# Licence in review text #}
   {% if elementsInReview === true %}
     {{ govukInsetText({
       text: "There are elements in review"
     }) }}
   {% endif %}
 
-  {# ------------- Charge Periods --------------- #}
+  {# Charge Periods #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
       <h2 class="govuk-heading-l govuk-!-margin-bottom-2">Charge periods</h2>
@@ -66,14 +66,14 @@
 
   <div class="divider govuk-!-margin-bottom-6"></div>
 
-  {# ------------- Returns --------------- #}
+  {# Returns #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
       <h2 class="govuk-heading-l govuk-!-margin-bottom-1">Returns</h2>
     </div>
   </div>
 
-  {# ------------- Matched Returns --------------- #}
+  {# Matched Returns #}
   {% if matchedReturns.length > 0 %}
     {% set tableRows = [] %}
     {% for return in matchedReturns %}
@@ -152,7 +152,7 @@
       }) }}
   {% endif %}
 
-  {# ------------- Unmatched Returns --------------- #}
+  {# Unmatched Returns #}
   {% if unmatchedReturns.length > 0 %}
     {% set tableRows = [] %}
     {% for return in unmatchedReturns %}
@@ -231,7 +231,7 @@
     }) }}
   {% endif %}
 
-  {# ------------- No Returns --------------- #}
+  {# No Returns #}
   {% if matchedReturns == 0 and unmatchedReturns == 0 %}
       <h2 class="govuk-heading-m">No two-part tariff returns</h2>
   {% endif %}

From 8acfd35a7c9e06ee13a0678d275fd7be80a1fd7f Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Tue, 16 Apr 2024 12:21:16 +0100
Subject: [PATCH 6/9] Refactor review flag code

Co-authored-by: Jason Claxton <Jozzey@users.noreply.github.com>
---
 .../two-part-tariff/review-licence.presenter.js | 14 +-------------
 .../fetch-review-licence-results.service.js     | 17 +++++++++++++++++
 .../review-licence.presenter.test.js            |  1 +
 ...fetch-review-licence-results.service.test.js |  3 +--
 4 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
index 13d7f5d981..b98369dfbf 100644
--- a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
+++ b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
@@ -26,7 +26,7 @@ function go (billRun, licence) {
       status: licence[0].status,
       licenceHolder: licence[0].licenceHolder
     },
-    elementsInReview: _elementsInReview(licence[0]),
+    elementsInReview: licence[0].hasReviewStatus,
     matchedReturns: _matchedReturns(licence[0].reviewReturns),
     unmatchedReturns: _unmatchedReturns(licence[0].reviewReturns),
     chargeData: _prepareChargeData(licence, billRun)
@@ -128,18 +128,6 @@ function _contactName (billingAccount) {
   return null
 }
 
-function _elementsInReview (licence) {
-  const hasReviewStatus = licence.reviewChargeVersions.some((chargeVersion) => {
-    return chargeVersion.reviewChargeReferences.some((chargeReference) => {
-      return chargeReference.reviewChargeElements.some((chargeElement) => {
-        return chargeElement.status === 'review'
-      })
-    })
-  })
-
-  return hasReviewStatus
-}
-
 function _financialYear (financialYearEnding) {
   const startYear = financialYearEnding - 1
   const endYear = financialYearEnding
diff --git a/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js b/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js
index b0090e8a91..30823780af 100644
--- a/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js
+++ b/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js
@@ -48,6 +48,23 @@ async function _fetchBillRun (billRunId) {
 
 async function _fetchReviewLicence (licenceId, billRunId) {
   return ReviewLicenceModel.query()
+    .select(
+      'id',
+      'billRunId',
+      'licenceId',
+      'licenceRef',
+      'licenceHolder',
+      'issues',
+      'status',
+      ReviewLicenceModel.raw(`
+      EXISTS (SELECT 1
+        FROM review_charge_elements rce
+        INNER JOIN review_charge_references rcr ON rce.review_charge_reference_id = rcr.id
+        INNER JOIN review_charge_versions rcv ON rcr.review_charge_version_id = rcv.id
+        WHERE rce.status = 'review'
+        AND rcv.review_licence_id = review_licences.id) AS has_review_status
+        `)
+    )
     .where('licenceId', licenceId)
     .where('billRunId', billRunId)
     .withGraphFetched('reviewReturns.reviewChargeElements')
diff --git a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
index c8d9e47eca..fe3e4794b4 100644
--- a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
+++ b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
@@ -203,6 +203,7 @@ function _licenceData () {
     licenceHolder: 'Licence Holder Ltd',
     issues: '',
     status: 'ready',
+    hasReviewStatus: false,
     reviewReturns: [{
       id: '2264f443-5c16-4ca9-8522-f63e2d4e38be',
       reviewLicenceId: '78a99c1c-26d3-4163-ab58-084cd78594ab',
diff --git a/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js b/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js
index 8105d8d1d7..fb6c38cfe9 100644
--- a/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js
+++ b/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js
@@ -117,8 +117,7 @@ describe('Fetch Review Licence Results Service', () => {
           licenceHolder: reviewLicence.licenceHolder,
           issues: reviewLicence.issues,
           status: reviewLicence.status,
-          createdAt: reviewLicence.createdAt,
-          updatedAt: reviewLicence.updatedAt,
+          hasReviewStatus: false,
           reviewReturns: [{
             id: reviewReturn.id,
             reviewLicenceId: reviewReturn.reviewLicenceId,

From ac1cbb49d67075449bfc777aecd172cd32b74263 Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Tue, 16 Apr 2024 12:33:40 +0100
Subject: [PATCH 7/9] Sort merge conflicts

---
 .../review-licence.presenter.js               | 20 +++++++++--
 app/views/bill-runs/review-licence.njk        | 33 +++++++++++++++--
 .../review-licence.presenter.test.js          | 35 ++++++++++++++++++-
 ...tch-review-licence-results.service.test.js |  1 +
 4 files changed, 84 insertions(+), 5 deletions(-)

diff --git a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
index b98369dfbf..4f48e5fd42 100644
--- a/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
+++ b/app/presenters/bill-runs/two-part-tariff/review-licence.presenter.js
@@ -13,10 +13,13 @@ const { formatLongDate } = require('../../base.presenter.js')
  *
  * @param {module:BillRunModel} billRun the data from the bill run
  * @param {module:ReviewLicenceModel} licence the data from review licence
+ * @param {String} markProgress will contain the string 'mark' or 'unmark' if the mark/unmark progress button has been
+ * clicked, otherwise it will be null. It is passed back to the view to determine if the 'Licence updated' banner should
+ * be displayed
  *
  * @returns {Object} the prepared bill run and licence data to be passed to the review licence page
  */
-function go (billRun, licence) {
+function go (billRun, licence, markProgress) {
   return {
     billRunId: billRun.id,
     region: billRun.region.displayName,
@@ -24,9 +27,11 @@ function go (billRun, licence) {
       licenceId: licence[0].licenceId,
       licenceRef: licence[0].licenceRef,
       status: licence[0].status,
-      licenceHolder: licence[0].licenceHolder
+      licenceHolder: licence[0].licenceHolder,
+      progress: licence[0].progress
     },
     elementsInReview: licence[0].hasReviewStatus,
+    licenceUpdated: _licenceUpdated(markProgress),
     matchedReturns: _matchedReturns(licence[0].reviewReturns),
     unmatchedReturns: _unmatchedReturns(licence[0].reviewReturns),
     chargeData: _prepareChargeData(licence, billRun)
@@ -135,6 +140,17 @@ function _financialYear (financialYearEnding) {
   return `${startYear} to ${endYear}`
 }
 
+function _licenceUpdated (markProgress) {
+  switch (markProgress) {
+    case 'mark':
+      return 'This licence has been marked.'
+    case 'unmark':
+      return 'The progress mark for this licence has been removed.'
+    default:
+      return null
+  }
+}
+
 function _matchedReturns (returnLogs) {
   const matchedReturns = []
 
diff --git a/app/views/bill-runs/review-licence.njk b/app/views/bill-runs/review-licence.njk
index ff6654b4ea..9de5b47982 100644
--- a/app/views/bill-runs/review-licence.njk
+++ b/app/views/bill-runs/review-licence.njk
@@ -1,9 +1,11 @@
 {% extends 'layout.njk' %}
 {% from "govuk/components/back-link/macro.njk" import govukBackLink %}
-{% from "govuk/components/table/macro.njk" import govukTable %}
-{% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
+{% from "govuk/components/button/macro.njk" import govukButton %}
 {% from "govuk/components/details/macro.njk" import govukDetails %}
+{% from "govuk/components/notification-banner/macro.njk" import govukNotificationBanner %}
 {% from "macros/review-status-tag.njk" import statusTag %}
+{% from "govuk/components/summary-list/macro.njk" import govukSummaryList %}
+{% from "govuk/components/table/macro.njk" import govukTable %}
 {% from "govuk/components/inset-text/macro.njk" import govukInsetText %}
 
 {% block breadcrumbs %}
@@ -17,6 +19,14 @@
 {% endblock %}
 
 {% block content %}
+  {# Licence updated banner #}
+  {% if licenceUpdated %}
+    {{ govukNotificationBanner({
+      titleText: 'Licence updated',
+      text: licenceUpdated
+    }) }}
+  {% endif %}
+
   {# Main heading #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
@@ -49,6 +59,25 @@
     }) }}
   {% endif %}
 
+  {# Mark progress #}
+  {% if licence.progress %}
+    {% set progressButtonText = 'Remove progress mark' %}
+    {% set progressButtonValue = 'unmark' %}
+  {% else %}
+    {% set progressButtonText = 'Mark progress' %}
+    {% set progressButtonValue = 'mark' %}
+  {% endif %}
+
+  <form method="post">
+    {{ govukButton({
+      text: progressButtonText,
+      classes: "govuk-button--secondary",
+      preventDoubleClick: true,
+      name: "marKProgress",
+      value: progressButtonValue
+    }) }}
+  </form>
+
   {# Charge Periods #}
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full">
diff --git a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
index fe3e4794b4..9ffd174467 100644
--- a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
+++ b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
@@ -13,15 +13,17 @@ const ReviewLicencePresenter = require('../../../../app/presenters/bill-runs/two
 describe('Review Licence presenter', () => {
   let billRun
   let licence
+  let markProgress
 
   describe('when there is data to be presented for the review licence page', () => {
     beforeEach(() => {
       billRun = _billRun()
       licence = _licenceData()
+      markProgress = undefined
     })
 
     it('correctly presents the data', async () => {
-      const result = ReviewLicencePresenter.go(billRun, licence)
+      const result = ReviewLicencePresenter.go(billRun, licence, markProgress)
 
       expect(result).to.equal({
         billRunId: '6620135b-0ecf-4fd4-924e-371f950c0526',
@@ -29,9 +31,11 @@ describe('Review Licence presenter', () => {
         licence: {
           licenceId: '786f0d83-eaf7-43c3-9de5-ec59e3de05ee',
           licenceRef: '01/49/80/4608',
+          progress: false,
           status: 'ready',
           licenceHolder: 'Licence Holder Ltd'
         },
+        licenceUpdated: null,
         elementsInReview: false,
         matchedReturns: [
           {
@@ -180,6 +184,34 @@ describe('Review Licence presenter', () => {
         })
       })
     })
+
+    describe('when there is data to be presented and the user has clicked the "Mark progress" button', () => {
+      beforeEach(() => {
+        billRun = _billRun()
+        licence = _licenceData()
+        markProgress = 'mark'
+      })
+
+      it('correctly returns the text for the "Licence updated" notification banner', async () => {
+        const result = ReviewLicencePresenter.go(billRun, licence, markProgress)
+
+        expect(result.licenceUpdated).to.equal('This licence has been marked.')
+      })
+    })
+
+    describe('when there is data to be presented and the user has clicked the "Remove progress mark" button', () => {
+      beforeEach(() => {
+        billRun = _billRun()
+        licence = _licenceData()
+        markProgress = 'unmark'
+      })
+
+      it('correctly returns the text for the "Licence updated" notification banner', async () => {
+        const result = ReviewLicencePresenter.go(billRun, licence, markProgress)
+
+        expect(result.licenceUpdated).to.equal('The progress mark for this licence has been removed.')
+      })
+    })
   })
 })
 
@@ -203,6 +235,7 @@ function _licenceData () {
     licenceHolder: 'Licence Holder Ltd',
     issues: '',
     status: 'ready',
+    progress: false,
     hasReviewStatus: false,
     reviewReturns: [{
       id: '2264f443-5c16-4ca9-8522-f63e2d4e38be',
diff --git a/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js b/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js
index fb6c38cfe9..ee5743be61 100644
--- a/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js
+++ b/test/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.test.js
@@ -117,6 +117,7 @@ describe('Fetch Review Licence Results Service', () => {
           licenceHolder: reviewLicence.licenceHolder,
           issues: reviewLicence.issues,
           status: reviewLicence.status,
+          progress: false,
           hasReviewStatus: false,
           reviewReturns: [{
             id: reviewReturn.id,

From 0d4e9c917d131ad0cb166425758fbbd64ed7c1ed Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Tue, 16 Apr 2024 13:48:36 +0100
Subject: [PATCH 8/9] Fix failing unit test

---
 .../two-part-tariff/fetch-review-licence-results.service.js      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js b/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js
index 30823780af..e067d4e25c 100644
--- a/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js
+++ b/app/services/bill-runs/two-part-tariff/fetch-review-licence-results.service.js
@@ -56,6 +56,7 @@ async function _fetchReviewLicence (licenceId, billRunId) {
       'licenceHolder',
       'issues',
       'status',
+      'progress',
       ReviewLicenceModel.raw(`
       EXISTS (SELECT 1
         FROM review_charge_elements rce

From 2a6883d64be5a3b111ca7dcce15796a3af15e334 Mon Sep 17 00:00:00 2001
From: Rebecca Ransome <beckyrose200@aol.com>
Date: Tue, 16 Apr 2024 14:08:26 +0100
Subject: [PATCH 9/9] Fix unit test

---
 .../review-licence.presenter.test.js          | 28 -------------------
 1 file changed, 28 deletions(-)

diff --git a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
index 5cae6fda6e..6958358483 100644
--- a/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
+++ b/test/presenters/bill-runs/two-part-tariff/review-licence.presenter.test.js
@@ -184,34 +184,6 @@ describe('Review Licence presenter', () => {
         })
       })
     })
-
-    describe('when there is data to be presented and the user has clicked the "Mark progress" button', () => {
-      beforeEach(() => {
-        billRun = _billRun()
-        licence = _licenceData()
-        markProgress = 'mark'
-      })
-
-      it('correctly returns the text for the "Licence updated" notification banner', async () => {
-        const result = ReviewLicencePresenter.go(billRun, licence, markProgress)
-
-        expect(result.licenceUpdated).to.equal('This licence has been marked.')
-      })
-    })
-
-    describe('when there is data to be presented and the user has clicked the "Remove progress mark" button', () => {
-      beforeEach(() => {
-        billRun = _billRun()
-        licence = _licenceData()
-        markProgress = 'unmark'
-      })
-
-      it('correctly returns the text for the "Licence updated" notification banner', async () => {
-        const result = ReviewLicencePresenter.go(billRun, licence, markProgress)
-
-        expect(result.licenceUpdated).to.equal('The progress mark for this licence has been removed.')
-      })
-    })
   })
 
   describe('when there is data to be presented and the user has clicked the "Mark progress" button', () => {