Add 'name' attr to the data API

nyaruka · Apr 29, 2014 · 61ad5f9 · 61ad5f9
1 parent b17fad3
commit 61ad5f9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/django_project/demo/models.py b/django_project/demo/models.py
@@ -49,6 +49,9 @@ class Indicator(models.Model):
     # define custom queryset
     objects = PassThroughManager.for_queryset_class(IndicatorQuerySet)()
 
+    def name(self):
+        return self.content_object.name or 'Unknown'
+
 
 class AdminLevel0(models.Model):
     osm_id = models.CharField(max_length=15, primary_key=True)

diff --git a/django_project/demo/serializers.py b/django_project/demo/serializers.py
@@ -22,5 +22,6 @@ class SubMenuSerializer(serializers.Serializer):
 
 class IndicatorSerializer(serializers.Serializer):
     osm_id = serializers.CharField(max_length=15, source='object_id')
+    name = serializers.CharField(max_length=50, source='name')
     factor_a = serializers.FloatField()
     factor_b = serializers.FloatField()
diff --git a/django_project/demo/views.py b/django_project/demo/views.py
@@ -38,8 +38,11 @@ def list(self, request, *args, **kwargs):
 class IndicatorList(viewsets.ViewSet):
 
     def list(self, request, *args, **kwargs):
-        serializer = IndicatorSerializer(
-            Indicator.objects.for_osm_id(self.kwargs.get('osm_id')),
+        serializer = IndicatorSerializer((
+            Indicator.objects
+            .for_osm_id(self.kwargs.get('osm_id'))
+            .prefetch_related('content_object')
+        ),
             many=True,
             context={'request': request}
         )