Persist and retrieve rtn-req set up session values

app/controllers/return-requirements.controller.js

@@ -71,7 +71,6 @@ async function approved (request, h) {
 
 async function checkYourAnswers (request, h) {
   const { sessionId } = request.params
-
   const pageData = await CheckYourAnswersService.go(sessionId)
 
   return h.view('return-requirements/check-your-answers.njk', {

app/presenters/return-requirements/check-your-answers.presenter.js

@@ -4,16 +4,38 @@
  * Formats data for the `/return-requirements/{sessionId}/check-your-answers` page
  * @module CheckYourAnswersPresenter
  */
-
+const { formatLongDate } = require('../base.presenter.js')
 function go (session) {
   const data = {
     id: session.id,
-    licenceRef: session.data.licence.licenceRef
+    journey: session.data.journey,
+    licenceRef: session.data.licence.licenceRef,
+    reason: session.data.reason,
+    startDate: _startDate(session.data)
   }
 
   return data
 }
 
+function _startDate (sessionData) {
+  const selectedOption = sessionData.startDateOptions
+  let date
+
+  if (selectedOption === 'licenceStartDate') {
+    date = new Date(sessionData.licence.currentVersionStartDate)
+  }
+
+  if (selectedOption === 'anotherStartDate') {
+    const day = sessionData.startDateDay
+    const month = sessionData.startDateMonth
+    const year = sessionData.startDateYear
+
+    date = new Date(`${year}-${month}-${day}`)
+  }
+
+  return formatLongDate(date)
+}
+
 module.exports = {
   go
 }

app/presenters/return-requirements/start-date.presenter.js

@@ -2,7 +2,7 @@
 
 /**
  * Formats data for the `/return-requirements/{sessionId}/start-date` page
- * @module StartDatedPresenter
+ * @module StartDatePresenter
 */
 
 const { formatLongDate } = require('../base.presenter.js')
@@ -15,13 +15,13 @@ const { formatLongDate } = require('../base.presenter.js')
  *
  * @returns {Object} The data formatted for the view template
  */
-function go (session, payload = {}) {
+function go (session) {
   const data = {
     id: session.id,
     licenceId: session.data.licence.id,
     licenceRef: session.data.licence.licenceRef,
     licenceVersionStartDate: _licenceVersionStartDate(session.data.licence.currentVersionStartDate),
-    ..._transformPayload(payload)
+    ..._transformSession(session.data)
   }
 
   return data
@@ -36,13 +36,13 @@ function _licenceVersionStartDate (date) {
   return formattedDate
 }
 
-function _transformPayload (payload) {
-  // NOTE: 'start-date-options' is the payload value that tells us whether the user selected the licence version start
+function _transformSession (sessionData) {
+  // NOTE: 'startDateOptions' is the session value that tells us whether the user selected the licence version start
   // date or another date radio button.
   // If it is not set then either its because the presenter has been called from `StartDateService` and it's the first
   // load. Else its been called by `SubmitStartDateService` but the user hasn't selected a radio button.
-  // Either way, we use it to tell us whether there is anything in the payload worth transforming.
-  const selectedOption = payload['start-date-options']
+  // Either way, we use it to tell us whether there is anything in the session worth transforming.
+  const selectedOption = sessionData.startDateOptions
 
   if (!selectedOption) {
     return {
@@ -55,9 +55,9 @@ function _transformPayload (payload) {
   }
 
   return {
-    anotherStartDateDay: payload['start-date-day'],
-    anotherStartDateMonth: payload['start-date-month'],
-    anotherStartDateYear: payload['start-date-year'],
+    anotherStartDateDay: sessionData.startDateDay,
+    anotherStartDateMonth: sessionData.startDateMonth,
+    anotherStartDateYear: sessionData.startDateYear,
     anotherStartDateSelected: selectedOption === 'anotherStartDate',
     licenceStartDateSelected: selectedOption === 'licenceStartDate'
   }

app/services/return-requirements/check-your-answers.service.js

@@ -17,8 +17,8 @@ const SessionModel = require('../../models/session.model.js')
  */
 async function go (sessionId) {
   const session = await SessionModel.query().findById(sessionId)
-  const formattedData = CheckYourAnswersPresenter.go(session)
 
+  const formattedData = CheckYourAnswersPresenter.go(session)
   return {
     activeNavBar: 'search',
     licenceRef: session.data.licence.licenceRef,

app/services/return-requirements/submit-no-returns-required.service.js

@@ -25,9 +25,15 @@ const SessionModel = require('../../models/session.model.js')
  */
 async function go (sessionId, payload) {
   const session = await SessionModel.query().findById(sessionId)
-
   const validationResult = _validate(payload)
 
+  if (!validationResult) {
+    await _save(session, payload)
+    return {
+      journey: session.data.journey
+    }
+  }
+
   const formattedData = NoReturnsRequiredPresenter.go(session, payload)
 
   return {
@@ -38,6 +44,14 @@ async function go (sessionId, payload) {
   }
 }
 
+async function _save (session, payload) {
+  const currentData = session.data
+
+  currentData.reason = payload.reason
+
+  return session.$query().patch({ data: currentData })
+}
+
 function _validate (payload) {
   const validation = NoReturnsRequiredValidator.go(payload)
 

app/services/return-requirements/submit-purpose.service.js

@@ -29,6 +29,12 @@ async function go (sessionId, payload) {
 
   const purposesData = await FetchPurposesService.go(session.data.licence.id)
   const validationResult = _validate(payload)
+
+  if (!validationResult) {
+    await _save(session, payload)
+    return {}
+  }
+
   const formattedData = SelectPurposePresenter.go(session, purposesData, payload)
 
   return {
@@ -39,6 +45,14 @@ async function go (sessionId, payload) {
   }
 }
 
+async function _save (session, payload) {
+  const currentData = session.data
+
+  currentData.purpose = payload.purpose
+
+  return session.$query().patch({ data: currentData })
+}
+
 function _validate (payload) {
   const validation = PurposeValidation.go(payload)
 

app/services/return-requirements/submit-reason.service.js

@@ -28,6 +28,11 @@ async function go (sessionId, payload) {
 
   const validationResult = _validate(payload)
 
+  if (!validationResult) {
+    await _save(session, payload)
+    return {}
+  }
+
   const formattedData = ReasonPresenter.go(session, payload)
 
   return {
@@ -38,6 +43,14 @@ async function go (sessionId, payload) {
   }
 }
 
+async function _save (session, payload) {
+  const currentData = session.data
+
+  currentData.reason = payload.reason
+
+  return session.$query().patch({ data: currentData })
+}
+
 function _validate (payload) {
   const validation = ReasonValidator.go(payload)
 

app/services/return-requirements/submit-setup.service.js

@@ -28,13 +28,19 @@ async function go (sessionId, payload) {
 
   const validationResult = _validate(payload)
 
+  if (!validationResult) {
+    await _save(session, payload)
+    return {
+      redirect: _redirect(payload.setup)
+    }
+  }
+
   const formattedData = SetupPresenter.go(session, payload)
 
   return {
     activeNavBar: 'search',
     error: validationResult,
     pageTitle: 'How do you want to set up the return requirement?',
-    redirect: _redirect(payload.setup),
     ...formattedData
   }
 }
@@ -53,6 +59,14 @@ function _redirect (setup) {
   return endpoint
 }
 
+async function _save (session, payload) {
+  const currentData = session.data
+
+  currentData.setup = payload.setup
+
+  return session.$query().patch({ data: currentData })
+}
+
 function _validate (payload) {
   const validation = SetupValidator.go(payload)
 

app/services/return-requirements/submit-start-date.service.js

@@ -30,6 +30,13 @@ async function go (sessionId, payload) {
   const { endDate, startDate } = session.data.licence
   const validationResult = _validate(payload, startDate, endDate)
 
+  if (!validationResult) {
+    await _save(session, payload)
+    return {
+      journey: session.data.journey
+    }
+  }
+
   const formattedData = StartDatePresenter.go(session, payload)
 
   return {
@@ -41,6 +48,21 @@ async function go (sessionId, payload) {
   }
 }
 
+async function _save (session, payload) {
+  const currentData = session.data
+  const selectedOption = payload['start-date-options']
+
+  currentData.startDateOptions = selectedOption
+
+  if (selectedOption === 'anotherStartDate') {
+    currentData.startDateDay = payload['start-date-day']
+    currentData.startDateMonth = payload['start-date-month']
+    currentData.startDateYear = payload['start-date-year']
+  }
+
+  return session.$query().patch({ data: currentData })
+}
+
 function _validate (payload, licenceStartDate, licenceEndDate) {
   const validation = StartDateValidator.go(payload, licenceStartDate, licenceEndDate)
 

app/validators/return-requirements/no-returns-required.validator.js

@@ -8,9 +8,9 @@
 const Joi = require('joi')
 
 const VALID_VALUES = [
-  'abstraction_below_100_cubic_metres_per_day',
-  'returns_exception',
-  'transfer_licence'
+  'abstraction-below-100-cubic-metres-per-day',
+  'returns-exception',
+  'transfer-licence'
 ]
 
 /**
@@ -23,7 +23,7 @@ const VALID_VALUES = [
  */
 function go (data) {
   const schema = Joi.object({
-    'no-returns-required': Joi.string()
+    reason: Joi.string()
       .required()
       .valid(...VALID_VALUES)
       .messages({

app/validators/return-requirements/reason.validator.js

@@ -8,17 +8,17 @@
 const Joi = require('joi')
 
 const VALID_VALUES = [
-  'change_to_special_agreement',
-  'name_or_address_change',
-  'transfer_and_now_chargeable',
-  'extension_of_licence_validity',
-  'major_change',
-  'minor_change',
-  'new_licence_in_part_succession_or_licence_apportionment',
-  'new_licence',
-  'new_special_agreement',
-  'succession_or_transfer_of_licence',
-  'succession_to_remainder_licence_or_licence_apportionment'
+  'change-to-special-agreement',
+  'name-or-address-change',
+  'transfer-and-now-chargeable',
+  'extension-of-licence-validity',
+  'major-change',
+  'minor-change',
+  'new-licence-in-part-succession-or-licence-apportionment',
+  'new-licence',
+  'new-special-agreement',
+  'succession-or-transfer-of-licence',
+  'succession-to-remainder-licence-or-licence-apportionment'
 ]
 
 /**