LBRYCommunity/hub
1
0
Fork 0
Code Issues 35 Pull requests 6 Projects Releases Packages Wiki Activity

fix https://github.com/lbryio/lbry-sdk/issues/3561

Browse source
This commit is contained in:
Jack Robison 2022-03-24 21:13:08 -04:00
parent 879869cb31
commit 444d1f51cc
No known key found for this signature in database
GPG key ID: DF25C68FE0239BB2
1 changed files with 26 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
scribe/elasticsearch/search.py
View file

@ -352,13 +352,37 @@ def expand_query(**kwargs):
query['must'].append({"range": {key: {ops[operator]: value}}}) query['must'].append({"range": {key: {ops[operator]: value}}})
elif key in RANGE_FIELDS and isinstance(value, list) and all(v[0] in ops for v in value): elif key in RANGE_FIELDS and isinstance(value, list) and all(v[0] in ops for v in value):
range_constraints = [] range_constraints = []
release_times = []
for v in value: for v in value:
operator_length = 2 if v[:2] in ops else 1 operator_length = 2 if v[:2] in ops else 1
operator, stripped_op_v = v[:operator_length], v[operator_length:] operator, stripped_op_v = v[:operator_length], v[operator_length:]
if key == 'fee_amount': if key == 'fee_amount':
stripped_op_v = str(Decimal(stripped_op_v)*1000) stripped_op_v = str(Decimal(stripped_op_v)*1000)
if key == 'release_time':
release_times.append((operator, stripped_op_v))
else:
range_constraints.append((operator, stripped_op_v)) range_constraints.append((operator, stripped_op_v))
if key != 'release_time':
query['must'].append({"range": {key: {ops[operator]: v for operator, v in range_constraints}}}) query['must'].append({"range": {key: {ops[operator]: v for operator, v in range_constraints}}})
else:
query['must'].append(
{"bool":
{"should": [
{"bool": {
"must_not": {
"exists": {
"field": "release_time"
}
}
}},
{"bool": {
"must": [
{"exists": {"field": "release_time"}},
{'range': {key: {ops[operator]: v for operator, v in release_times}}},
]}},
]}
}
)
elif many: elif many:
query['must'].append({"terms": {key: value}}) query['must'].append({"terms": {key: value}})
else: else: