feat: Export relationships with answers

See #27
See #29
Resolves #25

people/models/relationship.py

@@ -6,6 +6,7 @@ import typing
 
 from django.db import models
 from django.urls import reverse
+from django.utils.text import slugify
 
 from .person import Person
 
@@ -48,6 +49,10 @@ class RelationshipQuestion(models.Model):
             [choice.pk, str(choice)] for choice in self.answers.all()
         ]
     
+    @property
+    def slug(self) -> str:
+        return slugify(self.text)
+
     def __str__(self) -> str:
         return self.text
 
@@ -80,6 +85,10 @@ class RelationshipQuestionChoice(models.Model):
     order = models.SmallIntegerField(default=0,
                                      blank=False, null=False)
 
+    @property
+    def slug(self) -> str:
+        return slugify(self.text)
+
     def __str__(self) -> str:
         return self.text
 

people/serializers.py

@@ -46,13 +46,15 @@ class FlattenedModelSerializer(serializers.ModelSerializer):
         return data_out
     
     @property
-    def column_headers(self) -> typing.Collection:
+    def column_headers(self) -> typing.List[str]:
         """
         Get all column headers that will be output by this serializer.
         """
-        return self.flatten_data(self.fields,
+        fields = self.flatten_data(self.fields,
-                                 sub_type=serializers.BaseSerializer,
+                                   sub_type=serializers.BaseSerializer,
-                                 sub_value_accessor=lambda x: x.fields.items())
+                                   sub_value_accessor=lambda x: x.fields.items())
+        
+        return list(fields)
 
     def to_representation(self, instance) -> typing.OrderedDict:
         """
@@ -100,14 +102,25 @@ class RelationshipSerializer(FlattenedModelSerializer):
             'target',
         ]
 
+    @property
+    def column_headers(self) -> typing.List[str]:
+        headers = super().column_headers
+
+        # Add relationship questions to columns
+        for question in models.RelationshipQuestion.objects.all():
+            headers.append(question.slug)
+        
+        return headers
+        
     def to_representation(self, instance):
         rep = super().to_representation(instance)
 
-        # try:
+        try:
-        #     for answer in instance.current_answers.question_answers.all():
+            # Add relationship question answers to data
-        #         rep[answer.question.text] = answer.text
+            for answer in instance.current_answers.question_answers.all():
-        #
+                rep[answer.question.slug] = answer.slug
-        # except AttributeError:
+
-        #     pass
+        except AttributeError:
+            pass
 
         return rep

people/views/export.py

@@ -16,7 +16,8 @@ class CsvExportView(LoginRequiredMixin, BaseListView):
         response = HttpResponse(content_type='text/csv')
         response['Content-Disposition'] = f'attachment; filename="{self.get_context_object_name(self.object_list)}.csv"'
 
-        serializer = self.serializer_class(self.get_queryset(), many=True)
+        # Force ordering by PK - though this should be default anyway
+        serializer = self.serializer_class(self.get_queryset().order_by('pk'), many=True)
 
         writer = csv.DictWriter(response, fieldnames=serializer.child.column_headers)
         writer.writeheader()