Merge branch 'master' into dev

Author: VeryBigSad

users/helpers.py

@@ -87,3 +87,12 @@ def update_links(links, pk):
             for link in links
         ]
     )
+
+
+def force_verify_user(user: User) -> None:
+    if user.is_active:
+        return
+
+    # todo: send email
+    user.is_active = True
+    user.save()

users/migrations/0041_alter_customuser_options.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.3 on 2023-10-27 06:48
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("users", "0040_alter_customuser_user_type_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name="customuser",
+            options={
+                "ordering": ["-ordering_score", "id"],
+                "verbose_name": "Пользователь",
+                "verbose_name_plural": "Пользователи",
+            },
+        ),
+    ]

users/urls.py

@@ -18,6 +18,7 @@
     ResendVerifyEmail,
     CurrentUserPrograms,
     CurrentUserProgramsTags,
+    ForceVerifyView,
 )
 
 app_name = "users"
@@ -33,6 +34,7 @@
     path("users/types/", UserTypesView.as_view()),
     path("users/<int:pk>/", UserDetail.as_view()),
     path("users/<int:pk>/set_onboarding_stage/", SetUserOnboardingStage.as_view()),
+    path("users/<int:pk>/force_verify/", ForceVerifyView.as_view()),
     path("users/current/", CurrentUser.as_view()),
     # todo: change password view
     path("users/current/programs/", CurrentUserPrograms.as_view()),

users/views.py

@@ -6,7 +6,7 @@
 from django.db.models import Q
 from django.shortcuts import redirect
 from django_filters import rest_framework as filters
-from rest_framework import status
+from rest_framework import status, permissions
 from rest_framework.generics import (
     GenericAPIView,
     ListAPIView,
@@ -28,10 +28,12 @@
     UserProgramsSerializer,
     PartnerProgramListSerializer,
 )
+from projects.pagination import ProjectsPagination
 from projects.serializers import ProjectListSerializer
 from users.helpers import (
     verify_email,
     check_related_fields_update,
+    force_verify_user,
 )
 from users.constants import (
     VERBOSE_ROLE_TYPES,
@@ -248,17 +250,20 @@ class AchievementDetail(RetrieveUpdateDestroyAPIView):
     permission_classes = [IsAchievementOwnerOrReadOnly]
 
 
-class UserProjectsList(APIView):
+class UserProjectsList(GenericAPIView):
     permission_classes = [IsAuthenticated]
+    pagination_class = ProjectsPagination
+    serializer_class = ProjectListSerializer
 
     def get(self, request):
-        serializer = ProjectListSerializer(
-            Project.objects.get_user_projects_for_list_view().filter(
-                Q(leader_id=self.request.user.id)
-                | Q(collaborator__user=self.request.user)
-            ),
-            many=True,
+        queryset = Project.objects.get_user_projects_for_list_view().filter(
+            Q(leader_id=self.request.user.id) | Q(collaborator__user=self.request.user)
         )
+
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
         return Response(serializer.data, status=status.HTTP_200_OK)
 
 
@@ -348,3 +353,16 @@ def post(self, request, *args, **kwargs):
             )
         except Exception:
             return Response(status=status.HTTP_400_BAD_REQUEST)
+
+
+class ForceVerifyView(APIView):
+    queryset = User.objects.get_users_for_detail_view()
+    permission_classes = [permissions.IsAdminUser]
+
+    def post(self, request, *args, **kwargs):
+        try:
+            user = User.objects.get(pk=kwargs["pk"])
+            force_verify_user(user)
+            return Response(status=status.HTTP_200_OK)
+        except User.DoesNotExist:
+            return Response(status=status.HTTP_404_NOT_FOUND)