PI-2774 Remove user check when looking up referrals (#4591)

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

Hide file tree

Showing 3 changed files with 5 additions and 22 deletions.
diff --git a/...ov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Referral.kt b/...ov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Referral.kt
@@ -162,11 +162,7 @@ class Event(
 )
 
 interface ReferralRepository : JpaRepository<Referral, Long> {
-    fun findByPersonIdAndCreatedByUserIdAndExternalReference(
-        personId: Long,
-        createdByUserId: Long,
-        externalRef: String
-    ): Referral?
+    fun findByPersonIdAndExternalReference(personId: Long, externalRef: String): Referral?
 
     @Query(
         """

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
@@ -55,11 +55,7 @@ class ReferralService(
         val rTeam = teamRepository.getUnallocatedTeam(ap.probationArea.code)
         val rStaff = staffRepository.getByCode(details.bookedBy.staffMember.staffCode)
         val findReferral = {
-            referralRepository.findByPersonIdAndCreatedByUserIdAndExternalReference(
-                person.id,
-                ServiceContext.servicePrincipal()!!.userId,
-                EXT_REF_BOOKING_PREFIX + details.bookingId
-            )
+            referralRepository.findByPersonIdAndExternalReference(person.id, EXT_REF_BOOKING_PREFIX + details.bookingId)
         }
         findReferral() ?: run {
             eventRepository.findForUpdate(event.id)
@@ -229,11 +225,7 @@ class ReferralService(
     }
 
     fun findReferral(person: Person, externalReference: String): Referral? =
-        referralRepository.findByPersonIdAndCreatedByUserIdAndExternalReference(
-            person.id,
-            ServiceContext.servicePrincipal()!!.userId,
-            externalReference
-        )
+        referralRepository.findByPersonIdAndExternalReference(person.id, externalReference)
 
     fun getReferralDetails(crn: String, bookingId: String): ReferralDetail =
         referralRepository.findReferralDetail(crn, EXT_REF_BOOKING_PREFIX + bookingId)?.let {

diff --git a/...elius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/ApprovedPremisesServiceTest.kt b/...elius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/ApprovedPremisesServiceTest.kt
@@ -593,13 +593,8 @@ internal class ApprovedPremisesServiceTest {
             null,
             EXT_REF_BOOKING_PREFIX + bookingId,
         )
-        whenever(
-            referralRepository.findByPersonIdAndCreatedByUserIdAndExternalReference(
-                person.id,
-                UserGenerator.AUDIT_USER.id,
-                EXT_REF_BOOKING_PREFIX + bookingId
-            )
-        ).thenReturn(ref)
+        whenever(referralRepository.findByPersonIdAndExternalReference(person.id, EXT_REF_BOOKING_PREFIX + bookingId))
+            .thenReturn(ref)
         return ref
     }
 }