diff --git a/core/apps/evaluation/views/auto.py b/core/apps/evaluation/views/auto.py index 3c1c8ac..30de8b2 100644 --- a/core/apps/evaluation/views/auto.py +++ b/core/apps/evaluation/views/auto.py @@ -23,7 +23,7 @@ class AutoEvaluationView(BaseViewSetMixin, ModelViewSet): "valuation", "valuation__customer", "vehicle", - ).all() + ).filter(is_archived=False) serializer_class = serializers.ListAutoevaluationSerializer permission_classes = [AllowAny] diff --git a/core/apps/evaluation/views/quick.py b/core/apps/evaluation/views/quick.py index aced461..7716a1d 100644 --- a/core/apps/evaluation/views/quick.py +++ b/core/apps/evaluation/views/quick.py @@ -83,6 +83,7 @@ class QuickEvaluationArchiveAPIView(APIView): @extend_schema(tags=["QuickEvaluation"]) class QuickEvaluationArchivedListAPIView(ListAPIView): permission_classes = [IsAuthenticated] + serializer_class = serializers.ListQuickevaluationSerializer def get_queryset(self): return QuickEvaluationModel.objects.filter(is_archive=True) diff --git a/core/apps/evaluation/views/request.py b/core/apps/evaluation/views/request.py index cfae3f9..a8f7d5e 100644 --- a/core/apps/evaluation/views/request.py +++ b/core/apps/evaluation/views/request.py @@ -72,7 +72,7 @@ class EvaluationrequestView(BaseViewSetMixin, viewsets.ModelViewSet): def get_queryset(self): return EvaluationrequestModel.objects.filter( - user=self.request.user + user=self.request.user, is_archive=False ).order_by("-created_at")