fix(flags): flag UI didn't support value filtering for group property…

… filters on the backend (#25548) Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
PostHog · Oct 17, 2024 · 683d552 · 683d552
1 parent caff879
commit 683d552
Show file tree

Hide file tree

Showing 2 changed files with 79 additions and 31 deletions.
diff --git a/ee/clickhouse/views/groups.py b/ee/clickhouse/views/groups.py
@@ -177,38 +177,32 @@ def property_definitions(self, request: request.Request, **kw):
 
         return response.Response(group_type_index_to_properties)
 
-    @extend_schema(
-        parameters=[
-            OpenApiParameter(
-                "group_type_index",
-                OpenApiTypes.INT,
-                description="Specify the group type to find property values of",
-                required=True,
-            ),
-            OpenApiParameter(
-                "key",
-                OpenApiTypes.STR,
-                description="Specify the property key to find values for",
-                required=True,
-            ),
-        ]
-    )
     @action(methods=["GET"], detail=False)
     def property_values(self, request: request.Request, **kw):
-        rows = sync_execute(
-            f"""
-            SELECT {trim_quotes_expr("tupleElement(keysAndValues, 2)")} as value
+        value_filter = request.GET.get("value")
+
+        query = f"""
+            SELECT {trim_quotes_expr("tupleElement(keysAndValues, 2)")} as value, count(*) as count
             FROM groups
             ARRAY JOIN JSONExtractKeysAndValuesRaw(group_properties) as keysAndValues
-            WHERE team_id = %(team_id)s AND group_type_index = %(group_type_index)s AND tupleElement(keysAndValues, 1) = %(key)s
-            GROUP BY tupleElement(keysAndValues, 2)
-            ORDER BY value ASC
-        """,
-            {
-                "team_id": self.team.pk,
-                "group_type_index": request.GET["group_type_index"],
-                "key": request.GET["key"],
-            },
-        )
+            WHERE team_id = %(team_id)s
+              AND group_type_index = %(group_type_index)s
+              AND tupleElement(keysAndValues, 1) = %(key)s
+              {f"AND {trim_quotes_expr('tupleElement(keysAndValues, 2)')} ILIKE %(value_filter)s" if value_filter else ""}
+            GROUP BY value
+            ORDER BY count DESC, value ASC
+            LIMIT 20
+        """
+
+        params = {
+            "team_id": self.team.pk,
+            "group_type_index": request.GET["group_type_index"],
+            "key": request.GET["key"],
+        }
+
+        if value_filter:
+            params["value_filter"] = f"%{value_filter}%"
+
+        rows = sync_execute(query, params)
 
-        return response.Response([{"name": name[0]} for name in rows])
+        return response.Response([{"name": name, "count": count} for name, count in rows])
diff --git a/ee/clickhouse/views/test/test_clickhouse_groups.py b/ee/clickhouse/views/test/test_clickhouse_groups.py
@@ -309,17 +309,71 @@ def test_property_values(self):
             group_key="org:6",
             properties={"industry": "technology"},
         )
+        create_group(
+            team_id=self.team.pk,
+            group_type_index=0,
+            group_key="org:7",
+            properties={"industry": "finance-technology"},
+        )
         create_group(
             team_id=self.team.pk,
             group_type_index=1,
             group_key="org:1",
             properties={"industry": "finance"},
         )
+
+        # Test without query parameter
         response_data = self.client.get(
             f"/api/projects/{self.team.id}/groups/property_values/?key=industry&group_type_index=0"
         ).json()
+        self.assertEqual(len(response_data), 3)
+        self.assertEqual(
+            response_data,
+            [
+                {"name": "finance", "count": 1},
+                {"name": "finance-technology", "count": 1},
+                {"name": "technology", "count": 1},
+            ],
+        )
+
+        # Test with query parameter
+        response_data = self.client.get(
+            f"/api/projects/{self.team.id}/groups/property_values/?key=industry&group_type_index=0&value=fin"
+        ).json()
+        self.assertEqual(len(response_data), 2)
+        self.assertEqual(response_data, [{"name": "finance", "count": 1}, {"name": "finance-technology", "count": 1}])
+
+        # Test with query parameter - case insensitive
+        response_data = self.client.get(
+            f"/api/projects/{self.team.id}/groups/property_values/?key=industry&group_type_index=0&value=TECH"
+        ).json()
         self.assertEqual(len(response_data), 2)
-        self.assertEqual(response_data, [{"name": "finance"}, {"name": "technology"}])
+        self.assertEqual(
+            response_data, [{"name": "finance-technology", "count": 1}, {"name": "technology", "count": 1}]
+        )
+
+        # Test with query parameter - no matches
+        response_data = self.client.get(
+            f"/api/projects/{self.team.id}/groups/property_values/?key=industry&group_type_index=0&value=healthcare"
+        ).json()
+        self.assertEqual(len(response_data), 0)
+        self.assertEqual(response_data, [])
+
+        # Test with query parameter - exact match
+        response_data = self.client.get(
+            f"/api/projects/{self.team.id}/groups/property_values/?key=industry&group_type_index=0&value=technology"
+        ).json()
+        self.assertEqual(len(response_data), 2)
+        self.assertEqual(
+            response_data, [{"name": "finance-technology", "count": 1}, {"name": "technology", "count": 1}]
+        )
+
+        # Test with different group_type_index
+        response_data = self.client.get(
+            f"/api/projects/{self.team.id}/groups/property_values/?key=industry&group_type_index=1&value=fin"
+        ).json()
+        self.assertEqual(len(response_data), 1)
+        self.assertEqual(response_data, [{"name": "finance", "count": 1}])
 
     def test_empty_property_values(self):
         create_group(