Tidy Cas1SpaceSearchService

Remove unneccessary private functions, inlining calls instead
ministryofjustice · Jan 2, 2025 · 5038b0b · 5038b0b
1 parent de6172e
commit 5038b0b
Showing 1 changed file with 6 additions and 18 deletions.
diff --git a/...n/uk/gov/justice/digital/hmpps/approvedpremisesapi/service/cas1/Cas1SpaceSearchService.kt b/...n/uk/gov/justice/digital/hmpps/approvedpremisesapi/service/cas1/Cas1SpaceSearchService.kt
@@ -28,16 +28,18 @@ class Cas1SpaceSearchService(
 
     val requiredCharacteristics = getRequiredCharacteristics(searchParameters.requirements)
 
-    return getCandidatePremises(
-      searchParameters.targetPostcodeDistrict,
-      requiredCharacteristics,
+    return spaceSearchRepository.findAllPremisesWithCharacteristicsByDistance(
+      targetPostcodeDistrict = searchParameters.targetPostcodeDistrict,
+      approvedPremisesType = requiredCharacteristics.apType,
       isWomensPremises = application.isWomensApplication!!,
+      premisesCharacteristics = requiredCharacteristics.groupedCharacteristics.premisesCharacteristics,
+      roomCharacteristics = requiredCharacteristics.groupedCharacteristics.roomCharacteristics,
     )
   }
 
   private fun getRequiredCharacteristics(requirements: Cas1SpaceSearchRequirements) = RequiredCharacteristics(
     apType = if (requirements.apType != null) {
-      requirements.apType!!.asApprovedPremisesType()
+      requirements.apType.asApprovedPremisesType()
     } else {
       requirements.apTypes?.map { it.asApprovedPremisesType() }?.firstOrNull()
     },
@@ -54,20 +56,6 @@ class Cas1SpaceSearchService(
     )
   }
 
-  private fun getCandidatePremises(
-    targetPostcodeDistrict: String,
-    requiredCharacteristics: RequiredCharacteristics,
-    isWomensPremises: Boolean,
-  ): List<CandidatePremises> {
-    return spaceSearchRepository.findAllPremisesWithCharacteristicsByDistance(
-      targetPostcodeDistrict,
-      requiredCharacteristics.apType,
-      isWomensPremises,
-      requiredCharacteristics.groupedCharacteristics.premisesCharacteristics,
-      requiredCharacteristics.groupedCharacteristics.roomCharacteristics,
-    )
-  }
-
   private fun CharacteristicEntity.isPremisesCharacteristic(): Boolean =
     this.serviceMatches(ServiceName.approvedPremises.value) && this.modelMatches("premises")