Merge branch 'main' into view-licence-contact-details-page

.eslintrc.js

@@ -9,7 +9,8 @@ module.exports = {
       ignoreStrings: true,
       ignoreTemplateLiterals: true,
       ignoreUrls: true
-    }]
+    }],
+    'import/extensions': ['error', 'always']
   }
 }
 

app/controllers/bill-runs.controller.js

@@ -21,6 +21,7 @@ const StartBillRunProcessService = require('../services/bill-runs/start-bill-run
 const SubmitAmendedBillableReturnsService = require('..//services/bill-runs/two-part-tariff/submit-amended-billable-returns.service.js')
 const SubmitCancelBillRunService = require('../services/bill-runs/submit-cancel-bill-run.service.js')
 const SubmitRemoveBillRunLicenceService = require('../services/bill-runs/two-part-tariff/submit-remove-bill-run-licence.service.js')
+const SubmitReviewBillRunService = require('../services/bill-runs/two-part-tariff/submit-review-bill-run.service.js')
 const SubmitReviewLicenceService = require('../services/bill-runs/two-part-tariff/submit-review-licence.service.js')
 const SubmitSendBillRunService = require('../services/bill-runs/submit-send-bill-run.service.js')
 const ViewBillRunService = require('../services/bill-runs/view-bill-run.service.js')
@@ -49,6 +50,18 @@ async function cancel (request, h) {
   })
 }
 
+async function chargeReferenceDetails (request, h) {
+  const { id: billRunId, licenceId, reviewChargeReferenceId } = request.params
+
+  const pageData = await ChargeReferenceDetailsService.go(billRunId, licenceId, reviewChargeReferenceId)
+
+  return h.view('bill-runs/charge-reference-details.njk', {
+    pageTitle: 'Charge reference details',
+    activeNavBar: 'bill-runs',
+    ...pageData
+  })
+}
+
 async function create (request, h) {
   const validatedData = CreateBillRunValidator.go(request.payload)
 
@@ -102,7 +115,7 @@ async function removeLicence (request, h) {
 
 async function review (request, h) {
   const { id } = request.params
-  const pageData = await ReviewBillRunService.go(id, request.payload, request.yar)
+  const pageData = await ReviewBillRunService.go(id, request.yar)
 
   return h.view('bill-runs/review.njk', {
     pageTitle: 'Review licences',
@@ -111,18 +124,6 @@ async function review (request, h) {
   })
 }
 
-async function chargeReferenceDetails (request, h) {
-  const { id: billRunId, licenceId, reviewChargeReferenceId } = request.params
-
-  const pageData = await ChargeReferenceDetailsService.go(billRunId, licenceId, reviewChargeReferenceId)
-
-  return h.view('bill-runs/charge-reference-details.njk', {
-    pageTitle: 'Charge reference details',
-    activeNavBar: 'bill-runs',
-    ...pageData
-  })
-}
-
 async function reviewLicence (request, h) {
   const { id: billRunId, licenceId } = request.params
 
@@ -191,6 +192,14 @@ async function submitRemoveLicence (request, h) {
   return h.redirect(`/system/bill-runs/${billRunId}/review`)
 }
 
+async function submitReview (request, h) {
+  const { id } = request.params
+
+  await SubmitReviewBillRunService.go(request.payload, request.yar)
+
+  return h.redirect(`/system/bill-runs/${id}/review`)
+}
+
 async function submitReviewLicence (request, h) {
   const { id: billRunId, licenceId } = request.params
 
@@ -228,16 +237,17 @@ async function view (request, h) {
 module.exports = {
   amendBillableReturns,
   cancel,
+  chargeReferenceDetails,
   create,
   index,
   matchDetails,
   removeLicence,
   review,
-  chargeReferenceDetails,
   reviewLicence,
   send,
   submitAmendedBillableReturns,
   submitCancel,
+  submitReview,
   submitRemoveLicence,
   submitReviewLicence,
   submitSend,

app/routes/bill-runs.routes.js

@@ -113,7 +113,7 @@ const routes = [
   {
     method: 'POST',
     path: '/bill-runs/{id}/review',
-    handler: BillRunsController.review,
+    handler: BillRunsController.submitReview,
     options: {
       auth: {
         access: {

app/services/bill-runs/two-part-tariff/review-bill-run.service.js

@@ -12,17 +12,17 @@ const ReviewBillRunPresenter = require('../../../presenters/bill-runs/two-part-t
  * Orchestrates fetching and presenting the data needed for the review bill run page
  *
  * @param {String} id The UUID for the bill run to review
- * @param {Object} payload The `request.payload` containing the filter data. This is only passed to the service when
- * there is a POST request, which only occurs when a filter is applied to the results.
  * @param {Object} yar - The Hapi `request.yar` session manager passed on by the controller
  *
  * @returns {Promise<Object>} An object representing the `pageData` needed by the review bill run template. It contains
  * details of the bill run and the licences linked to it as well as any data that has been used to filter the results.
  */
-async function go (id, payload, yar) {
-  const filterIssues = payload?.filterIssues
-  const filterLicenceHolder = payload?.filterLicenceHolder
-  const filterLicenceStatus = payload?.filterLicenceStatus
+async function go (id, yar) {
+  const filters = yar.get('reviewFilters')
+
+  const filterIssues = filters?.filterIssues
+  const filterLicenceHolder = filters?.filterLicenceHolder
+  const filterLicenceStatus = filters?.filterLicenceStatus
 
   const { billRun, licences } = await FetchBillRunLicencesService.go(
     id,

app/services/bill-runs/two-part-tariff/submit-review-bill-run.service.js

@@ -0,0 +1,33 @@
+'use strict'
+
+/**
+ * Updates the session cookie with the filter data needed for the two-part tariff review bill run page
+ * @module SubmitReviewBillRunService
+ */
+
+/**
+ * Updates the session cookie with the filter data needed for the two-part tariff review bill run page
+ *
+ * @param {Object} payload The `request.payload` containing the filter data.
+ * @param {Object} yar - The Hapi `request.yar` session manager passed on by the controller
+ */
+async function go (payload, yar) {
+  const clearFilters = payload?.clearFilters
+  const filterIssues = payload?.filterIssues
+  const filterLicenceHolder = payload?.filterLicenceHolder
+  const filterLicenceStatus = payload?.filterLicenceStatus
+
+  if (clearFilters) {
+    yar.clear('reviewFilters')
+  } else {
+    yar.set('reviewFilters', {
+      filterIssues,
+      filterLicenceHolder,
+      filterLicenceStatus
+    })
+  }
+}
+
+module.exports = {
+  go
+}

app/views/bill-runs/review.njk

@@ -248,8 +248,7 @@
           text: "Clear filters",
           classes: "govuk-button--secondary ",
           name: "clearFilters",
-          type: "reset",
-          href: "review",
+          value: 'reset',
           preventDoubleClick: true
         }) }}
       </div>