Merge pull request #221 from willemarcel/develop

add owner field to mapping-team serializer
OSMCha · Sep 24, 2019 · 669594a · 669594a
2 parents 2145698 + 10e797a
commit 669594a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/osmchadjango/users/serializers.py b/osmchadjango/users/serializers.py
@@ -3,6 +3,7 @@
 from rest_framework.serializers import (
     ModelSerializer, Serializer, CharField, SlugRelatedField
     )
+from rest_framework.fields import ReadOnlyField
 from rest_framework.fields import SerializerMethodField
 
 from .models import MappingTeam
@@ -55,7 +56,9 @@ class SocialSignUpSerializer(Serializer):
 
 
 class MappingTeamSerializer(ModelSerializer):
+    owner = ReadOnlyField(source='created_by.username', default=None)
+
     class Meta:
         model = MappingTeam
-        fields = ('id', 'name', 'users', 'trusted')
-        read_only_fields = ('trusted',)
+        fields = ('id', 'name', 'users', 'trusted', 'owner')
+        read_only_fields = ('trusted', 'owner')
diff --git a/osmchadjango/users/tests/test_views.py b/osmchadjango/users/tests/test_views.py
@@ -158,6 +158,8 @@ def test_create_authenticated(self):
         self.assertTrue("name" in response.json().get('results')[0].keys())
         self.assertTrue("users" in response.json().get('results')[0].keys())
         self.assertTrue("trusted" in response.json().get('results')[0].keys())
+        self.assertTrue("owner" in response.json().get('results')[0].keys())
+        self.assertEqual(response.json().get('results')[0].get('owner'), 'test')
 
     def test_filters(self):
         self.client.login(username='test', password='password')