From 48cce12c321ea1293251b1cebdb20c0388c60461 Mon Sep 17 00:00:00 2001
From: James Graham <j.graham@software.ac.uk>
Date: Mon, 17 May 2021 19:29:26 +0100
Subject: [PATCH] feat: embed extra data in person csv

Resolves #113
---
 export/serializers/people.py | 2 ++
 people/models/person.py      | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/export/serializers/people.py b/export/serializers/people.py
index 071cf44..ca77258 100644
--- a/export/serializers/people.py
+++ b/export/serializers/people.py
@@ -43,6 +43,8 @@ class PersonSerializer(base.FlattenedModelSerializer):
         fields = [
             'id',
             'name',
+            'organisation',
+            'country_of_residence',
         ]
 
 
diff --git a/people/models/person.py b/people/models/person.py
index d0f5d41..618bbfb 100644
--- a/people/models/person.py
+++ b/people/models/person.py
@@ -123,6 +123,14 @@ class Person(models.Model):
     def current_answers(self) -> 'PersonAnswerSet':
         return self.answer_sets.last()
 
+    @property
+    def organisation(self) -> Organisation:
+        return self.current_answers.organisation
+
+    @property
+    def country_of_residence(self):
+        return self.current_answers.country_of_residence
+
     def get_absolute_url(self):
         return reverse('people:person.detail', kwargs={'pk': self.pk})