Renamed according to acronym

Author: chiaramapellimt

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ManagePOMCaseGateway.kt

@@ -5,7 +5,7 @@ import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpMethod
 import org.springframework.stereotype.Component
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.WebClientWrapper
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOfficerManager
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOffenderManager
 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.managePOMCase.AllocationPrimaryPOM
@@ -19,7 +19,7 @@ class ManagePOMCaseGateway(
   @Autowired
   lateinit var hmppsAuthGateway: HmppsAuthGateway
 
-  fun getPrimaryPOMForNomisNumber(id: String): Response<PrisonOfficerManager> {
+  fun getPrimaryPOMForNomisNumber(id: String): Response<PrisonOffenderManager> {
     val result =
       webClient.request<AllocationPrimaryPOM>(
         HttpMethod.GET,
@@ -30,12 +30,12 @@ class ManagePOMCaseGateway(
 
     return when (result) {
       is WebClientWrapper.WebClientWrapperResponse.Success -> {
-        Response(data = result.data.toPrisonOfficerManager())
+        Response(data = result.data.toPrisonOffenderManager())
       }
 
       is WebClientWrapper.WebClientWrapperResponse.Error -> {
         Response(
-          data = PrisonOfficerManager(),
+          data = PrisonOffenderManager(),
           errors = result.errors,
         )
       }

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

@@ -1,6 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
 data class PersonResponsibleOfficer(
-  val prisonOfficerManager: PrisonOfficerManager = PrisonOfficerManager(),
+  val prisonOffenderManager: PrisonOffenderManager = PrisonOffenderManager(),
   val communityOffenderManager: CommunityOffenderManager = CommunityOffenderManager(),
 )

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/PrisonOfficerManager.kt src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/PrisonOffenderManager.kt

@@ -1,6 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
-data class PrisonOfficerManager(
+data class PrisonOffenderManager(
   val forename: String? = null,
   val surname: String? = null,
   val prison: Prison = Prison(),

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/managePOMCase/AllocationPrimaryPOM.kt

@@ -1,14 +1,14 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.managePOMCase
 
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Prison
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOfficerManager
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOffenderManager
 
 data class AllocationPrimaryPOM(
   val manager: AllocationManager = AllocationManager(),
   val prison: AllocationPrison = AllocationPrison(),
 ) {
-  fun toPrisonOfficerManager(): PrisonOfficerManager =
-    PrisonOfficerManager(
+  fun toPrisonOffenderManager(): PrisonOffenderManager =
+    PrisonOffenderManager(
       forename = this.manager.forename,
       surname = this.manager.surname,
       prison =

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

@@ -3,26 +3,26 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.services
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.ManagePOMCaseGateway
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOfficerManager
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOffenderManager
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
 
 @Service
-class GetPrisonOfficerManagerForPersonService(
+class GetPrisonOffenderManagerForPersonService(
   @Autowired val getPersonService: GetPersonService,
   @Autowired val managePOMCaseGateway: ManagePOMCaseGateway,
 ) {
-  fun execute(hmppsId: String): Response<PrisonOfficerManager> {
+  fun execute(hmppsId: String): Response<PrisonOffenderManager> {
     val personResponse = getPersonService.execute(hmppsId = hmppsId)
     val nomisNumber = personResponse.data?.identifiers?.nomisNumber
-    var prisonOfficeManager: Response<PrisonOfficerManager> = Response(data = PrisonOfficerManager())
+    var prisonOffenderManager: Response<PrisonOffenderManager> = Response(data = PrisonOffenderManager())
 
     if (nomisNumber != null) {
-      prisonOfficeManager = managePOMCaseGateway.getPrimaryPOMForNomisNumber(nomisNumber)
+      prisonOffenderManager = managePOMCaseGateway.getPrimaryPOMForNomisNumber(nomisNumber)
     }
 
     return Response(
-      data = prisonOfficeManager.data,
-      errors = personResponse.errors + prisonOfficeManager.errors,
+      data = prisonOffenderManager.data,
+      errors = personResponse.errors + prisonOffenderManager.errors,
     )
   }
 }

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

@@ -13,37 +13,37 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.ManagePOMCaseGa
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Identifiers
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Person
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Prison
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOfficerManager
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PrisonOffenderManager
 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],
-  classes = [GetPrisonOfficerManagerForPersonService::class],
+  classes = [GetPrisonOffenderManagerForPersonService::class],
 )
-class GetPrisonOfficerManagerForPersonServiceTest(
+class GetPrisonOffenderManagerForPersonServiceTest(
   @MockBean val managePOMCaseGateway: ManagePOMCaseGateway,
   @MockBean val getPersonService: GetPersonService,
-  private val getPrisonOfficerManagerForPersonService: GetPrisonOfficerManagerForPersonService,
+  private val getPrisonOffenderManagerForPersonService: GetPrisonOffenderManagerForPersonService,
 ) : DescribeSpec(
     {
       val hmppsId = "1234/56789B"
       val nomisNumber = "Z99999ZZ"
       val person = Person(firstName = "Julianna", lastName = "Blake", identifiers = Identifiers(nomisNumber = nomisNumber))
 
-      val prisonOfficerManager = PrisonOfficerManager(forename = "Paul", surname = "Smith", prison = Prison(code = "RED"))
+      val prisonOffenderManager = PrisonOffenderManager(forename = "Paul", surname = "Smith", prison = Prison(code = "RED"))
 
       beforeEach {
         Mockito.reset(getPersonService)
         Mockito.reset(managePOMCaseGateway)
 
         whenever(getPersonService.execute(hmppsId = hmppsId)).thenReturn(Response(person))
-        whenever(managePOMCaseGateway.getPrimaryPOMForNomisNumber(id = nomisNumber)).thenReturn(Response(prisonOfficerManager))
+        whenever(managePOMCaseGateway.getPrimaryPOMForNomisNumber(id = nomisNumber)).thenReturn(Response(prisonOffenderManager))
       }
 
       it("performs a search according to hmpps Id") {
-        getPrisonOfficerManagerForPersonService.execute(hmppsId)
+        getPrisonOffenderManagerForPersonService.execute(hmppsId)
         verify(getPersonService, VerificationModeFactory.times(1)).execute(hmppsId = hmppsId)
       }
 
@@ -53,8 +53,8 @@ class GetPrisonOfficerManagerForPersonServiceTest(
             data = person,
           ),
         )
-        val result = getPrisonOfficerManagerForPersonService.execute(hmppsId)
-        result.shouldBe(Response(data = prisonOfficerManager))
+        val result = getPrisonOffenderManagerForPersonService.execute(hmppsId)
+        result.shouldBe(Response(data = prisonOffenderManager))
       }
 
       it("should return a list of errors if person not found") {
@@ -70,8 +70,8 @@ class GetPrisonOfficerManagerForPersonServiceTest(
               ),
           ),
         )
-        val result = getPrisonOfficerManagerForPersonService.execute("NOT_FOUND")
-        result.data.shouldBe(PrisonOfficerManager())
+        val result = getPrisonOffenderManagerForPersonService.execute("NOT_FOUND")
+        result.data.shouldBe(PrisonOffenderManager())
         result.errors.first().type.shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
       }
     },