From 2301e1ff8d550ca3bd9f125a2e98cfd025cd4b5e Mon Sep 17 00:00:00 2001 From: Amardeep Chimber Date: Tue, 4 Mar 2025 11:56:04 +0000 Subject: [PATCH] PI-2886: remove time filter, as this will be picked up on a separate task --- .../activitysearch/ActivitySearchService.kt | 4 -- .../ActivitySearchIntegrationTest.kt | 48 +++++++++---------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchService.kt b/src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchService.kt index 04dd41e0..54c07d01 100644 --- a/src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchService.kt +++ b/src/main/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchService.kt @@ -37,8 +37,6 @@ import uk.gov.justice.hmpps.probationsearch.services.shouldAll import uk.gov.justice.hmpps.sqs.audit.HmppsAuditService import java.time.Instant import java.time.LocalDate -import java.time.LocalTime -import java.time.format.DateTimeFormatter @Service class ActivitySearchService( @@ -171,8 +169,6 @@ private fun BoolQueryBuilder.fromActivityRequest(request: ActivitySearchRequest) filter(rangeQuery("date").lte(LocalDate.now())) } - filter(rangeQuery("startTime").lte(LocalTime.now().format(DateTimeFormatter.ofPattern("HH:mm:ss")))) - val filters = ActivitySearchService.ActivityFilter.entries.filter { request.filters.contains(it.filterName) } .flatMap { it.queries } if (filters.isNotEmpty()) { diff --git a/src/test/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchIntegrationTest.kt b/src/test/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchIntegrationTest.kt index d3518f1c..9f8e3761 100644 --- a/src/test/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchIntegrationTest.kt +++ b/src/test/kotlin/uk/gov/justice/hmpps/probationsearch/contactsearch/activitysearch/ActivitySearchIntegrationTest.kt @@ -88,13 +88,13 @@ class ActivitySearchIntegrationTest { .results() assertThat(results.size).isEqualTo(3) - assertThat(results.totalResults).isEqualTo(5) + assertThat(results.totalResults).isEqualTo(6) assertThat(results.results.map { it.id }).isEqualTo( contacts .filter { it.crn == crn } .sortedWith(compareByDescending { it.date }.thenByDescending { it.startTime }) .map { it.id } - .drop(4) + .drop(3) .take(3) .sorted(), ) @@ -110,8 +110,8 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(5) - assertThat(results.totalResults).isEqualTo(5) + assertThat(results.size).isEqualTo(6) + assertThat(results.totalResults).isEqualTo(6) } @@ -127,8 +127,8 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(1) - assertThat(results.totalResults).isEqualTo(1) + assertThat(results.size).isEqualTo(2) + assertThat(results.totalResults).isEqualTo(2) } @Test @@ -149,8 +149,8 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(1) - assertThat(results.totalResults).isEqualTo(1) + assertThat(results.size).isEqualTo(2) + assertThat(results.totalResults).isEqualTo(2) } @Test @@ -172,8 +172,8 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(2) - assertThat(results.totalResults).isEqualTo(2) + assertThat(results.size).isEqualTo(3) + assertThat(results.totalResults).isEqualTo(3) } @@ -186,8 +186,8 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(2) - assertThat(results.totalResults).isEqualTo(5) + assertThat(results.size).isEqualTo(3) + assertThat(results.totalResults).isEqualTo(6) assertThat(results.results.map { it.id }).isEqualTo( contacts .asSequence() @@ -195,7 +195,7 @@ class ActivitySearchIntegrationTest { .sortedWith(compareByDescending { it.date }.thenByDescending { it.startTime }) .map { it.id } .toList() - .takeLast(2) + .takeLast(3) .sorted(), ) } @@ -212,9 +212,9 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(1) - assertThat(results.totalResults).isEqualTo(1) - assertThat(results.results[0].notes).isEqualTo("I have no outcome") + assertThat(results.size).isEqualTo(2) + assertThat(results.totalResults).isEqualTo(2) + assertThat(results.results[1].notes).isEqualTo("I have no outcome") } @Test @@ -340,10 +340,10 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(2) - assertThat(results.totalResults).isEqualTo(2) + assertThat(results.size).isEqualTo(3) + assertThat(results.totalResults).isEqualTo(3) assertThat(results.results[0].notes).isEqualTo("I have no outcome") - assertThat(results.results[1].outcomeDescription).isEqualTo("outcome2") + assertThat(results.results[2].outcomeDescription).isEqualTo("outcome2") } @Test @@ -358,10 +358,10 @@ class ActivitySearchIntegrationTest { .then() .results() - assertThat(results.size).isEqualTo(2) - assertThat(results.totalResults).isEqualTo(2) + assertThat(results.size).isEqualTo(3) + assertThat(results.totalResults).isEqualTo(3) assertThat(results.results[0].notes).isEqualTo("I have no outcome") - assertThat(results.results[1].outcomeDescription).isEqualTo("outcome2") + assertThat(results.results[2].outcomeDescription).isEqualTo("outcome2") } @Test @@ -377,9 +377,9 @@ class ActivitySearchIntegrationTest { .results() assertThat(results.size).isEqualTo(4) - assertThat(results.totalResults).isEqualTo(5) + assertThat(results.totalResults).isEqualTo(6) assertThat(results.results[0].notes).isEqualTo("I have no outcome") - assertThat(results.results[2].outcomeDescription).isEqualTo("outcome3") + assertThat(results.results[2].outcomeDescription).isEqualTo("outcome2") assertThat(results.results[3].notes).isEqualTo("I failed to comply") }