From 069c96d1c6bef730d0fe996fc48d7816f7d89654 Mon Sep 17 00:00:00 2001 From: Marcus Aspin Date: Tue, 28 Jan 2025 15:42:57 +0000 Subject: [PATCH] PI-2774 Remove user check when looking up residences --- .../approvedpremises/referral/entity/Residence.kt | 1 - .../justice/digital/hmpps/service/ReferralService.kt | 11 ++++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Residence.kt b/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Residence.kt index 5e3e420bdd..0f8e950533 100644 --- a/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Residence.kt +++ b/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Residence.kt @@ -81,7 +81,6 @@ class MoveOnCategory( interface ResidenceRepository : JpaRepository { fun findByReferralId(referralId: Long): Residence? - fun findByReferralIdAndCreatedByUserId(referralId: Long, createdByUserId: Long): Residence? } interface MoveOnCategoryRepository : JpaRepository { diff --git a/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt b/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt index 72cf942b86..961741f393 100644 --- a/projects/approved-premises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt +++ b/projects/approved-premises-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,