Информация о файлах в достижениях пользователя возвращается в подробном виде при GET запросе, но принимается в сокращённом при POST запросе

Author: Toksi86

users/admin.py

@@ -393,12 +393,14 @@ class UserAchievementAdmin(admin.ModelAdmin):
     inlines = [UserAchievementFileInline]
 
     def file_link(self, obj):
-        uf = obj.files.select_related("file").first()
-        if uf and uf.file and uf.file.link:
+        first_file = obj.files.first()
+        count = obj.files.count()
+
+        if first_file and getattr(first_file, "link", None):
             return format_html(
                 "<a href='{}' target='_blank'>открыть</a> ({} файл(ов))",
-                uf.file.link,
-                obj.files.count(),
+                first_file.link,
+                count,
             )
         return "—"
 

users/managers.py

@@ -1,6 +1,8 @@
+from django.apps import apps
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import UserManager
-from django.db.models import Manager
+from django.db import models
+from django.db.models import Manager, Prefetch
 
 from users.constants import MEMBER
 
@@ -53,19 +55,35 @@ def _create_user(self, email, password, **extra_fields):
         return user
 
 
-class UserAchievementManager(Manager):
-    def get_achievements_for_list_view(self):
+FILE_FIELDS = (
+    "id",
+    "name",
+    "extension",
+    "mime_type",
+    "size",
+    "link",
+    "user_id",
+    "datetime_uploaded",
+)
+
+
+class UserAchievementManager(models.Manager):
+    def _with_user_and_files(self):
+        UserFile = apps.get_model("files", "UserFile")
         return (
             self.get_queryset()
             .select_related("user")
-            .only("id", "title", "status", "user__id")
+            .prefetch_related(Prefetch("files", queryset=UserFile.objects.all()))
+        )
+
+    def get_achievements_for_list_view(self):
+        return self._with_user_and_files().only(
+            "id", "title", "status", "year", "user_id"
         )
 
     def get_achievements_for_detail_view(self):
-        return (
-            self.get_queryset()
-            .select_related("user")
-            .only("id", "title", "status", "user")
+        return self._with_user_and_files().only(
+            "id", "title", "status", "year", "user_id"
         )
 
 

users/migrations/0058_userachievement_files_and_more.py

@@ -0,0 +1,48 @@
+# Generated by Django 4.2.24 on 2025-10-24 06:41
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("files", "0007_auto_20230929_1727"),
+        ("users", "0057_alter_usereducation_description_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="userachievement",
+            name="files",
+            field=models.ManyToManyField(
+                blank=True,
+                related_name="achievements",
+                related_query_name="achievement",
+                through="users.UserAchievementFile",
+                to="files.userfile",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userachievementfile",
+            name="achievement",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="file_links",
+                related_query_name="file_link",
+                to="users.userachievement",
+                verbose_name="Достижение",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="userachievementfile",
+            name="file",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="achievement_links",
+                related_query_name="achievement_link",
+                to="files.userfile",
+                verbose_name="Файл",
+            ),
+        ),
+    ]

users/models.py

@@ -272,6 +272,14 @@ class UserAchievement(models.Model):
         on_delete=models.CASCADE,
         related_name="achievements",
     )
+    files = models.ManyToManyField(
+        "files.UserFile",
+        through="UserAchievementFile",
+        through_fields=("achievement", "file"),
+        related_name="achievements",
+        related_query_name="achievement",
+        blank=True,
+    )
 
     objects = UserAchievementManager()
 
@@ -293,16 +301,19 @@ class Meta(TypedModelMeta):
 class UserAchievementFile(models.Model):
     ALLOWED_EXTENSIONS = {"pdf", "doc", "docx", "jpg", "jpeg", "png", "webp"}
     MAX_UPLOAD_SIZE = 50 * 1024 * 1024
+
     achievement = models.ForeignKey(
         UserAchievement,
         on_delete=models.CASCADE,
-        related_name="files",
+        related_name="file_links",
+        related_query_name="file_link",
         verbose_name="Достижение",
     )
     file = models.ForeignKey(
         "files.UserFile",
         on_delete=models.CASCADE,
         related_name="achievement_links",
+        related_query_name="achievement_link",
         verbose_name="Файл",
     )
 

users/serializers.py

@@ -15,6 +15,7 @@
 from core.services import get_views_count
 from core.utils import get_user_online_cache_key
 from files.models import UserFile
+from files.serializers import UserFileSerializer
 from partner_programs.models import PartnerProgram, PartnerProgramUserProfile
 from projects.models import Collaborator, Project
 from projects.validators import validate_project
@@ -36,23 +37,69 @@
 from users.validators import specialization_exists_validator
 
 
+class UserFileReadSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = UserFile
+        fields = ("link", "name", "extension", "mime_type", "size")
+
+
+class FileLinkField(serializers.SlugRelatedField):
+    """
+    write-only: принимает link, маппит на UserFile текущего пользователя.
+    """
+
+    def get_queryset(self):
+        request = self.context.get("request")
+        qs = UserFile.objects.all()
+        if request and request.user.is_authenticated:
+            return qs.filter(user=request.user)
+        return qs.none()
+
+
 class AchievementListSerializer(serializers.ModelSerializer):
     year = serializers.IntegerField(required=False, allow_null=True)
-    file_link = serializers.SerializerMethodField()
+    files = UserFileSerializer(many=True, read_only=True)
 
     class Meta:
         model = UserAchievement
-        fields = ["id", "title", "status", "year", "file_link"]
+        fields = ["id", "title", "status", "year", "files"]
 
-    def get_file_link(self, obj):
-        uaf = obj.files.first()
-        return uaf.file.link if (uaf and uaf.file) else None
 
+class AchievementDetailSerializer(serializers.ModelSerializer):
+    files = UserFileSerializer(many=True, read_only=True)
+    file_links = FileLinkField(
+        slug_field="link",
+        many=True,
+        write_only=True,
+        required=False,
+    )
 
-class UserFileReadSerializer(serializers.ModelSerializer):
     class Meta:
-        model = UserFile
-        fields = ("link", "name", "extension", "mime_type", "size")
+        model = UserAchievement
+        fields = [
+            "id",
+            "title",
+            "status",
+            "year",
+            "files",
+            "file_links",
+        ]
+
+    @transaction.atomic
+    def create(self, validated_data):
+        file_objs = validated_data.pop("file_links", [])
+        achievement = super().create(validated_data)
+        if file_objs:
+            achievement.files.set(file_objs)
+        return achievement
+
+    @transaction.atomic
+    def update(self, instance, validated_data):
+        file_objs = validated_data.pop("file_links", None)
+        achievement = super().update(instance, validated_data)
+        if file_objs is not None:
+            achievement.files.set(file_objs)
+        return achievement
 
 
 class AchievementFileReadSerializer(serializers.ModelSerializer):
@@ -873,66 +920,6 @@ class Meta:
         ]
 
 
-class AchievementDetailSerializer(serializers.ModelSerializer):
-    file_link = serializers.URLField(required=False, allow_null=True)
-    user = serializers.PrimaryKeyRelatedField(read_only=True)
-
-    class Meta:
-        model = UserAchievement
-        fields = ["id", "title", "status", "year", "user", "file_link"]
-        read_only_fields = ["id", "user"]
-
-    def to_representation(self, instance):
-        data = super().to_representation(instance)
-        rel = instance.files.first()  # UserAchievementFile
-        data["file_link"] = rel.file.link if (rel and rel.file) else None
-        return data
-
-    def validate_year(self, value):
-        import datetime
-
-        if value is None:
-            return value
-        cur = datetime.date.today().year
-        if value < 1900 or value > cur:
-            raise serializers.ValidationError("Год вне допустимого диапазона.")
-        return value
-
-    @transaction.atomic
-    def _set_single_file(self, achievement: UserAchievement, link: str | None):
-        UserAchievementFile.objects.filter(achievement=achievement).delete()
-
-        if not link:
-            return
-
-        uf, _ = UserFile.objects.get_or_create(link=link)
-
-        rel = UserAchievementFile(achievement=achievement, file=uf)
-        rel.clean()
-        rel.save()
-
-    @transaction.atomic
-    def create(self, validated_data):
-        link = validated_data.pop("file_link", None)
-        achievement = UserAchievement.objects.create(**validated_data)
-        self._set_single_file(achievement, link)
-        return achievement
-
-    @transaction.atomic
-    def update(self, instance, validated_data):
-        sentinel = object()
-        link = validated_data.pop("file_link", sentinel)
-
-        for attr, val in validated_data.items():
-            setattr(instance, attr, val)
-        instance.save()
-
-        if link is not sentinel:
-            self._set_single_file(instance, link)
-
-        return instance
-
-
 class EmailSerializer(serializers.Serializer):
     email = serializers.EmailField()
 

users/views.py

@@ -343,7 +343,11 @@ class AchievementList(ListCreateAPIView):
     POST /api/users/achievements/
     """
 
-    queryset = UserAchievement.objects.get_achievements_for_list_view()
+    queryset = (
+        UserAchievement.objects.get_achievements_for_list_view()
+        .select_related("user")
+        .prefetch_related("files")
+    )
 
     def get_permissions(self):
         if self.request.method == "POST":
@@ -388,7 +392,11 @@ class AchievementDetail(RetrieveUpdateDestroyAPIView):
     DELETE /api/users/achievements/{id}/
     """
 
-    queryset = UserAchievement.objects.get_achievements_for_detail_view()
+    queryset = (
+        UserAchievement.objects.get_achievements_for_detail_view()
+        .select_related("user")
+        .prefetch_related("files")
+    )
     serializer_class = AchievementDetailSerializer
     permission_classes = [IsAchievementOwnerOrReadOnly]