fix(web-analytics): Create group property filters correctly in hogql …

…property_to_expr (#19981)
PostHog · Jan 26, 2024 · ff17fd6 · ff17fd6
1 parent f22c21f
commit ff17fd6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/posthog/hogql/property.py b/posthog/hogql/property.py
@@ -151,6 +151,7 @@ def property_to_expr(
                             type=property.type,
                             key=property.key,
                             operator=property.operator,
+                            group_type_index=property.group_type_index,
                             value=v,
                         ),
                         team,
@@ -263,6 +264,7 @@ def property_to_expr(
                             type=property.type,
                             key=property.key,
                             operator=property.operator,
+                            group_type_index=property.group_type_index,
                             value=v,
                         ),
                         team,

diff --git a/posthog/hogql/test/test_property.py b/posthog/hogql/test/test_property.py
@@ -82,12 +82,16 @@ def test_property_to_expr_group(self):
                 {"type": "group", "group_type_index": 0, "key": "a", "value": "b", "operator": "is_not_set"}
             ),
         )
+        self.assertEqual(
+            self._property_to_expr(Property(type="group", group_type_index=0, key="a", value=["b", "c"])),
+            self._parse_expr("group_0.properties.a = 'b' OR group_0.properties.a = 'c'"),
+        )
 
         with self.assertRaises(Exception) as e:
             self._property_to_expr({"type": "group", "key": "a", "value": "b"})
         self.assertEqual(
             str(e.exception),
-            "Missing required key group_type_index for property type group with name a",
+            "Missing required attr group_type_index for property type group with key a",
         )
 
     def test_property_to_expr_event(self):

diff --git a/posthog/models/property/property.py b/posthog/models/property/property.py
@@ -253,14 +253,14 @@ def __init__(
         if self.type not in VALIDATE_PROP_TYPES.keys():
             raise ValueError(f"Invalid property type: {self.type}")
 
-        for key in VALIDATE_PROP_TYPES[self.type]:
-            if getattr(self, key, None) is None:
-                raise ValueError(f"Missing required key {key} for property type {self.type} with name {self.key}")
+        for attr in VALIDATE_PROP_TYPES[self.type]:
+            if getattr(self, attr, None) is None:
+                raise ValueError(f"Missing required attr {attr} for property type {self.type} with key {self.key}")
 
         if self.type == "behavioral":
-            for key in VALIDATE_BEHAVIORAL_PROP_TYPES[cast(BehavioralPropertyType, self.value)]:
-                if getattr(self, key, None) is None:
-                    raise ValueError(f"Missing required key {key} for property type {self.type}::{self.value}")
+            for attr in VALIDATE_BEHAVIORAL_PROP_TYPES[cast(BehavioralPropertyType, self.value)]:
+                if getattr(self, attr, None) is None:
+                    raise ValueError(f"Missing required attr {attr} for property type {self.type}::{self.value}")
 
     def __repr__(self):
         params_repr = ", ".join(f"{key}={repr(value)}" for key, value in self.to_dict().items())