Для действия Подтверждение пользователя добавлено автоматическое выставление даты верификации

Author: Toksi86

users/admin.py

@@ -1,34 +1,35 @@
+import urllib.parse
 from datetime import date
 
 import tablib
-import urllib.parse
 from django.conf import settings
 from django.contrib import admin
 from django.contrib.auth.models import Permission
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.urls import path
+from django.utils.timezone import now
 
+from core.admin import SkillToObjectInline
 from core.utils import XlsxFileToExport
 from mailing.views import MailingTemplateRender
 from users.services.users_activity import UserActivityDataPreparer
-from .helpers import send_verification_completed_email, force_verify_user
+
+from .helpers import force_verify_user, send_verification_completed_email
 from .models import (
     CustomUser,
-    UserAchievement,
-    Member,
-    Mentor,
     Expert,
     Investor,
-    UserLink,
+    Member,
+    Mentor,
+    UserAchievement,
     UserEducation,
-    UserWorkExperience,
-    UserSkillConfirmation,
     UserLanguages,
+    UserLink,
+    UserSkillConfirmation,
+    UserWorkExperience,
 )
 
-from core.admin import SkillToObjectInline
-
 admin.site.register(Permission)
 
 
@@ -55,7 +56,7 @@ class UserLanguagesInline(admin.TabularInline):
 
 @admin.action(description="Сделать выбранных пользователей подтверждёнными")
 def make_active(modeladmin, request, queryset):
-    queryset.update(is_active=True)
+    queryset.update(is_active=True, verification_date=now().date())
 
 
 @admin.register(CustomUser)
@@ -268,7 +269,9 @@ def get_users_activity(self, _) -> HttpResponse:
             binary_data_to_export,
             content_type="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
         )
-        response["Content-Disposition"] = f'attachment; filename*=UTF-8\'\'{encoded_file_name}'
+        response["Content-Disposition"] = (
+            f"attachment; filename*=UTF-8''{encoded_file_name}"
+        )
 
         return response
 
@@ -321,7 +324,9 @@ def get_export_users_emails(self, users):
                     baby.first_name + " " + baby.last_name,
                     today.year - baby.birthday.year,
                     ", ".join(interests),
-                    "; ".join(baby.education.values_list("organization_name", flat=True)),
+                    "; ".join(
+                        baby.education.values_list("organization_name", flat=True)
+                    ),
                     baby.v2_speciality if baby.v2_speciality else baby.speciality,
                     baby.email,
                 ]
@@ -337,7 +342,9 @@ def get_export_users_emails(self, users):
                     big_man.first_name + " " + big_man.last_name,
                     today.year - big_man.birthday.year,
                     ", ".join(industry_names),
-                    "; ".join(big_man.education.values_list("organization_name", flat=True)),
+                    "; ".join(
+                        big_man.education.values_list("organization_name", flat=True)
+                    ),
                     big_man.v2_speciality
                     if big_man.v2_speciality
                     else big_man.speciality,

users/helpers.py

@@ -1,10 +1,11 @@
 from django.conf import settings
-from django.core.cache import cache
-from django.utils import timezone
 from django.contrib.auth import get_user_model
-from rest_framework_simplejwt.tokens import RefreshToken
 from django.contrib.sites.shortcuts import get_current_site
+from django.core.cache import cache
 from django.urls import reverse
+from django.utils import timezone
+from django.utils.timezone import now
+from rest_framework_simplejwt.tokens import RefreshToken
 
 from mailing.utils import send_mail
 from users.constants import PROTOCOL
@@ -31,7 +32,8 @@ def verify_email(user, request):
 
 def send_verification_completed_email(user: User):
     template_content = open(
-        settings.BASE_DIR / "templates/email/verification-succeed.html", encoding="utf-8"
+        settings.BASE_DIR / "templates/email/verification-succeed.html",
+        encoding="utf-8",
     ).read()
     send_mail(
         user=user,
@@ -97,6 +99,8 @@ def force_verify_user(user: User) -> None:
 
     # todo: send email
     user.is_active = True
+    if hasattr(user, "verification_date"):
+        user.verification_date = now().date()
     user.save()