Add previous vaccination exports to exports list

Author: paulrobertlloyd

app/controllers/download.js

@@ -5,6 +5,15 @@ import { getDateValueDifference } from '../utils/date.js'
 import { getResults, getPagination } from '../utils/pagination.js'
 
 export const downloadController = {
+  read(request, response, next, download_id) {
+    response.locals.download = Download.findOne(
+      download_id,
+      request.session.data
+    )
+
+    next()
+  },
+
   readAll(request, response, next) {
     response.locals.downloads = Download.findAll(request.session.data)
 
@@ -95,8 +104,8 @@ export const downloadController = {
     const { account } = request.app.locals
     const { data } = request.session
 
-    const { type } = request.body.download
-    const programme_id = programmesData[type].id
+    const { programmeType } = request.body.download
+    const programme_id = programmesData[programmeType].id
     const programme = Programme.findOne(programme_id, data)
 
     const createdDownload = Download.create(
@@ -117,6 +126,19 @@ export const downloadController = {
     response.header('Content-Type', mimetype)
     response.header('Content-disposition', `attachment; filename=${fileName}`)
 
+    response.end(buffer)
+  },
+
+  download(request, response) {
+    const { data } = request.session
+    const { download } = response.locals
+
+    // Generate and return file
+    const { buffer, fileName, mimetype } = download.createFile(data)
+
+    response.header('Content-Type', mimetype)
+    response.header('Content-disposition', `attachment; filename=${fileName}`)
+
     response.end(buffer)
   }
 }

app/models/download.js

@@ -109,11 +109,12 @@ export class Download {
    * @returns {string} Name
    */
   get name() {
-    if (this.programme) {
-      return this.programme.name
+    switch (true) {
+      case this.type === DownloadType.Report:
+        return `${this.programme.name} vaccination records`
+      default:
+        return 'Download'
     }
-
-    return 'Download'
   }
 
   /**
@@ -346,7 +347,7 @@ export class Download {
    * @returns {string} URI
    */
   get uri() {
-    return `/reports/${this.programme_id}/download/${this.id}`
+    return `/downloads/${this.id}`
   }
 
   /**

app/routes/download.js

@@ -10,4 +10,8 @@ router.post('/', download.filterList)
 router.get('/new', download.form)
 router.post('/new', download.create)
 
+router.param('download_id', download.read)
+
+router.get('/:download_id/download', download.download)
+
 export const downloadRoutes = router

app/views/download/form.njk

@@ -29,7 +29,7 @@
       }
     },
     items: programmeTypeItems,
-    decorate: "download.type"
+    decorate: "download.programmeType"
   }) }}
   {{ dateInput({
     formGroup: {

app/views/download/list.njk

@@ -76,7 +76,7 @@
             heading: download.name,
             headingSize: "s",
             headingLevel: 4,
-            href: download.uri,
+            href: download.uri + "/download",
             clickable: true
           },
           rows: summaryRows(download, {