Apply requested changes

kobo/apps/openrosa/apps/logger/models/xform.py

@@ -296,7 +296,7 @@ def url(self):
         )
 
     @property
-    def xforms_root_node_name(self):
+    def xform_root_node_name(self):
         """
         Retrieves the name of the XML tag representing the root node of the "survey"
         in the XForm XML structure.

kobo/apps/openrosa/apps/viewer/models/data_dictionary.py

@@ -70,11 +70,7 @@ def set_uuid_in_xml(self):
         """
         Add bind to automatically set UUID node in XML.
         """
-        # XForm always contains a non-empty/null JSON
-        # `name` and `id_string` attributes should always be present
-        form_json = json.loads(self.json)
-        root_node = form_json['name']
-        id_string = form_json['id_string']
+        root_node = self.xform_root_node_name
 
         doc = clean_and_parse_xml(self.xml)
         model_nodes = doc.getElementsByTagName("model")
@@ -101,15 +97,10 @@ def set_uuid_in_xml(self):
             node
             for node in instance_node.childNodes
             if node.nodeType == Node.ELEMENT_NODE
-            and (
-                node.tagName == root_node
-                and node.attributes.get('id').value == id_string
-            )
+            and node.tagName == root_node
         ]
         if len(survey_nodes) != 1:
-            raise Exception(
-                f'Multiple survey nodes `{root_node}` with the id `{id_string}`'
-            )
+            raise Exception(f'Multiple survey nodes `{root_node}`')
 
         survey_node = survey_nodes[0]
         formhub_nodes = [

kpi/models/asset_snapshot.py

@@ -244,7 +244,7 @@ def generate_xml_from_source(self,
         return xml, details
 
     @property
-    def xforms_root_node_name(self):
+    def xform_root_node_name(self):
         """
         Retrieves the name of the XML tag representing the root node of the "survey"
         in the XForm XML structure.

kpi/utils/xml.py

@@ -373,8 +373,8 @@ def __init__(self, obj: Union['kpi.AssetSnapshot', 'logger.XForm']):
         self._object = obj
         self._unique_id = obj.asset.uid
 
-        # Avoid initializing `_root_tag_name` immediately to prevent extra
-        # database queries. It will be set only when it is actually needed.
+        # Avoid accessing the `xform_root_node_name` property immediately to prevent
+        # extra database queries. It will be set only when it is actually needed.
         self._root_tag_name = None
         self._add_disclaimer()
 
@@ -394,7 +394,7 @@ def _add_disclaimer(self):
         translated, disclaimers_dict, default_language_code = value
 
         self._root_node = minidom.parseString(self._object.xml)
-        self._root_tag_name = self._object.xforms_root_node_name
+        self._root_tag_name = self._object.xform_root_node_name
 
         if translated:
             self._add_translation_nodes(disclaimers_dict, default_language_code)