Skip to content
Extraits de code Groupes Projets
Valider ce5bf7f6 rédigé par Jamesie Pic's avatar Jamesie Pic
Parcourir les fichiers

PEP8

parent eebec1ea
Branches
Étiquettes
1 requête de fusion!12API release
...@@ -26,7 +26,11 @@ class DossierViewSet(viewsets.ReadOnlyModelViewSet): ...@@ -26,7 +26,11 @@ class DossierViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Dossier.objects.all() queryset = Dossier.objects.all()
serializer_class = DossierSerializer serializer_class = DossierSerializer
filter_backends = (filters.DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter) filter_backends = (
filters.DjangoFilterBackend,
filters.SearchFilter,
filters.OrderingFilter
)
filter_fields = { filter_fields = {
'fingerprint': ['exact'], 'fingerprint': ['exact'],
...@@ -34,9 +38,15 @@ class DossierViewSet(viewsets.ReadOnlyModelViewSet): ...@@ -34,9 +38,15 @@ class DossierViewSet(viewsets.ReadOnlyModelViewSet):
'reference': ['exact', 'icontains'], 'reference': ['exact', 'icontains'],
} }
search_fields = ('title', 'fingerprint', 'reference', 'text', 'proposals__title') search_fields = (
ordering_fields = ('id', 'reference') 'title',
'fingerprint',
'reference',
'text',
'proposals__title'
)
ordering_fields = ('id', 'reference')
def list(self, request): def list(self, request):
return super(DossierViewSet, self).list(request) return super(DossierViewSet, self).list(request)
...@@ -54,7 +64,11 @@ class ProposalViewSet(viewsets.ReadOnlyModelViewSet): ...@@ -54,7 +64,11 @@ class ProposalViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Proposal.objects.all() queryset = Proposal.objects.all()
serializer_class = ProposalSerializer serializer_class = ProposalSerializer
filter_backends = (filters.DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter) filter_backends = (
filters.DjangoFilterBackend,
filters.SearchFilter,
filters.OrderingFilter
)
filter_fields = { filter_fields = {
'fingerprint': ['exact'], 'fingerprint': ['exact'],
...@@ -66,9 +80,14 @@ class ProposalViewSet(viewsets.ReadOnlyModelViewSet): ...@@ -66,9 +80,14 @@ class ProposalViewSet(viewsets.ReadOnlyModelViewSet):
'kind': ['exact'], 'kind': ['exact'],
} }
search_fields = ('title', 'fingerprint', 'reference', search_fields = (
'dossier__fingerprint', 'dossier__title', 'title',
'dossier__reference') 'fingerprint', 'reference',
'dossier__fingerprint',
'dossier__title',
'dossier__reference'
)
ordering_fields = ('id', 'reference') ordering_fields = ('id', 'reference')
def list(self, request): def list(self, request):
...@@ -87,7 +106,11 @@ class VoteViewSet(viewsets.ReadOnlyModelViewSet): ...@@ -87,7 +106,11 @@ class VoteViewSet(viewsets.ReadOnlyModelViewSet):
queryset = Vote.objects.all() queryset = Vote.objects.all()
serializer_class = VoteSerializer serializer_class = VoteSerializer
filter_backends = (filters.DjangoFilterBackend, filters.SearchFilter, filters.OrderingFilter) filter_backends = (
filters.DjangoFilterBackend,
filters.SearchFilter,
filters.OrderingFilter
)
filter_fields = { filter_fields = {
'proposal__fingerprint': ['exact'], 'proposal__fingerprint': ['exact'],
......
...@@ -34,7 +34,7 @@ class VoteSerializer(serializers.ModelSerializer): ...@@ -34,7 +34,7 @@ class VoteSerializer(serializers.ModelSerializer):
source='representative.fingerprint', source='representative.fingerprint',
allow_null=True allow_null=True
) )
class Meta: class Meta:
model = models.Vote model = models.Vote
fields = ( fields = (
...@@ -74,7 +74,7 @@ class ProposalSerializer(serializers.ModelSerializer): ...@@ -74,7 +74,7 @@ class ProposalSerializer(serializers.ModelSerializer):
source='dossier.reference', source='dossier.reference',
read_only=True read_only=True
) )
class Meta: class Meta:
model = models.Proposal model = models.Proposal
fields = ( fields = (
...@@ -95,13 +95,14 @@ class ProposalSerializer(serializers.ModelSerializer): ...@@ -95,13 +95,14 @@ class ProposalSerializer(serializers.ModelSerializer):
) )
def to_internal_value(self, data): def to_internal_value(self, data):
validated_data = super(ProposalSerializer, self).to_internal_value(data) validated_data = super(ProposalSerializer, self).to_internal_value(
data)
validated_data['dossier'] = models.Dossier.objects.get( validated_data['dossier'] = models.Dossier.objects.get(
fingerprint=validated_data['dossier']['fingerprint'] fingerprint=validated_data['dossier']['fingerprint']
) )
validated_data['votes'] = data['votes'] validated_data['votes'] = data['votes']
return validated_data return validated_data
def _create_votes(self, votes_data, proposal): def _create_votes(self, votes_data, proposal):
for vote in votes_data: for vote in votes_data:
serializer = VoteSerializer(data=vote) serializer = VoteSerializer(data=vote)
...@@ -109,7 +110,7 @@ class ProposalSerializer(serializers.ModelSerializer): ...@@ -109,7 +110,7 @@ class ProposalSerializer(serializers.ModelSerializer):
serializer.save() serializer.save()
else: else:
raise Exception(serializer.errors) raise Exception(serializer.errors)
def create(self, validated_data): def create(self, validated_data):
votes_data = validated_data.pop('votes') votes_data = validated_data.pop('votes')
proposal = models.Proposal.objects.create( proposal = models.Proposal.objects.create(
...@@ -129,7 +130,7 @@ class ProposalSerializer(serializers.ModelSerializer): ...@@ -129,7 +130,7 @@ class ProposalSerializer(serializers.ModelSerializer):
class ProposalDetailSerializer(ProposalSerializer): class ProposalDetailSerializer(ProposalSerializer):
""" Proposal serializer that includes votes """ """ Proposal serializer that includes votes """
votes = VoteSerializer(many=True) votes = VoteSerializer(many=True)
class Meta(ProposalSerializer.Meta): class Meta(ProposalSerializer.Meta):
fields = ProposalSerializer.Meta.fields + ( fields = ProposalSerializer.Meta.fields + (
'votes', 'votes',
...@@ -152,13 +153,10 @@ class DossierSerializer(serializers.ModelSerializer): ...@@ -152,13 +153,10 @@ class DossierSerializer(serializers.ModelSerializer):
class DossierDetailSerializer(DossierSerializer): class DossierDetailSerializer(DossierSerializer):
"""
Dossier serializer that includes proposals
and votes
""" """
proposals = ProposalDetailSerializer( Dossier serializer that includes proposals and votes.
many = True, """
) proposals = ProposalDetailSerializer(many=True)
class Meta(DossierSerializer.Meta): class Meta(DossierSerializer.Meta):
fields = DossierSerializer.Meta.fields + ( fields = DossierSerializer.Meta.fields + (
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter