add hfid support to Relationshipmanager add, extend & remove methods

Author: wvandeun

infrahub_sdk/node.py

@@ -569,7 +569,7 @@ def add(self, data: str | RelatedNode | dict) -> None:
             raise UninitializedError("Must call fetch() on RelationshipManager before editing members")
         new_node = RelatedNode(schema=self.schema, client=self.client, branch=self.branch, data=data)
 
-        if new_node.id and new_node.id not in self.peer_ids:
+        if (new_node.id and new_node.id not in self.peer_ids) or (new_node.hfid and new_node.hfid not in self.peer_hfids):
             self.peers.append(new_node)
             self._has_update = True
 
@@ -591,6 +591,14 @@ def remove(self, data: str | RelatedNode | dict) -> None:
             self.peers.pop(idx)
             self._has_update = True
 
+        elif node_to_remove.hfid and node_to_remove.hfid in self.peer_hfids:
+            idx = self.peer_hfids.index(node_to_remove.hfid)
+            if self.peers[idx].hfid != node_to_remove.hfid:
+                raise IndexError(f"Unexpected situation, the node with the index {idx} should be {node_to_remove.hfid}")
+
+            self.peers.pop(idx)
+            self._has_update = True
+
 
 class RelationshipManagerSync(RelationshipManagerBase):
     """Manages relationships of a node in a synchronous context."""
@@ -664,7 +672,7 @@ def add(self, data: str | RelatedNodeSync | dict) -> None:
             raise UninitializedError("Must call fetch() on RelationshipManager before editing members")
         new_node = RelatedNodeSync(schema=self.schema, client=self.client, branch=self.branch, data=data)
 
-        if new_node.id and new_node.id not in self.peer_ids:
+        if (new_node.id and new_node.id not in self.peer_ids) or (new_node.hfid and new_node.hfid not in self.peer_hfids):
             self.peers.append(new_node)
             self._has_update = True
 
@@ -682,6 +690,13 @@ def remove(self, data: str | RelatedNodeSync | dict) -> None:
             idx = self.peer_ids.index(node_to_remove.id)
             if self.peers[idx].id != node_to_remove.id:
                 raise IndexError(f"Unexpected situation, the node with the index {idx} should be {node_to_remove.id}")
+            self.peers.pop(idx)
+            self._has_update = True
+
+        elif node_to_remove.hfid and node_to_remove.hfid in self.peer_hfids:
+            idx = self.peer_hfids.index(node_to_remove.hfid)
+            if self.peers[idx].hfid != node_to_remove.hfid:
+                raise IndexError(f"Unexpected situation, the node with the index {idx} should be {node_to_remove.hfid}")
 
             self.peers.pop(idx)
             self._has_update = True
@@ -1268,7 +1283,7 @@ async def generate_query_data(
                 exclude=exclude,
                 prefetch_relationships=prefetch_relationships,
                 inherited=True,
-                property=property,
+                property=propertchildy,
             )
         )