Skip to content

Null search filter #879

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 4 commits into from
Aug 1, 2017
Merged

Null search filter #879

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
a3771f7
null search filter
hkethi002 Jul 28, 2017
2a1b090
null search filter unit test
hkethi002 Jul 28, 2017
9029f40
add missing filter, removed extra bools
hkethi002 Jul 28, 2017
9f6ae93
conditional addition of top level container filter
hkethi002 Jul 31, 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
53 changes: 46 additions & 7 deletions api/handlers/dataexplorerhandler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,19 +156,22 @@
"subject.sex" : {
"terms" : {
"field" : "subject.sex.raw",
"size" : 15
"size" : 15,
"missing": "null"
}
},
"session.tags" : {
"terms" : {
"field" : "subject.tags.raw",
"size" : 15
"size" : 15,
"missing": "null"
}
},
"subject.code" : {
"terms" : {
"field" : "subject.code.raw",
"size" : 15
"size" : 15,
"missing": "null"
}
},
"session.timestamp" : {
Expand Down Expand Up @@ -213,13 +216,15 @@
"file.measurements" : {
"terms" : {
"field" : "file.measurements.raw",
"size" : 15
"size" : 15,
"missing": "null"
}
},
"file.type" : {
"terms" : {
"field" : "file.type.raw",
"size" : 15
"size" : 15,
"missing": "null"
}
}
}
Expand Down Expand Up @@ -305,7 +310,40 @@ def _parse_request(self, request_type='search'):
for f in filters:
if f.get('terms'):
for k,v in f['terms'].iteritems():
modified_filters.append({'terms': {k+'.raw': v}})
if "null" in v:
if isinstance(v, list):
v.remove("null")
elif isinstance(v, str):
v = None
null_filter = {
'bool': {
'should': [
{
'bool': {
'must': [
{
'bool':{
'must_not': [
{
'exists': {'field': k}
}
]
}
}
]
}
}
]
}
}
if len(k.split('.')) > 1:
null_filter['bool']['should'][0]['bool']['must'].append({'exists': {'field': k.split('.')[0]}})
if v:
null_filter['bool']['should'].append({'terms': {k+'.raw': v}})
modified_filters.append(null_filter)

else:
modified_filters.append({'terms': {k+'.raw': v}})
else:
modified_filters.append(f)

Expand Down Expand Up @@ -364,7 +402,8 @@ def aggregate_field_values(self):
"results" : {
"terms" : {
"field" : field_name + ".raw",
"size" : 15
"size" : 15,
"missing": "null"
}
}
}
Expand Down
43 changes: 41 additions & 2 deletions test/unit_tests/python/test_dataexplorer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,45 @@ def test_search(as_public, as_drone, es):
assert r.ok
assert r.json['results'] == results

# file search w/ search null filter
r = as_drone.post('/dataexplorer/search', json={'return_type': cont_type, 'all_data': True, 'filters': [
{'terms': {filter_key: [filter_value, "null"]}},
]})
es.search.assert_called_with(
body={
'_source': deh.SOURCE[cont_type],
'query': {'bool': {
'filter': {'bool': {'must': [
{'term': {'container_type': cont_type}},
{'bool':
{'should':
[
{'bool':
{
'must': [
{
'bool': {
'must_not': [
{"exists": {"field":filter_key}}
]
}
}
]
}
},
{'terms': {filter_key + '.raw': [filter_value]}}
]
}
}
]}}
}},
'size': 100},
doc_type='flywheel',
index='data_explorer')
assert r.ok
assert r.json['results'] == results



def test_get_facets(as_public, as_drone, es):
# try to get facets w/o login
Expand Down Expand Up @@ -302,7 +341,7 @@ def test_aggregate_field_values(as_public, as_drone, es):
es.search.return_value = {'aggregations': {'results': result}}
r = as_drone.post('/dataexplorer/search/fields/aggregate', json={'field_name': field_name})
es.search.assert_called_with(
body={'aggs': {'results': {'terms': {'field': field_name + '.raw', 'size': 15}}},
body={'aggs': {'results': {'terms': {'field': field_name + '.raw', 'size': 15, 'missing': 'null'}}},
'query': {'bool': {'filter': [{'term': {'permissions._id': None}}], 'must': {'match_all': {}}}},
'size': 0},
doc_type='flywheel',
Expand All @@ -313,7 +352,7 @@ def test_aggregate_field_values(as_public, as_drone, es):
# get typeahead w/ search string for string|boolean field type
r = as_drone.post('/dataexplorer/search/fields/aggregate', json={'field_name': field_name, 'search_string': search_str})
es.search.assert_called_with(
body={'aggs': {'results': {'terms': {'field': field_name + '.raw', 'size': 15}}},
body={'aggs': {'results': {'terms': {'field': field_name + '.raw', 'size': 15, 'missing': 'null'}}},
'query': {'bool': {'filter': [{'term': {'permissions._id': None}}], 'must': {'match': {'field': search_str}}}},
'size': 0},
doc_type='flywheel',
Expand Down