fix queries

src/sentry/release_health/release_monitor/metrics.py

@@ -5,6 +5,8 @@
 from datetime import datetime, timedelta
 
 from snuba_sdk import (
+    BooleanCondition,
+    BooleanOp,
     Column,
     Condition,
     Direction,
@@ -117,6 +119,7 @@ def fetch_project_release_health_totals_with_org_project_filter(
                         env_col,
                     ],
                     groupby=[
+                        Column("org_id"),
                         Column("project_id"),
                         release_col,
                         env_col,
@@ -138,12 +141,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),