removed unnecessary attributes on list views, only showing active vacancies on vacancy list

Author: VeryBigSad

projects/serializers.py

@@ -6,6 +6,16 @@
 
 
 class AchievementListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Achievement
+        fields = [
+            "id",
+            "title",
+            "status",
+        ]
+
+
+class ProjectAchievementListSerializer(serializers.ModelSerializer):
     class Meta:
         model = Achievement
         fields = ["id", "title", "status", "project"]
@@ -21,10 +31,6 @@ class Meta:
             "avatar",
         ]
 
-    def get_queryset(self):
-        # ???? why is this here
-        return CustomUser.objects.all()
-
 
 class ProjectDetailSerializer(serializers.ModelSerializer):
     achievements = AchievementListSerializer(many=True, read_only=True)
@@ -92,9 +98,6 @@ class Meta:
             "name",
         ]
 
-    def get_queryset(self):
-        return Industry.objects.all()
-
 
 class ProjectCollaboratorsSerializer(serializers.Serializer):
     collaborators = serializers.PrimaryKeyRelatedField(

projects/views.py

@@ -3,7 +3,7 @@
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from core.permissions import IsProjectLeaderOrReadOnly, IsStaffOrReadOnly
+from core.permissions import IsStaffOrReadOnly
 from projects.filters import ProjectFilter
 from projects.helpers import VERBOSE_STEPS
 from projects.models import Project, Achievement
@@ -106,10 +106,10 @@ def get(self, request, format=None):
 class AchievementList(generics.ListCreateAPIView):
     queryset = Achievement.objects.get_achievements_for_list_view()
     serializer_class = AchievementListSerializer
-    permission_classes = [IsProjectLeaderOrReadOnly]
+    permission_classes = [IsStaffOrReadOnly]
 
 
 class AchievementDetail(generics.RetrieveUpdateDestroyAPIView):
     queryset = Achievement.objects.get_achievements_for_detail_view()
     serializer_class = AchievementDetailSerializer
-    permission_classes = [IsProjectLeaderOrReadOnly]
+    permission_classes = [IsStaffOrReadOnly]

vacancy/managers.py

@@ -12,9 +12,8 @@ def get_vacancy_for_list_view(self):
                 "description",
                 "project__id",
                 "is_active",
-                "datetime_created",
-                "datetime_updated",
             )
+            .filter(is_active=True)
         )
 
     def get_vacancy_for_detail_view(self):
@@ -43,8 +42,6 @@ def get_vacancy_response_for_list_view(self):
                 "vacancy__id",
                 "why_me",
                 "is_approved",
-                "datetime_created",
-                "datetime_updated",
             )
         )
 

vacancy/serializers.py

@@ -23,6 +23,18 @@ class Meta:
 
 
 class VacancyListSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Vacancy
+        fields = [
+            "id",
+            "role",
+            "required_skills",
+            "description",
+            "is_active",
+        ]
+
+
+class ProjectVacancyListSerializer(serializers.ModelSerializer):
     class Meta:
         model = Vacancy
         fields = [
@@ -32,22 +44,19 @@ class Meta:
             "description",
             "project",
             "is_active",
-            "datetime_created",
-            "datetime_updated",
         ]
 
 
 class VacancyResponseListSerializer(serializers.ModelSerializer):
+    is_approved = serializers.BooleanField(read_only=True)
+
     class Meta:
         model = VacancyResponse
         fields = [
             "id",
             "user",
-            "vacancy",
             "why_me",
             "is_approved",
-            "datetime_created",
-            "datetime_updated",
         ]
 
 

vacancy/urls.py

@@ -13,6 +13,6 @@
 urlpatterns = [
     path("", VacancyList.as_view()),
     path("<int:pk>/", VacancyDetail.as_view()),
-    path("<int:pk>/requests/", VacancyResponseList.as_view()),
-    path("requests/<int:pk>/", VacancyResponseDetail.as_view()),
+    path("<int:pk>/responses/", VacancyResponseList.as_view()),
+    path("responses/<int:pk>/", VacancyResponseDetail.as_view()),
 ]

vacancy/views.py

@@ -5,15 +5,15 @@
 from vacancy.models import Vacancy, VacancyResponse
 from vacancy.serializers import (
     VacancyDetailSerializer,
-    VacancyListSerializer,
     VacancyResponseDetailSerializer,
     VacancyResponseListSerializer,
+    ProjectVacancyListSerializer,
 )
 
 
 class VacancyList(generics.ListCreateAPIView):
     queryset = Vacancy.objects.get_vacancy_for_list_view()
-    serializer_class = VacancyListSerializer
+    serializer_class = ProjectVacancyListSerializer
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]