-
Notifications
You must be signed in to change notification settings - Fork 25
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
avniproject/avni-webapp#1317 - removed subject type join to simplify.…
… simplified search query has lesser cost. (cherry picked from commit 394959f)
- Loading branch information
1 parent
8e3a36c
commit 54f1570
Showing
10 changed files
with
121 additions
and
56 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 3 additions & 2 deletions
5
avni-server-api/src/main/java/org/avni/server/dao/search/SearchBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,10 @@ | ||
| package org.avni.server.dao.search; | ||
|
|
||
| import org.avni.server.domain.SubjectType; | ||
| import org.avni.server.web.request.webapp.search.SubjectSearchRequest; | ||
|
|
||
| public interface SearchBuilder { | ||
| SqlQuery getSQLResultQuery(SubjectSearchRequest searchRequest); | ||
| SqlQuery getSQLResultQuery(SubjectSearchRequest searchRequest, SubjectType subjectType); | ||
|
|
||
| SqlQuery getSQLCountQuery(SubjectSearchRequest searchRequest); | ||
| SqlQuery getSQLCountQuery(SubjectSearchRequest searchRequest, SubjectType subjectType); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
94 changes: 67 additions & 27 deletions
94
avni-server-api/src/test/java/org/avni/server/dao/search/SubjectSearchQueryBuilderTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,109 +1,149 @@ | ||
| package org.avni.server.dao.search; | ||
|
|
||
| import org.avni.server.dao.search.SqlQuery; | ||
| import org.avni.server.dao.search.SubjectSearchQueryBuilder; | ||
| import org.junit.Test; | ||
| import org.avni.server.domain.Organisation; | ||
| import org.avni.server.domain.SubjectType; | ||
| import org.avni.server.domain.UserContext; | ||
| import org.avni.server.domain.metadata.SubjectTypeBuilder; | ||
| import org.avni.server.framework.security.UserContextHolder; | ||
| import org.avni.server.web.request.webapp.search.Concept; | ||
| import org.avni.server.web.request.webapp.search.DateRange; | ||
| import org.avni.server.web.request.webapp.search.IntegerRange; | ||
| import org.junit.Before; | ||
| import org.junit.Test; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Arrays; | ||
|
|
||
| import static org.assertj.core.api.Assertions.assertThat; | ||
|
|
||
| public class SubjectSearchQueryBuilderTest { | ||
| private SubjectType subjectType; | ||
|
|
||
| @Before | ||
| public void setup() { | ||
| UserContext userContext = new UserContext(); | ||
| userContext.setOrganisation(new Organisation()); | ||
| UserContextHolder.create(userContext); | ||
| subjectType = new SubjectTypeBuilder().setId(1l).setName("Individual").build(); | ||
| } | ||
|
|
||
| @Test | ||
| public void withoutSubjectType() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withNameFilter("name") | ||
| .build(null); | ||
| String sql = query.getSql(); | ||
| assertThat(sql).isNotEmpty(); | ||
| assertThat(sql).contains(SubjectSearchQueryBuilder.SubjectTypeColumn); | ||
| assertThat(sql).contains(SubjectSearchQueryBuilder.SubjectTypeJoin); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldBuildBaseQueryWhenRunWithoutParameters() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder().build(); | ||
| System.out.println(query.getSql()); | ||
| assertThat(query.getSql()).isNotEmpty(); | ||
| SqlQuery query = new SubjectSearchQueryBuilder().build(subjectType); | ||
| String sql = query.getSql(); | ||
| assertThat(sql).isNotEmpty(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldBeAbleToSearchByName() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withNameFilter("name") | ||
| .build(); | ||
| assertThat(query.getSql()).isNotEmpty(); | ||
| .withSubjectTypeFilter(subjectType) | ||
| .build(subjectType); | ||
| String sql = query.getSql(); | ||
| System.out.println(sql); | ||
| assertThat(sql).isNotEmpty(); | ||
| assertThat(sql).contains("i.subject_type_id = :subjectTypeId"); | ||
| assertThat(sql).contains("'Individual' as \"subjectTypeName\""); | ||
| assertThat(sql).doesNotContain(SubjectSearchQueryBuilder.SubjectTypeColumn); | ||
| assertThat(sql).doesNotContain(SubjectSearchQueryBuilder.SubjectTypeJoin); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldNotAddNameFiltersForNullOrEmptyNames() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withNameFilter(" ") | ||
| .build(); | ||
| .build(subjectType); | ||
| assertThat(query.getSql().contains("i.last_name ilike")).isFalse(); | ||
|
|
||
| query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withNameFilter(null) | ||
| .build(); | ||
| .build(subjectType); | ||
| assertThat(query.getSql().contains("i.last_name ilike")).isFalse(); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldBreakNameStringIntoTokensInTheQuery() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withNameFilter("two tokens andAnother") | ||
| .build(); | ||
| assertThat(query.getParameters().values().contains("%two%")).isTrue(); | ||
| assertThat(query.getParameters().values().contains("%tokens%")).isTrue(); | ||
| assertThat(query.getParameters().values().contains("%andAnother%")).isTrue(); | ||
| assertThat(query.getParameters().size()).isEqualTo(5); | ||
| .build(subjectType); | ||
| assertThat(query.getParameters().containsValue("%two%")).isTrue(); | ||
| assertThat(query.getParameters().containsValue("%tokens%")).isTrue(); | ||
| assertThat(query.getParameters().containsValue("%andAnother%")).isTrue(); | ||
| assertThat(query.getParameters().size()).isEqualTo(6); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldAddAgeFilter() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withAgeFilter(new IntegerRange(1, null)) | ||
| .build(); | ||
| assertThat(query.getParameters().size()).isEqualTo(3); | ||
| .build(subjectType); | ||
| assertThat(query.getParameters().size()).isEqualTo(4); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldAddGenderFilter() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withGenderFilter(null) | ||
| .build(); | ||
| assertThat(query.getParameters().size()).isEqualTo(2); | ||
| .build(subjectType); | ||
| assertThat(query.getParameters().size()).isEqualTo(3); | ||
|
|
||
| ArrayList<String> genders = new ArrayList<>(); | ||
| genders.add("firstGenderUuid"); | ||
| query = new SubjectSearchQueryBuilder() | ||
| .withGenderFilter(genders) | ||
| .build(); | ||
| .build(subjectType); | ||
| assertThat(query.getParameters().size()).isEqualTo(3); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldAddEncounterJoinWhtnAddingEncounterDateFilter() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withEncounterDateFilter(new DateRange("2021-01-01", "2022-01-01")) | ||
| .build(); | ||
| assertThat(query.getParameters().size()).isEqualTo(4); | ||
| .build(subjectType); | ||
| assertThat(query.getParameters().size()).isEqualTo(5); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldNotAddTheSameJoinsMultipleTimes() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withProgramEncounterDateFilter(new DateRange("2021-01-01", "2022-01-01")) | ||
| .withProgramEnrolmentDateFilter(new DateRange("2021-01-01", "2022-01-01")) | ||
| .build(); | ||
| assertThat(query.getParameters().size()).isEqualTo(6); | ||
| .build(subjectType); | ||
| assertThat(query.getParameters().size()).isEqualTo(7); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldAddConditionsForConcepts() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .withConceptsFilter(Arrays.asList( | ||
| new Concept[]{new Concept("uuid", "registration", "CODED", Arrays.asList(new String[]{"asdf", "qwer"}), null)})) | ||
| .build(); | ||
| .build(subjectType); | ||
| } | ||
|
|
||
| @Test | ||
| public void shouldMakeQueryForCount() { | ||
| SqlQuery query = new SubjectSearchQueryBuilder().forCount() | ||
| .build(); | ||
| new SubjectSearchQueryBuilder() | ||
| .withSubjectTypeFilter(subjectType) | ||
| .forCount().build(subjectType); | ||
| } | ||
| } |
Oops, something went wrong.