Merge branch 'main' into test-licences

Author: chiaramapellimt

docs/adr/0003-manually-manage-openapi-file.md

@@ -11,8 +11,8 @@ Accepted
 The [OpenAPI specification](https://spec.openapis.org/oas/latest.html) is a standard for describing REST APIs and
 [Swagger UI](https://swagger.io/tools/swagger-ui/) is used to visualise and interact with a specification file in more
 user-friendly manner. These are used widely used within HMPPS to document APIs,
-e.g. [Prison API's OpenAPI specification](https://api.prison.service.justice.gov.uk/v3/api-docs)
-and [Prison API's Swagger UI](https://api.prison.service.justice.gov.uk/swagger-ui/index.html). This is achieved by
+e.g. [Prison API's OpenAPI specification](https://prison-api.prison.service.justice.gov.uk/v3/api-docs)
+and [Prison API's Swagger UI](https://prison-api.prison.service.justice.gov.uk/swagger-ui/index.html). This is achieved by
 using the [SpringDoc OpenAPI library](https://springdoc.org) and annotating the codebase which the library then uses to
 expose two endpoints: one for the OpenAPI specification in JSON format and another for Swagger UI.
 

scripts/data_analysis/requirements.txt

@@ -1,4 +1,4 @@
 graphviz==0.20.1
 pandas==2.0.2
-requests==2.31.0
+requests==2.32.0
 PyYAML==6.0

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

@@ -30,7 +30,7 @@ class GetLicenceConditionService(
 
     return Response(
       data = personLicences,
-      errors = personResponse.errors + licences.errors,
+      errors = licences.errors,
     )
   }
 }

src/main/resources/application-preprod.yml

@@ -1,6 +1,6 @@
 services:
   prison-api:
-    base-url: https://api-preprod.prison.service.justice.gov.uk
+    base-url: https://prison-api-preprod.prison.service.justice.gov.uk
   prisoner-offender-search:
     base-url: https://prisoner-search-preprod.prison.service.justice.gov.uk
   probation-offender-search:

src/main/resources/application-prod.yml

@@ -1,6 +1,6 @@
 services:
   prison-api:
-    base-url: https://api.prison.service.justice.gov.uk
+    base-url: https://prison-api.prison.service.justice.gov.uk
   prisoner-offender-search:
     base-url: https://prisoner-search.prison.service.justice.gov.uk
   probation-offender-search:

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetLicenceConditionServiceTest.kt

@@ -1,11 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.services
 
 import io.kotest.core.spec.style.DescribeSpec
-import io.kotest.matchers.shouldBe
-import org.mockito.Mockito
-import org.mockito.internal.verification.VerificationModeFactory
-import org.mockito.kotlin.verify
-import org.mockito.kotlin.whenever
 import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.test.context.ContextConfiguration
@@ -14,9 +9,6 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Identifiers
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Licence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.LicenceCondition
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Person
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApiError
 
 @ContextConfiguration(
   initializers = [ConfigDataApplicationContextInitializer::class],
@@ -25,6 +17,8 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
 internal class GetLicenceConditionServiceTest(
   @MockBean val createAndVaryLicenceGateway: CreateAndVaryLicenceGateway,
   @MockBean val getPersonService: GetPersonService,
+  @MockBean val getPersonService: GetPersonService,
+
   private val getLicenceConditionService: GetLicenceConditionService,
 ) : DescribeSpec(
     {
@@ -34,9 +28,18 @@ internal class GetLicenceConditionServiceTest(
       val licences = listOf(Licence(id = "12345"))
       val conditions = listOf(LicenceCondition(condition = "MockCondition", category = "AP"))
 
-      beforeEach {
-        Mockito.reset(getPersonService)
-        Mockito.reset(createAndVaryLicenceGateway)
+     beforeEach {
+       Mockito.reset(getPersonService)
+       Mockito.reset(createAndVaryLicenceGateway)
+
+       whenever(getPersonService.execute(hmppsId = hmppsId)).thenReturn(Response(person))
+       whenever(createAndVaryLicenceGateway.getLicenceSummaries(id = crn)).thenReturn(Response(licences))
+       whenever(createAndVaryLicenceGateway.getLicenceConditions(id = 12345)).thenReturn(Response(conditions))
+     }
+     it("performs a search according to hmpps Id") {
+       getLicenceConditionService.execute(hmppsId)
+       verify(getPersonService, VerificationModeFactory.times(1)).execute(hmppsId = hmppsId)
+     }
 
         whenever(getPersonService.execute(hmppsId = hmppsId)).thenReturn(Response(person))
         whenever(createAndVaryLicenceGateway.getLicenceSummaries(id = crn)).thenReturn(Response(licences))