Merge remote-tracking branch 'origin/main' into release/2.024.17

kpi/deployment_backends/base_backend.py

@@ -193,6 +193,11 @@ def calculated_submission_count(self, user: 'auth.User', **kwargs):
     def connect(self, active=False):
         pass
 
+    @property
+    @abc.abstractmethod
+    def form_uuid(self):
+        pass
+
     @abc.abstractmethod
     def nlp_tracking_data(self, start_date: Optional[datetime.date] = None):
         pass
@@ -793,7 +798,8 @@ def _rewrite_json_attachment_urls(
             attachment['filename'] = os.path.join(
                 self.asset.owner.username,
                 'attachments',
-                submission['formhub/uuid'],
+                # KoboCAT accepts submissions even when they lack `formhub/uuid`
+                self.form_uuid or submission['formhub/uuid'],
                 submission['_uuid'],
                 os.path.basename(filename)
             )

kpi/deployment_backends/kobocat_backend.py

@@ -173,6 +173,16 @@ def connect(self, active=False):
             }
         )
 
+    @property
+    def form_uuid(self):
+        try:
+            return self.backend_response['uuid']
+        except KeyError:
+            logging.warning(
+                'KoboCAT backend response has no `uuid`', exc_info=True
+            )
+            return None
+
     @staticmethod
     def nlp_tracking_data(asset_ids, start_date=None):
         """

kpi/deployment_backends/mock_backend.py

@@ -95,6 +95,10 @@ def generate_uuid_for_form():
             'version': self.asset.version_id,
         })
 
+    @property
+    def form_uuid(self):
+        return 'formhub-uuid'  # to match existing tests
+
     def nlp_tracking_data(self, start_date=None):
         """
         Get the NLP tracking data since a specified date