Merge pull request #4878 from opsmill/lgu-search-groups

Search anywhere looks at Groups

Author: LucasG0

backend/infrahub/graphql/queries/search.py

@@ -105,7 +105,7 @@ async def search_resolver(
 ) -> dict[str, Any]:
     context: GraphqlContext = info.context
     response: dict[str, Any] = {}
-    result: list[CoreNode] = []
+    results: list[CoreNode] = []
 
     fields = await extract_fields_first_node(info)
 
@@ -114,30 +114,30 @@ async def search_resolver(
             db=context.db, branch=context.branch, at=context.at, id=q
         )
         if matching:
-            result.append(matching)
+            results.append(matching)
     else:
         try:
             # Convert any IPv6 address, network or partial address to collapsed format as it might be stored in db.
             q = _collapse_ipv6(q)
         except (ValueError, ipaddress.AddressValueError):
             pass
 
-        result.extend(
-            await NodeManager.query(
+        for kind in [InfrahubKind.NODE, InfrahubKind.GENERICGROUP]:
+            objs = await NodeManager.query(
                 db=context.db,
                 branch=context.branch,
-                schema=InfrahubKind.NODE,
+                schema=kind,
                 filters={"any__value": q},
                 limit=limit,
                 partial_match=partial_match,
             )
-        )
+            results.extend(objs)
 
-    if "edges" in fields and result:
-        response["edges"] = [{"node": {"id": obj.id, "kind": obj.get_kind()}} for obj in result]
+    if "edges" in fields and len(results) > 0:
+        response["edges"] = [{"node": {"id": obj.id, "kind": obj.get_kind()}} for obj in results]
 
     if "count" in fields:
-        response["count"] = len(result)
+        response["count"] = len(results)
 
     return response
 

backend/tests/unit/graphql/queries/test_search.py

@@ -2,6 +2,7 @@
 from graphql import graphql
 
 from infrahub.core.branch import Branch
+from infrahub.core.constants import InfrahubKind
 from infrahub.core.node import Node
 from infrahub.database import InfrahubDatabase
 from infrahub.graphql.initialization import prepare_graphql_params
@@ -282,3 +283,28 @@ def test_collapse_ipv6_address_or_network(query, expected):
 def test_collapse_ipv6_address_or_network_invalid_cases(query):
     with pytest.raises(ValueError):
         _collapse_ipv6(query)
+
+
+async def test_search_groups(
+    db: InfrahubDatabase,
+    default_branch: Branch,
+    register_core_models_schema,
+    register_builtin_models_schema,
+    car_person_data_generic,
+):
+    group1 = await Node.init(db=db, schema=InfrahubKind.STANDARDGROUP)
+    await group1.new(db=db, name="group1", members=[car_person_data_generic["c1"], car_person_data_generic["c2"]])
+    await group1.save(db=db)
+
+    gql_params = prepare_graphql_params(db=db, include_subscription=False, branch=default_branch)
+
+    result = await graphql(
+        schema=gql_params.schema,
+        source=SEARCH_QUERY,
+        context_value=gql_params.context,
+        root_value=None,
+        variable_values={"search": "group1"},
+    )
+    assert result.data["InfrahubSearchAnywhere"]["count"] == 1
+
+    assert result.data["InfrahubSearchAnywhere"]["edges"][0]["node"]["id"] == group1.id

changelog/3173.fixed.md

@@ -0,0 +1 @@
+Fix search anywhere so it looks at Groups