Skip to content

Commit

Permalink
Operator: in
Browse files Browse the repository at this point in the history
  • Loading branch information
xeBuz committed Oct 4, 2015
1 parent 7eacf09 commit 37d5709
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 4 deletions.
7 changes: 5 additions & 2 deletions sqlalchemy_elasticquery/elastic_query.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,11 @@ def __init__(self, model, query, session=None, enabled_fields=None):

def search(self):
""" This is the most important method """
# TODO: verify format and emit expetion
filters = json.loads(self.query)
try:
filters = json.loads(self.query)
except ValueError:
return False

result = self.model_query
if 'filter'in filters.keys():
result = self.parse_filter(filters['filter'])
Expand Down
14 changes: 12 additions & 2 deletions test/test.py
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ def test_and_operator(self):

def test_or_operator(self):
""" test or operator """
query_string = '{"filter" : {"or" : { "name" : "Jobs", "lastname" : "Man", "uid" : "19571957" } } }'
query_string = \
'{"filter" : {"or" : { "name" : "Jobs", "lastname" : "Man", "uid" : "19571957" } } }'
assert(elastic_query(User, query_string, session).count() == 2)

def test_or_and_operator(self):
Expand All @@ -86,10 +87,19 @@ def test_or_and_operator(self):

def test_sorting(self):
""" test operator levels """
query_string = '{"filter" : {"or" : { "name" : "Jhon", "lastname" : "Man" } }, "sort": { "name" : "asc" } }'
query_string = \
'{"filter" : {"or" : { "name" : "Jhon", "lastname" : "Man" } }, "sort": { "name" : "asc" } }'
results = elastic_query(User, query_string, session).all()
assert(results[0].name == 'Iron')

def test_in_operator(self):
""" test operator in """
query_string = '{"filter" : {"name" : {"in" : ["Jhon", "Peter", "Iron"] } } }'
assert(elastic_query(User, query_string, session).count() == 2)

query_string = '{"filter" : {"name" : {"in" :["Jhon", "Peter", "Iron"]}, "lastname" : "Galt" } }'
assert(elastic_query(User, query_string, session).count() == 1)

def test_flask(self):
app = Flask(__name__)
db = SQLAlchemy(app)
Expand Down

0 comments on commit 37d5709

Please sign in to comment.