Make LiveSegmentManager the base manager for Segment

Co-authored-by: Claude <[email protected]>

Author: emyller

api/segments/models.py

@@ -32,19 +32,32 @@
 logger = logging.getLogger(__name__)
 
 
-class SegmentManager(SoftDeleteExportableManager):
-    pass
-
-
 class LiveSegmentManager(SoftDeleteExportableManager):
     def get_queryset(self):  # type: ignore[no-untyped-def]
         """
-        Returns only the canonical segments, which will always be
-        the highest version.
+        Returns only canonical segments (where version_of is NULL).
+        Canonical segments represent the current/live version.
         """
         return super().get_queryset().filter(version_of__isnull=True)
 
 
+class RevisionsManager(SoftDeleteExportableManager):
+    def get_queryset(self):  # type: ignore[no-untyped-def]
+        """
+        Returns only segment revisions (where version_of is NOT NULL).
+        Revisions are historical versions of segments.
+        """
+        return super().get_queryset().filter(version_of__isnull=False)
+
+
+class AllSegmentsManager(SoftDeleteExportableManager):
+    """
+    Returns all segments (both canonical and revisions).
+    Only filters out soft-deleted segments.
+    """
+    pass
+
+
 class ConfiguredOrderManager(SoftDeleteExportableManager, models.Manager[ModelT]):
     setting_name: str
 
@@ -119,10 +132,11 @@ class Segment(
     updated_at = models.DateTimeField(null=True, auto_now=True)
     is_system_segment = models.BooleanField(default=False)
 
-    objects = SegmentManager()  # type: ignore[misc]
-
-    # Only serves segments that are the canonical version.
-    live_objects = LiveSegmentManager()
+    # Manager declarations - order matters! First manager is the base_manager used in relations.
+    objects = LiveSegmentManager()  # type: ignore[misc]  # Default: canonical segments only
+    live_objects = objects  # Explicit alias for clarity
+    revisions = RevisionsManager()  # type: ignore[misc]  # Only historical versions
+    all_objects = AllSegmentsManager()  # type: ignore[misc]  # Both canonical and revisions
 
     class Meta:
         ordering = ("id",)  # explicit ordering to prevent pagination warnings

api/tests/unit/segments/test_unit_segments_views.py

@@ -207,9 +207,7 @@ def test_segments_limit_ignores_old_segment_versions(
 
     # and create some older versions for the segment fixture
     segment.clone(is_revision=True)
-    # With the NULL-based canonical representation, only revisions are counted here
-    # (the canonical segment has version_of=None).
-    assert Segment.objects.filter(version_of=segment).count() == 1
+    assert Segment.revisions.filter(version_of=segment).count() == 1
     assert Segment.live_objects.count() == 1
 
     url = reverse("api-v1:projects:project-segments-list", args=[project.id])
@@ -1060,13 +1058,11 @@ def test_update_segment_versioned_segment(
     assert response.status_code == status.HTTP_200_OK
 
     # Now verify that a new versioned segment has been set.
-    # With the NULL-based canonical representation, canonical segments have
-    # version_of=None, so only revisions are counted here.
-    assert Segment.objects.filter(version_of=segment).count() == 1
+    assert Segment.revisions.filter(version_of=segment).count() == 1
 
     # Now check the previously versioned segment to match former count of conditions.
 
-    versioned_segment = Segment.objects.filter(version_of=segment, version=1).first()
+    versioned_segment = Segment.revisions.filter(version_of=segment, version=1).first()
     assert versioned_segment != segment
     assert versioned_segment.rules.count() == 1
     versioned_rule = versioned_segment.rules.first()
@@ -1097,10 +1093,8 @@ def test_update_segment_versioned_segment_with_thrown_exception(
         rule=nested_rule, property="foo", operator=EQUAL, value="bar"
     )
 
-    # With the NULL-based canonical representation, canonical segments have
-    # version_of=None, so they are not included in this count.
     assert segment.version == 1
-    assert Segment.objects.filter(version_of=segment).count() == 0
+    assert Segment.revisions.filter(version_of=segment).count() == 0
 
     new_condition_property = "foo2"
     new_condition_value = "bar"
@@ -1153,7 +1147,7 @@ def test_update_segment_versioned_segment_with_thrown_exception(
     # Now verify that the version of the segment has not been changed.
     # The transaction should have rolled back, so no revisions should exist.
     assert segment.version == 1
-    assert Segment.objects.filter(version_of=segment).count() == 0
+    assert Segment.revisions.filter(version_of=segment).count() == 0
 
 
 @pytest.mark.parametrize(

api/util/mappers/engine.py

@@ -201,8 +201,8 @@ def map_environment_to_engine(
     organisation: "Organisation" = project.organisation
 
     # Read relationships - grab all the data needed from the ORM here.
-    # Note: project.segments is prefetched with Segment.live_objects which already
-    # filters by version_of__isnull=True, so no need to filter again here.
+    # Note: project.segments uses Segment's base manager (LiveSegmentManager),
+    # which returns only canonical segments.
     project_segments = list(project.segments.all())
 
     project_segment_rules_by_segment_id: Dict[