Merge pull request #556 from PROCOLLAB-github/feture/new_fields_for_user_achievements

Feture/new fields for user achievements

Author: Toksi86

core/serializers.py

@@ -3,6 +3,10 @@
 from .models import SkillToObject, SkillCategory, Skill
 
 
+class EmptySerializer(serializers.Serializer):
+    pass
+
+
 class SetLikedSerializer(serializers.Serializer):
     is_liked = serializers.BooleanField()
 

feed/views.py

@@ -1,18 +1,19 @@
 from django.contrib.contenttypes.models import ContentType
-from django.db.models import QuerySet, Q
+from django.db.models import Q, QuerySet
 from rest_framework.generics import CreateAPIView
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
+from core.serializers import EmptySerializer
 from feed.pagination import FeedPagination
 from feed.services import get_liked_news
-
 from news.models import News
-from .serializers import NewsFeedListSerializer
-from projects.models import Project
 from partner_programs.models import PartnerProgramUserProfile
+from projects.models import Project
 from vacancy.models import Vacancy
 
+from .serializers import NewsFeedListSerializer
+
 
 class NewSimpleFeed(APIView):
     serializator_class = NewsFeedListSerializer
@@ -29,11 +30,9 @@ def _get_filter_data(self) -> list[str]:
 
     def _get_excluded_projects_ids(self) -> list[int]:
         """IDs for exclude projects which in Partner Program."""
-        excluded_projects = (
-            PartnerProgramUserProfile.objects
-            .values_list("project_id", flat=True)
-            .exclude(project_id__isnull=True)
-        )
+        excluded_projects = PartnerProgramUserProfile.objects.values_list(
+            "project_id", flat=True
+        ).exclude(project_id__isnull=True)
         return excluded_projects
 
     def get_queryset(self) -> QuerySet[News]:
@@ -80,6 +79,8 @@ def get(self, *args, **kwargs):
 
 
 class DevScript(CreateAPIView):
+    serializer_class = EmptySerializer
+
     def create(self, request):
         content_type_project = ContentType.objects.filter(model="project").first()
         for project in Project.objects.filter(draft=False):

partner_programs/serializers.py

@@ -80,9 +80,7 @@ class PartnerProgramForMemberSerializer(PartnerProgramBaseSerializerMixin):
 
     views_count = serializers.SerializerMethodField(method_name="count_views")
     links = serializers.SerializerMethodField(method_name="get_links")
-    is_user_manager = serializers.SerializerMethodField(
-        method_name="get_is_user_manager"
-    )
+    is_user_manager = serializers.SerializerMethodField(method_name="get_is_user_manager")
 
     def count_views(self, program):
         return get_views_count(program)

partner_programs/views.py

@@ -19,7 +19,7 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from core.serializers import SetLikedSerializer, SetViewedSerializer
+from core.serializers import EmptySerializer, SetLikedSerializer, SetViewedSerializer
 from core.services import add_view, set_like
 from partner_programs.helpers import date_to_iso
 from partner_programs.models import (
@@ -69,6 +69,7 @@ class PartnerProgramList(generics.ListCreateAPIView):
 class PartnerProgramDetail(generics.RetrieveAPIView):
     queryset = PartnerProgram.objects.prefetch_related("materials", "managers").all()
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
+    serializer_class = PartnerProgramForUnregisteredUserSerializer
 
     def get(self, request, *args, **kwargs):
         program = self.get_object()
@@ -320,7 +321,7 @@ def put(self, request, project_id, *args, **kwargs):
 
 class PartnerProgramProjectSubmitView(GenericAPIView):
     permission_classes = [IsAuthenticated, IsProjectLeader]
-    serializer_class = None
+    serializer_class = EmptySerializer
     queryset = PartnerProgramProject.objects.all()
 
     @swagger_auto_schema(
@@ -375,6 +376,7 @@ class ProgramProjectFilterAPIView(GenericAPIView):
     serializer_class = ProgramProjectFilterRequestSerializer
     permission_classes = [permissions.IsAuthenticated]
     pagination_class = PartnerProgramPagination
+    queryset = PartnerProgram.objects.none()
 
     def post(self, request, pk):
         serializer = self.get_serializer(data=request.data)
@@ -445,6 +447,9 @@ class PartnerProgramProjectsAPIView(generics.ListAPIView):
     pagination_class = PartnerProgramPagination
 
     def get_queryset(self):
+        if "pk" not in self.kwargs:
+            return Project.objects.none()
+
         program = get_object_or_404(PartnerProgram, pk=self.kwargs["pk"])
         return Project.objects.filter(program_links__partner_program=program).distinct()
 

procollab/celery.py

@@ -1,22 +1,17 @@
 import os
 
 from celery import Celery
-import django
 
-# from celery.schedules import crontab
 from celery.schedules import crontab
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "procollab.settings")
-django.setup()
 
-app = Celery("procollab")
 
+app = Celery("procollab")
 app.config_from_object("django.conf:settings", namespace="CELERY")
-
 app.autodiscover_tasks()
 
 app.conf.task_serializer = "json"
-
 app.conf.beat_schedule = {
     "outdate_vacancy": {
         "task": "vacancy.tasks.email_notificate_vacancy_outdated",

projects/views.py

@@ -51,11 +51,11 @@
     IsProjectLeaderOrReadOnlyForNonDrafts,
     TimingAfterEndsProgramPermission,
 )
+from core.serializers import EmptySerializer
 from projects.serializers import (
     AchievementDetailSerializer,
     AchievementListSerializer,
     CompanySerializer,
-    EmptySerializer,
     ProjectCollaboratorSerializer,
     ProjectCompanySerializer,
     ProjectCompanyUpdateSerializer,

users/admin.py

@@ -8,11 +8,13 @@
 from django.http import HttpResponse
 from django.shortcuts import redirect
 from django.urls import path
+from django.utils.html import format_html
 from django.utils.timezone import now
 
 from core.admin import SkillToObjectInline
 from core.utils import XlsxFileToExport
 from mailing.views import MailingTemplateRender
+from users.models import UserAchievementFile
 from users.services.users_activity import UserActivityDataPreparer
 
 from .helpers import force_verify_user, send_verification_completed_email
@@ -377,9 +379,30 @@ def get_export_users_emails(self, users):
         return response
 
 
+class UserAchievementFileInline(admin.TabularInline):
+    model = UserAchievementFile
+    extra = 0
+    autocomplete_fields = ("file",)
+
+
 @admin.register(UserAchievement)
 class UserAchievementAdmin(admin.ModelAdmin):
-    list_display = ("id", "title", "status", "user")
+    list_display = ("id", "title", "status", "user", "year", "file_link")
+    list_filter = ("year",)
+    search_fields = ("title", "status", "user__email", "user__username")
+    inlines = [UserAchievementFileInline]
+
+    def file_link(self, obj):
+        uf = obj.files.select_related("file").first()
+        if uf and uf.file and uf.file.link:
+            return format_html(
+                "<a href='{}' target='_blank'>открыть</a> ({} файл(ов))",
+                uf.file.link,
+                obj.files.count(),
+            )
+        return "—"
+
+    file_link.short_description = "Файл(ы)"
 
 
 @admin.register(UserLink)

users/migrations/0056_userachievementfile_userachievement_year_and_more.py

@@ -0,0 +1,80 @@
+# Generated by Django 4.2.24 on 2025-10-20 08:06
+
+import django.core.validators
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("files", "0007_auto_20230929_1727"),
+        ("users", "0055_alter_customuser_avatar_alter_customuser_email"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UserAchievementFile",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Файл достижения",
+                "verbose_name_plural": "Файлы достижения",
+            },
+        ),
+        migrations.AddField(
+            model_name="userachievement",
+            name="year",
+            field=models.PositiveSmallIntegerField(
+                blank=True,
+                db_index=True,
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1900),
+                    django.core.validators.MaxValueValidator(2025),
+                ],
+                verbose_name="Год достижения",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="userachievement",
+            constraint=models.UniqueConstraint(
+                fields=("user", "title", "year"), name="uniq_user_achievement_title_year"
+            ),
+        ),
+        migrations.AddField(
+            model_name="userachievementfile",
+            name="achievement",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="files",
+                to="users.userachievement",
+                verbose_name="Достижение",
+            ),
+        ),
+        migrations.AddField(
+            model_name="userachievementfile",
+            name="file",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="achievement_links",
+                to="files.userfile",
+                verbose_name="Файл",
+            ),
+        ),
+        migrations.AddConstraint(
+            model_name="userachievementfile",
+            constraint=models.UniqueConstraint(
+                fields=("achievement", "file"), name="uniq_achievement_file_link"
+            ),
+        ),
+    ]

users/models.py

@@ -1,9 +1,10 @@
+import datetime
 from functools import partial
 
 from django.contrib.auth.models import AbstractUser
 from django.contrib.contenttypes.fields import GenericRelation
 from django.core.exceptions import ValidationError
-from django.core.validators import URLValidator
+from django.core.validators import MaxValueValidator, MinValueValidator, URLValidator
 from django.db import models
 from django.db.models import QuerySet
 from django.utils import timezone
@@ -211,9 +212,7 @@ def calculate_ordering_score(self) -> int:
     def get_project_chats(self) -> QuerySet:
         from chats.models import ProjectChat
 
-        user_project_ids = self.collaborations.all().values_list(
-            "project_id", flat=True
-        )
+        user_project_ids = self.collaborations.all().values_list("project_id", flat=True)
         return ProjectChat.objects.filter(project__in=user_project_ids)
 
     def get_full_name(self) -> str:
@@ -258,7 +257,16 @@ class UserAchievement(models.Model):
 
     title = models.CharField(max_length=256)
     status = models.CharField(max_length=256)
-
+    year = models.PositiveSmallIntegerField(
+        "Год достижения",
+        null=True,
+        blank=True,
+        db_index=True,
+        validators=[
+            MinValueValidator(1900),
+            MaxValueValidator(datetime.date.today().year),
+        ],
+    )
     user = models.ForeignKey(
         CustomUser,
         on_delete=models.CASCADE,
@@ -274,6 +282,54 @@ class Meta(TypedModelMeta):
         verbose_name = "Достижение"
         verbose_name_plural = "Достижения"
 
+        constraints = [
+            models.UniqueConstraint(
+                fields=["user", "title", "year"],
+                name="uniq_user_achievement_title_year",
+            ),
+        ]
+
+
+class UserAchievementFile(models.Model):
+    ALLOWED_EXTENSIONS = {"pdf", "doc", "docx", "jpg", "jpeg", "png"}
+    MAX_UPLOAD_SIZE = 50 * 1024 * 1024
+    achievement = models.ForeignKey(
+        UserAchievement,
+        on_delete=models.CASCADE,
+        related_name="files",
+        verbose_name="Достижение",
+    )
+    file = models.ForeignKey(
+        "files.UserFile",
+        on_delete=models.CASCADE,
+        related_name="achievement_links",
+        verbose_name="Файл",
+    )
+
+    class Meta:
+        constraints = [
+            models.UniqueConstraint(
+                fields=["achievement", "file"], name="uniq_achievement_file_link"
+            )
+        ]
+        verbose_name = "Файл достижения"
+        verbose_name_plural = "Файлы достижения"
+
+    def clean(self):
+        super().clean()
+        if not self.file or not self.achievement:
+            return
+
+        if self.file.user_id is None or self.file.user_id != self.achievement.user_id:
+            raise ValidationError("Файл должен принадлежать тому же пользователю.")
+
+        if self.file.size and self.file.size > self.MAX_UPLOAD_SIZE:
+            raise ValidationError("Размер файла превышает 50 МБ.")
+
+        ext = (self.file.extension or "").lower()
+        if ext and ext not in self.ALLOWED_EXTENSIONS:
+            raise ValidationError("Недопустимое расширение файла.")
+
 
 class AbstractUserWithRole(models.Model):
     """
@@ -556,6 +612,12 @@ class UserEducation(AbstractUserExperience):
         null=True,
         verbose_name="Статус по обучению",
     )
+    description = models.TextField(
+        max_length=1000,
+        null=True,
+        blank=True,
+        verbose_name="Направление обучения",
+    )
 
     class Meta:
         verbose_name = "Образование пользователя"
@@ -583,6 +645,12 @@ class UserWorkExperience(AbstractUserExperience):
         related_name="work_experience",
         verbose_name="Пользователь",
     )
+    description = models.TextField(
+        max_length=1000,
+        null=True,
+        blank=True,
+        verbose_name="Краткое описание деятельности",
+    )
     job_position = models.CharField(
         max_length=256,
         null=True,