fix queries

getsentry · May 23, 2024 · 20aee36 · 20aee36
1 parent 4836630
commit 20aee36
Showing 1 changed file with 13 additions and 6 deletions.
diff --git a/src/sentry/release_health/release_monitor/metrics.py b/src/sentry/release_health/release_monitor/metrics.py
@@ -203,6 +203,7 @@ def fetch_project_release_health_totals_with_org_project_filter(
                         env_col,
                     ],
                     groupby=[
+                        Column("org_id"),
                         Column("project_id"),
                         release_col,
                         env_col,
@@ -224,12 +225,18 @@ def fetch_project_release_health_totals_with_org_project_filter(
                             ),
                         ),
                         # Either org_id > prev_org_id or (org_id == prev_org_id and project_id > prev_project_id)
-                        Condition(
-                            Condition(Column("org_id"), Op.GT, prev_org_id)
-                            | (
-                                Condition(Column("org_id"), Op.EQ, prev_org_id)
-                                & Condition(Column("project_id"), Op.GT, prev_project_id)
-                            )
+                        BooleanCondition(
+                            BooleanOp.OR,
+                            [
+                                Condition(Column("org_id"), Op.GT, prev_org_id),
+                                BooleanCondition(
+                                    BooleanOp.AND,
+                                    [
+                                        Condition(Column("org_id"), Op.EQ, prev_org_id),
+                                        Condition(Column("project_id"), Op.GT, prev_project_id),
+                                    ],
+                                ),
+                            ],
                         ),
                     ],
                     granularity=Granularity(21600),