Merge pull request #86 from PROCOLLAB-github/dev

Dev

Author: VeryBigSad

projects/filters.py

@@ -1,3 +1,4 @@
+from django.db.models import Count
 from django_filters import rest_framework as filters
 
 from projects.models import Project
@@ -11,16 +12,28 @@ class ProjectFilter(filters.FilterSet):
     Parameters to filter by:
         industry (int), step (int), region (str), name__contains (str),
          description__contains (str), collaborator__user__in (List[int]),
-         datetime_created__gt (datetime.datetime)
+         datetime_created__gt (datetime.datetime), step (int), any_vacancies (bool),
+         member_count__gt (int), member_count__lt (int), leader (int)
 
     Examples:
         ?industry=1&name__contains=clown
             equals to .filter(industry=1, name__contains='clown')
         ?datetime_created__gt=25.10.2022
             equals to .filter(datetime_created__gt=datetime.datetime(...))
         ?collaborator__user__in=1,2 equals to .filter(collaborator__user__in=[1, 2])
+        ?step=1 equals to .filter(step=1)
+        ?any_vacancies=true equals to .filter(any_vacancies=True)
+        ?collaborator__count__gt=1 equals to .filter(collaborator__count__gt=1)
     """
 
+    @classmethod
+    def filter_collaborator_count_lt(cls, queryset, name, value):
+        return queryset.alias(Count("collaborator")).filter(collaborator__count__lt=value)
+
+    @classmethod
+    def filter_collaborator_count_gt(cls, queryset, name, value):
+        return queryset.alias(Count("collaborator")).filter(collaborator__count__gt=value)
+
     name__contains = filters.Filter(field_name="name", lookup_expr="contains")
     description__contains = filters.Filter(
         field_name="description", lookup_expr="contains"
@@ -32,6 +45,18 @@ class ProjectFilter(filters.FilterSet):
         field_name="datetime_created", lookup_expr="gt"
     )
 
+    # filters by whether there are any vacancies in the project
+    any_vacancies = filters.BooleanFilter(
+        field_name="vacancies", lookup_expr="isnull", exclude=True
+    )
+    collaborator__count__gt = filters.NumberFilter(
+        field_name="collaborator", lookup_expr="count__gt"
+    )
+    collaborator__count__lt = filters.NumberFilter(
+        field_name="collaborator", method="filter_collaborator_count_lt"
+    )
+    step = filters.NumberFilter(field_name="step")
+
     class Meta:
         model = Project
-        fields = ("industry", "step", "region", "leader")
+        fields = ("industry", "step", "region", "leader", "step")

users/urls.py

@@ -13,6 +13,7 @@
     UserList,
     UserTypesView,
     VerifyEmail,
+    LogoutView,
 )
 
 app_name = "users"
@@ -30,6 +31,7 @@
     path("users/current/", CurrentUser.as_view()),
     path("users/achievements/", AchievementList.as_view()),
     path("users/achievements/<int:pk>/", AchievementDetail.as_view()),
+    path("logout/", LogoutView.as_view()),
     re_path(
         r"^account-confirm-email/",
         VerifyEmail.as_view(),

users/views.py

@@ -331,3 +331,17 @@ def get(self, request):
             many=True,
         )
         return Response(serializer.data, status=status.HTTP_200_OK)
+
+
+class LogoutView(APIView):
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        try:
+            # get request's refresh token from headers
+            refresh_token = request.headers["Authorization"].split(" ")[1]
+            # blacklist the refresh token
+            RefreshToken(refresh_token).blacklist()
+            return Response(status=status.HTTP_205_RESET_CONTENT)
+        except TokenError:
+            return Response(status=status.HTTP_400_BAD_REQUEST)