HIA-765 - update logic to check if nomis number is provided

ministryofjustice · Nov 26, 2024 · 28c7b46 · 28c7b46
1 parent 05d75b5
commit 28c7b46
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 5 deletions.
diff --git a/...gov/justice/digital/hmpps/hmppsintegrationapi/services/GetCellLocationForPersonService.kt b/...gov/justice/digital/hmpps/hmppsintegrationapi/services/GetCellLocationForPersonService.kt
@@ -12,12 +12,24 @@ class GetCellLocationForPersonService(
   @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
 ) {
   fun execute(hmppsId: String): Response<CellLocation?> {
-    val personResponse = getPersonService.execute(hmppsId = hmppsId)
 
-    val prisonResponse =
-      personResponse.data?.identifiers?.nomisNumber?.let {
-        prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = it)
+    val prisonResponse = when {
+      isNomsNumber(hmppsId) -> prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = hmppsId)
+      else -> {
+        val personResponse = getPersonService.execute(hmppsId = hmppsId)
+
+        if (personResponse.data == null) {
+          return Response(
+            data = CellLocation(),
+            errors = personResponse.errors
+          )
+        }
+
+        personResponse.data.identifiers.nomisNumber?.let {
+          prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = it)
+        }
       }
+    }
 
     val cellLocation =
       if (prisonResponse?.data?.inOutStatus == "IN") {
@@ -28,7 +40,8 @@ class GetCellLocationForPersonService(
 
     return Response(
       data = cellLocation,
-      errors = personResponse.errors + (prisonResponse?.errors ?: emptyList()),
+      errors = prisonResponse?.errors ?: emptyList()
     )
+
   }
 }
diff --git a/...main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonService.kt b/...main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonService.kt
@@ -106,3 +106,7 @@ class GetPersonService(
 
   fun getPersonFromNomis(nomisNumber: String) = prisonerOffenderSearchGateway.getPrisonOffender(nomisNumber)
 }
+
+fun isNomsNumber(id: String?): Boolean {
+  return id?.matches(Regex("^[A-Z]\\d{4}[A-Z]{2}+$")) == true
+}