add check for if link exists during import and imrove the error handling

northdpole · northdpole · commit 7bc87b683a02 · 2025-04-26T19:19:52.000+01:00
diff --git a/application/defs/cre_defs.py b/application/defs/cre_defs.py
@@ -362,6 +362,9 @@ def todict(self) -> Dict[str, Union[Dict[str, str], List[Any], Set[str], str]]:
     def __repr__(self):
         return f"{self.todict()}"
 
+    def has_link(self, link: Link) -> bool:
+        return link.document.id in [l.document.id for l in self.links]
+
     def add_link(self, link: Link) -> "Document":
         if not self.links:
             self.links = []
@@ -381,9 +384,6 @@ def add_link(self, link: Link) -> "Document":
         self.links.append(link)
         return self
 
-    def link_exists(self, doc: "Document") -> bool:
-        return doc.id in [l.document.id for l in self.links]
-
     def __post_init__(self):
         if not len(self.name) > 1:
             raise cre_exceptions.InvalidDocumentNameException(self)
diff --git a/application/utils/spreadsheet.py b/application/utils/spreadsheet.py
@@ -211,12 +211,14 @@ def prepare_spreadsheet(
                 for link in doc.links:
                     if link.document.doctype == defs.Credoctypes.CRE:
                         newCRE = self.input_cres.get(link.document.id)
+
                         if not newCRE:
                             newCRE = link.document
-                        if not newCRE.link_exists(doc):
-                            newCRE.add_link(
-                                defs.Link(document=doc.shallow_copy(), ltype=link.ltype)
-                            )
+
+                        lnk = defs.Link(document=doc.shallow_copy(), ltype=link.ltype)
+                        if not newCRE.has_link(lnk):
+                            newCRE.add_link(lnk)
+
                         self.input_cres[newCRE.id] = newCRE
                 if not newCRE:
                     non_cre_docs.append(doc)
diff --git a/application/utils/spreadsheet_parsers.py b/application/utils/spreadsheet_parsers.py
@@ -187,13 +187,12 @@ def parse_export_format(lfile: List[Dict[str, Any]]) -> Dict[str, List[defs.Docu
                         )
                     )
                 elif highest_index < i:  # we found a higher hierarchy CRE
-                    if not highest_cre.link_exists(working_cre):
-                        cres[highest_cre.id] = highest_cre.add_link(
-                            defs.Link(
-                                document=working_cre.shallow_copy(),
-                                ltype=defs.LinkTypes.Contains,
-                            )
-                        )
+                    lnk = defs.Link(
+                        document=working_cre.shallow_copy(),
+                        ltype=defs.LinkTypes.Contains,
+                    )
+                    if not highest_cre.has_link(lnk):
+                        cres[highest_cre.id] = highest_cre.add_link(lnk)
                     else:
                         logger.warning(
                             f"Link between {highest_cre.name} and {working_cre.name} already exists"
@@ -442,12 +441,15 @@ def parse_hierarchical_export_format(
                     )
                     new_cre = cre_dict[other_cre.strip()]
                     # we only need a shallow copy here
-                    cre = cre.add_link(
-                        defs.Link(
-                            ltype=defs.LinkTypes.Related,
-                            document=new_cre.shallow_copy(),
-                        )
+                    lnk = defs.Link(
+                        ltype=defs.LinkTypes.Related,
+                        document=new_cre.shallow_copy(),
                     )
+                    if cre.has_link(lnk):
+                        indx = cre.links.index(lnk)
+                        cre.links[indx].document = new_cre.shallow_copy()
+                    else:
+                        cre = cre.add_link(lnk)
 
         for link in parse_standards(mapping):
             doc = link.document
diff --git a/application/web/web_main.py b/application/web/web_main.py
@@ -78,8 +78,9 @@ def extend_cre_with_tag_links(
     others = list(frozenset(others))
     for o in others:
         o.links = []
-        if not cre.link_exists(o) and o.id != cre.id:
-            cre.add_link(defs.Link(ltype=defs.LinkTypes.Related, document=o))
+        lnk = defs.Link(ltype=defs.LinkTypes.Related, document=o)
+        if not cre.has_link(lnk) and o.id != cre.id:
+            cre.add_link(lnk)
     return cre
 
 
