Merge branch 'dev'

Toksi86 · Toksi86 · commit 50a6e07026b0 · 2025-06-11T14:44:03.000+05:00
diff --git a/.github/workflows/django-test.yml b/.github/workflows/django-test.yml
@@ -11,10 +11,10 @@ jobs:
   django-test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
diff --git a/.github/workflows/release-ci.yml b/.github/workflows/release-ci.yml
@@ -10,10 +10,10 @@ jobs:
     name: 'Test before deploy'
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python 3.11
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
         with:
           python-version: 3.11
 
@@ -52,24 +52,24 @@ jobs:
     needs: [ test ]
     steps:
       - name: "Checkout repository"
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: "Set up QEMU"
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v3
 
       - name: "Set up Docker Buildx"
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v3
 
       - name: "Login to GitHub Registry"
-        uses: docker/login-action@v1
+        uses: docker/login-action@v3
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ghcr.io/procollab-github/api
           flavor: latest=true
@@ -78,7 +78,7 @@ jobs:
             type=ref,event=pr
             type=semver,pattern={{version}}
       - name: Build and push container
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: .
           file: Dockerfile
diff --git a/procollab/settings.py b/procollab/settings.py
@@ -118,9 +118,9 @@
 MIDDLEWARE = [
     "django_prometheus.middleware.PrometheusBeforeMiddleware",
     "django.middleware.security.SecurityMiddleware",
+    "corsheaders.middleware.CorsMiddleware",
     "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
-    "corsheaders.middleware.CorsMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
diff --git a/users/admin.py b/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
 
diff --git a/users/helpers.py b/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()
 
 
diff --git a/users/serializers.py b/users/serializers.py
@@ -47,7 +47,9 @@ def to_representation(self, data):
         if isinstance(data, list):
             return data
         return [
-            i.replace("'", "") for i in data.strip("][").split(",") if i.replace("'", "")
+            i.replace("'", "")
+            for i in data.strip("][").split(",")
+            if i.replace("'", "")
         ]
 
 
@@ -107,6 +109,7 @@ class Meta:
 
 class UserDataConfirmationSerializer(serializers.ModelSerializer):
     """Information about the User to add to the skill confirmation information."""
+
     v2_speciality = SpecializationSerializer()
 
     class Meta:
@@ -148,12 +151,15 @@ def to_representation(self, instance):
         """Returns correct data about user in `confirmed_by`."""
         data = super().to_representation(instance)
         data.pop("skill_to_object", None)
-        data["confirmed_by"] = UserDataConfirmationSerializer(instance.confirmed_by).data
+        data["confirmed_by"] = UserDataConfirmationSerializer(
+            instance.confirmed_by
+        ).data
         return data
 
 
 class UserApproveSkillResponse(serializers.Serializer):
     """For swagger response presentation."""
+
     confirmed_by = UserDataConfirmationSerializer(read_only=True)
 
 
@@ -173,14 +179,14 @@ class Meta:
 
     def get_approves(self, obj):
         """Adds information about confirm to the skill."""
-        confirmations = (
-            UserSkillConfirmation.objects
-            .filter(skill_to_object=obj)
-            .select_related('confirmed_by')
-        )
+        confirmations = UserSkillConfirmation.objects.filter(
+            skill_to_object=obj
+        ).select_related("confirmed_by")
         return [
             {
-                "confirmed_by": UserDataConfirmationSerializer(confirmation.confirmed_by).data,
+                "confirmed_by": UserDataConfirmationSerializer(
+                    confirmation.confirmed_by
+                ).data,
             }
             for confirmation in confirmations
         ]
@@ -300,14 +306,15 @@ def validate(self, attrs):
         completion_year = attrs.get("completion_year")
         entry_year = attrs.get("entry_year")
         if (entry_year and completion_year) and (entry_year > completion_year):
-            raise ValidationError({
-                "entry_year": constants.USER_EXPERIENCE_YEAR_VALIDATION_MESSAGE,
-            })
+            raise ValidationError(
+                {
+                    "entry_year": constants.USER_EXPERIENCE_YEAR_VALIDATION_MESSAGE,
+                }
+            )
         return attrs
 
 
 class UserEducationSerializer(UserExperienceMixin, serializers.ModelSerializer):
-
     class Meta:
         model = UserEducation
         fields = [
@@ -321,7 +328,6 @@ class Meta:
 
 
 class UserWorkExperienceSerializer(UserExperienceMixin, serializers.ModelSerializer):
-
     class Meta:
         model = UserWorkExperience
         fields = [
@@ -334,7 +340,6 @@ class Meta:
 
 
 class UserLanguagesSerializer(serializers.ModelSerializer):
-
     class Meta:
         model = UserLanguages
         fields = [
@@ -391,11 +396,9 @@ def get_projects(self, user: CustomUser):
         ).data
 
     def get_programs(self, user: CustomUser):
-        user_program_profiles = (
-            user.partner_program_profiles
-            .select_related('partner_program')
-            .filter(partner_program__draft=False)
-        )
+        user_program_profiles = user.partner_program_profiles.select_related(
+            "partner_program"
+        ).filter(partner_program__draft=False)
         return UserProgramsSerializer(
             [profile.partner_program for profile in user_program_profiles],
             context={"request": self.context.get("request"), "user": user},
@@ -523,7 +526,10 @@ def update(self, instance, validated_data):
             if attr in IMMUTABLE_FIELDS + USER_TYPE_FIELDS + RELATED_FIELDS:
                 continue
             if attr == "user_type":
-                if value == instance.user_type or value not in user_types_to_attr.keys():
+                if (
+                    value == instance.user_type
+                    or value not in user_types_to_attr.keys()
+                ):
                     continue
                 # we can't change user type to Member
                 if value == CustomUser.MEMBER:
@@ -556,13 +562,17 @@ def _update_user_education(self, instance: CustomUser, data: list[dict]) -> None
             serializer.save(user=instance)
 
     @transaction.atomic
-    def _update_user_work_experience(self, instance: CustomUser, data: list[dict]) -> None:
+    def _update_user_work_experience(
+        self, instance: CustomUser, data: list[dict]
+    ) -> None:
         """
         Update user work experience.
         `PUT`/ `PATCH` methods require full data about education.
         """
         instance.work_experience.all().delete()
-        serializer = UserWorkExperienceSerializer(data=data, many=True, context=self.context)
+        serializer = UserWorkExperienceSerializer(
+            data=data, many=True, context=self.context
+        )
         if serializer.is_valid(raise_exception=True):
             serializer.save(user=instance)
 
@@ -575,7 +585,9 @@ def _update_user_languages(self, instance: CustomUser, data: list[dict]) -> None
         # Only unique languages in profile.
         languages = [lang_data["language"] for lang_data in data]
         if len(languages) != len(set(languages)):
-            raise ValidationError({"language": constants.UNIQUE_LANGUAGES_VALIDATION_MESSAGE})
+            raise ValidationError(
+                {"language": constants.UNIQUE_LANGUAGES_VALIDATION_MESSAGE}
+            )
         # Custom validation to limit the number of languages per user to `USER_MAX_LANGUAGES_COUNT`.
         if len(languages) > constants.USER_MAX_LANGUAGES_COUNT:
             raise ValidationError(constants.COUNT_LANGUAGES_VALIDATION_MESSAGE)
@@ -591,7 +603,9 @@ def _update_user_skills(self, instance: CustomUser, data: list[int]) -> None:
         Required count of skills between 1 and `USER_MAX_SKILL_QUANTITY`.
         """
         if not (1 <= len(data) <= constants.USER_MAX_SKILL_QUANTITY):
-            raise serializers.ValidationError(constants.USER_SKILL_QUANTITY_VALIDATIONS_MESSAGE)
+            raise serializers.ValidationError(
+                constants.USER_SKILL_QUANTITY_VALIDATIONS_MESSAGE
+            )
 
         user_content_type = ContentType.objects.get_for_model(CustomUser)
 
@@ -624,7 +638,9 @@ def _update_user_skills(self, instance: CustomUser, data: list[int]) -> None:
 
     def _user_skills_quantity_limit_validation(self, instance: CustomUser) -> None:
         if instance.skills_count > constants.USER_MAX_SKILL_QUANTITY:
-            raise serializers.ValidationError(constants.USER_SKILL_QUANTITY_VALIDATIONS_MESSAGE)
+            raise serializers.ValidationError(
+                constants.USER_SKILL_QUANTITY_VALIDATIONS_MESSAGE
+            )
 
     def to_representation(self, instance) -> dict[str, Any]:
         """
@@ -734,6 +750,50 @@ class Meta:
         }
 
 
+class PublicUserSerializer(serializers.ModelSerializer):
+    firstName = serializers.CharField(source="first_name")
+    lastName = serializers.CharField(source="last_name")
+    skills = serializers.SerializerMethodField()
+    is_online = serializers.SerializerMethodField()
+
+    def get_skills(self, user: CustomUser) -> list:
+        """Возвращает список навыков без поля approves"""
+        skills = []
+        for sto in getattr(user, "prefetched_skills", []):
+            skill = sto.skill
+            skills.append(
+                {
+                    "id": skill.id,
+                    "name": skill.name,
+                    "category": {"id": skill.category.id, "name": skill.category.name},
+                }
+            )
+        return skills
+
+    def get_is_online(self, user: CustomUser) -> bool:
+        """Логика проверки онлайн-статуса"""
+        request = self.context.get("request")
+        if request and request.user.is_authenticated and request.user.id == user.id:
+            return True
+
+        cache_key = get_user_online_cache_key(user)
+        return cache.get(cache_key, False)
+
+    class Meta:
+        model = CustomUser
+        fields = [
+            "id",
+            "firstName",
+            "lastName",
+            "avatar",
+            "user_type",
+            "skills",
+            "is_online",
+            "birthday",
+            "speciality",
+        ]
+
+
 class UserFeedSerializer(serializers.ModelSerializer, SkillsSerializerMixin):
     class Meta:
         model = CustomUser
diff --git a/users/urls.py b/users/urls.py
diff --git a/users/views.py b/users/views.py
