Address feedback

Author: ogenstad

backend/infrahub/graphql/mutations/ipam.py

@@ -20,7 +20,7 @@
 from infrahub.lock import InfrahubMultiLock, build_object_lock_name
 from infrahub.log import get_logger
 
-from .main import InfrahubMutationMixin, InfrahubMutationOptions
+from .main import DeleteResult, InfrahubMutationMixin, InfrahubMutationOptions
 
 if TYPE_CHECKING:
     from infrahub.graphql.initialization import GraphqlContext
@@ -235,7 +235,7 @@ async def mutate_delete(
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-    ):
+    ) -> DeleteResult:
         return await super().mutate_delete(info=info, data=data, branch=branch)
 
 
@@ -402,7 +402,7 @@ async def mutate_delete(
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-    ) -> tuple[Node, Self, list[Node]]:
+    ) -> DeleteResult:
         graphql_context: GraphqlContext = info.context
         db = graphql_context.db
 
@@ -431,4 +431,4 @@ async def mutate_delete(
 
         ok = True
 
-        return reconciled_prefix, cls(ok=ok), []
+        return DeleteResult(node=reconciled_prefix, mutation=cls(ok=ok))

backend/infrahub/graphql/mutations/main.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Any, Mapping, Optional, Union
 
 from graphene import InputObjectType, Mutation
@@ -49,6 +50,13 @@
 KINDS_CONCURRENT_MUTATIONS_NOT_ALLOWED = [InfrahubKind.GENERICGROUP]
 
 
+@dataclass
+class DeleteResult:
+    node: Node
+    mutation: InfrahubMutationMixin
+    deleted_nodes: list[Node] = field(default_factory=list)
+
+
 # ------------------------------------------
 # Infrahub GraphQLType
 # ------------------------------------------
@@ -64,7 +72,7 @@ async def mutate(cls, root: dict, info: GraphQLResolveInfo, data: InputObjectTyp
         obj = None
         mutation = None
         action = MutationAction.UNDEFINED
-        deleted: list[Node] = []
+        deleted_nodes: list[Node] = []
 
         if "Create" in cls.__name__:
             obj, mutation = await cls.mutate_create(info=info, branch=graphql_context.branch, data=data, **kwargs)
@@ -87,9 +95,11 @@ async def mutate(cls, root: dict, info: GraphQLResolveInfo, data: InputObjectTyp
             else:
                 action = MutationAction.UPDATED
         elif "Delete" in cls.__name__:
-            obj, mutation, deleted = await cls.mutate_delete(
-                info=info, branch=graphql_context.branch, data=data, **kwargs
-            )
+            delete_result = await cls.mutate_delete(info=info, branch=graphql_context.branch, data=data, **kwargs)
+            obj = delete_result.node
+            mutation = delete_result.mutation
+            deleted_nodes = delete_result.deleted_nodes
+
             action = MutationAction.DELETED
         else:
             raise ValueError(
@@ -127,8 +137,8 @@ async def mutate(cls, root: dict, info: GraphQLResolveInfo, data: InputObjectTyp
 
             events = [main_event]
 
-            deleted_changelogs = [node.node_changelog for node in deleted if node.id != obj.id]
-            deleted_ids = [node.node_id for node in deleted_changelogs]
+            deleted_changelogs = [node.node_changelog for node in deleted_nodes if node.id != obj.id]
+            deleted_ids = {node.node_id for node in deleted_changelogs}
 
             for node_changelog in deleted_changelogs:
                 meta = EventMeta.from_parent(parent=main_event)
@@ -448,9 +458,9 @@ async def mutate_update_object(
         await node_constraint_runner.check(node=obj, field_filters=fields_to_validate)
 
         fields = list(data.keys())
-        for field in ("id", "hfid"):
-            if field in fields:
-                fields.remove(field)
+        for field_to_remove in ("id", "hfid"):
+            if field_to_remove in fields:
+                fields.remove(field_to_remove)
 
         await obj.save(db=db, fields=fields)
 
@@ -513,7 +523,7 @@ async def mutate_delete(
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-    ) -> tuple[Node, Self, list[Node]]:
+    ) -> DeleteResult:
         graphql_context: GraphqlContext = info.context
 
         obj = await NodeManager.find_object(
@@ -531,7 +541,7 @@ async def mutate_delete(
 
         ok = True
 
-        return obj, cls(ok=ok), deleted
+        return DeleteResult(node=obj, mutation=cls(ok=ok), deleted_nodes=deleted)
 
 
 class InfrahubMutation(InfrahubMutationMixin, Mutation):

backend/infrahub/graphql/mutations/menu.py

@@ -14,7 +14,7 @@
 from infrahub.exceptions import ValidationError
 from infrahub.graphql.mutations.main import InfrahubMutationMixin
 
-from .main import InfrahubMutationOptions
+from .main import DeleteResult, InfrahubMutationOptions
 
 if TYPE_CHECKING:
     from infrahub.graphql.initialization import GraphqlContext
@@ -89,7 +89,7 @@ async def mutate_delete(
         info: GraphQLResolveInfo,
         data: InputObjectType,
         branch: Branch,
-    ) -> tuple[Node, Self, list[Node]]:
+    ) -> DeleteResult:
         graphql_context: GraphqlContext = info.context
         obj = await NodeManager.find_object(
             db=graphql_context.db, kind=CoreMenuItem, id=data.get("id"), hfid=data.get("hfid"), branch=branch