Merge pull request #626 from onaio/624_aws_links

return download_url to images that does not require auth

Author: pld

Diff for: onadata/apps/api/tests/viewsets/test_attachment_viewset.py

@@ -23,7 +23,7 @@ def test_retrieve_view(self):
         pk = self.attachment.pk
         data = {
             'url': 'http://testserver/api/v1/media/%s' % pk,
-            'download_url': 'http://testserver/api/v1/media/%s.jpg' % pk,
+            'download_url': self.attachment.media_file.url,
             'id': pk,
             'xform': self.xform.pk,
             'instance': self.attachment.instance.pk,
@@ -104,9 +104,7 @@ def test_direct_image_link(self):
         response = self.retrieve_view(request, pk=self.attachment.pk)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(isinstance(response.data, basestring))
-        self.assertEqual(response.data,
-                         'http://testserver/api/v1/media/%s.jpg'
-                         % self.attachment.pk)
+        self.assertEqual(response.data, self.attachment.media_file.url)
 
         data['filename'] = 10000000
         request = self.factory.get('/', data, **self.extra)
@@ -131,6 +129,4 @@ def test_direct_image_link_uppercase(self):
         response = self.retrieve_view(request, pk=self.attachment.pk)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(isinstance(response.data, basestring))
-        self.assertEqual(response.data,
-                         'http://testserver/api/v1/media/%s.jpg'
-                         % self.attachment.pk)
+        self.assertEqual(response.data, self.attachment.media_file.url)

Diff for: onadata/libs/serializers/attachment_serializer.py

@@ -1,5 +1,4 @@
 from rest_framework import serializers
-from rest_framework.reverse import reverse
 from onadata.apps.logger.models.attachment import Attachment
 
 
@@ -19,10 +18,4 @@ class Meta:
 
     def get_download_url(self, obj):
         if obj is not None:
-            kwargs = {'pk': obj.pk}
-            request = self.context.get('request')
-            format = obj.media_file.name[obj.media_file.name.rindex('.') + 1:]
-            format = format and format.lower()
-
-            return reverse('attachment-detail', kwargs=kwargs,
-                           request=request, format=format)
+            return obj.media_file.url if obj.media_file.url else None