Skip to content

RTGOV-502 Fix situation properties query #127

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

Merged
objectiser merged 1 commit into from
Jun 20, 2014
Merged

RTGOV-502 Fix situation properties query #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions ...g/overlord/rtgov/analytics/situation/store/elasticsearch/ElasticsearchSituationStore.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ protected QueryBuilder getQueryBuilder(SituationsQuery sitQuery) {
BoolQueryBuilder bool=QueryBuilders.boolQuery();

if (!isNullOrEmpty(sitQuery.getResolutionState())) {
bool.must(QueryBuilders.matchQuery("situationProperties."+SituationStore.RESOLUTION_STATE_PROPERTY, sitQuery.getResolutionState()));
bool.must(QueryBuilders.matchQuery("properties."+SituationStore.RESOLUTION_STATE_PROPERTY, sitQuery.getResolutionState()));
}

if (sitQuery.getProperties() != null && !sitQuery.getProperties().isEmpty()) {
Expand All @@ -185,9 +185,9 @@ protected QueryBuilder getQueryBuilder(SituationsQuery sitQuery) {
Object key = entry.getKey();
Object value = entry.getValue();
if (value instanceof String) {
bool.must(QueryBuilders.fuzzyLikeThisFieldQuery("situationProperties."+key).likeText((String)value));
bool.must(QueryBuilders.fuzzyLikeThisFieldQuery("properties."+key).likeText((String)value));
} else {
bool.must(QueryBuilders.matchQuery("situationProperties."+key, value));
bool.must(QueryBuilders.matchQuery("properties."+key, value));
}
}
}
Expand Down