Only set a transaction id if one hasn't already been set

packages/gafl-webapp-service/src/handlers/__tests__/agreed-handler-recurring-payments.spec.js

@@ -36,7 +36,7 @@ describe('The agreed handler', () => {
     cache: () => ({
       helpers: {
         transaction: {
-          get: async () => ({ id: 'id-111', cost: 0 }),
+          get: async () => ({ cost: 0 }),
           set: async () => {}
         },
         status: {
@@ -90,6 +90,26 @@ describe('The agreed handler', () => {
       expect(transactionPayload.id).toBe(v4guid)
     })
 
+    it("doesn't overwrite transaction id if one is already set", async () => {
+      const setTransaction = jest.fn()
+      const transactionId = 'abc-123-def-456'
+      uuidv4.mockReturnValue('def-789-ghi-012')
+      const mockRequest = getMockRequest({
+        transaction: {
+          get: async () => ({ cost: 0, id: transactionId }),
+          set: setTransaction
+        }
+      })
+
+      await agreedHandler(mockRequest, getRequestToolkit())
+
+      expect(setTransaction).toHaveBeenCalledWith(
+        expect.objectContaining({
+          id: transactionId
+        })
+      )
+    })
+
     it('sends a recurring payment creation request to Gov.UK Pay', async () => {
       const preparedPayment = Symbol('preparedPayment')
       prepareRecurringPayment.mockResolvedValueOnce(preparedPayment)

packages/gafl-webapp-service/src/handlers/agreed-handler.js

@@ -241,7 +241,9 @@ const finaliseTransaction = async (request, transaction, status) => {
 export default async (request, h) => {
   const status = await request.cache().helpers.status.get()
   const transaction = await request.cache().helpers.transaction.get()
-  transaction.id = uuidv4()
+  if (!transaction.id) {
+    transaction.id = uuidv4()
+  }
 
   // If the agreed flag is not set to true then throw an exception
   if (!status[COMPLETION_STATUS.agreed]) {