Revised transactions accounts endpoint uri

Author: wcdkj

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

@@ -22,7 +22,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.internal.AuditS
 import java.time.LocalDate
 
 @RestController
-@RequestMapping("/v1/prison/{prisonId}/prisoners/{hmppsId}/transactions/{accountCode}")
+@RequestMapping("/v1/prison/{prisonId}/prisoners/{hmppsId}/accounts/{accountCode}/transactions")
 class TransactionsController(
   @Autowired val auditService: AuditService,
   @Autowired val getTransactionsForPersonService: GetTransactionsForPersonService,

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/.*/accounts/.*/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/.*/accounts/.*/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/.*/accounts/.*/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/.*/accounts/.*/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/.*/accounts/.*/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/.*/accounts/.*/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/.*/accounts/.*/transactions"
       filters:
     config-test:
       include:

src/main/resources/application-test.yml

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

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/TransactionsControllerTest.kt

@@ -35,7 +35,7 @@ class TransactionsControllerTest(
       val hmppsId = "200313116M"
       val prisonId = "ABC"
       val accountCode = "spends"
-      val basePath = "/v1/prison/$prisonId/prisoners/$hmppsId/transactions/$accountCode"
+      val basePath = "/v1/prison/$prisonId/prisoners/$hmppsId/accounts/$accountCode/transactions"
       val mockMvc = IntegrationAPIMockMvc(springMockMvc)
 
       val transactions =

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/integration/TransactionsIntegrationTest.kt

@@ -11,12 +11,11 @@ class TransactionsIntegrationTest : IntegrationTestBase() {
   val accountCode = "spends"
   final val fromDate = "2024-01-01"
   final val toDate = "2024-01-14"
-  val transactionsPath = "/v1/prison"
   var dateQueryParams = "?from_date=$fromDate&to_date=$toDate"
 
   @Test
   fun `return a list of transactions for a prisoner`() {
-    callApi("/v1/prison/$prisonId/prisoners/$hmppsId/transactions/$accountCode")
+    callApi("/v1/prison/$prisonId/prisoners/$hmppsId/accounts/$accountCode/transactions")
       .andExpect(status().isOk)
       .andExpect(content().json(getExpectedResponse("transactions-response")))
   }
@@ -27,7 +26,7 @@ class TransactionsIntegrationTest : IntegrationTestBase() {
     headers.set("subject-distinguished-name", "C=GB,ST=London,L=London,O=Home Office,CN=automated-test-client")
     mockMvc
       .perform(
-        get("$transactionsPath/$prisonId/prisoners/$hmppsId/transactions/$accountCode$dateQueryParams").headers(headers),
+        get("/v1/prison/$prisonId/prisoners/$hmppsId/accounts/$accountCode/transactions$dateQueryParams").headers(headers),
       ).andExpect(status().isOk)
       .andExpect(content().json(getExpectedResponse("transactions-response")))
   }
@@ -39,7 +38,7 @@ class TransactionsIntegrationTest : IntegrationTestBase() {
     headers.set("subject-distinguished-name", "C=GB,ST=London,L=London,O=Home Office,CN=limited-prisons")
     mockMvc
       .perform(
-        get("$transactionsPath/$wrongPrisonId/prisoners/$hmppsId/transactions/$accountCode").headers(headers),
+        get("/v1/prison/$wrongPrisonId/prisoners/$hmppsId/accounts/$accountCode/transactions").headers(headers),
       ).andExpect(status().isNotFound)
   }
 }