Update routes to use a querystring

DEFRA · Dec 30, 2024 · 065cf2c · 065cf2c
1 parent 45f533f
commit 065cf2c
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/app/controllers/return-logs.controller.js b/app/controllers/return-logs.controller.js
@@ -8,7 +8,7 @@ const EditReturnLogService = require('../services/return-logs/edit-return-log.se
  */
 
 async function edit(request, h) {
-  const { returnLogId } = request.params
+  const { returnLogId } = request.query
   const pageData = await EditReturnLogService.go(returnLogId)
 
   return h.view('return-logs/edit.njk', { activeNavBar: 'search', ...pageData })

diff --git a/app/routes/return-logs.routes.js b/app/routes/return-logs.routes.js
@@ -5,7 +5,7 @@ const ReturnLogsController = require('../controllers/return-logs.controller.js')
 const routes = [
   {
     method: 'GET',
-    path: '/return-logs/{returnLogId}/edit',
+    path: '/return-logs/edit',
     options: {
       handler: ReturnLogsController.edit,
       app: {

diff --git a/app/services/return-logs/edit-return-log.service.js b/app/services/return-logs/edit-return-log.service.js
@@ -5,6 +5,8 @@
  * @module EditReturnLogService
  */
 
+const FetchEditReturnLogService = require('./fetch-edit-return-log.service.js')
+
 /**
  * Orchestrates fetching and presenting the data needed for the how to edit an abstraction return page
  *
@@ -13,6 +15,9 @@
  * @returns {Promise<object>} page data needed by the view template
  */
 async function go(returnLogId) {
+  const editReturnLog = await FetchEditReturnLogService.go(returnLogId)
+  console.log('🚀 ~ go ~ editReturnLog:', editReturnLog)
+
   return {
     returnLogId,
     pageTitle: 'Abstraction return',

diff --git a/app/views/return-logs/edit.njk b/app/views/return-logs/edit.njk
@@ -101,19 +101,19 @@
       },
       items: [
         {
-          value: '/return-logs/'+ returnLogId +'/edit/single-volume',
+          value: '/return-logs/edit/single-volume?returnLogId=' + returnLogId,
           text: "Enter individual volumes"
         },
         {
-          value: '/return-logs/'+ returnLogId +'/edit/new-volumes',
+          value: '/return-logs/edit/new-volumes?returnLogId=' + returnLogId,
           text: "Enter new volumes or readings"
         },
         {
-          value: '/return-logs/'+ returnLogId +'/edit/nil-return',
+          value: '/return-logs/edit/nil-return?returnLogId=' + returnLogId,
           text: "Enter a nil return"
         },
         {
-          value: '/return-logs/'+ returnLogId +'/edit/query',
+          value: '/return-logs/edit/query?returnLogId=' + returnLogId,
           text: queryText
         }
       ]