Moved transaction account code check to service layer, updated regex inc consumer config

Author: wcdkj

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/TransactionsController.kt

@@ -86,10 +86,6 @@ class TransactionsController(
       endDate = toDate
     }
 
-    if (accountCode !in listOf("spends", "savings", "cash")) {
-      throw ValidationException("Account code must either be 'spends', 'savings', or 'cash'")
-    }
-
     val response = getTransactionsForPersonService.execute(hmppsId, prisonId, accountCode, startDate, endDate, filters)
 
     if (response.hasError(UpstreamApiError.Type.ENTITY_NOT_FOUND)) {

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetTransactionsForPersonService.kt

@@ -1,5 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.services
 
+import jakarta.validation.ValidationException
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.NomisGateway
@@ -31,6 +32,10 @@ class GetTransactionsForPersonService(
       )
     }
 
+    if (accountCode !in listOf("spends", "savings", "cash")) {
+      throw ValidationException("Account code must either be 'spends', 'savings', or 'cash'")
+    }
+
     val personResponse = getPersonService.getNomisNumber(hmppsId = hmppsId)
 
     if (personResponse == null) {

src/main/resources/application-dev.yml

@@ -130,7 +130,7 @@ authorisation:
         - "/v1/prison/prisoners"
         - "/v1/prison/.*/prisoners/.*/balances$"
         - "/v1/prison/.*/prisoners/.*/balances/[^/]*$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
       filters:
     kilco:
       include:
@@ -140,7 +140,7 @@ authorisation:
         - "/v1/prison/prisoners/[^/]*$"
         - "/v1/prison/.*/prisoners/.*/balances$"
         - "/v1/prison/.*/prisoners/.*/balances/[^/]*$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
       filters:
     meganexus:
       include:
@@ -158,7 +158,7 @@ authorisation:
         - "/v1/prison/prisoners"
         - "/v1/prison/.*/prisoners/.*/balances$"
         - "/v1/prison/.*/prisoners/.*/balances/[^/]*$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
       filters:
     serco:
       include:

src/main/resources/application-integration-test.yml

@@ -85,7 +85,7 @@ authorisation:
         - "/v1/prison/prisoners/[^/]*$"
         - "/v1/prison/prisoners"
         - "/v1/prison/.*/prisoners/.*/balances$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
         - "/v1/prison/.*/prisoners/.*/balances/[^/]*$"
       filters:
     config-test:
@@ -99,7 +99,7 @@ authorisation:
     limited-prisons:
       include:
         - "/v1/prison/prisoners/[^/]*$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
       filters:
         prisons:
           - ABC

src/main/resources/application-local-docker.yml

@@ -59,7 +59,7 @@ authorisation:
         - "/v1/prison/prisoners/[^/]*$"
         - "/v1/prison/prisoners"
         - "/v1/prison/.*/prisoners/.*/balances$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
       filters:
     config-test:
       include:

src/main/resources/application-local.yml

@@ -66,7 +66,7 @@ authorisation:
         - "/v1/prison/prisoners/[^/]*$"
         - "/v1/prison/prisoners"
         - "/v1/prison/.*/prisoners/.*/balances$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
       filters:
     config-test:
       include:

src/main/resources/application-test.yml

@@ -87,8 +87,8 @@ authorisation:
         - "/v1/prison/prisoners/[^/]*$"
         - "/v1/prison/prisoners"
         - "/v1/prison/.*/prisoners/.*/balances$"
-        - "/v1/prison/.*/prisoners/.*/transactions/.*"
         - "/v1/prison/.*/prisoners/.*/balances/[^/]*$"
+        - "/v1/prison/.*/prisoners/.*/transactions/[^/]*$"
     config-test:
       include:
         - "/v1/config/authorisation"