Skip to content

Query string query #21

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
merged 2 commits into from
Jul 28, 2017
Merged

Query string query #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eb7272
Add query string query if keyword is presented
amymok Jul 27, 2017
8513296
Add tests for query string query search
amymok Jul 27, 2017
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
45 changes: 29 additions & 16 deletions complaint_search/es_builders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,15 @@ def build(self):
search = {
"from": self.params.get("frm"),
"size": self.params.get("size"),
"query": {"match_all": {}},
"query": {
"query_string": {
"query": "*",
"fields": [
self.params.get("field")
],
"default_operator": "AND"
}
},
"highlight": {
"fields": {
self.params.get("field"): {}
Expand All @@ -111,24 +119,29 @@ def build(self):

# query
if self.params.get("search_term"):
search["query"] = {
"match": {
self.params.get("field"): {
"query": self.params.get("search_term"),
"operator": "and"
if any(keyword in self.params.get("search_term")
for keyword in ("AND", "OR", "NOT", "TO")):
Copy link
Contributor

@AdamZarger AdamZarger Jul 28, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like this is a loop that does nothing. Was this intentional? Otherwise everything looks great!

Edit: I realize now that I misread this line, ignore my earlier comment.


# QueryString Query
search["query"] = {
"query_string": {
"query": self.params.get("search_term"),
"fields": [
self.params.get("field")
],
"default_operator": "AND"
}
}
}
else:
search["query"] = {
"query_string": {
"query": "*",
"fields": [
self.params.get("field")
],
"default_operator": "AND"
else:
# Match Query
search["query"] = {
"match": {
self.params.get("field"): {
"query": self.params.get("search_term"),
"operator": "and"
}
}
}
}

return search

Expand Down
0 ...sults/search_with_search_term__valid.json → ...search_with_search_term_match__valid.json
View file
Open in desktop
File renamed without changes.
314 changes: 314 additions & 0 deletions complaint_search/tests/expected_results/search_with_search_term_qsq_and__valid.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,314 @@
{
"from": 0,
"size": 10,
"query": {
"query_string": {
"query": "test AND term",
"fields": [
"complaint_what_happened"
],
"default_operator": "AND"
}
},
"highlight": {
"fields": {
"complaint_what_happened": {}
},
"number_of_fragments": 1,
"fragment_size": 500
},
"sort": [{"_score": {"order": "desc"}}],
"post_filter": {"and": {"filters": []}},
"aggs": {
"has_narratives": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"has_narratives": {
"terms": {
"field": "has_narratives",
"size": 0
}
}
}
},
"company": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"company": {
"terms": {
"field": "company",
"size": 0
}
}
}
},
"product": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"product": {
"terms": {
"field": "product.raw",
"size": 0
},
"aggs": {
"sub_product.raw": {
"terms": {
"field": "sub_product.raw",
"size": 0
}
}
}
}
}
},
"issue": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"issue": {
"terms": {
"field": "issue.raw",
"size": 0
},
"aggs": {
"sub_issue.raw": {
"terms": {
"field": "sub_issue.raw",
"size": 0
}
}
}
}
}
},
"state": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"state": {
"terms": {
"field": "state",
"size": 0
}
}
}
},
"zip_code": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"zip_code": {
"terms": {
"field": "zip_code",
"size": 0
}
}
}
},
"timely": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"timely": {
"terms": {
"field": "timely",
"size": 0
}
}
}
},
"company_response": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"company_response": {
"terms": {
"field": "company_response",
"size": 0
}
}
}
},
"company_public_response": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"company_public_response": {
"terms": {
"field": "company_public_response.raw",
"size": 0
}
}
}
},
"consumer_disputed": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"consumer_disputed": {
"terms": {
"field": "consumer_disputed.raw",
"size": 0
}
}
}
},
"consumer_consent_provided": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"consumer_consent_provided": {
"terms": {
"field": "consumer_consent_provided.raw",
"size": 0
}
}
}
},
"tag": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"tag": {
"terms": {
"field": "tag",
"size": 0
}
}
}
},
"submitted_via": {
"filter": {
"and": {
"filters": [
{
"range": {
"date_received": {}
}
}
]
}
},
"aggs": {
"submitted_via": {
"terms": {
"field": "submitted_via",
"size": 0
}
}
}
}

}
}
Loading