Merge pull request #560 from PROCOLLAB-github/feature/project-detail-extra-fields

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

Author: Toksi86

projects/managers.py

@@ -29,6 +29,10 @@ def get_projects_for_detail_view(self):
                 "collaborator_set",
                 "vacancies",
                 "links",
+                "goals__responsible",
+                "project_companies__company",
+                "project_companies__decision_maker",
+                "resources__partner_company",
             )
             .all()
         )

projects/serializers.py

@@ -159,13 +159,86 @@ class Meta:
         list_serializer_class = ProjectGoalBulkListSerializer
 
 
+class CompanySerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Company
+        fields = ("id", "name", "inn")
+        read_only_fields = ("id",)
+
+
+class ProjectCompanySerializer(serializers.ModelSerializer):
+    company = CompanySerializer()
+    project_id = serializers.IntegerField(read_only=True)
+    decision_maker = serializers.PrimaryKeyRelatedField(read_only=True)
+
+    class Meta:
+        model = ProjectCompany
+        fields = ("id", "project_id", "company", "contribution", "decision_maker")
+
+
+class ResourceSerializer(serializers.ModelSerializer):
+    project_id = serializers.IntegerField(read_only=True)
+    project = serializers.PrimaryKeyRelatedField(
+        queryset=Project.objects.all(),
+        write_only=True,
+        required=False,
+    )
+
+    class Meta:
+        model = Resource
+        fields = (
+            "id",
+            "project_id",
+            "project",
+            "type",
+            "description",
+            "partner_company",
+        )
+        read_only_fields = ("id", "project")
+
+    def validate(self, attrs):
+        project = attrs.get("project", getattr(self.instance, "project", None))
+        partner_company = attrs.get(
+            "partner_company", getattr(self.instance, "partner_company", None)
+        )
+        if project and partner_company:
+            exists = ProjectCompany.objects.filter(
+                project=project, company=partner_company
+            ).exists()
+            if not exists:
+                raise serializers.ValidationError(
+                    {
+                        "partner_company": "Эта компания не является партнёром данного проекта."
+                    }
+                )
+        return attrs
+
+    def create(self, validated_data):
+        obj = Resource(**validated_data)
+        obj.full_clean()
+        obj.save()
+        return obj
+
+    def update(self, instance, validated_data):
+        for key, value in validated_data.items():
+            setattr(instance, key, value)
+        instance.full_clean()
+        instance.save()
+        return instance
+
+
 class ProjectDetailSerializer(serializers.ModelSerializer):
     achievements = AchievementListSerializer(many=True, read_only=True)
     cover = UserFileSerializer(required=False)
     collaborators = CollaboratorSerializer(
         source="collaborator_set", many=True, read_only=True
     )
     vacancies = ProjectVacancyListSerializer(many=True, read_only=True)
+    goals = ProjectGoalSerializer(many=True, read_only=True)
+    partners = ProjectCompanySerializer(
+        source="project_companies", many=True, read_only=True
+    )
+    resources = ResourceSerializer(many=True, read_only=True)
     short_description = serializers.SerializerMethodField()
     industry_id = serializers.IntegerField(required=False)
     views_count = serializers.SerializerMethodField(method_name="count_views")
@@ -222,17 +295,20 @@ class Meta:
             "description",
             "short_description",
             "achievements",
+            "goals",
             "links",
             "region",
             "industry",
             "industry_id",
             "presentation_address",
             "image_address",
             "collaborators",
+            "partners",
             "leader",
             "draft",
             "is_company",
             "vacancies",
+            "resources",
             "datetime_created",
             "datetime_updated",
             "views_count",
@@ -585,74 +661,6 @@ def _is_valid_url(self, url: str) -> bool:
             return False
 
 
-class CompanySerializer(serializers.ModelSerializer):
-    class Meta:
-        model = Company
-        fields = ("id", "name", "inn")
-        read_only_fields = ("id",)
-
-
-class ProjectCompanySerializer(serializers.ModelSerializer):
-    company = CompanySerializer()
-    project_id = serializers.IntegerField(read_only=True)
-    decision_maker = serializers.PrimaryKeyRelatedField(read_only=True)
-
-    class Meta:
-        model = ProjectCompany
-        fields = ("id", "project_id", "company", "contribution", "decision_maker")
-
-
-class ResourceSerializer(serializers.ModelSerializer):
-    project_id = serializers.IntegerField(read_only=True)
-    project = serializers.PrimaryKeyRelatedField(
-        queryset=Project.objects.all(),
-        write_only=True,
-        required=False,
-    )
-
-    class Meta:
-        model = Resource
-        fields = (
-            "id",
-            "project_id",
-            "project",
-            "type",
-            "description",
-            "partner_company",
-        )
-        read_only_fields = ("id", "project")
-
-    def validate(self, attrs):
-        project = attrs.get("project", getattr(self.instance, "project", None))
-        partner_company = attrs.get(
-            "partner_company", getattr(self.instance, "partner_company", None)
-        )
-        if project and partner_company:
-            exists = ProjectCompany.objects.filter(
-                project=project, company=partner_company
-            ).exists()
-            if not exists:
-                raise serializers.ValidationError(
-                    {
-                        "partner_company": "Эта компания не является партнёром данного проекта."
-                    }
-                )
-        return attrs
-
-    def create(self, validated_data):
-        obj = Resource(**validated_data)
-        obj.full_clean()
-        obj.save()
-        return obj
-
-    def update(self, instance, validated_data):
-        for key, value in validated_data.items():
-            setattr(instance, key, value)
-        instance.full_clean()
-        instance.save()
-        return instance
-
-
 class ProjectCompanyUpsertSerializer(serializers.Serializer):
     name = serializers.CharField(max_length=255)
     inn = serializers.RegexField(regex=r"^\d{10}(\d{2})?$")

users/helpers.py

@@ -2,7 +2,7 @@
 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.db import IntegrityError, transaction
 from django.urls import reverse
 from django.utils import timezone
 from django.utils.timezone import now
@@ -140,7 +140,21 @@ def update_achievements(achievements, pk):
         achievement.id: achievement
         for achievement in UserAchievement.objects.filter(user_id=pk)
     }
-    seen_ids: set[int] = set()
+    existing_ids = set(existing_achievements.keys())
+    payload_existing_ids = {
+        achievement.get("id")
+        for achievement in achievements
+        if isinstance(achievement, dict)
+        and achievement.get("id") in existing_achievements
+    }
+    stale_ids = existing_ids - payload_existing_ids
+
+    if stale_ids:
+        UserAchievement.objects.filter(id__in=stale_ids).delete()
+        for stale_id in stale_ids:
+            existing_achievements.pop(stale_id, None)
+
+    seen_pairs: set[tuple[str, int | None]] = set()
 
     for achievement_payload in achievements:
         if not isinstance(achievement_payload, dict):
@@ -164,34 +178,71 @@ def update_achievements(achievements, pk):
 
         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")
+            title = achievement_payload.get("title", achievement_instance.title)
+            status = achievement_payload.get("status", achievement_instance.status)
+            year = (
+                achievement_payload.get("year")
+                if has_year_key
+                else achievement_instance.year
+            )
 
-            if title is not None:
-                achievement_instance.title = title
-            if status is not None:
-                achievement_instance.status = status
+            achievement_instance.title = title
+            achievement_instance.status = status
             if has_year_key:
-                achievement_instance.year = achievement_payload.get("year")
-            achievement_instance.save()
+                achievement_instance.year = year
         else:
-            achievement_instance = UserAchievement.objects.create(
+            achievement_instance = UserAchievement(
                 user_id=pk,
                 title=achievement_payload.get("title"),
                 status=achievement_payload.get("status"),
                 year=achievement_payload.get("year"),
             )
+            title = achievement_instance.title
+            year = achievement_instance.year
+
+        duplicate_key = (title, year)
+        if duplicate_key in seen_pairs:
+            raise ValidationError(
+                {
+                    "achievements": [
+                        f"Достижение с названием '{title}' и годом '{year}' указано несколько раз."
+                    ]
+                }
+            )
 
-        seen_ids.add(achievement_instance.id)
+        existing_conflict = (
+            UserAchievement.objects.filter(
+                user_id=pk, title=title, year=year
+            )
+            .exclude(id=achievement_instance.id)
+            .exists()
+        )
+        if existing_conflict:
+            raise ValidationError(
+                {
+                    "achievements": [
+                        f"Достижение с названием '{title}' за {year} уже существует."
+                    ]
+                }
+            )
+
+        try:
+            achievement_instance.save()
+        except IntegrityError:
+            raise ValidationError(
+                {
+                    "achievements": [
+                        f"Достижение с названием '{title}' за {year} уже существует."
+                    ]
+                }
+            ) from None
+
+        seen_pairs.add(duplicate_key)
 
         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/managers.py

@@ -16,18 +16,26 @@ def get_vacancy_for_list_view(self):
                 "description",
                 "project__id",
                 "is_active",
+                "datetime_created",
             )
         )
 
     def get_vacancy_for_detail_view(self):
         return (
             self.get_queryset()
-            .select_related("project")
+            .select_related("project", "project__industry")
+            .prefetch_related("project__links")
             .only(
                 "role",
                 "required_skills",
                 "description",
                 "project",
+                "project__name",
+                "project__description",
+                "project__image_address",
+                "project__is_company",
+                "project__industry",
+                "project__links__link",
                 "is_active",
                 "datetime_created",
                 "datetime_updated",