Refactor list of all organisations (#539)

A bit of code tidying-up ahead of looking at organisation management
stuff.

Author: frankieroberto

app/data/all-organisations.js

@@ -1,3 +1,4 @@
+// These are organisations set up as using RAVS
 module.exports = [
   {
     id: "RCF",
@@ -8082,7 +8083,7 @@ module.exports = [
     status: "Closed",
     dateClosed: "2024-12-04",
     type: "NHS Trust",
-    region: "Y61"
+    region: "Y62"
   },
   {
     id: "RLQ",
@@ -8125,7 +8126,7 @@ module.exports = [
     status: "Closed",
     dateClosed: "2025-02-12",
     type: "NHS Trust",
-    region: "Y61"
+    region: "Y62"
   },
   {
     id: "RX8",

app/data/organisations.js

@@ -8,12 +8,12 @@ module.exports = router => {
     if (error === "no-pharmacy") {
       errors.push({
         text: "Select pharmacy",
-        href: "#organisation-code"
+        href: "#organisation-id"
       })
     } else if (error === "existing-account") {
       errors.push({
         text: "This pharmacy already has access to the service.",
-        href: "#organisation-code"
+        href: "#organisation-id"
       })
     }
 
@@ -25,8 +25,8 @@ module.exports = router => {
 
   router.post('/apply/answer-pharmacy', (req, res) => {
     const data = req.session.data
-    const organisationCode = data.organisationCode
-    const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
 
     if (!organisation) {
       res.redirect('/apply/start?error=no-pharmacy');
@@ -36,18 +36,14 @@ module.exports = router => {
       res.redirect('/apply/check-pharmacy')
     }
 
-    res.render('apply/start', {
-      errors
-    })
-
   })
 
 
   // Show organisation check page
   router.get('/apply/check-pharmacy', (req, res) => {
     const data = req.session.data
-    const organisationCode = data.organisationCode
-    const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
     if (!organisation) { res.redirect('/apply/start'); return }
 
     res.render('apply/check-pharmacy', {
@@ -58,8 +54,8 @@ module.exports = router => {
   // Check your answers page
   router.get('/apply/check', (req, res) => {
     const data = req.session.data
-    const organisationCode = data.organisationCode
-    const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
     if (!organisation) { res.redirect('/apply/start'); return }
 
     res.render('apply/check', {
@@ -70,8 +66,8 @@ module.exports = router => {
   // 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)
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
 
     if (!organisation) { res.redirect('/apply/start'); return }
 
@@ -90,8 +86,8 @@ module.exports = router => {
   // Welcome email mockup
   router.get('/apply/welcome-email', (req, res) => {
     const data = req.session.data
-    const organisationCode = data.organisationCode
-    const organisation = data.organisations.find((organisation) => organisation.id === organisationCode)
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
     if (!organisation) { res.redirect('/apply/start'); return }
 
     res.render('apply/welcome-email', {

app/data/session-data-defaults.js

@@ -811,6 +811,8 @@ module.exports = router => {
     let errors = []
     let locationType = req.session.data.locationType
 
+    const careHomes = req.session.data.allOrganisations.filter((organisation) => organisation.type === "Care home")
+
     if (req.query.showErrors === "yes") {
       if (!locationType) {
         errors.push({
@@ -821,7 +823,8 @@ module.exports = router => {
     }
 
     res.render('record-vaccinations/location', {
-      errors
+      errors,
+      careHomes
     })
   })
 
@@ -1089,12 +1092,19 @@ module.exports = router => {
     const data = req.session.data
     const vaccinator = data.users.find((user) => user.id === data.vaccinatorId)
 
+    let careHome
+
     // Get the details of the vaccine product
     const vaccineProduct = data.vaccines.find((vaccine) => vaccine.name === data.vaccine)?.products.find((vaccineProduct) => vaccineProduct.name === data.vaccineProduct)
 
+    if (data.locationType === "Care home") {
+      careHome = data.allOrganisations.find((organisation) => organisation.id === data.careHomeId)
+    }
+
     res.render('record-vaccinations/check', {
       vaccinator,
-      vaccineProduct
+      vaccineProduct,
+      careHome
     })
   })
 

app/routes/apply.js

@@ -7,7 +7,7 @@ module.exports = router => {
 
     const organisations = data.organisations.filter((organisation) => (organisation.region === currentRegion.id) && (["Active", "Invited", "Deactivated"].includes(organisation.status)))
 
-    const closedOrganisationsCount = data.organisations.filter((organisation) => (organisation.region === "Y61" && organisation.status == "Closed")).length
+    const closedOrganisationsCount = data.organisations.filter((organisation) => (organisation.region === currentRegion.id && organisation.status == "Closed")).length
 
     res.render('regions/index', {
       organisations,
@@ -28,7 +28,7 @@ module.exports = router => {
 
   router.get('/regions/review/:id', (req, res) => {
     const data = req.session.data
-    const organisation = data.organisations.find((org) => org.id === req.params.id)
+    const organisation = data.allOrganisations.find((org) => org.id === req.params.id)
 
     res.render('regions/organisation-request', {
       organisation
@@ -37,7 +37,7 @@ module.exports = router => {
 
   router.get('/regions/accept/:id', (req, res) => {
     const data = req.session.data
-    const organisation = data.organisations.find((org) => org.id === req.params.id)
+    const organisation = data.allOrganisations.find((org) => org.id === req.params.id)
 
     res.render('regions/accept', {
       organisation
@@ -46,49 +46,33 @@ module.exports = router => {
 
   // Inviting an organisation
   router.post('/regions/add', (req, res) => {
+    const data = req.session.data
+    const currentRegion = res.locals.currentRegion
 
-    const organisationCode = req.session.data.organisationCode
-    const addedUserId = Math.floor(Math.random() * 10000000).toString()
-
-    let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((org) => org.id === organisationId)
 
-    if (organisationCode.startsWith('FA')) {
-      organisationName = req.session.data.nhsPharmacies[organisationCode].name
-      organisationLine1 = req.session.data.nhsPharmacies[organisationCode].address
-      organisationTown = req.session.data.nhsPharmacies[organisationCode].town
-      organisationPostcode = req.session.data.nhsPharmacies[organisationCode].postcode
-      organisationType = 'Community Pharmacy'
-    } else {
-      organisationName = req.session.data.nhsTrusts[organisationCode]
-      organisationLine1 = 'Cobbett House, Oxford Road'
-      organisationTown = 'Manchester'
-      organisationPostcode = 'M13 9WL'
-      organisationType = 'NHS Trust'
-    }
+    const addedUserId = Math.floor(Math.random() * 10000000).toString()
 
     // Add organisation
     req.session.data.organisations.push({
-      id: req.session.data.organisationCode,
-      name: organisationName,
-      address: {
-        line1: organisationLine1,
-        town: organisationTown,
-        postcode: organisationPostcode
-      },
-      type: organisationType,
+      id: organisation.id,
+      name: organisation.name,
+      address: organisation.address,
+      type: organisation.type,
       status: 'Invited',
-      region: "Y61"
+      region: currentRegion.id
     })
 
     req.session.data.users.push({
       id: addedUserId,
       email: req.session.data.email,
       status: 'Invited',
-      firstName: req.session.data.firstName,
-      lastName: req.session.data.lastName,
+      firstName: data.firstName,
+      lastName: data.lastName,
       organisations: [
         {
-          id: req.session.data.organisationCode,
+          id: organisation.id,
           status: "Invited",
           permissionLevel: "Lead administrator"
         }
@@ -97,115 +81,38 @@ module.exports = router => {
 
     // Remove data from adding organisation flow
     req.session.data.email = ''
-    req.session.data.organisationCode = ''
+    req.session.data.organisationId = ''
     req.session.data.firstName = ''
     req.session.data.lastName = ''
 
-    res.redirect('/regions/organisations/' + organisationCode)
+    res.redirect('/regions/organisations/' + organisationId)
   })
 
   router.get('/regions/organisation-details', (req, res) => {
-    const organisationCode = req.session.data.organisationCode
-
-    let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType, legallyClosed
-
-    if (organisationCode.startsWith('FA')) {
-      organisationName = req.session.data.nhsPharmacies[organisationCode].name
-      organisationLine1 = req.session.data.nhsPharmacies[organisationCode].address
-      organisationTown = req.session.data.nhsPharmacies[organisationCode].town
-      organisationPostcode = req.session.data.nhsPharmacies[organisationCode].postcode
-      legallyClosed = req.session.data.nhsPharmacies[organisationCode].legallyClosed
-      organisationType = 'Community Pharmacy'
-    } else {
-      organisationName = req.session.data.nhsTrusts[organisationCode]
-      legallyClosed = false
-      organisationLine1 = 'Cobbett House, Oxford Road'
-      organisationTown = 'Manchester'
-      organisationPostcode = 'M13 9WL'
-      organisationType = 'NHS Trust'
-    }
-
-    const organisation = {
-      code: organisationCode,
-      name: organisationName,
-      type: organisationType,
-      address: {
-        line1: organisationLine1,
-        town: organisationTown,
-        postcode: organisationPostcode
-      },
-      legallyClosed: legallyClosed
-    }
+    const data = req.session.data
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
 
     res.render('regions/organisation-details', {
       organisation
     })
   })
 
   router.get('/regions/add-email', (req, res) => {
-    const organisationCode = req.session.data.organisationCode
-
-    let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType
-
-    if (organisationCode.startsWith('FA')) {
-      organisationName = req.session.data.nhsPharmacies[organisationCode].name
-      organisationLine1 = req.session.data.nhsPharmacies[organisationCode].address
-      organisationTown = req.session.data.nhsPharmacies[organisationCode].town
-      organisationPostcode = req.session.data.nhsPharmacies[organisationCode].postcode
-      organisationType = 'Community Pharmacy'
-    } else {
-      organisationName = req.session.data.nhsTrusts[organisationCode]
-      organisationLine1 = 'Cobbett House, Oxford Road'
-      organisationTown = 'Manchester'
-      organisationPostcode = 'M13 9WL'
-      organisationType = 'NHS Trust'
-    }
-
-    const organisation = {
-      id: organisationCode,
-      name: organisationName,
-      type: organisationType,
-      address: {
-        line1: organisationLine1,
-        town: organisationTown,
-        postcode: organisationPostcode
-      }
-    }
+    const data = req.session.data
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
 
     res.render('regions/add-email', {
       organisation
     })
   })
 
   router.get('/regions/check-and-send', (req, res) => {
-    const organisationCode = req.session.data.organisationCode
-
-    let organisationName, organisationLine1, organisationTown, organisationPostcode, organisationType
-
-    if (organisationCode.startsWith('FA')) {
-      organisationName = req.session.data.nhsPharmacies[organisationCode].name
-      organisationLine1 = req.session.data.nhsPharmacies[organisationCode].address
-      organisationTown = req.session.data.nhsPharmacies[organisationCode].town
-      organisationPostcode = req.session.data.nhsPharmacies[organisationCode].postcode
-      organisationType = 'Community Pharmacy'
-    } else {
-      organisationName = req.session.data.nhsTrusts[organisationCode]
-      organisationLine1 = '73 Roman Rd'
-      organisationTown = 'Leeds'
-      organisationPostcode = 'LS2 5ZN'
-      organisationType = 'NHS Trust'
-    }
+    const data = req.session.data
+    const organisationId = data.organisationId
+    const organisation = data.allOrganisations.find((organisation) => organisation.id === organisationId)
 
-    const organisation = {
-      id: organisationCode,
-      name: organisationName,
-      type: organisationType,
-      address: {
-        line1: organisationLine1,
-        town: organisationTown,
-        postcode: organisationPostcode
-      }
-    }
 
     res.render('regions/check-and-send', {
       organisation

app/routes/record-vaccinations.js

@@ -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) if organisation.address else ""
+                html: (organisation.address) if organisation.address else ""
               }
           }
         ]

app/routes/regions.js

@@ -36,19 +36,19 @@ <h1 class="nhsuk-heading-l">{{ pageName }}</h1>
       {% set options = [] %}
       {% set items = [{ text: "", value: ""}] %}
 
-      {% for organisation in data.organisations %}
-        {% if organisation.type == "Community Pharmacy" %}
+      {% for organisation in data.allOrganisations | sort(false, false, "name") %}
+        {% if organisation.type == "Community pharmacy" %}
           {% set items = (items.push({
-            text: organisation.name + ", " + organisation.address.line1 + ", " + (organisation.address.postcode | upper) + " (" + organisation.id + ")",
+            text: organisation.name + ", " + organisation.address + ", " + (organisation.address.postcode | upper) + " (" + organisation.id + ")",
             value: organisation.id,
-            selected: (organisation.id === data.organisationCode)
+            selected: (organisation.id === data.organisationId)
           }), items) %}
         {% endif %}
       {% endfor %}
 
       {{ select({
-        id: "organisation-code",
-        name: "organisationCode",
+        id: "organisation-id",
+        name: "organisationId",
         label: {
           text: "Find your pharmacy",
           classes: "nhsuk-label--m nhsuk-u-margin-bottom-1"