fix: properly serialize Country for individuals, impacts #7 and #17

platform-coop-toolkit · Mar 20, 2020 · e4a8ab7 · e4a8ab7
1 parent 54c3996
commit e4a8ab7
Showing 1 changed file with 25 additions and 22 deletions.
diff --git a/mdi/serializers.py b/mdi/serializers.py
@@ -6,31 +6,34 @@
 from django_countries.serializers import CountryFieldMixin
 
 
-# class UserSerializer(CountryFieldMixin, GeoFeatureModelSerializer):
-class UserSerializer(serializers.HyperlinkedModelSerializer):
-  class Meta:
-    model = User
-    fields = (
-        'id',
-        'email',
-        'first_name',
-        'middle_name',
-        'last_name',
-        'address',
-        'city',
-        'state',
-        'postal_code',
-        'country',
-        'url',
-        'bio',
-        'notes'
-    )
+class UserSerializer(CountryFieldMixin, GeoFeatureModelSerializer):
+    source = serializers.StringRelatedField(source='source.name')
+
+    class Meta:
+        model = User
+        geo_field = 'geom'
+        fields = (
+            'id',
+            'email',
+            'first_name',
+            'middle_name',
+            'last_name',
+            'address',
+            'city',
+            'state',
+            'postal_code',
+            'country',
+            'url',
+            'bio',
+            'notes',
+            'source',
+        )
 
 
 class GroupSerializer(serializers.HyperlinkedModelSerializer):
-  class Meta:
-    model = Group
-    fields = ('id', 'name')
+    class Meta:
+        model = Group
+        fields = ('id', 'name')
 
 
 class SectorSerializer(serializers.HyperlinkedModelSerializer):