From a2a8ef53c623e24fd4c98ad67fe4d5918275e623 Mon Sep 17 00:00:00 2001
From: stevomcallister <stephen.mcallister@digital.justice.gov.uk>
Date: Thu, 21 Nov 2024 10:47:57 +0000
Subject: [PATCH 1/2] prison search fix

---
 .../gateways/PrisonerOffenderSearchGateway.kt |  6 -----
 .../services/GetHmppsIdService.kt             | 25 +++++++++----------
 src/main/resources/application-dev.yml        |  4 ---
 3 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PrisonerOffenderSearchGateway.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PrisonerOffenderSearchGateway.kt
index 3f83442c5..03ecd431d 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PrisonerOffenderSearchGateway.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PrisonerOffenderSearchGateway.kt
@@ -1,6 +1,5 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways
 
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpMethod
@@ -19,8 +18,6 @@ class PrisonerOffenderSearchGateway(
 ) {
   private val webClient = WebClientWrapper(baseUrl)
 
-  private val log: org.slf4j.Logger = LoggerFactory.getLogger(this::class.java)
-
   @Autowired
   lateinit var hmppsAuthGateway: HmppsAuthGateway
 
@@ -59,7 +56,6 @@ class PrisonerOffenderSearchGateway(
   }
 
   fun getPrisonOffender(nomsNumber: String): Response<POSPrisoner?> {
-    log.info("looking up the person via prison search $nomsNumber")
     val result =
       webClient.request<POSPrisoner>(
         HttpMethod.GET,
@@ -70,12 +66,10 @@ class PrisonerOffenderSearchGateway(
 
     return when (result) {
       is WebClientWrapperResponse.Success -> {
-        log.info("found a match via prison search $nomsNumber")
         Response(data = result.data)
       }
 
       is WebClientWrapperResponse.Error -> {
-        log.error("An error occurred getting person from prion search: ${result.errors}")
         Response(
           data = null,
           errors = result.errors,
diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetHmppsIdService.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetHmppsIdService.kt
index 36d180f0d..621074bc7 100644
--- a/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetHmppsIdService.kt
+++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetHmppsIdService.kt
@@ -1,6 +1,5 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.services
 
-import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.HmppsId
@@ -11,23 +10,23 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
 class GetHmppsIdService(
   @Autowired val getPersonService: GetPersonService,
 ) {
-  private val log: org.slf4j.Logger = LoggerFactory.getLogger(this::class.java)
-
   fun execute(hmppsId: String): Response<HmppsId?> {
     val personResponse = getPersonService.execute(hmppsId.uppercase())
-
     var hmppsIdToReturn =
       personResponse.data?.hmppsId
-    log.info("hmppsId from probation: $hmppsIdToReturn")
-    if (hmppsIdToReturn == null) {
-      hmppsIdToReturn = getPersonService.getPersonFromNomis(hmppsId.uppercase()).data?.prisonerNumber
-      log.info("hmppsId from prison: $hmppsIdToReturn")
+    return if (hmppsIdToReturn != null) {
+      Response(
+        data = HmppsId(hmppsIdToReturn),
+        errors = personResponse.errors,
+      )
+    } else {
+      val prisonerResponse = getPersonService.getPersonFromNomis(hmppsId.uppercase())
+      hmppsIdToReturn = prisonerResponse.data?.prisonerNumber
+      Response(
+        data = HmppsId(hmppsIdToReturn),
+        errors = prisonerResponse.errors,
+      )
     }
-
-    return Response(
-      data = HmppsId(hmppsIdToReturn),
-      errors = personResponse.errors,
-    )
   }
 
   fun getNomisNumber(hmppsId: String): Response<NomisNumber?> {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 11897f133..307edd3f9 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -115,7 +115,3 @@ authorisation:
       - "/v1/hmpps/id/by-nomis-number/[^/]*$"
       - "/v1/hmpps/id/nomis-number/by-hmpps-id/[^/]*$"
 
-logging:
-  level:
-    root: INFO
-    uk.gov.justice.digital.hmpps.hmppsintegrationapi: DEBUG

From 6b629c9a2ed2876fdefa88cda9d397adb7c3b89d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]" <github-actions[bot]@users.noreply.github.com>
Date: Thu, 21 Nov 2024 10:48:51 +0000
Subject: [PATCH 2/2] Commit changes made by code formatters

---
 src/main/resources/application-dev.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index 307edd3f9..ad0529211 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -114,4 +114,3 @@ authorisation:
       - "/v1/persons/.*/plp/inductionScheduleUpdated"
       - "/v1/hmpps/id/by-nomis-number/[^/]*$"
       - "/v1/hmpps/id/nomis-number/by-hmpps-id/[^/]*$"
-