Bugfixes to avoid server errors (#329)

This avoids server errors if the user didn't select a pharmacy in the
first step.

Author: frankieroberto

app/routes/apply.js

@@ -6,6 +6,7 @@ module.exports = router => {
     const data = req.session.data
     const organisationCode = data.organisationCode
     const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    if (!organisation) { res.redirect('/apply/start'); return }
 
     res.render('apply/check-pharmacy', {
       organisation
@@ -17,19 +18,34 @@ module.exports = router => {
     const data = req.session.data
     const organisationCode = data.organisationCode
     const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    if (!organisation) { res.redirect('/apply/start'); return }
 
     res.render('apply/check', {
       organisation
     })
   })
 
+  // Check your email page
+  router.get('/apply/check-your-email', (req, res) => {
+    const data = req.session.data
+    const organisationCode = data.organisationCode
+    const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+
+    if (!organisation) { res.redirect('/apply/start'); return }
+
+    res.render('apply/check-your-email', {
+      organisation
+    })
+  })
+
 
   // Routing after the final check answers page
   router.post('/apply/answer-check', (req, res) => {
     const data = req.session.data
+    const vaccineTypes = (data.vaccineTypes || [])
     let nextPage
 
-    if (data.vaccineTypes.includes('COVID-19') && data.organisationCode === 'FA02S') {
+    if (vaccineTypes.includes('COVID-19') && data.organisationCode === 'FA02S') {
       nextPage = '/apply/no-contract'
     } else {
       nextPage = '/apply/check-your-email'
@@ -43,6 +59,7 @@ module.exports = router => {
     const data = req.session.data
     const organisationCode = data.organisationCode
     const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    if (!organisation) { res.redirect('/apply/start'); return }
 
     res.render('apply/welcome-email', {
       organisation

app/views/apply/check-pharmacy.html

@@ -34,7 +34,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
               text: "Type"
             },
             value: {
-              html: organisation.type
+              text: organisation.type
             }
           },
           {
@@ -50,7 +50,7 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
               text: "Address"
             },
             value: {
-                html: organisation.address.line1 + "<br>" + organisation.address.town + "<br>" + organisation.address.postcode
+                html: (organisation.address.line1 + "<br>" + organisation.address.town + "<br>" + organisation.address.postcode) if organisation.address else ""
               }
           }
         ]

app/views/apply/check-your-email.html

@@ -12,7 +12,7 @@
 
       <h2 class="nhsuk-heading-l">{{ pageName }}</h2>
 
-      <p>We've set up an account for you as a lead administrator for Addlestone Pharmacy.</p>
+      <p>We've set up an account for you as a lead administrator for {{ organisation.name }}.</p>
 
       <p>You will now get a welcome email which includes:</p>
         <ul>