Fixed the API

It wasn't clear which URL would be what resource, ie. the proposal list
view displayed votes and not the proposal detail view.

Also changed the tests so that they requested indented responses which
will be easier to diff.

Author: jpic

representatives_votes/api.py

@@ -26,7 +26,7 @@ class DossierViewSet(viewsets.ReadOnlyModelViewSet):
     """
 
     pagination_class = DefaultWebPagination
-    queryset = Dossier.objects.prefetch_related('proposals__votes__representative')
+    queryset = Dossier.objects.all()
     serializer_class = DossierSerializer
 
     filter_backends = (

representatives_votes/serializers.py

@@ -23,7 +23,6 @@ class ProposalSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = models.Proposal
         fields = (
-            'id',
             'dossier',
             'title',
             'description',
@@ -40,29 +39,31 @@ class Meta:
 class ProposalDetailSerializer(ProposalSerializer):
     """ Proposal serializer that includes votes """
 
+    votes = VoteSerializer(many=True)
+
+    class Meta:
+        model = models.Proposal
+
 
 class DossierSerializer(serializers.HyperlinkedModelSerializer):
     """ Base dossier serializer """
-    proposals = ProposalSerializer(many=True)
 
     class Meta:
         model = models.Dossier
         fields = (
-            'id',
             'title',
             'reference',
             'text',
             'link',
             'url',
-            'proposals',
         )
 
 
 class DossierDetailSerializer(DossierSerializer):
     """
     Dossier serializer that includes proposals and votes.
     """
-    proposals = ProposalSerializer(many=True)
+    proposals = ProposalDetailSerializer(many=True)
 
     class Meta:
         model = models.Dossier

representatives_votes/tests/test_views.py

@@ -31,5 +31,8 @@ def test_proposals(self):
     def test_vote(self):
         self.functional_test(1, '/api/votes/1/')
 
+    def test_proposals(self):
+        self.functional_test(1, '/api/proposals/')
+
     def test_votes(self):
         self.functional_test(1, '/api/votes/')