From 7d1aac2021d47513e736c66acd3bfd293d53278d Mon Sep 17 00:00:00 2001 From: James Graham Date: Wed, 1 Apr 2020 16:23:16 +0100 Subject: [PATCH] refactor: Rename Person serializers --- export/serializers/people.py | 8 ++++---- export/views/people.py | 2 +- people/models/relationship.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/export/serializers/people.py b/export/serializers/people.py index 4ded304..baed3bb 100644 --- a/export/serializers/people.py +++ b/export/serializers/people.py @@ -7,7 +7,7 @@ from people import models from . import base -class PersonSerializer(serializers.ModelSerializer): +class SimplePersonSerializer(serializers.ModelSerializer): class Meta: model = models.Person fields = [ @@ -16,7 +16,7 @@ class PersonSerializer(serializers.ModelSerializer): ] -class PersonExportSerializer(serializers.ModelSerializer): +class PersonSerializer(base.FlattenedModelSerializer): class Meta: model = models.Person fields = [ @@ -31,8 +31,8 @@ class PersonExportSerializer(serializers.ModelSerializer): class RelationshipSerializer(base.FlattenedModelSerializer): - source = PersonSerializer() - target = PersonSerializer() + source = SimplePersonSerializer() + target = SimplePersonSerializer() class Meta: model = models.Relationship diff --git a/export/views/people.py b/export/views/people.py index 77d6999..7f73d5f 100644 --- a/export/views/people.py +++ b/export/views/people.py @@ -6,7 +6,7 @@ from people import models class PersonExportView(base.CsvExportView): model = models.person.Person - serializer_class = serializers.people.PersonExportSerializer + serializer_class = serializers.people.PersonSerializer class RelationshipExportView(base.CsvExportView): diff --git a/people/models/relationship.py b/people/models/relationship.py index c141810..2776f71 100644 --- a/people/models/relationship.py +++ b/people/models/relationship.py @@ -43,7 +43,7 @@ class RelationshipQuestion(models.Model): @property def choices(self) -> typing.List[typing.List[str]]: """ - Convert the :class:`RelationshipQuestionChoices` for this question into Django choices. + Convert the :class:`RelationshipQuestionChoice`s for this question into Django choices. """ return [ [choice.pk, str(choice)] for choice in self.answers.all()