Merge pull request #559 from PROCOLLAB-github/fix/UserVacancyResponses

Расширил поле файла при выдачи откликов на вакансии;

Author: Toksi86

users/helpers.py

@@ -2,11 +2,14 @@
 from django.contrib.auth import get_user_model
 from django.contrib.sites.shortcuts import get_current_site
 from django.core.cache import cache
+from django.db import transaction
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.timezone import now
+from rest_framework.exceptions import ValidationError
 from rest_framework_simplejwt.tokens import RefreshToken
 
+from files.models import UserFile
 from mailing.utils import send_mail
 from users.constants import PROTOCOL
 from users.models import UserAchievement, UserLink
@@ -54,24 +57,140 @@ def check_related_fields_update(data, pk):
         update_links(data.get("links"), pk)
 
 
+def _extract_file_links(raw_files) -> list[str]:
+    """
+    Normalize file input payload into a list of links.
+    Accepts either a list of strings or a list of dicts with a `link` key.
+    """
+
+    if not raw_files:
+        return []
+
+    if isinstance(raw_files, str):
+        raw_files = [raw_files]
+
+    if not isinstance(raw_files, (list, tuple)):
+        return []
+
+    links: list[str] = []
+    for item in raw_files:
+        if isinstance(item, str):
+            links.append(item)
+        elif isinstance(item, dict):
+            link = item.get("link")
+            if isinstance(link, str):
+                links.append(link)
+    # keep original order but remove empties/duplicates
+    seen = set()
+    deduped = []
+    for link in links:
+        if link and link not in seen:
+            seen.add(link)
+            deduped.append(link)
+    return deduped
+
+
+def _resolve_user_files(file_links: list[str], user_id: int) -> list[UserFile]:
+    """
+    Resolve file links to UserFile objects, validating ownership.
+    """
+
+    if not file_links:
+        return []
+
+    files = UserFile.objects.filter(link__in=file_links)
+    files_by_link = {f.link: f for f in files}
+
+    missing = [link for link in file_links if link not in files_by_link]
+    if missing:
+        raise ValidationError({"achievements": [f"Файлы не найдены: {missing}"]})
+
+    wrong_owner = [
+        link
+        for link, file in files_by_link.items()
+        if file.user_id is None or file.user_id != user_id
+    ]
+    if wrong_owner:
+        raise ValidationError(
+            {
+                "achievements": [
+                    "Нельзя привязать файлы: нет владельца или владелец другой "
+                    f"({wrong_owner})"
+                ]
+            }
+        )
+
+    # Preserve original ordering
+    return [files_by_link[link] for link in file_links]
+
+
+@transaction.atomic
 def update_achievements(achievements, pk):
     """
     Bootleg version of updating achievements via user
     """
 
-    # delete all old achievements
-    UserAchievement.objects.filter(user_id=pk).delete()
-    # create new achievements
-    UserAchievement.objects.bulk_create(
-        [
-            UserAchievement(
+    if achievements is None:
+        return
+
+    if not isinstance(achievements, list):
+        raise ValidationError({"achievements": ["Должен быть списком объектов."]})
+
+    existing_achievements = {
+        achievement.id: achievement
+        for achievement in UserAchievement.objects.filter(user_id=pk)
+    }
+    seen_ids: set[int] = set()
+
+    for achievement_payload in achievements:
+        if not isinstance(achievement_payload, dict):
+            raise ValidationError({"achievements": ["Каждое достижение должно быть объектом."]})
+
+        achievement_id = achievement_payload.get("id")
+        has_year_key = "year" in achievement_payload
+        raw_files = None
+        files_key_present = False
+
+        if "file_links" in achievement_payload:
+            raw_files = achievement_payload.get("file_links")
+            files_key_present = True
+        elif "files" in achievement_payload:
+            raw_files = achievement_payload.get("files")
+            files_key_present = True
+
+        file_links = (
+            _extract_file_links(raw_files) if files_key_present else None
+        )
+
+        if achievement_id and achievement_id in existing_achievements:
+            achievement_instance = existing_achievements[achievement_id]
+            title = achievement_payload.get("title")
+            status = achievement_payload.get("status")
+
+            if title is not None:
+                achievement_instance.title = title
+            if status is not None:
+                achievement_instance.status = status
+            if has_year_key:
+                achievement_instance.year = achievement_payload.get("year")
+            achievement_instance.save()
+        else:
+            achievement_instance = UserAchievement.objects.create(
                 user_id=pk,
-                title=achievement.get("title"),
-                status=achievement.get("status"),
+                title=achievement_payload.get("title"),
+                status=achievement_payload.get("status"),
+                year=achievement_payload.get("year"),
             )
-            for achievement in achievements
-        ]
-    )
+
+        seen_ids.add(achievement_instance.id)
+
+        if file_links is not None:
+            user_files = _resolve_user_files(file_links, pk)
+            achievement_instance.files.set(user_files)
+
+    stale_ids = set(existing_achievements.keys()) - seen_ids
+    if stale_ids:
+        UserAchievement.objects.filter(id__in=stale_ids).delete()
 
 
 def update_links(links, pk):

vacancy/serializers.py

@@ -307,12 +307,6 @@ def create(self, validated_data):
         return vacancy_response
 
 
-class VacancyResponseFullFileInfoListSerializer(VacancyResponseListSerializer):
-    """Returns full file info."""
-
-    accompanying_file = UserFileSerializer(read_only=True)
-
-
 class VacancyResponseDetailSerializer(serializers.ModelSerializer[VacancyResponse]):
     user = UserDetailSerializer(many=False, read_only=True)
     vacancy = VacancyListSerializer(many=False, read_only=True)
@@ -340,3 +334,15 @@ class Meta:
 
 class VacancyResponseAcceptSerializer(VacancyResponseDetailSerializer[VacancyResponse]):
     is_approved = serializers.BooleanField(required=True, read_only=False)
+
+
+class VacancyResponseFullFileInfoListSerializer(VacancyResponseListSerializer):
+    """Returns full file info."""
+
+    accompanying_file = UserFileSerializer(read_only=True)
+
+
+class VacancyResponseDetailReadSerializer(VacancyResponseDetailSerializer):
+    """Returns full file info for detail view without breaking writes."""
+
+    accompanying_file = UserFileSerializer(read_only=True)

vacancy/views.py

@@ -22,6 +22,8 @@
     VacancyDetailSerializer,
     VacancyResponseAcceptSerializer,
     VacancyResponseDetailSerializer,
+    VacancyResponseDetailReadSerializer,
+    VacancyResponseFullFileInfoListSerializer,
     VacancyResponseListSerializer,
     ProjectVacancyCreateListSerializer,
 )
@@ -76,6 +78,11 @@ class VacancyResponseList(
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
     serializer_class = VacancyResponseListSerializer
 
+    def get_serializer_class(self):
+        if self.request.method == "GET":
+            return VacancyResponseFullFileInfoListSerializer
+        return super().get_serializer_class()
+
     def get(self, request, *args, **kwargs):
         """retrieve all responses for certain vacancy"""
         # note: doesn't raise an error if the vacancy_id passed is non-existent
@@ -127,6 +134,11 @@ class VacancyResponseDetail(generics.RetrieveUpdateDestroyAPIView):
     serializer_class = VacancyResponseDetailSerializer
     permission_classes = [IsVacancyResponseOwnerOrReadOnly]
 
+    def get_serializer_class(self):
+        if self.request.method == "GET":
+            return VacancyResponseDetailReadSerializer
+        return super().get_serializer_class()
+
 
 class VacancyResponseAccept(generics.GenericAPIView):
     queryset = VacancyResponse.objects.get_vacancy_response_for_detail_view()
@@ -210,7 +222,7 @@ def post(self, request, pk):
 
 
 class UserVacancyResponses(ListAPIView):
-    serializer_class = VacancyResponseListSerializer
+    serializer_class = VacancyResponseFullFileInfoListSerializer
     permission_classes = [IsVacancyResponseOwnerOrReadOnly]
     pagination_class = VacancyPagination