Skip to content

Commit 3ce1c59

Browse files
Merge pull request #416 from OSLL/case_insensitive_search_414
case_insensitive_search_414 for full_name filter
2 parents 82556d8 + a3a1fd2 commit 3ce1c59

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
.git
22
venv
3+
.venv
34
.idea
45
.ssl
56
__pycache__

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
venv
2+
.venv
23
.idea
34
ssl
45
__pycache__

app/filters.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ def __new__(cls):
2727
cls.init_done = True
2828
return cls.instance
2929

30-
def __collect_filters(self, filters: dict) -> (dict, dict):
30+
def __collect_filters(self, filters: dict) -> tuple[dict, dict]:
3131
simple_filters = {}
3232
complex_filters = {}
3333

@@ -64,8 +64,11 @@ def __create_simple_query(self, applicable_filters: dict) -> dict:
6464
logger.info("ELSE ID: " + str(values[0]))
6565
mongodb_query[key] = ObjectId(values[0])
6666
elif key == "username" or key == "full_name":
67-
# Частичное совпадение
68-
mongodb_query[key] = {"$regex": regex.escape(values[0], literal_spaces=True)}
67+
# Частичное совпадение без учета регистра
68+
mongodb_query[key] = {
69+
"$regex": regex.escape(values[0], literal_spaces=True),
70+
"$options": 'i'
71+
}
6972
elif key == "presentation_record_duration":
7073
# Range по длительности воспроизведения
7174
start_range_time = datetime.strptime(values[0], "%M:%S").time()

0 commit comments

Comments
 (0)