PI-2774 Remove user check when looking up residences (#4593)

ministryofjustice · Jan 28, 2025 · 1260578 · 1260578
1 parent 89962ee
commit 1260578
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/...v/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Residence.kt b/...v/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Residence.kt
@@ -81,7 +81,6 @@ class MoveOnCategory(
 
 interface ResidenceRepository : JpaRepository<Residence, Long> {
     fun findByReferralId(referralId: Long): Residence?
-    fun findByReferralIdAndCreatedByUserId(referralId: Long, createdByUserId: Long): Residence?
 }
 
 interface MoveOnCategoryRepository : JpaRepository<MoveOnCategory, Long> {

diff --git a/...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt b/...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt
@@ -28,7 +28,6 @@ import uk.gov.justice.digital.hmpps.integrations.delius.team.getUnallocatedTeam
 import uk.gov.justice.digital.hmpps.model.ApReferral
 import uk.gov.justice.digital.hmpps.model.ExistingReferrals
 import uk.gov.justice.digital.hmpps.model.ReferralDetail
-import uk.gov.justice.digital.hmpps.security.ServiceContext
 import java.time.ZonedDateTime
 
 @Transactional
@@ -187,14 +186,12 @@ class ReferralService(
     }
 
     fun personDeparted(person: Person, details: PersonDeparted) {
-        val serviceUserId = ServiceContext.servicePrincipal()!!.userId
         val externalReference = EXT_REF_BOOKING_PREFIX + details.bookingId
         val referral = getReferral(person, externalReference)
-        val residence = residenceRepository.findByReferralIdAndCreatedByUserId(referral.id, serviceUserId)
-            ?: throw IgnorableMessageException(
-                "Residence not found",
-                mapOf("crn" to person.crn, "externalReference" to externalReference)
-            )
+        val residence = residenceRepository.findByReferralId(referral.id) ?: throw IgnorableMessageException(
+            "Residence not found",
+            mapOf("crn" to person.crn, "externalReference" to externalReference)
+        )
         residence.departureDate = details.departedAt
         residence.departureReasonId = referenceDataRepository.findByCodeAndDatasetCode(
             details.legacyReasonCode,