Merge branch 'master' of github.com:SEL-Columbia/formhub into no_stathat so that we can deploy + test on dev before merging into master and deploying on formhub.org.

Author: Denis Papathanasiou

api/tests/test_api.py

@@ -8,8 +8,7 @@
 from django.contrib.auth.models import User
 from django.contrib.auth.models import Permission
 
-from utils.user_auth import set_api_permissions_for_user
-
+from main.models import UserProfile
 from api.models import OrganizationProfile, Project
 from api.views import OrgProfileViewSet
 from api.views import ProjectViewSet
@@ -43,22 +42,25 @@ def _login_user_and_profile(self, extra_post_data={}):
             'home_page': 'bob.com',
             'twitter': 'boberama'
         }
-        url = '/accounts/register/'
         post_data = dict(post_data.items() + extra_post_data.items())
-        self.response = self.client.post(url, post_data)
-        try:
-            self.user = User.objects.get(username=post_data['username'])
-        except User.DoesNotExist:
-            pass
-        else:
-            self.user.is_active = True
-            self.user.save()
-            self.assertTrue(
-                self.client.login(username=self.user.username,
-                                  password='bobbob'))
-            self.extra = {
-                'HTTP_AUTHORIZATION': 'Token %s' % self.user.auth_token}
-            set_api_permissions_for_user(self.user)
+        user, created = User.objects.get_or_create(
+            username=post_data['username'],
+            first_name=post_data['name'],
+            email=post_data['email'])
+        user.set_password(post_data['password1'])
+        user.save()
+        new_profile, created = UserProfile.objects.get_or_create(
+            user=user, name=post_data['name'],
+            city=post_data['city'],
+            country=post_data['country'],
+            organization=post_data['organization'],
+            home_page=post_data['home_page'],
+            twitter=post_data['twitter'])
+        self.user = user
+        self.assertTrue(
+            self.client.login(username=self.user.username, password='bobbob'))
+        self.extra = {
+            'HTTP_AUTHORIZATION': 'Token %s' % self.user.auth_token}
 
     def _org_create(self):
         view = OrgProfileViewSet.as_view({

api/tests/test_data_api.py

@@ -34,7 +34,7 @@ def test_form_list(self):
 
         data = {
             u'_bamboo_dataset_id': u'',
-#            u'_deleted_at': None,
+            # u'_deleted_at': None,
             u'_attachments': [],
             u'_geolocation': [None, None],
             u'_xform_id_string': u'transportation_2011_07_25',
@@ -49,6 +49,53 @@ def test_form_list(self):
         self.assertIsInstance(response.data, dict)
         self.assertDictContainsSubset(data, response.data)
 
+    def test_data_with_query_parameter(self):
+        view = DataViewSet.as_view({'get': 'list'})
+        request = self.factory.get('/', **self.extra)
+        formid = self.xform.pk
+        dataid = self.xform.surveys.all()[0].pk
+        response = view(request, owner='bob', formid=formid)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 4)
+        query_str = '{"_id": "%s"}' % dataid
+        request = self.factory.get('/?query=%s' % query_str, **self.extra)
+        response = view(request, owner='bob', formid=formid)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 1)
+
+    def test_data_with_dataid_as_string(self):
+        view = DataViewSet.as_view({'get': 'list'})
+        request = self.factory.get('/', **self.extra)
+        formid = self.xform.pk
+        dataid = "random_string"
+        request = self.factory.get('/', **self.extra)
+        response = view(request, owner='bob', formid=formid, dataid=dataid)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 0)
+        dataid = self.xform.surveys.all()[0].pk
+        request = self.factory.get('/', **self.extra)
+        response = view(request, owner='bob', formid=formid, dataid=dataid)
+        self.assertEqual(response.status_code, 200)
+        # a dict object instead of a list
+        self.assertIsInstance(response.data, dict)
+
+    def test_data_with_formid_as_string(self):
+        view = DataViewSet.as_view({'get': 'list'})
+        request = self.factory.get('/', **self.extra)
+        formid = "random_string"
+        response = view(request, owner='bob', formid=formid)
+        self.assertEqual(response.status_code, 404)
+        formid = self.xform.id_string
+        response = view(request, owner='bob', formid=formid)
+        self.assertEqual(response.status_code, 200)
+        self.assertEqual(len(response.data), 4)
+
+    def test_anon_form_list(self):
+        view = DataViewSet.as_view({'get': 'list'})
+        request = self.factory.get('/')
+        response = view(request)
+        self.assertEqual(response.status_code, 401)
+
     def test_add_form_tag_propagates_to_data_tags(self):
         """Test that when a tag is applied on an xform,
         it propagates to the instance submissions
@@ -77,3 +124,14 @@ def test_add_form_tag_propagates_to_data_tags(self):
         self.assertEqual(response.data, [])
         for i in self.xform.surveys.all():
             self.assertNotIn(u'hello', i.tags.names())
+        view = DataViewSet.as_view({'get': 'labels'})
+        request = self.factory.get('/', **self.extra)
+        response = view(request, owner='bob', formid="random_string",
+                        dataid=i.pk)
+        self.assertEqual(response.status_code, 404)
+        response = view(request, owner='bob', formid=self.xform.pk,
+                        dataid="random")
+        self.assertEqual(response.status_code, 404)
+        response = view(request, owner='bob', formid=self.xform.pk,
+                        dataid=i.pk)
+        self.assertEqual(response.status_code, 200)

api/views.py

@@ -2,6 +2,7 @@
 
 from django import forms
 from django.db.models import Q
+from django.http import Http404
 from django.shortcuts import get_object_or_404
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext as _
@@ -23,7 +24,8 @@
 from api.signals import xform_tags_add, xform_tags_delete
 from api import tools as utils
 
-from utils.user_auth import check_and_set_form_by_id
+from utils.user_auth import check_and_set_form_by_id, \
+    check_and_set_form_by_id_string
 from main.models import UserProfile
 
 from odk_logger.models import XForm, Instance
@@ -1031,7 +1033,7 @@ class DataViewSet(viewsets.ViewSet):
   >
   >        HTTP 200 OK
     """
-    permission_classes = [permissions.IsAuthenticatedOrReadOnly, ]
+    permission_classes = [permissions.IsAuthenticated, ]
     lookup_field = 'owner'
     lookup_fields = ('owner', 'formid', 'dataid')
     extra_lookup_fields = None
@@ -1092,27 +1094,41 @@ def list(self, request, owner=None, formid=None, dataid=None, **kwargs):
         if not formid and not dataid and not tags:
             data = self._get_formlist_data_points(request, owner)
         if formid:
-            xform = check_and_set_form_by_id(int(formid), request)
+            try:
+                xform = check_and_set_form_by_id(int(formid), request)
+            except ValueError:
+                xform = check_and_set_form_by_id_string(formid, request)
             if not xform:
                 raise exceptions.PermissionDenied(
                     _("You do not have permission to "
                       "view data from this form."))
+            else:
+                query = {}
+                query[ParsedInstance.USERFORM_ID] = \
+                    u'%s_%s' % (xform.user.username, xform.id_string)
         if xform and dataid and dataid == 'labels':
             return Response(list(xform.tags.names()))
-        if xform and dataid:
-            query = {'_id': int(dataid)}
+        if dataid:
+            if query:
+                query.update({'_id': dataid})
+            else:
+                query = {'_id': dataid}
         rquery = request.QUERY_PARAMS.get('query', None)
         if rquery:
             rquery = json.loads(rquery)
             if query:
-                rquery.update(json.loads(query))
+                query.update(rquery)
+            else:
+                query = rquery
         if tags:
             query = query if query else {}
             query['_tags'] = {'$all': tags.split(',')}
         if xform:
             data = self._get_form_data(xform, query=query)
         if not xform and not data:
             xforms = self._get_accessible_forms(owner)
+            if not query:
+                query = {}
             query[ParsedInstance.USERFORM_ID] = {
                 '$in': [
                     u'%s_%s' % (form.user.username, form.id_string)
@@ -1130,13 +1146,21 @@ class TagForm(forms.Form):
             tags = TagField()
         if owner is None and not request.user.is_anonymous():
             owner = request.user.username
-        xform = check_and_set_form_by_id(int(formid), request)
+        xform = None
+        try:
+            xform = check_and_set_form_by_id(int(formid), request)
+        except ValueError:
+            xform = check_and_set_form_by_id_string(formid, request)
         if not xform:
             raise exceptions.PermissionDenied(
                 _("You do not have permission to "
                     "view data from this form."))
         status = 400
-        instance = get_object_or_404(ParsedInstance, instance__pk=int(dataid))
+        try:
+            instance = get_object_or_404(
+                ParsedInstance, instance__pk=int(dataid))
+        except ValueError:
+            raise Http404("No data with id %s" % dataid)
         if request.method == 'POST':
             form = TagForm(request.DATA)
             if form.is_valid():

formhub/settings.py

@@ -51,6 +51,9 @@
     ('es', u'Español'),
     ('it', u'Italiano'),
     ('km', u'ភាសាខ្មែរ'),
+    ('ne', u'नेपाली'),
+    ('nl', u'Nederlands'),
+    ('zh', u'中文'),
 )
 
 SITE_ID = 1

main/tests/fixtures/transportation/transportation_with_long_id_string.xls

@@ -0,0 +1,8 @@
+<idChunk xmlns="http://opendatakit.org/submissions">
+    <idList>
+        <id>uuid:5b2cc313-fc09-437e-8149-fcd32f695d41</id>
+        <id>uuid:9c6f3468-cfda-46e8-84c1-75458e72805d</id>
+        <id>uuid:9f0a1508-c3b7-4c99-be00-9b237c26bcbf</id>
+    </idList>
+    <resumptionCursor>{{resumptionCursor}}</resumptionCursor>
+</idChunk>

main/tests/fixtures/transportation/transportation_with_long_id_string_updated.xls

@@ -321,6 +321,38 @@ def test_replace_xform(self):
                                if e.name == u'preferred_means']) > 0
         self.assertTrue(is_updated_form)
 
+    def test_update_form_doesnt_truncate_to_50_chars(self):
+        count = XForm.objects.count()
+        xls_path = os.path.join(
+            self.this_directory,
+            "fixtures",
+            "transportation",
+            "transportation_with_long_id_string.xls")
+        self._publish_xls_file_and_set_xform(xls_path)
+
+        # Update the form
+        xform_update_url = reverse(update_xform, kwargs={
+            'username': self.user.username,
+            'id_string': self.xform.id_string
+        })
+        updated_xls_path = os.path.join(
+            self.this_directory,
+            "fixtures",
+            "transportation",
+            "transportation_with_long_id_string_updated.xls")
+        with open(updated_xls_path, "r") as xls_file:
+            post_data = {'xls_file': xls_file}
+            self.client.post(xform_update_url, post_data)
+        # Count should stay the same
+        self.assertEqual(XForm.objects.count(), count + 1)
+        self.xform = XForm.objects.order_by('id').reverse()[0]
+        data_dictionary = self.xform.data_dictionary()
+        # look for the preferred_means question
+        # which is only in the updated xls
+        is_updated_form = len([e.name for e in data_dictionary.survey_elements
+                               if e.name == u'preferred_means']) > 0
+        self.assertTrue(is_updated_form)
+
     def test_xform_delete(self):
         id_string = self.xform.id_string
         form_exists = XForm.objects.filter(