HMAI-385 - Empty non associations should not result in an error (#780)

* Remove empty list 404

* Tidy up tests

Author: tomwatkins1994

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

@@ -23,26 +23,18 @@ class GetPrisonersNonAssociationsService(
     filters: ConsumerFilters?,
   ): Response<NonAssociations?> {
     val consumerPrisonFilterCheck = consumerPrisonAccessService.checkConsumerHasPrisonAccess<NonAssociations?>(prisonId, filters, upstreamServiceType = UpstreamApi.NON_ASSOCIATIONS)
-
     if (consumerPrisonFilterCheck.errors.isNotEmpty()) {
       return consumerPrisonFilterCheck
     }
 
     val responseFromNonAssociationsGateway = nonAssociationsGateway.getNonAssociationsForPerson(hmppsId, includeOpen, includeClosed)
-
     if (responseFromNonAssociationsGateway.errors.isNotEmpty()) {
       return Response(data = null, responseFromNonAssociationsGateway.errors)
     }
     if (responseFromNonAssociationsGateway.data?.nonAssociations == null) {
       return Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.NON_ASSOCIATIONS, UpstreamApiError.Type.ENTITY_NOT_FOUND, "No non associates found with prisoner")))
     }
 
-    val unpackedResponse = NonAssociations(responseFromNonAssociationsGateway.data.nonAssociations ?: emptyList())
-
-    if (unpackedResponse.nonAssociations.isEmpty()) {
-      return Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.NON_ASSOCIATIONS, UpstreamApiError.Type.ENTITY_NOT_FOUND, "Not found")))
-    }
-
-    return Response(data = unpackedResponse)
+    return Response(data = NonAssociations(responseFromNonAssociationsGateway.data.nonAssociations))
   }
 }

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

@@ -29,6 +29,8 @@ internal class GetPrisonersNonAssociationsServiceTest(
 ) : DescribeSpec(
     {
       val prisonId = "MDI"
+      val prisonerNumber = "ABC1234"
+      val filters = null
       val nonAssociations =
         NonAssociations(
           nonAssociations =
@@ -51,7 +53,7 @@ internal class GetPrisonersNonAssociationsServiceTest(
                 closedAt = "Bad Dudes",
                 otherPrisonerDetails =
                   NonAssociationPrisonerDetails(
-                    prisonerNumber = "ABC1234",
+                    prisonerNumber = prisonerNumber,
                     role = "Bad Dudes",
                     roleDescription = "Bad Dudes",
                     firstName = "Bad Dudes",
@@ -72,16 +74,15 @@ internal class GetPrisonersNonAssociationsServiceTest(
         whenever(
           consumerPrisonAccessService.checkConsumerHasPrisonAccess<NonAssociations?>(
             prisonId,
-            filters = ConsumerFilters(null),
+            filters,
             upstreamServiceType = UpstreamApi.NON_ASSOCIATIONS,
           ),
         ).thenReturn(Response(data = null, errors = emptyList()))
+        whenever(nonAssociationsGateway.getNonAssociationsForPerson(prisonerNumber)).thenReturn(Response(data = nonAssociations))
       }
 
       it("returns a valid response when provided a valid prisoner number") {
-        whenever(nonAssociationsGateway.getNonAssociationsForPerson(prisonerNumber = "ABC1234")).thenReturn(Response(data = nonAssociations))
-
-        val response = getPrisonersNonAssociationsService.execute("ABC1234", prisonId, filters = ConsumerFilters(null))
+        val response = getPrisonersNonAssociationsService.execute(prisonerNumber, prisonId, filters = filters)
         response.errors.shouldBeEmpty()
         response.data.shouldBe(nonAssociations)
       }
@@ -97,12 +98,11 @@ internal class GetPrisonersNonAssociationsServiceTest(
             ),
           )
 
-        whenever(nonAssociationsGateway.getNonAssociationsForPerson(prisonerNumber = "ABC1234")).thenReturn(Response(data = null))
         whenever(consumerPrisonAccessService.checkConsumerHasPrisonAccess<NonAssociations?>(wrongPrisonId, ConsumerFilters(listOf("MDI")), upstreamServiceType = UpstreamApi.NON_ASSOCIATIONS)).thenReturn(
           Response(data = null, errors = errors),
         )
 
-        val response = getPrisonersNonAssociationsService.execute("ABC1234", wrongPrisonId, filters = ConsumerFilters(listOf("MDI")))
+        val response = getPrisonersNonAssociationsService.execute(prisonerNumber, wrongPrisonId, filters = ConsumerFilters(listOf("MDI")))
         response.errors.shouldBe(errors)
         response.data.shouldBe(null)
       }
@@ -116,10 +116,9 @@ internal class GetPrisonersNonAssociationsServiceTest(
               description = "Not found",
             ),
           )
+        whenever(nonAssociationsGateway.getNonAssociationsForPerson(prisonerNumber)).thenReturn(Response(data = null, errors = errors))
 
-        whenever(nonAssociationsGateway.getNonAssociationsForPerson(prisonerNumber = "ABC1234")).thenReturn(Response(data = null, errors = errors))
-
-        val response = getPrisonersNonAssociationsService.execute("ABC1234", prisonId, filters = ConsumerFilters(null))
+        val response = getPrisonersNonAssociationsService.execute(prisonerNumber, prisonId, filters = filters)
         response.errors.shouldBe(errors)
         response.data.shouldBe(null)
       }