Apply requested changes

kobo/apps/openrosa/apps/api/permissions.py

@@ -172,13 +172,13 @@ def has_object_permission(self, request, view, obj):
         except KeyError:
             pass
         else:
-            # Deleting submissions is not allowed anymore with KoboCAT API
+            # Deleting submissions is not allowed with KoboCAT API
             if view.action == 'bulk_delete':
                 raise LegacyAPIException
 
             return user.has_perms(required_perms, obj)
 
-        # Deleting submissions in not allowed anymore with KoboCAT API
+        # Deleting submissions is not allowed with KoboCAT API
         if view.action == 'destroy':
             raise LegacyAPIException
 

kobo/apps/openrosa/apps/api/tests/viewsets/test_abstract_viewset.py

@@ -61,7 +61,9 @@ def publish_xls_form(
         # during deployment. Thus, this method will create the XForm object directly
         # without an API call except if `use_api` is True.
 
-        # In unit tests, if we need to test the result of the (KoboCAT API),
+        # Some unit tests still need to test the result of API `v1`
+        # (i.e.: KoboCAT API). For example, to ensure project creation is
+        # not allowed anymore.
         if not data:
             data = {
                 'owner': self.user.username,

kobo/apps/openrosa/apps/api/tools.py

@@ -34,7 +34,7 @@
     default_kobocat_storage as default_storage,
 )
 from kpi.views.v2.paired_data import (
-    PairedDataViewset,
+    OpenRosaDynamicDataAttachmentViewset,
     SubmissionXMLRenderer,
     XMLExternalDataPermission,
 )
@@ -170,11 +170,10 @@ def get_media_file_response(
     args = resolver_match.args
     kwargs = resolver_match.kwargs
 
-    paired_data_viewset = PairedDataViewset.as_view({'get': 'external'})
+    paired_data_viewset = OpenRosaDynamicDataAttachmentViewset.as_view(
+        {'get': 'external'}
+    )
     django_http_request = request._request
-    paired_data_viewset.cls.permission_classes = [XMLExternalDataPermission]
-    paired_data_viewset.cls.renderer_classes = [SubmissionXMLRenderer]
-    paired_data_viewset.cls.filter_backends = []
     return paired_data_viewset(request=django_http_request, *args, **kwargs)
 
 

kobo/apps/openrosa/apps/api/viewsets/xform_list_api.py

@@ -203,7 +203,7 @@ def _is_metadata_expired(obj: MetaData, request: Request) -> bool:
 
         timedelta = timezone.now() - obj.date_modified
         if timedelta.total_seconds() > settings.PAIRED_DATA_EXPIRATION:
-            # Force external xml regeneration
+            # Force external XML regeneration
             get_media_file_response(obj, request)
 
             # We update the modification time here to avoid requesting that KPI

kobo/apps/openrosa/apps/api/viewsets/xform_viewset.py

@@ -575,9 +575,6 @@ def create(self, request, *args, **kwargs):
 
         return Response(survey, status=status.HTTP_400_BAD_REQUEST)
 
-    def get_queryset(self):
-        return super().get_queryset()
-
     def update(self, request, pk, *args, **kwargs):
         if 'xls_file' in request.FILES:
             # A new XLSForm has been uploaded and will replace the existing

kobo/apps/openrosa/apps/main/tests/test_past_bugs.py

@@ -41,6 +41,13 @@ def test_buggy_files(self):
             )
             assert message == str(e)
 
+    def test_erics_files(self):
+        for name in [
+            'battery_life.xls',
+            'Enumerator_Training_Practice_Survey.xls',
+        ]:
+            self._publish_xls_file(os.path.join('fixtures', 'bug_fixes', name))
+
 
 class TestSubmissionBugs(TestBase):
 

kpi/views/v2/paired_data.py

@@ -227,7 +227,7 @@ def external(self, request, paired_data_uid, **kwargs):
                 file_type=AssetFile.PAIRED_DATA,
                 user=self.asset.owner,
             )
-            # When asset file is new, we consider its content as expired to
+            # When the asset file is new, we consider its content as expired to
             # force its creation below
             has_expired = True
         else:
@@ -336,3 +336,15 @@ def get_serializer_context(self):
             source__names[record['uid']] = record['name']
         context_['source__names'] = source__names
         return context_
+
+
+class OpenRosaDynamicDataAttachmentViewset(PairedDataViewset):
+    """
+    Only specific to OpenRosa manifest when projects are linked with DDA.
+    Enforce permission and renderer classes at the class level instead to be
+    sure they are taken into account while calling `viewset.as_view()`
+    """
+
+    permission_classes = [XMLExternalDataPermission]
+    renderer_classes = [SubmissionXMLRenderer]
+    filter_backends = []