Skip to content

Commit a9f1a84

Browse files
committed
Fixed the result being different depending on the hint_attr_value of search_entries
1 parent 61238f0 commit a9f1a84

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

airone/lib/elasticsearch.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,8 +190,8 @@ def make_query(hint_entity_ids, hint_attrs, hint_attr_value, entry_name, or_matc
190190
'nested': {
191191
'path': 'attr',
192192
'query': {
193-
'wildcard': {
194-
'attr.value': "*" + str(hint_attr_value) + "*"
193+
'regexp': {
194+
'attr.value': ".*" + _get_regex_pattern(str(hint_attr_value)) + ".*"
195195
}
196196
}
197197
}

entry/tests/test_model.py

+5
Original file line numberDiff line numberDiff line change
@@ -1598,6 +1598,11 @@ def test_search_entries(self):
15981598
self.assertEqual(ret['ret_count'], 1)
15991599
self.assertEqual(ret['ret_values'][0]['entry']['name'], 'e-0')
16001600

1601+
# check whether keyword would be insensitive case
1602+
ret = Entry.search_entries(user, [entity.id], hint_attr_value='FOO-0')
1603+
self.assertEqual(ret['ret_count'], 1)
1604+
self.assertEqual(ret['ret_values'][0]['entry']['name'], 'e-0')
1605+
16011606
def test_search_entries_with_hint_referral(self):
16021607
user = User.objects.create(username='hoge')
16031608

0 commit comments

Comments
 (0)