Merge pull request #387 from Pet-projects-CodePET/refactor/requests_a…

…nd_serializers

Refactor/requests and serializers

src/backend/api/v1/general/serializers.py

@@ -29,7 +29,10 @@ class ProfessionSerializer(CustomModelSerializer):
 
     class Meta:
         model = Profession
-        fields = "__all__"
+        fields = (
+            "speciality",
+            "specialization",
+        )
 
 
 class SkillSerializer(CustomModelSerializer):

src/backend/api/v1/profile/serializers.py

@@ -130,6 +130,13 @@ class Meta:
             "specialists",
         )
 
+    def __init__(self, *args, **kwargs):
+        exclude = kwargs.pop("exclude", None)
+        super().__init__(*args, **kwargs)
+        if exclude:
+            for field in exclude:
+                self.fields.pop(field, None)
+
 
 class ProfilePreviewReadSerializer(BaseProfileSerializer):
     """Сериализатор для чтения превью профилей специалистов."""
@@ -182,7 +189,7 @@ def get_projects(profile: Profile) -> list[Optional[dict]]:
             Project.objects.filter(
                 Q(creator=user) | Q(participants=user) | Q(owner=user)
             )
-            .exclude(status=Project.DRAFT)
+            .exclude(project_status=Project.DRAFT)
             .only("id", "name")
         )
 

src/backend/api/v1/projects/constants.py

@@ -3,15 +3,15 @@
 
 PROJECT_PARTICIPATION_REQUEST_DESTROY_ONLY_FIELDS = (
     "user__id",
-    "status",
+    "project__project_status",
 )
 PROJECT_PARTICIPATION_REQUEST_LIST_ONLY_FIELDS = (
     *PROJECT_PARTICIPATION_REQUEST_DESTROY_ONLY_FIELDS,
     "project__creator__id",
     "project__owner__id",
     "project__name",
     "project__directions",
-    "project__status",
+    "request_status",
     "position__is_required",
     "position__profession",
     "position__count",
@@ -27,5 +27,5 @@
 PROJECT_PARTICIPATION_REQUEST_ONLY_FIELDS = {
     "destroy": PROJECT_PARTICIPATION_REQUEST_DESTROY_ONLY_FIELDS,
     "list": PROJECT_PARTICIPATION_REQUEST_LIST_ONLY_FIELDS,
-    "retrieve": PROJECT_PARTICIPATION_REQUEST_RETRIEVE_ONLY_FIELDS,
+    # "retrieve": PROJECT_PARTICIPATION_REQUEST_RETRIEVE_ONLY_FIELDS,
 }

src/backend/api/v1/projects/filters.py

@@ -5,14 +5,20 @@
 
 from apps.general.constants import LEVEL_CHOICES
 from apps.general.models import Profession, Skill
-from apps.projects.constants import BUSYNESS_CHOICES, PROJECT_STATUS_CHOICES
-from apps.projects.models import Direction, Project
+from apps.projects.constants import (
+    BUSYNESS_CHOICES,
+    PROJECT_STATUS_CHOICES,
+    RequestStatuses,
+)
+from apps.projects.models import Direction, ParticipationRequest, Project
 
 
 class ProjectFilter(FilterSet):
     """Класс фильтрации проектов, по запросу на главной странице."""
 
-    status = filters.MultipleChoiceFilter(choices=PROJECT_STATUS_CHOICES)
+    project_status = filters.MultipleChoiceFilter(
+        choices=PROJECT_STATUS_CHOICES
+    )
     started = filters.DateFromToRangeFilter()
     ended = filters.DateFromToRangeFilter()
     recruitment_status = filters.NumberFilter(
@@ -39,7 +45,7 @@ class ProjectFilter(FilterSet):
     class Meta:
         model = Project
         fields = (
-            "status",
+            "project_status",
             "started",
             "ended",
             "recruitment_status",
@@ -75,7 +81,7 @@ def get_project_role(self, queryset, name, value):
         return queryset
 
     def project_search(self, queryset, name, value):
-        if value:
+        if len(value) >= 3:
             search_language = detect(value)
             if search_language == "ru":
                 search_query = SearchQuery(value, config="russian")
@@ -94,3 +100,13 @@ def filter_is_favorite_project(self, queryset, name, value):
         if value == 1 and user.is_authenticated:
             return queryset.filter(favorited_by=user)
         return queryset
+
+
+class MyRequestsFilter(FilterSet):
+    """Класс фильтрации запросов на участие в проектах."""
+
+    request_status = filters.MultipleChoiceFilter(choices=RequestStatuses)
+
+    class Meta:
+        model = ParticipationRequest
+        fields = ("request_status",)

src/backend/api/v1/projects/mixins.py

@@ -115,7 +115,7 @@ def validate(self, attrs) -> Dict[str, Any]:
             self, "instance", None
         )  # mypy по другому не пропускал
         started = attrs.get("started", instance.started if instance else None)
-        ended = attrs.get("ended", instance.started if instance else None)
+        ended = attrs.get("ended", instance.ended if instance else None)
         if started + datetime.timedelta(days=2) > ended:
             errors.setdefault("invalid_dates", []).append(
                 "Дата завершения проекта не может быть "

src/backend/api/v1/projects/permissions.py

@@ -38,7 +38,7 @@ def has_object_permission(self, request, view, obj) -> bool:
         return bool(
             request.user == obj.user
             and (
-                obj.status == RequestStatuses.IN_PROGRESS
+                obj.request_status == RequestStatuses.IN_PROGRESS
                 or request.method == "DELETE"
             )
             or (
@@ -66,7 +66,7 @@ class IsProjectCreatorOrOwnerForParticipationRequest(IsProjectCreatorOrOwner):
 
     def has_object_permission(self, request, view, obj) -> bool:
         return bool(
-            obj.status
+            obj.request_status
             not in (
                 RequestStatuses.ACCEPTED,
                 RequestStatuses.REJECTED,