15809 Mark unions as nullable in GraphQL where appropriate (#15824)

* 15809 mark unions as nullable where appropriate * 15809 fix tests * 15809 fix tests
netbox-community · Apr 25, 2024 · ded2fe9 · ded2fe9
1 parent e05ca71
commit ded2fe9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/netbox/dcim/graphql/types.py b/netbox/dcim/graphql/types.py
@@ -130,7 +130,7 @@ class CableTerminationType(NetBoxObjectType):
         Annotated["PowerOutletType", strawberry.lazy('dcim.graphql.types')],
         Annotated["PowerPortType", strawberry.lazy('dcim.graphql.types')],
         Annotated["RearPortType", strawberry.lazy('dcim.graphql.types')],
-    ], strawberry.union("CableTerminationTerminationType")]
+    ], strawberry.union("CableTerminationTerminationType")] | None
 
 
 @strawberry_django.type(
@@ -302,7 +302,7 @@ def parent(self) -> Annotated["InventoryItemTemplateType", strawberry.lazy('dcim
         Annotated["PowerOutletType", strawberry.lazy('dcim.graphql.types')],
         Annotated["PowerPortType", strawberry.lazy('dcim.graphql.types')],
         Annotated["RearPortType", strawberry.lazy('dcim.graphql.types')],
-    ], strawberry.union("InventoryItemTemplateComponentType")]
+    ], strawberry.union("InventoryItemTemplateComponentType")] | None
 
 
 @strawberry_django.type(
@@ -431,7 +431,7 @@ def parent(self) -> Annotated["InventoryItemType", strawberry.lazy('dcim.graphql
         Annotated["PowerOutletType", strawberry.lazy('dcim.graphql.types')],
         Annotated["PowerPortType", strawberry.lazy('dcim.graphql.types')],
         Annotated["RearPortType", strawberry.lazy('dcim.graphql.types')],
-    ], strawberry.union("InventoryItemComponentType")]
+    ], strawberry.union("InventoryItemComponentType")] | None
 
 
 @strawberry_django.type(

diff --git a/netbox/ipam/graphql/types.py b/netbox/ipam/graphql/types.py
@@ -133,7 +133,7 @@ def assigned_object(self) -> Annotated[Union[
         Annotated["InterfaceType", strawberry.lazy('dcim.graphql.types')],
         Annotated["FHRPGroupType", strawberry.lazy('ipam.graphql.types')],
         Annotated["VMInterfaceType", strawberry.lazy('virtualization.graphql.types')],
-    ], strawberry.union("IPAddressAssignmentType")]:
+    ], strawberry.union("IPAddressAssignmentType")] | None:
         return self.assigned_object
 
 
@@ -261,7 +261,7 @@ def scope(self) -> Annotated[Union[
         Annotated["RegionType", strawberry.lazy('dcim.graphql.types')],
         Annotated["SiteType", strawberry.lazy('dcim.graphql.types')],
         Annotated["SiteGroupType", strawberry.lazy('dcim.graphql.types')],
-    ], strawberry.union("VLANGroupScopeType")]:
+    ], strawberry.union("VLANGroupScopeType")] | None:
         return self.scope
 
 

diff --git a/netbox/utilities/testing/api.py b/netbox/utilities/testing/api.py
@@ -469,6 +469,9 @@ def _build_query(self, name, **filters):
                 elif type(field.type) is StrawberryUnion:
                     # this would require a fragment query
                     continue
+                elif type(field.type) is StrawberryOptional and type(field.type.of_type) is StrawberryUnion:
+                    # this would require a fragment query
+                    continue
                 elif type(field.type) is StrawberryOptional and type(field.type.of_type) is LazyType:
                     fields_string += f'{field.name} {{ id }}\n'
                 elif hasattr(field, 'is_relation') and field.is_relation: