Update serializer & queryset for proposal api

Author: ChillarAnand

junction/proposals/api.py

@@ -1,6 +1,7 @@
 from rest_framework import generics
 from rest_framework.pagination import PageNumberPagination
 
+from junction.base.constants import ProposalStatus
 from junction.proposals import serializers
 from junction.proposals.models import Proposal
 
@@ -16,7 +17,7 @@ class ProposalListApiView(generics.ListAPIView):
     pagination_class = StandardResultsSetPagination
 
     def get_queryset(self):
-        queryset = Proposal.objects.all()
+        queryset = Proposal.objects.filter(deleted=False, status=ProposalStatus.PUBLIC)
         conference = self.request.query_params.get('conference', None)
         if conference:
             queryset = queryset.filter(conference__slug=conference)

junction/proposals/serializers.py

@@ -3,7 +3,7 @@
 from .models import Proposal, ProposalSection, ProposalType, ProposalComment
 
 
-class ProposalSerializer(serializers.HyperlinkedModelSerializer):
+class BaseProposalSerializer(serializers.HyperlinkedModelSerializer):
     section = serializers.SerializerMethodField()
     type = serializers.SerializerMethodField()
     author = serializers.SerializerMethodField()
@@ -25,6 +25,10 @@ class Meta:
                   'prerequisites', 'content_urls', 'speaker_info', 'speaker_links')
 
 
+class ProposalSerializer(BaseProposalSerializer):
+    pass
+
+
 class ProposalCommentSerializer(serializers.ModelSerializer):
 
     commenter = serializers.SerializerMethodField()
@@ -37,7 +41,7 @@ class Meta:
         fields = ('commenter', 'comment')
 
 
-class ProposalListSerializer(serializers.ModelSerializer):
+class ProposalListSerializer(BaseProposalSerializer):
 
     comments = serializers.SerializerMethodField()