CDPS-1085: Handle 0 health results (#12)

ministryofjustice · Jan 29, 2025 · 7a32127 · 7a32127
1 parent 76c1333
commit 7a32127
Show file tree

Hide file tree

Showing 2 changed files with 38 additions and 3 deletions.
diff --git a/.../kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthService.kt b/.../kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthService.kt
@@ -60,7 +60,9 @@ class PrisonerHealthService(
 
       // Fetch all non-empty health data for the given prisoner numbers
       val healthData =
-        prisonerHealthRepository.findAllByPrisonerNumberInAndFoodAllergiesIsNotEmptyOrMedicalDietaryRequirementsIsNotEmpty(prisonerNumbers)
+        prisonerHealthRepository.findAllByPrisonerNumberInAndFoodAllergiesIsNotEmptyOrMedicalDietaryRequirementsIsNotEmpty(
+          prisonerNumbers,
+        )
 
       // This maintains the order from the prisoner search API so that we're able to have sorting
       val overlappingIds = prisonerNumbers.intersect(healthData.map { it.prisonerNumber }.toSet()).toList()
@@ -89,10 +91,14 @@ class PrisonerHealthService(
           last = (lastIndex + 1) >= overlappingIds.size,
           numberOfElements = idsForPage.size,
           offset = startIndex,
-          pageNumber = Math.ceilDiv(startIndex, idsForPage.size) + 1,
+          pageNumber = if (idsForPage.isNotEmpty()) {
+            Math.ceilDiv(startIndex, idsForPage.size) + 1
+          } else {
+            1
+          },
           size = request.size,
           totalElements = overlappingIds.size,
-          totalPages = Math.ceilDiv(overlappingIds.size, request.size),
+          totalPages = Math.ceilDiv(overlappingIds.size, request.size).coerceAtLeast(1),
         ),
       )
     }

diff --git a/...lin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthServiceTest.kt b/...lin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthServiceTest.kt
@@ -434,6 +434,35 @@ class PrisonerHealthServiceTest {
         )
       }
 
+      @Test
+      fun `it doesnt crash with 0 prisoners`() {
+        whenever(
+          prisonerHealthRepository.findAllByPrisonerNumberInAndFoodAllergiesIsNotEmptyOrMedicalDietaryRequirementsIsNotEmpty(
+            mutableListOf(
+              PRISONER_NUMBER,
+            ),
+          ),
+        ).thenReturn(emptyList())
+
+        assertThat(
+          underTest.getHealthForPrison(PRISON_ID, HealthAndMedicationForPrisonRequest(1, 10)),
+        ).isEqualTo(
+          HealthAndMedicationForPrisonResponse(
+            content = emptyList(),
+            metadata = PageMeta(
+              first = true,
+              last = true,
+              numberOfElements = 0,
+              offset = 0,
+              pageNumber = 1,
+              size = 10,
+              totalElements = 0,
+              totalPages = 1,
+            ),
+          ),
+        )
+      }
+
       @Test
       fun `it fetches the health information for the returned prisoners`() {
         assertThat(