Merge pull request #4788 from kobotoolbox/correct-instanceid-deprecatedid-confusion

Correctly use instanceID instead of deprecatedID

Author: jnm

kpi/deployment_backends/base_backend.py

@@ -39,7 +39,8 @@ class BaseDeploymentBackend(abc.ABC):
     ]
 
     # XPaths are relative to the root node
-    SUBMISSION_UUID_XPATH = './meta/deprecatedID'
+    SUBMISSION_CURRENT_UUID_XPATH = './meta/instanceID'
+    SUBMISSION_DEPRECATED_UUID_XPATH = './meta/deprecatedID'
     FORM_UUID_XPATH = './formhub/uuid'
 
     def __init__(self, asset):

kpi/deployment_backends/kobocat_backend.py

@@ -539,7 +539,9 @@ def edit_submission(
                 t('Your submission XML is malformed.')
             )
         try:
-            deprecated_uuid = xml_root.find(self.SUBMISSION_UUID_XPATH).text
+            deprecated_uuid = xml_root.find(
+                self.SUBMISSION_DEPRECATED_UUID_XPATH
+            ).text
             xform_uuid = xml_root.find(self.FORM_UUID_XPATH).text
         except AttributeError:
             raise SubmissionIntegrityError(

kpi/tests/utils/mock.py

@@ -11,7 +11,6 @@
 from django.core.files import File
 from rest_framework import status
 
-from kpi.deployment_backends.base_backend import BaseDeploymentBackend
 from kpi.mixins.audio_transcoding import AudioTranscodingMixin
 from kpi.models.asset_snapshot import AssetSnapshot
 from kpi.tests.utils.xml import get_form_and_submission_tag_names
@@ -70,10 +69,10 @@ def enketo_edit_instance_response_with_uuid_validation(request):
     submission = body['instance']
     submission_xml_root = lxml.etree.fromstring(submission)
     assert submission_xml_root.find(
-        BaseDeploymentBackend.FORM_UUID_XPATH
+        './formhub/uuid'
     ).text.strip()
     assert submission_xml_root.find(
-        BaseDeploymentBackend.SUBMISSION_UUID_XPATH
+        './meta/instanceID'
     ).text.strip()
 
     resp_body = {

kpi/views/v2/data.py

@@ -694,14 +694,16 @@ def _get_enketo_link(
             )
         if (
             not (
-                e := submission_xml_root.find(deployment.SUBMISSION_UUID_XPATH)
+                e := submission_xml_root.find(
+                    deployment.SUBMISSION_CURRENT_UUID_XPATH
+                )
             )
             or not e.text.strip()
         ):
             edit_submission_xml(
                 submission_xml_root,
-                deployment.SUBMISSION_UUID_XPATH,
-                'uuid:' + submission_json['_uuid']
+                deployment.SUBMISSION_CURRENT_UUID_XPATH,
+                'uuid:' + submission_json['_uuid'],
             )
 
         # Do not use version_uid from the submission until UI gives users the