graphQL with has_path_data and has_type_specific_data filtering

Author: jirivrany

cesnet_service_path_plugin/graphql/filters.py

@@ -98,27 +98,28 @@ class SegmentFilter(NetBoxModelFilterMixin):
         strawberry_django.filter_field()
     )
 
-    # Custom filter for checking if segment has path data
-    has_path_data: Optional[bool] = None
-
-    # Custom filter for checking if segment has type-specific data
-    has_type_specific_data: Optional[bool] = None
-
-    def filter_has_path_data(self, queryset, info):
-        if self.has_path_data is None:
-            return queryset
-        if self.has_path_data:
-            return queryset.filter(path_geometry__isnull=False)
+    # Custom filter methods with decorator approach
+    @strawberry_django.filter_field
+    def has_path_data(self, value: bool, prefix: str) -> Q:
+        """Filter segments based on whether they have path geometry data"""
+
+        if value:
+            # Filter for segments WITH path data
+            return Q(**{f"{prefix}path_geometry__isnull": False})
         else:
-            return queryset.filter(path_geometry__isnull=True)
-
-    def filter_has_type_specific_data(self, queryset, info):
-        if self.has_type_specific_data is None:
-            return queryset
-        if self.has_type_specific_data:
-            return queryset.exclude(type_specific_data={})
+            # Filter for segments WITHOUT path data
+            return Q(**{f"{prefix}path_geometry__isnull": True})
+
+    @strawberry_django.filter_field
+    def has_type_specific_data(self, value: bool, prefix: str) -> Q:
+        """Filter segments based on whether they have type-specific data"""
+        if value:
+            # Has type-specific data: JSON field is not empty and not null
+            # Return Q object that excludes empty dict and null values
+            return ~Q(**{f"{prefix}type_specific_data": {}}) & ~Q(**{f"{prefix}type_specific_data__isnull": True})
         else:
-            return queryset.filter(type_specific_data={})
+            # No type-specific data: JSON field is empty or null
+            return Q(**{f"{prefix}type_specific_data": {}}) | Q(**{f"{prefix}type_specific_data__isnull": True})
 
 
 @strawberry_django.filter(ServicePath, lookups=True)

cesnet_service_path_plugin/graphql/types.py

@@ -1,13 +1,12 @@
 from typing import Annotated, List, Optional
-import logging
+
 from circuits.graphql.types import CircuitType, ProviderType
 from dcim.graphql.types import LocationType, SiteType
 from netbox.graphql.types import NetBoxObjectType
 from strawberry import auto, lazy, field
 from strawberry_django import type as strawberry_django_type
 import strawberry
 
-
 from cesnet_service_path_plugin.models import (
     Segment,
     SegmentCircuitMapping,
@@ -24,9 +23,6 @@
 )
 
 
-logger = logging.getLogger(__name__)
-
-
 # Custom scalar types for path geometry data
 @strawberry.type
 class PathBounds:
@@ -74,8 +70,6 @@ def has_type_specific_data(self) -> bool:
         """Whether this segment has type-specific data"""
         if hasattr(self, "has_type_specific_data"):
             return self.has_type_specific_data()
-        logger.warning("Segment has no type-specific data")
-        logger.debug(f"Type-specific data: {self.type_specific_data}")
         return bool(self.type_specific_data)
 
     @field
@@ -92,22 +86,6 @@ def segment_type_display(self) -> Optional[str]:
             return self.get_segment_type_display()
         return None
 
-    @field
-    def type_specific_schema(self) -> Optional[strawberry.scalars.JSON]:
-        """Schema for the segment's type"""
-        from cesnet_service_path_plugin.models.segment_types import SEGMENT_TYPE_SCHEMAS
-
-        if self.segment_type:
-            return SEGMENT_TYPE_SCHEMAS.get(self.segment_type, {})
-        return None
-
-    @field
-    def has_type_specific_data(self) -> bool:
-        """Whether this segment has type-specific data"""
-        if hasattr(self, "has_type_specific_data"):
-            return self.has_type_specific_data()
-        return bool(self.type_specific_data)
-
     @field
     def path_geometry_geojson(self) -> Optional[strawberry.scalars.JSON]:
         """Path geometry as GeoJSON Feature"""
@@ -155,20 +133,6 @@ def path_bounds(self) -> Optional[PathBounds]:
                 return PathBounds(xmin=bounds[0], ymin=bounds[1], xmax=bounds[2], ymax=bounds[3])
         return None
 
-    @field
-    def path_segment_count(self) -> int:
-        """Number of path segments in the MultiLineString"""
-        if hasattr(self, "get_path_segment_count"):
-            return self.get_path_segment_count()
-        return 0
-
-    @field
-    def path_total_points(self) -> int:
-        """Total number of coordinate points across all segments"""
-        if hasattr(self, "get_total_points"):
-            return self.get_total_points()
-        return 0
-
 
 @strawberry_django_type(SegmentCircuitMapping, filters=SegmentCircuitMappingFilter)
 class SegmentCircuitMappingType(NetBoxObjectType):