Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dfpl 1761 ES query fix #5524

Merged
merged 4 commits into from
Aug 2, 2024
Merged

Dfpl 1761 ES query fix #5524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad2e4f9
update es search query
chak-shing-lo-justice Aug 1, 2024
1691343
fix and update test
chak-shing-lo-justice Aug 1, 2024
1c95d3a
query close case as well
chak-shing-lo-justice Aug 2, 2024
6928aa6
Update CafcassApiSearchCaseServiceTest.java
chak-shing-lo-justice Aug 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 19 additions & 2 deletions ...rc/main/java/uk/gov/hmcts/reform/fpl/service/cafcass/api/CafcassApiSearchCaseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@
import uk.gov.hmcts.reform.fpl.model.cafcass.api.CafcassApiCaseData;
import uk.gov.hmcts.reform.fpl.service.CaseConverter;
import uk.gov.hmcts.reform.fpl.service.search.SearchService;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.BooleanQuery;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.Filter;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.MatchQuery;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.MustNot;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.RangeQuery;

import java.time.LocalDateTime;
Expand All @@ -19,18 +23,31 @@
@Service
@RequiredArgsConstructor(onConstructor = @__(@Autowired))
public class CafcassApiSearchCaseService {
private static final MustNot CASE_STATES = MustNot.builder()
.clauses(List.of(
MatchQuery.of("state", "Open"),
MatchQuery.of("state", "Deleted"),
MatchQuery.of("state", "RETURNED")))
.build();

private final CaseConverter caseConverter;
private final SearchService searchService;
private final List<CafcassApiCaseDataConverter> cafcassApiCaseDataConverters;

public List<CafcassApiCase> searchCaseByDateRange(LocalDateTime startDate, LocalDateTime endDate) {

final RangeQuery searchRange = RangeQuery.builder()
.field("last_modified")
.greaterThanOrEqual(startDate)
.lessThanOrEqual(endDate).build();

List<CaseDetails> caseDetails = searchService.search(searchRange, 10000, 0);
final BooleanQuery searchCaseQuery = BooleanQuery.builder()
.mustNot(CASE_STATES)
.filter(Filter.builder()
.clauses(List.of(searchRange))
.build())
.build();

List<CaseDetails> caseDetails = searchService.search(searchCaseQuery, 10000, 0);

return caseDetails.stream()
.map(this::convertToCafcassApiCase)
Expand Down
28 changes: 24 additions & 4 deletions ...est/java/uk/gov/hmcts/reform/fpl/service/cafcass/api/CafcassApiSearchCaseServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import uk.gov.hmcts.reform.ccd.client.model.CaseDetails;
Expand All @@ -13,6 +15,11 @@
import uk.gov.hmcts.reform.fpl.model.cafcass.api.CafcassApiCaseData;
import uk.gov.hmcts.reform.fpl.service.CaseConverter;
import uk.gov.hmcts.reform.fpl.service.search.SearchService;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.BooleanQuery;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.ESQuery;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.Filter;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.MatchQuery;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.MustNot;
import uk.gov.hmcts.reform.fpl.utils.elasticsearch.RangeQuery;

import java.time.LocalDateTime;
Expand All @@ -31,8 +38,18 @@
public class CafcassApiSearchCaseServiceTest {
private static final LocalDateTime SEARCH_END_DATE = LocalDateTime.now();
private static final LocalDateTime SEARCH_START_DATE = SEARCH_END_DATE.minusDays(1);
private static final RangeQuery SEARCH_RANGE = RangeQuery.builder().field("last_modified")
.greaterThanOrEqual(SEARCH_START_DATE).lessThanOrEqual(SEARCH_END_DATE).build();
private static final BooleanQuery SEARCH_QUERY = BooleanQuery.builder()
.mustNot(MustNot.builder()
.clauses(List.of(
MatchQuery.of("state", "Open"),
MatchQuery.of("state", "Deleted"),
MatchQuery.of("state", "RETURNED")))
.build())
.filter(Filter.builder()
.clauses(List.of(RangeQuery.builder().field("last_modified")
.greaterThanOrEqual(SEARCH_START_DATE).lessThanOrEqual(SEARCH_END_DATE).build()))
.build())
.build();

private static final CaseData MOCK_CASE_DATA_1 = mock(CaseData.class);
private static final CaseDetails MOCK_CASE_DETAILS_1 = CaseDetails.builder()
Expand All @@ -58,6 +75,8 @@ public class CafcassApiSearchCaseServiceTest {
private CafcassApiCaseDataConverter cafcassApiCaseDataConverter2;
@Mock
private CafcassApiCaseDataConverter cafcassApiCaseDataConverter3;
@Captor
private ArgumentCaptor<ESQuery> searchQueryCaptor;

private CafcassApiSearchCaseService underTest;

Expand All @@ -77,7 +96,7 @@ void shouldReturnSearchResultAndBuildCafcassApiCaseByInvokingAllConverter() {
when(cafcassApiCaseDataConverter3.convert(any(), any())).thenReturn(mockBuilder);

final List<CaseDetails> caseDetails = List.of(MOCK_CASE_DETAILS_1, MOCK_CASE_DETAILS_2);
when(searchService.search(eq(SEARCH_RANGE), anyInt(), anyInt())).thenReturn(caseDetails);
when(searchService.search(searchQueryCaptor.capture(), anyInt(), anyInt())).thenReturn(caseDetails);
when(caseConverter.convert(MOCK_CASE_DETAILS_1)).thenReturn(MOCK_CASE_DATA_1);
when(caseConverter.convert(MOCK_CASE_DETAILS_2)).thenReturn(MOCK_CASE_DATA_2);

Expand All @@ -100,6 +119,7 @@ void shouldReturnSearchResultAndBuildCafcassApiCaseByInvokingAllConverter() {
List<CafcassApiCase> expected = List.of(expectedCafcassApiCase1, expectedCafcassApiCase2);

assertEquals(expected, actual);
assertEquals(SEARCH_QUERY.toMap(), searchQueryCaptor.getValue().toMap());

// verify calling all converters to build CafcassApiCaseData
verify(cafcassApiCaseDataConverter1).convert(eq(MOCK_CASE_DATA_1), any());
Expand All @@ -115,7 +135,7 @@ void shouldReturnSearchResultAndBuildCafcassApiCaseByInvokingAllConverter() {

@Test
void shouldReturnEmptyListIfNoCaseFound() {
when(searchService.search(eq(SEARCH_RANGE), anyInt(), anyInt())).thenReturn(List.of());
when(searchService.search(any(), anyInt(), anyInt())).thenReturn(List.of());
List<CafcassApiCase> actual = underTest.searchCaseByDateRange(SEARCH_START_DATE, SEARCH_END_DATE);

assertEquals(List.of(), actual);
Expand Down
Loading