Skip to content

Commit 79988b2

Browse files
anthony-britton-mojanthony-britton-moj
authored
PI-2678 (#534)
* PI-2678
1 parent b0dd56c commit 79988b2

File tree

81 files changed

+233
-215
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

81 files changed

+233
-215
lines changed

‎src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/Person.kt

+4
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,8 @@ open class Person(
2727
@Schema(description = "HMPPS identifier", example = "2008/0545166T")
2828
val hmppsId: String? = null,
2929
val contactDetails: ContactDetailsWithEmailAndPhone? = null,
30+
val currentRestriction: Boolean? = null,
31+
val restrictionMessage: String? = null,
32+
val currentExclusion: Boolean? = null,
33+
val exclusionMessage: String? = null,
3034
)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import org.mockito.kotlin.verify
99
import org.mockito.kotlin.whenever
1010
import org.springframework.beans.factory.annotation.Autowired
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
12-
import org.springframework.boot.test.mock.mockito.MockBean
1312
import org.springframework.http.HttpStatus
1413
import org.springframework.test.context.ActiveProfiles
14+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1515
import org.springframework.test.web.servlet.MockMvc
1616
import org.springframework.web.reactive.function.client.WebClientResponseException
1717
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -24,8 +24,8 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.internal.AuditS
2424
@ActiveProfiles("test")
2525
internal class EPFPersonDetailControllerTest(
2626
@Autowired var springMockMvc: MockMvc,
27-
@MockBean val getEPFPersonDetailService: GetEPFPersonDetailService,
28-
@MockBean val auditService: AuditService,
27+
@MockitoBean val getEPFPersonDetailService: GetEPFPersonDetailService,
28+
@MockitoBean val auditService: AuditService,
2929
) : DescribeSpec({
3030
val hmppsId = "X12345"
3131
val eventNumber = 1234

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import org.mockito.kotlin.verify
99
import org.mockito.kotlin.whenever
1010
import org.springframework.beans.factory.annotation.Autowired
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
12-
import org.springframework.boot.test.mock.mockito.MockBean
1312
import org.springframework.http.HttpStatus
1413
import org.springframework.test.context.ActiveProfiles
14+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1515
import org.springframework.test.web.servlet.MockMvc
1616
import org.springframework.web.reactive.function.client.WebClientResponseException
1717
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -24,8 +24,8 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.internal.AuditS
2424
@ActiveProfiles("test")
2525
internal class HmppsIdControllerTest(
2626
@Autowired var springMockMvc: MockMvc,
27-
@MockBean val getHmppsIdService: GetHmppsIdService,
28-
@MockBean val auditService: AuditService,
27+
@MockitoBean val getHmppsIdService: GetHmppsIdService,
28+
@MockitoBean val auditService: AuditService,
2929
) : DescribeSpec({
3030
val nomisNumber = "A1234AA"
3131
val path = "/v1/hmpps/id/nomis-number/$nomisNumber"

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import org.mockito.kotlin.verify
99
import org.mockito.kotlin.whenever
1010
import org.springframework.beans.factory.annotation.Autowired
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
12-
import org.springframework.boot.test.mock.mockito.MockBean
1312
import org.springframework.http.HttpStatus
1413
import org.springframework.test.context.ActiveProfiles
14+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1515
import org.springframework.test.web.servlet.MockMvc
1616
import org.springframework.web.reactive.function.client.WebClientResponseException
1717
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -25,8 +25,8 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.internal.AuditS
2525
@ActiveProfiles("test")
2626
internal class ImageControllerTest(
2727
@Autowired var springMockMvc: MockMvc,
28-
@MockBean val getImageService: GetImageService,
29-
@MockBean val auditService: AuditService,
28+
@MockitoBean val getImageService: GetImageService,
29+
@MockitoBean val auditService: AuditService,
3030
) : DescribeSpec(
3131
{
3232
val id = 2461788

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import org.mockito.Mockito
99
import org.mockito.kotlin.whenever
1010
import org.springframework.beans.factory.annotation.Autowired
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
12-
import org.springframework.boot.test.mock.mockito.MockBean
1312
import org.springframework.http.HttpStatus
1413
import org.springframework.test.context.ActiveProfiles
14+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1515
import org.springframework.test.web.servlet.MockMvc
1616
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.MockMvcExtensions.contentAsJson
1717
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -22,7 +22,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.services.ReferenceDataSe
2222
@ActiveProfiles("test")
2323
internal class ReferenceDataControllerTests(
2424
@Autowired var springMockMvc: MockMvc,
25-
@MockBean val referenceDataService: ReferenceDataService,
25+
@MockitoBean val referenceDataService: ReferenceDataService,
2626
val objectMapper: ObjectMapper = ObjectMapper().registerKotlinModule(),
2727
) : DescribeSpec(
2828
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import org.mockito.kotlin.verify
1212
import org.mockito.kotlin.whenever
1313
import org.springframework.beans.factory.annotation.Autowired
1414
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
15-
import org.springframework.boot.test.mock.mockito.MockBean
1615
import org.springframework.http.HttpStatus
1716
import org.springframework.test.context.ActiveProfiles
17+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1818
import org.springframework.test.web.servlet.MockMvc
1919
import org.springframework.web.reactive.function.client.WebClientResponseException
2020
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -31,8 +31,8 @@ import java.nio.charset.StandardCharsets
3131
@ActiveProfiles("test")
3232
class RiskManagementControllerTest(
3333
@Autowired var springMockMvc: MockMvc,
34-
@MockBean val getRiskManagementService: GetRiskManagementPlansForCrnService,
35-
@MockBean val auditService: AuditService,
34+
@MockitoBean val getRiskManagementService: GetRiskManagementPlansForCrnService,
35+
@MockitoBean val auditService: AuditService,
3636
) : DescribeSpec({
3737
val hmppsId = "D1974X"
3838
val badHmppsId = "Not a real CRN"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/AdjudicationsControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.mockito.kotlin.verify
1010
import org.mockito.kotlin.whenever
1111
import org.springframework.beans.factory.annotation.Autowired
1212
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
13-
import org.springframework.boot.test.mock.mockito.MockBean
1413
import org.springframework.http.HttpStatus
1514
import org.springframework.test.context.ActiveProfiles
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1616
import org.springframework.test.web.servlet.MockMvc
1717
import org.springframework.web.reactive.function.client.WebClientResponseException
1818
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -30,8 +30,8 @@ import java.nio.charset.StandardCharsets
3030
@ActiveProfiles("test")
3131
internal class AdjudicationsControllerTest(
3232
@Autowired var springMockMvc: MockMvc,
33-
@MockBean val getAdjudicationsForPersonService: GetAdjudicationsForPersonService,
34-
@MockBean val auditService: AuditService,
33+
@MockitoBean val getAdjudicationsForPersonService: GetAdjudicationsForPersonService,
34+
@MockitoBean val auditService: AuditService,
3535
) : DescribeSpec(
3636
{
3737
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/AlertsControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import org.mockito.kotlin.verify
1111
import org.mockito.kotlin.whenever
1212
import org.springframework.beans.factory.annotation.Autowired
1313
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
14-
import org.springframework.boot.test.mock.mockito.MockBean
1514
import org.springframework.http.HttpStatus
1615
import org.springframework.test.context.ActiveProfiles
16+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1717
import org.springframework.test.web.servlet.MockMvc
1818
import org.springframework.web.reactive.function.client.WebClientResponseException
1919
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -32,8 +32,8 @@ import java.time.LocalDate
3232
@ActiveProfiles("test")
3333
internal class AlertsControllerTest(
3434
@Autowired var springMockMvc: MockMvc,
35-
@MockBean val getAlertsForPersonService: GetAlertsForPersonService,
36-
@MockBean val auditService: AuditService,
35+
@MockitoBean val getAlertsForPersonService: GetAlertsForPersonService,
36+
@MockitoBean val auditService: AuditService,
3737
) : DescribeSpec(
3838
{
3939
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/CaseNotesControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import org.mockito.kotlin.verify
1212
import org.mockito.kotlin.whenever
1313
import org.springframework.beans.factory.annotation.Autowired
1414
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
15-
import org.springframework.boot.test.mock.mockito.MockBean
1615
import org.springframework.http.HttpStatus
1716
import org.springframework.test.context.ActiveProfiles
17+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1818
import org.springframework.test.web.servlet.MockMvc
1919
import org.springframework.web.reactive.function.client.WebClientResponseException
2020
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -31,8 +31,8 @@ import java.nio.charset.StandardCharsets
3131
@ActiveProfiles("test")
3232
class CaseNotesControllerTest(
3333
@Autowired var springMockMvc: MockMvc,
34-
@MockBean val getCaseNotesForPersonService: GetCaseNotesForPersonService,
35-
@MockBean val auditService: AuditService,
34+
@MockitoBean val getCaseNotesForPersonService: GetCaseNotesForPersonService,
35+
@MockitoBean val auditService: AuditService,
3636
) : DescribeSpec(
3737
{
3838
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/CellLocationControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.mockito.kotlin.verify
1010
import org.mockito.kotlin.whenever
1111
import org.springframework.beans.factory.annotation.Autowired
1212
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
13-
import org.springframework.boot.test.mock.mockito.MockBean
1413
import org.springframework.http.HttpStatus
1514
import org.springframework.test.context.ActiveProfiles
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1616
import org.springframework.test.web.servlet.MockMvc
1717
import org.springframework.web.reactive.function.client.WebClientResponseException
1818
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -30,8 +30,8 @@ import java.nio.charset.StandardCharsets
3030
@ActiveProfiles("test")
3131
internal class CellLocationControllerTest(
3232
@Autowired var springMockMvc: MockMvc,
33-
@MockBean val getCellLocationForPersonService: GetCellLocationForPersonService,
34-
@MockBean val auditService: AuditService,
33+
@MockitoBean val getCellLocationForPersonService: GetCellLocationForPersonService,
34+
@MockitoBean val auditService: AuditService,
3535
) : DescribeSpec(
3636
{
3737
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/DynamicRisksControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import org.mockito.kotlin.verify
1111
import org.mockito.kotlin.whenever
1212
import org.springframework.beans.factory.annotation.Autowired
1313
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
14-
import org.springframework.boot.test.mock.mockito.MockBean
1514
import org.springframework.http.HttpStatus
1615
import org.springframework.test.context.ActiveProfiles
16+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1717
import org.springframework.test.web.servlet.MockMvc
1818
import org.springframework.web.reactive.function.client.WebClientResponseException
1919
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -31,8 +31,8 @@ import java.nio.charset.StandardCharsets
3131
@ActiveProfiles("test")
3232
internal class DynamicRisksControllerTest(
3333
@Autowired var springMockMvc: MockMvc,
34-
@MockBean val getDynamicRisksForPersonService: GetDynamicRisksForPersonService,
35-
@MockBean val auditService: AuditService,
34+
@MockitoBean val getDynamicRisksForPersonService: GetDynamicRisksForPersonService,
35+
@MockitoBean val auditService: AuditService,
3636
) : DescribeSpec(
3737
{
3838
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/LicenceConditionControllerTests.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.mockito.kotlin.verify
1010
import org.mockito.kotlin.whenever
1111
import org.springframework.beans.factory.annotation.Autowired
1212
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
13-
import org.springframework.boot.test.mock.mockito.MockBean
1413
import org.springframework.http.HttpStatus
1514
import org.springframework.test.context.ActiveProfiles
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1616
import org.springframework.test.web.servlet.MockMvc
1717
import org.springframework.web.reactive.function.client.WebClientResponseException
1818
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -32,8 +32,8 @@ import java.nio.charset.StandardCharsets
3232
@ActiveProfiles("test")
3333
class LicenceConditionControllerTests(
3434
@Autowired var springMockMvc: MockMvc,
35-
@MockBean val getLicenceConditionService: GetLicenceConditionService,
36-
@MockBean val auditService: AuditService,
35+
@MockitoBean val getLicenceConditionService: GetLicenceConditionService,
36+
@MockitoBean val auditService: AuditService,
3737
) : DescribeSpec(
3838
{
3939
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/MappaDetailControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ import org.mockito.kotlin.verify
99
import org.mockito.kotlin.whenever
1010
import org.springframework.beans.factory.annotation.Autowired
1111
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
12-
import org.springframework.boot.test.mock.mockito.MockBean
1312
import org.springframework.http.HttpStatus
1413
import org.springframework.test.context.ActiveProfiles
14+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1515
import org.springframework.test.web.servlet.MockMvc
1616
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
1717
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.IntegrationAPIMockMvc
@@ -28,8 +28,8 @@ import java.nio.charset.StandardCharsets
2828
@ActiveProfiles("test")
2929
internal class MappaDetailControllerTest(
3030
@Autowired var springMockMvc: MockMvc,
31-
@MockBean val getMappaDetailForPersonService: GetMappaDetailForPersonService,
32-
@MockBean val auditService: AuditService,
31+
@MockitoBean val getMappaDetailForPersonService: GetMappaDetailForPersonService,
32+
@MockitoBean val auditService: AuditService,
3333
) : DescribeSpec(
3434
{
3535
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/NeedsControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ import org.mockito.kotlin.verify
1010
import org.mockito.kotlin.whenever
1111
import org.springframework.beans.factory.annotation.Autowired
1212
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
13-
import org.springframework.boot.test.mock.mockito.MockBean
1413
import org.springframework.http.HttpStatus
1514
import org.springframework.test.context.ActiveProfiles
15+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1616
import org.springframework.test.web.servlet.MockMvc
1717
import org.springframework.web.reactive.function.client.WebClientResponseException
1818
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -32,8 +32,8 @@ import java.time.LocalDateTime
3232
@ActiveProfiles("test")
3333
internal class NeedsControllerTest(
3434
@Autowired var springMockMvc: MockMvc,
35-
@MockBean val getNeedsForPersonService: GetNeedsForPersonService,
36-
@MockBean val auditService: AuditService,
35+
@MockitoBean val getNeedsForPersonService: GetNeedsForPersonService,
36+
@MockitoBean val auditService: AuditService,
3737
) : DescribeSpec(
3838
{
3939
val hmppsId = "9999/11111A"

‎src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/OffencesControllerTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ import org.mockito.kotlin.verify
1111
import org.mockito.kotlin.whenever
1212
import org.springframework.beans.factory.annotation.Autowired
1313
import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
14-
import org.springframework.boot.test.mock.mockito.MockBean
1514
import org.springframework.http.HttpStatus
1615
import org.springframework.test.context.ActiveProfiles
16+
import org.springframework.test.context.bean.override.mockito.MockitoBean
1717
import org.springframework.test.web.servlet.MockMvc
1818
import org.springframework.web.reactive.function.client.WebClientResponseException
1919
import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.removeWhitespaceAndNewlines
@@ -33,8 +33,8 @@ import java.time.LocalDate
3333
@ActiveProfiles("test")
3434
internal class OffencesControllerTest(
3535
@Autowired var springMockMvc: MockMvc,
36-
@MockBean val getOffencesForPersonService: GetOffencesForPersonService,
37-
@MockBean val auditService: AuditService,
36+
@MockitoBean val getOffencesForPersonService: GetOffencesForPersonService,
37+
@MockitoBean val auditService: AuditService,
3838
) : DescribeSpec(
3939
{
4040
val hmppsId = "9999/11111A"

0 commit comments

Comments
 (0)