chore: make homepage visit events more obvious, trim preceding slash,…

… dont change pageNameSuffix in journey id mware (#347)
ministryofjustice · Nov 29, 2024 · 9036047 · 9036047
1 parent f791f61
commit 9036047
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/server/middleware/auditPageViewMiddleware.ts b/server/middleware/auditPageViewMiddleware.ts
@@ -14,6 +14,12 @@ export const auditPageViewMiddleware = (auditService: AuditService): RequestHand
     if (hasCsipId) {
       pageNameSuffix = `${splitUrl[1]}_${splitUrl.slice(3)}`
     }
+    if (pageNameSuffix[0] === '/') {
+      pageNameSuffix = pageNameSuffix.slice(1)
+    }
+    if (pageNameSuffix.length === 0) {
+      pageNameSuffix = 'HOMEPAGE'
+    }
     res.locals.auditEvent = {
       pageNameSuffix: pageNameSuffix.replace('/', '_').replace('-', '_'),
       who: res.locals.user.username,

diff --git a/server/middleware/insertJourneyIdentifier.ts b/server/middleware/insertJourneyIdentifier.ts
@@ -7,9 +7,6 @@ export default function insertJourneyIdentifier() {
     if (!validate(uuid)) {
       return res.redirect(`${req.baseUrl}/${uuidV4()}${req.url}`)
     }
-    if (res.locals.auditEvent) {
-      res.locals.auditEvent.pageNameSuffix = `${req.url.split('/')[1]}/${req.url.replace(/\?.*/, '').split('/').slice(2).join('/')}` // JOURNEYID_PAGE
-    }
     return next()
   }
 }