Merge pull request #254 from PROCOLLAB-github/verybigsad-pro-53

Добавить возможность делать только "от" или только "до" в фильтрах по возрасту

Author: VeryBigSad

users/filters.py

@@ -1,11 +1,13 @@
-import datetime
 from django.contrib.auth import get_user_model
 from django.db.models import Q
 from django_filters import rest_framework as filters
 
 from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
+from users.utils import filter_age
 
 User = get_user_model()
+MIN_AGE_VALUE = 0
+MAX_AGE_VALUE = 1000
 
 
 class UserFilter(filters.FilterSet):
@@ -45,19 +47,12 @@ def filter_by_partner_program(cls, queryset, name, value):
             return User.objects.none()
 
     @classmethod
-    def filter_age(cls, queryset, name, value):
-        start, stop = map(int, value.split(","))
-        start, stop = min(start, stop), max(start, stop)
-        return queryset.filter(
-            Q(
-                birthday__gte=datetime.datetime.now()
-                - datetime.timedelta(days=365.24 * int(stop))
-            )
-            & Q(
-                birthday__lte=datetime.datetime.now()
-                - datetime.timedelta(days=365.24 * int(start))
-            )
-        )
+    def filter_age__gte(cls, queryset, name, value):
+        return filter_age(queryset, value, MAX_AGE_VALUE)
+
+    @classmethod
+    def filter_age__lte(cls, queryset, name, value):
+        return filter_age(queryset, MIN_AGE_VALUE, value)
 
     @classmethod
     def filter_by_fullname(cls, queryset, name, value):
@@ -93,7 +88,8 @@ def filter_by_fullname(cls, queryset, name, value):
     )
     fullname = filters.CharFilter(method="filter_by_fullname")
 
-    age = filters.Filter(field_name="age", method="filter_age")
+    age__gte = filters.Filter(method="filter_age__gte")
+    age__lte = filters.Filter(method="filter_age__lte")
 
     class Meta:
         model = User

users/utils.py

@@ -0,0 +1,20 @@
+from datetime import datetime, timedelta
+from django.db.models import Q
+
+
+def filter_age(queryset, start: int, stop: int):
+    """Filters given queryset by age range
+
+    Args:
+        queryset (_type_): Queryset of CustomUser
+        start (int): start age, included
+        stop (int): end age range, included
+
+    Returns:
+        Queryset: Filtered queryset of users
+    """
+    start, stop = min(start, stop), max(start, stop)
+    return queryset.filter(
+        Q(birthday__gte=datetime.now() - timedelta(days=365.24 * int(stop)))
+        & Q(birthday__lte=datetime.now() - timedelta(days=365.24 * int(start)))
+    )