Added test

Author: jbarnsley10

src/server/plugins/engine/pageControllers/helpers/state.test.ts

@@ -1,8 +1,9 @@
-import { ComponentType, type Page } from '@defra/forms-model'
+import { ComponentType, ControllerType, type Page } from '@defra/forms-model'
 
 import { type FormModel } from '~/src/server/plugins/engine/models/FormModel.js'
 import { type PageControllerClass } from '~/src/server/plugins/engine/pageControllers/helpers/pages.js'
 import {
+  checkSaveAndExitRepeater,
   copyNotYetValidatedState,
   prefillStateFromQueryParameters,
   stripParam
@@ -292,4 +293,56 @@ describe('State helpers', () => {
       })
     })
   })
+
+  describe('checkSaveAndExitRepeater', () => {
+    function createMockContextWithPath(path) {
+      return {
+        state: {
+          abc: '123',
+          __stateNotYetValidated: {
+            def: '456',
+            __currentPagePath: path
+          }
+        },
+        payload: {}
+      } as unknown as FormContext
+    }
+
+    const mockModel = {
+      def: {
+        pages: [
+          {
+            controller: ControllerType.Repeat,
+            path: '/personal_details'
+          }
+        ]
+      },
+      basePath: 'form/preview/draft/repeater-test'
+    } as unknown as FormModel
+
+    it('should return undefined if url does not end in a guid', () => {
+      const mockContext = createMockContextWithPath(
+        '/form/preview/draft/repeater-test/personal_details'
+      )
+      expect(checkSaveAndExitRepeater(mockContext, mockModel)).toBeUndefined()
+    })
+
+    it('should return undefined if url ends in a guid but not a repeater path', () => {
+      const mockContext = createMockContextWithPath(
+        '/form/preview/draft/repeater-test/wrong_page/7d27fe6e-73e8-4265-84bd-1e118c92470b'
+      )
+      expect(checkSaveAndExitRepeater(mockContext, mockModel)).toBeUndefined()
+    })
+
+    it('should return correct urls if url ends in a guid and is a repeater path', () => {
+      const mockContext = createMockContextWithPath(
+        '/form/preview/draft/repeater-test/personal_details/7d27fe6e-73e8-4265-84bd-1e118c92470b'
+      )
+      expect(checkSaveAndExitRepeater(mockContext, mockModel)).toEqual({
+        pathExcludingGuid: '/personal_details',
+        pathIncludingGuid:
+          '/personal_details/7d27fe6e-73e8-4265-84bd-1e118c92470b'
+      })
+    })
+  })
 })

src/server/plugins/engine/pageControllers/helpers/state.ts

@@ -125,27 +125,36 @@ export function checkSaveAndExitRepeater(
     .filter((page) => page.controller === ControllerType.Repeat)
     .map((p) => `/${model.basePath}${p.path}/`)
 
-  if (typeof originalPath === 'string') {
-    const lastParam = originalPath.split('/').at(-1) ?? ''
-    if (lastParam.length === GUID_LENGTH && isValidUUID(lastParam)) {
-      const pathWithoutBase = originalPath.substring(model.basePath.length + 1)
-      const pathStripGuid = originalPath.substring(
-        0,
-        originalPath.length - GUID_LENGTH
-      )
-      if (repeaterPaths.includes(pathStripGuid)) {
-        return {
-          pathIncludingGuid: pathWithoutBase,
-          pathExcludingGuid: pathWithoutBase.substring(
-            0,
-            pathWithoutBase.length - GUID_LENGTH - 1
-          )
-        }
-      }
-    }
+  if (typeof originalPath !== 'string') {
+    return undefined
+  }
+
+  const segments = originalPath.split('/')
+  const lastSegment = segments.at(-1) ?? ''
+
+  if (!isValidUUID(lastSegment)) {
+    return undefined
+  }
+
+  const baseOffset = model.basePath.length + 1
+  const pathIncludingGuid = originalPath.substring(baseOffset)
+
+  const guidStartIndex = originalPath.length - GUID_LENGTH
+  const originalPathWithoutGuid = originalPath.substring(0, guidStartIndex)
+
+  if (!repeaterPaths.includes(originalPathWithoutGuid)) {
+    return undefined
   }
 
-  return undefined
+  const pathExcludingGuid = pathIncludingGuid.substring(
+    0,
+    pathIncludingGuid.length - GUID_LENGTH - 1
+  )
+
+  return {
+    pathIncludingGuid,
+    pathExcludingGuid
+  }
 }
 
 /**