diff options
Diffstat (limited to 'src')
4 files changed, 11 insertions, 6 deletions
diff --git a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt index 5dbba2b..8b2776a 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/monitoring/Request.kt @@ -151,4 +151,6 @@ interface RequestRepository : fun findPatientUniqueDeleteStates(): List<CountedState> fun findByPatientPseudonymContainingIgnoreCaseOrTanContainingIgnoreCase(patientPseudonym: PatientPseudonym, tan: Tan, pageable: Pageable): Page<Request> + + fun findByPatientPseudonymContainingIgnoreCaseOrTanContainingIgnoreCase(patientPseudonym: PatientPseudonym, tan: Tan): List<Request> } diff --git a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestService.kt b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestService.kt index 7174974..6e7c2f3 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/services/RequestService.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/services/RequestService.kt @@ -41,6 +41,9 @@ class RequestService(private val requestRepository: RequestRepository) { fun searchRequestLike(patientPseudonym: PatientPseudonym, tan: Tan, pageable: Pageable): Page<Request> = requestRepository.findByPatientPseudonymContainingIgnoreCaseOrTanContainingIgnoreCase(patientPseudonym, tan, pageable) + fun searchRequestLike(patientPseudonym: PatientPseudonym, tan: Tan): List<Request> = + requestRepository.findByPatientPseudonymContainingIgnoreCaseOrTanContainingIgnoreCase(patientPseudonym, tan) + fun findByUuid(uuid: RequestId): Optional<Request> = requestRepository.findByUuidEquals(uuid) fun findRequestByPatientId( @@ -94,7 +97,7 @@ class RequestService(private val requestRepository: RequestRepository) { } } -fun Page<Request>.filter(filter: RequestService.Filter): Page<Request> { +fun List<Request>.filter(filter: RequestService.Filter, pageable: Pageable): Page<Request> { val list = this .toList() @@ -108,5 +111,5 @@ fun Page<Request>.filter(filter: RequestService.Filter): Page<Request> { || filter == RequestService.Filter.UNCONFIRMED && !it.submissionAccepted } - return PageImpl(list, this.pageable, list.size.toLong()) + return PageImpl(list, pageable, list.size.toLong()) } diff --git a/src/main/kotlin/dev/dnpm/etl/processor/web/HomeController.kt b/src/main/kotlin/dev/dnpm/etl/processor/web/HomeController.kt index 35045da..6622348 100644 --- a/src/main/kotlin/dev/dnpm/etl/processor/web/HomeController.kt +++ b/src/main/kotlin/dev/dnpm/etl/processor/web/HomeController.kt @@ -66,8 +66,8 @@ class HomeController( if (null != filter) { model.addAttribute("filter", filter.value) requestService - .searchRequestLike(PatientPseudonym(queryString), Tan(queryString), pageable) - .filter(filter) + .searchRequestLike(PatientPseudonym(queryString), Tan(queryString)) + .filter(filter, pageable) } else { requestService .searchRequestLike(PatientPseudonym(queryString), Tan(queryString), pageable) diff --git a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt index 8b6e5e2..9b103ba 100644 --- a/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt +++ b/src/test/kotlin/dev/dnpm/etl/processor/services/RequestServiceTest.kt @@ -312,8 +312,8 @@ class RequestServiceTest { ) ) - val actualIds = PageImpl(requests, PageRequest.of(0, 10), requests.size.toLong()) - .filter(filter) + val actualIds = requests + .filter(filter, PageRequest.of(0, 10)) .toList() .map { it.uuid } |