Merge pull request #4875 from opsmill/lgu-fix-hfid-related-node-generic

Allow the use of HFID of a node to create a related node on a generc relationship

Author: LucasG0

backend/infrahub/core/relationship/model.py

@@ -425,8 +425,14 @@ async def resolve(self, db: InfrahubDatabase) -> None:
                 await self.set_peer(value=peer)
 
         if not self.peer_id and self.peer_hfid:
+            peer_schema = db.schema.get(name=self.schema.peer, branch=self.branch)
+            kind = (
+                self.data["kind"]
+                if isinstance(self.data, dict) and "kind" in self.data and peer_schema.is_generic_schema
+                else self.schema.peer
+            )
             peer = await registry.manager.get_one_by_hfid(
-                db=db, hfid=self.peer_hfid, branch=self.branch, kind=self.schema.peer, fields={"display_label": None}
+                db=db, hfid=self.peer_hfid, branch=self.branch, kind=kind, fields={"display_label": None}
             )
             if peer:
                 await self.set_peer(value=peer)

backend/infrahub/graphql/types/attribute.py

@@ -20,6 +20,7 @@ class GenericPoolInput(InputObjectType):
 class RelatedNodeInput(InputObjectType):
     id = String(required=False)
     hfid = Field(List(of_type=String), required=False)
+    kind = String(required=False)  # Only used to resolve hfid of a related node on a generic relationship, see #4649
     from_pool = Field(GenericPoolInput, required=False)
     _relation__is_visible = Boolean(required=False)
     _relation__is_protected = Boolean(required=False)

backend/tests/unit/conftest.py

@@ -2947,3 +2947,64 @@ def init_service(db: InfrahubDatabase):
     services.service = InfrahubServices(database=db, workflow=WorkflowLocalExecution())
     yield services.service
     services.service = original
+
+
+@pytest.fixture
+async def generic_car_person_schema(default_branch: Branch, data_schema):
+    schema: dict[str, Any] = {
+        "generics": [
+            {
+                "name": "Car",
+                "namespace": "Test",
+                "attributes": [
+                    {
+                        "kind": "Text",
+                        "name": "name",
+                    },
+                ],
+                "relationships": [
+                    {
+                        "cardinality": "one",
+                        "identifier": "person__car",
+                        "name": "owner",
+                        "optional": True,
+                        "peer": "TestPerson",
+                    }
+                ],
+            }
+        ],
+        "nodes": [
+            {
+                "name": "ElectricCar",
+                "namespace": "Test",
+                "human_friendly_id": ["name__value", "color__value"],
+                "inherit_from": ["TestCar"],
+                "attributes": [
+                    {
+                        "kind": "Text",
+                        "name": "name",
+                    },
+                    {
+                        "kind": "Text",
+                        "name": "color",
+                    },
+                ],
+            },
+            {
+                "name": "Person",
+                "namespace": "Test",
+                "attributes": [
+                    {
+                        "kind": "Text",
+                        "name": "name",
+                    },
+                ],
+                "relationships": [
+                    {"cardinality": "one", "identifier": "person__car", "name": "car", "peer": "TestCar"}
+                ],
+            },
+        ],
+    }
+
+    schema_root = SchemaRoot(**schema)
+    registry.schema.register_schema(schema=schema_root, branch=default_branch.name)

backend/tests/unit/graphql/test_mutation_relationship.py

@@ -695,3 +695,54 @@ async def test_relationship_add_from_pool(
     addresses = await p1.ip_addresses.get(db=db)
     assert prefixes
     assert not addresses
+
+
+# See #4649
+async def test_add_generic_related_node_with_hfid(
+    db: InfrahubDatabase,
+    default_branch: Branch,
+    generic_car_person_schema,
+):
+    electric_car = await Node.init(db=db, schema="TestElectricCar", branch=default_branch)
+    await electric_car.new(db=db, name="testing-car", color="blue")
+    await electric_car.save(db=db)
+
+    person = await Node.init(db=db, schema="TestPerson", branch=default_branch)
+    await person.new(db=db, name="testing-person")
+    await person.save(db=db)
+
+    query = """
+    mutation {
+        TestPersonUpdate(data: {
+            id: "%s",
+            car: {
+                hfid: ["testing-car", "blue"],
+                kind: "TestElectricCar"
+              }
+        }) {
+            ok
+            object {
+                id
+                car {
+                    node {
+                        name {
+                            value
+                        }
+                    }
+                }
+            }
+        }
+    }
+    """ % (person.id)
+
+    gql_params = prepare_graphql_params(db=db, include_subscription=False, branch=default_branch)
+
+    result = await graphql(
+        schema=gql_params.schema,
+        source=query,
+        context_value=gql_params.context,
+        root_value=None,
+        variable_values={},
+    )
+    assert result.errors is None
+    assert result.data["TestPersonUpdate"]["object"]["car"]["node"]["name"]["value"] == "testing-car"

changelog/4649.added.md

@@ -0,0 +1 @@
+Add ability to use node HFID to create a related node on a generic relationship