fix: Normalising Children and New Nodes

backend/editor/entries.py

@@ -18,12 +18,16 @@ def create_node(label, entry, main_language_code):
     """
     Helper function used for creating a node with given id and label
     """
+    #Normalising new Node ID
+
+    normalised_entry = normalizing(entry, main_language_code).split(':', 1)[1]
+
     query = [f"""CREATE (n:{label})\n"""]
-    params = {"id": entry}
+    params = {"id": normalised_entry}
 
     # Build all basic keys of a node
     if (label == "ENTRY"):
-        canonical_tag = entry.split(":", 1)[1]
+        canonical_tag = normalised_entry.split(":", 1)[1]
         query.append(f""" SET n.main_language = $main_language_code """) # Required for only an entry
         params["main_language_code"] = main_language_code
     else:
@@ -173,13 +177,28 @@ def update_nodes(label, entry, new_node_keys):
             continue
         query.append(f"""\nREMOVE n.{key}\n""")
 
+    #Normalising Node to be Updated
+    normalised_new_node_keys = {}
+    for keys in new_node_keys.keys():
+        if keys.startswith("tags") and not keys.endswith("str"):
+            if "ids" not in keys:
+                keys_language_code = keys.split('_', 1)[1]
+                normalised_value = []
+                for values in new_node_keys[keys]:
+                    normalised_value.append(normalizing(values, keys_language_code))
+                normalised_new_node_keys[keys] = new_node_keys[keys]
+
+                normalised_new_node_keys["tags_ids_"+keys_language_code] = normalised_value
+        else:
+            normalised_new_node_keys[keys] = new_node_keys[keys]
+
     # Update keys
-    for key in new_node_keys.keys():
+    for key in normalised_new_node_keys.keys():
         query.append(f"""\nSET n.{key} = ${key}\n""")
 
     query.append(f"""RETURN n""")
 
-    params = dict(new_node_keys, id=entry)
+    params = dict(normalised_new_node_keys, id=entry)
     result = get_current_transaction().run(" ".join(query), params)
     return result
 
@@ -206,7 +225,13 @@ def update_node_children(entry, new_children_ids):
     existing_ids = [record['child.id'] for record in get_current_transaction().run(query, ids=list(added_children))]
     to_create = added_children - set(existing_ids)
 
-    for child in to_create:
+    #Normalising new children node ID
+    normalised_added_children = set()
+    for child_node in to_create:
+        child_language_code, new_child_name = child_node.split(":",1)
+        normalised_added_children.add(normalizing(new_child_name,child_language_code))
+
+    for child in normalised_added_children:
         main_language_code = child.split(":", 1)[0]
         create_node("ENTRY", child, main_language_code)
 
@@ -215,7 +240,7 @@ def update_node_children(entry, new_children_ids):
 
     # Stores result of last query executed
     result = []
-    for child in added_children:
+    for child in normalised_added_children:
         # Create new relationships if it doesn't exist
         query = f"""
             MATCH (parent:ENTRY), (new_child:ENTRY) WHERE parent.id = $id AND new_child.id = $child