Make condition.property not null

Author: emyller

api/segments/migrations/0028_condition_property_not_null.py

@@ -0,0 +1,39 @@
+# Generated by Django 4.2.22 on 2025-08-04 20:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    """
+    Update condition.property to be non-nullable.
+
+    Only conditions of operator PERCENTAGE_SPLIT have empty `property` values,
+    according to this query:
+
+    ```sql
+    select c.operator, count(*) from segments_condition c where c.property is null or c.property !~ '\S' group by 1;
+    ```
+
+    The Flagsmith engine can now do percentage split upon any property, so we
+    default empty `property` values to `"$.identity.key"` because that's the
+    old behavior for PERCENTAGE_SPLIT conditions.
+    """
+
+    dependencies = [
+        ("segments", "0027_historicalsegmentrule"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="condition",
+            name="property",
+            field=models.CharField(default="$.identity.key", max_length=1000),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="historicalcondition",
+            name="property",
+            field=models.CharField(default="$.identity.key", max_length=1000),
+            preserve_default=False,
+        ),
+    ]

api/segments/models.py

@@ -310,7 +310,7 @@ class Condition(
     )
 
     operator = models.CharField(choices=CONDITION_TYPES, max_length=500)
-    property = models.CharField(blank=True, null=True, max_length=1000)
+    property = models.CharField(max_length=1000)
     value = models.CharField(
         max_length=settings.SEGMENT_CONDITION_VALUE_LIMIT, blank=True, null=True
     )

api/segments/serializers.py

@@ -4,7 +4,6 @@
 from django.conf import settings
 from django.db import transaction
 from drf_writable_nested.serializers import WritableNestedModelSerializer
-from flag_engine.segments.constants import PERCENTAGE_SPLIT
 from rest_framework import serializers
 from rest_framework.exceptions import ValidationError
 
@@ -33,12 +32,6 @@ class Meta:
             "delete",
         ]
 
-    def validate(self, attrs: dict[str, Any]) -> dict[str, Any]:
-        attrs = super().validate(attrs)
-        if attrs.get("operator") != PERCENTAGE_SPLIT and not attrs.get("property"):
-            raise ValidationError({"property": ["This field may not be blank."]})
-        return attrs
-
     def to_internal_value(self, data: dict[str, Any]) -> Any:
         # Conversion to correct value type is handled elsewhere
         data["value"] = str(data["value"]) if "value" in data else None

api/tests/unit/segments/test_unit_segments_views.py

@@ -1065,40 +1065,6 @@ def test_create_segment_with_required_metadata_returns_201(
     assert response.json()["metadata"][0]["field_value"] == str(field_value)
 
 
-def test_update_segment__empty_non_split_condition__responds_400(
-    admin_client: APIClient,
-    segment: Segment,
-    segment_rule: SegmentRule,
-) -> None:
-    # When
-    response = admin_client.patch(
-        f"/api/v1/projects/{segment.project.pk}/segments/{segment.pk}/",
-        data={
-            "rules": [
-                {
-                    "id": segment_rule.pk,
-                    "type": "ALL",
-                    "rules": [],
-                    "conditions": [
-                        {
-                            # "property": "not-provided",
-                            "operator": EQUAL,
-                            "value": "👀",
-                        },
-                    ],
-                },
-            ],
-        },
-        format="json",
-    )
-
-    # Then
-    assert response.status_code == status.HTTP_400_BAD_REQUEST, response.data
-    assert response.json()["rules"][0]["conditions"][0]["property"] == [
-        "This field may not be blank."
-    ]
-
-
 @pytest.mark.parametrize(
     "client",
     [lazy_fixture("admin_master_api_key_client"), lazy_fixture("admin_client")],