What do you want to do with this return?

.env.example

@@ -76,3 +76,4 @@ ENABLE_TWO_PART_TARIFF_SUPPLEMENTARY=false
 ENABLE_MONITORING_STATIONS_VIEW=true
 ENABLE_LICENCE_PURPOSES_VIEW=true
 ENABLE_LICENCE_POINTS_VIEW=true
+ENABLE_SYSTEM_RETURNS_VIEW=true

app/controllers/return-logs-setup.controller.js

@@ -7,7 +7,9 @@
 
 const InitiateSessionService = require('../services/return-logs/setup/initiate-session.service.js')
 const ReceivedService = require('../services/return-logs/setup/received.service.js')
+const StartService = require('../services/return-logs/setup/start.service.js')
 const SubmitReceivedService = require('../services/return-logs/setup/submit-received.service.js')
+const SubmitStartService = require('../services/return-logs/setup/submit-start.service.js')
 
 async function received(request, h) {
   const { sessionId } = request.params
@@ -20,7 +22,14 @@ async function setup(request, h) {
   const { returnLogId } = request.query
   const session = await InitiateSessionService.go(returnLogId)
 
-  return h.redirect(`/system/return-logs/setup/${session.id}/how-to-edit`)
+  return h.redirect(`/system/return-logs/setup/${session.id}/start`)
+}
+
+async function start(request, h) {
+  const { sessionId } = request.params
+  const pageData = await StartService.go(sessionId)
+
+  return h.view('return-logs/setup/start.njk', { activeNavBar: 'search', ...pageData })
 }
 
 async function submitReceived(request, h) {
@@ -38,8 +47,25 @@ async function submitReceived(request, h) {
   return h.redirect(`/system/return-logs/setup/${sessionId}/reported`)
 }
 
+async function submitStart(request, h) {
+  const { sessionId } = request.params
+
+  const pageData = await SubmitStartService.go(sessionId, request.payload)
+
+  if (pageData.error) {
+    return h.view('return-logs/setup/start.njk', {
+      activeNavBar: 'search',
+      ...pageData
+    })
+  }
+
+  return h.redirect(`/system/return-logs/setup/${sessionId}/received`)
+}
+
 module.exports = {
   received,
   setup,
-  submitReceived
+  start,
+  submitReceived,
+  submitStart
 }

app/presenters/licences/view-licence-returns.presenter.js

@@ -5,6 +5,7 @@
  * @module ViewLicenceReturnsPresenter
  */
 
+const FeatureFlagsConfig = require('../../../config/feature-flags.config.js')
 const { formatLongDate } = require('../base.presenter.js')
 
 /**
@@ -34,7 +35,11 @@ function _link(status, returnLogId, canManageReturns) {
   }
 
   if (canManageReturns) {
-    return `/return/internal?returnId=${returnLogId}`
+    if (FeatureFlagsConfig.enableSystemReturnsView) {
+      return `/system/return-logs/setup?returnLogId=${returnLogId}`
+    } else {
+      return `/return/internal?returnId=${returnLogId}`
+    }
   }
 
   return null

app/presenters/return-logs/setup/start.presenter.js

@@ -0,0 +1,84 @@
+'use strict'
+
+/**
+ * Formats the data ready for presenting in the `/return-log-edit/{sessionId}/start` page
+ * @module StartPresenter
+ */
+
+const { formatAbstractionPeriod, formatLongDate } = require('../../base.presenter.js')
+
+/**
+ * Formats the data ready for presenting in the `/return-log-edit/{sessionId}/start` page
+ *
+ * @param {module:SessionModel} session - The session instance to format
+ *
+ * @returns {object} page data needed for the `/return-log-edit/{sessionId}/start` page
+ */
+function go(session) {
+  const {
+    dueDate,
+    endDate,
+    licenceId,
+    licenceRef,
+    periodStartDay,
+    periodStartMonth,
+    periodEndDay,
+    periodEndMonth,
+    purposes,
+    receivedDate,
+    returnLogId,
+    returnReference,
+    siteDescription,
+    startDate,
+    status,
+    twoPartTariff,
+    whatToDo
+  } = session
+
+  return {
+    abstractionPeriod: `From ${formatAbstractionPeriod(
+      periodStartDay,
+      periodStartMonth,
+      periodEndDay,
+      periodEndMonth
+    )}`,
+    displayRecordReceipt: receivedDate === null,
+    licenceId,
+    licenceRef,
+    pageTitle: 'Abstraction return',
+    purposes,
+    returnLogId,
+    returnsPeriod: `From ${formatLongDate(new Date(startDate))} to ${formatLongDate(new Date(endDate))}`,
+    returnReference,
+    selectedOption: whatToDo ?? whatToDo,
+    siteDescription,
+    status: _status(status, dueDate),
+    tariffType: twoPartTariff ? 'Two part tariff' : 'Standard tariff'
+  }
+}
+
+function _status(status, dueDate) {
+  // If the return is completed we are required to display it as 'complete'. This also takes priority over the other
+  // statues
+  if (status === 'completed') {
+    return 'complete'
+  }
+
+  // Work out if the return is overdue (status is still 'due' and it is past the due date)
+  const today = new Date()
+
+  // The due date held in the record is date-only. If we compared it against 'today' without this step any return due
+  // 'today' would be flagged as overdue when it is still due (just!)
+  today.setHours(0, 0, 0, 0)
+
+  if (status === 'due' && new Date(dueDate) < today) {
+    return 'overdue'
+  }
+
+  // For all other cases we can just return the status and the return-status-tag macro will know how to display it
+  return status
+}
+
+module.exports = {
+  go
+}

app/routes/return-logs-setup.routes.js

@@ -38,6 +38,36 @@ const routes = [
         }
       }
     }
+  },
+  {
+    method: 'GET',
+    path: '/return-logs/setup/{sessionId}/start',
+    options: {
+      handler: ReturnLogsSetupController.start,
+      app: {
+        plainOutput: true
+      },
+      auth: {
+        access: {
+          scope: ['billing']
+        }
+      }
+    }
+  },
+  {
+    method: 'POST',
+    path: '/return-logs/setup/{sessionId}/start',
+    options: {
+      handler: ReturnLogsSetupController.submitStart,
+      app: {
+        plainOutput: true
+      },
+      auth: {
+        access: {
+          scope: ['billing']
+        }
+      }
+    }
   }
 ]
 

app/services/return-logs/setup/initiate-session.service.js

@@ -49,7 +49,10 @@ async function _fetchReturnLog(returnLogId) {
       'returnLogs.id as returnLogId',
       'returnLogs.startDate',
       'returnLogs.endDate',
+      'returnLogs.receivedDate',
       'returnLogs.returnReference',
+      'returnLogs.dueDate',
+      'returnLogs.status',
       'returnLogs.underQuery',
       ref('returnLogs.metadata:nald.periodStartDay').castInt().as('periodStartDay'),
       ref('returnLogs.metadata:nald.periodStartMonth').castInt().as('periodStartMonth'),

app/services/return-logs/setup/start.service.js

@@ -0,0 +1,26 @@
+'use strict'
+
+/**
+ * Orchestrates fetching and presenting the data needed for the `/return-log-edit/{sessionId}/start` page
+ * @module StartService
+ */
+
+const SessionModel = require('../../../models/session.model.js')
+const StartPresenter = require('../../../presenters/return-logs/setup/start.presenter.js')
+
+/**
+ * Orchestrates fetching and presenting the data needed for the `/return-log-edit/{sessionId}/start` page
+ *
+ * @param {string} sessionId - The UUID for setup bill run session record
+ *
+ * @returns {Promise<object>} page data needed by the view template
+ */
+async function go(sessionId) {
+  const session = await SessionModel.query().findById(sessionId)
+
+  return StartPresenter.go(session)
+}
+
+module.exports = {
+  go
+}

app/services/return-logs/setup/submit-start.service.js

@@ -0,0 +1,57 @@
+'use strict'
+
+/**
+ * Handles the user submission for the `/return-log-edit/{sessionId}/start` page
+ * @module SubmitStartService
+ */
+
+const SessionModel = require('../../../models/session.model.js')
+const StartPresenter = require('../../../presenters/return-logs/setup/start.presenter.js')
+
+/**
+ * Handles the user submission for the `/return-log-edit/{sessionId}/start` page
+ *
+ * @param {string} sessionId - The UUID for setup bill run session record
+ * @param {object} payload - The submitted form data
+ *
+ * @returns {Promise<object>} An object with a `whatToDo:` property if there are no errors else the page data for
+ * the abstraction return page including the validation error details
+ */
+async function go(sessionId, payload) {
+  const session = await SessionModel.query().findById(sessionId)
+  const { whatToDo } = payload
+  const validationResult = _validate(whatToDo)
+
+  if (!validationResult) {
+    await _save(session, whatToDo)
+
+    return { whatToDo }
+  }
+
+  const formattedData = StartPresenter.go(session)
+
+  return {
+    error: validationResult,
+    ...formattedData
+  }
+}
+
+async function _save(session, whatToDo) {
+  const currentData = session
+
+  currentData.whatToDo = whatToDo
+
+  return session.$query().patch({ data: currentData })
+}
+
+function _validate(whatToDo) {
+  if (!whatToDo) {
+    return { text: 'Select what you want to do with this return' }
+  }
+
+  return null
+}
+
+module.exports = {
+  go
+}