avoid using raw response

app/controllers/simplified-account/settings/worldpay-details/worldpay-details.controller.test.js

@@ -2,6 +2,7 @@ const ControllerTestBuilder = require('@test/test-helpers/simplified-account/con
 const sinon = require('sinon')
 const { expect } = require('chai')
 const Service = require('@models/Service.class')
+const GatewayAccount = require('@models/GatewayAccount.class')
 
 const mockResponse = sinon.spy()
 
@@ -13,10 +14,19 @@ const { req, res, call } = new ControllerTestBuilder('@controllers/simplified-ac
     external_id: SERVICE_ID
   }))
   .withAccountType(ACCOUNT_TYPE)
-  .withAccount({
+  .withAccount(new GatewayAccount({
     type: ACCOUNT_TYPE,
-    allowMoto: true
-  })
+    allow_moto: true,
+    gateway_account_id: 1,
+    gateway_account_credentials: [{
+      external_id: 'creds-id',
+      payment_provider: 'worldpay',
+      state: 'CREATED',
+      created_date: '2024-11-29T11:58:36.214Z',
+      gateway_account_id: 1,
+      credentials: {}
+    }]
+  }))
   .withStubs({
     '@utils/response': { response: mockResponse }
   })

app/models/GatewayAccount.class.js

@@ -1,5 +1,13 @@
 const GatewayAccountCredential = require('@models/GatewayAccountCredential.class')
 
+const CREDENTIAL_STATE = {
+  CREATED: 'CREATED',
+  ENTERED: 'ENTERED',
+  VERIFIED: 'VERIFIED_WITH_LIVE_PAYMENT',
+  ACTIVE: 'ACTIVE',
+  RETIRED: 'RETIRED'
+}
+
 /**
  * @class GatewayAccount
  * @property {string} name - The name of the gateway account
@@ -44,6 +52,8 @@ class GatewayAccount {
     if (gatewayAccountData?.gateway_account_credentials) {
       this.gatewayAccountCredentials = gatewayAccountData?.gateway_account_credentials
         .map(credentialData => new GatewayAccountCredential(credentialData))
+
+      this.activeCredential = this.gatewayAccountCredentials.filter((credential) => credential.state === CREDENTIAL_STATE.ACTIVE)[0] || null
     }
     // TODO: this is a temporary compatability fix! If you find yourself using this for new code
     //  you should instead add any rawResponse data as part of the constructor

app/models/WorldpayTasks.class.js

@@ -1,7 +1,5 @@
 'use strict'
 
-const { getActiveCredential } = require('@utils/credentials')
-
 class WorldpayTasks {
   /**
    * @param {GatewayAccount} gatewayAccount
@@ -10,7 +8,7 @@ class WorldpayTasks {
     this.tasks = []
     this.incompleteTasks = true
 
-    const credential = getActiveCredential(gatewayAccount.rawResponse)
+    const credential = gatewayAccount.activeCredential
 
     if (gatewayAccount.allowMoto) {
       const worldpayCredentials = {