Merge remote-tracking branch 'origin/main' into sshin/2757

Author: suejung-sentry

graphql_api/tests/test_test_analytics.py

@@ -153,12 +153,14 @@ def test_flaky_filter_on_test_results(self) -> None:
             created_at=datetime.datetime.now(),
             repoid=repo.repoid,
             branch="main",
+            flaky_fail_count=0,
         )
         _ = DailyTestRollupFactory(
             test=test2,
             created_at=datetime.datetime.now(),
             repoid=repo.repoid,
             branch="feature",
+            flaky_fail_count=1000,
         )
         res = self.fetch_test_analytics(
             repo.name,

utils/test_results.py

@@ -9,6 +9,7 @@
     Avg,
     F,
     Q,
+    QuerySet,
     Sum,
     Value,
 )
@@ -299,6 +300,17 @@ def compare(row: TestResultsRow) -> int:
     return rows[left:]
 
 
+def get_relevant_totals(
+    repoid: int, branch: str | None, since: dt.datetime
+) -> QuerySet:
+    if branch:
+        return DailyTestRollup.objects.filter(
+            repoid=repoid, date__gt=since, branch=branch
+        )
+    else:
+        return DailyTestRollup.objects.filter(repoid=repoid, date__gt=since)
+
+
 def generate_test_results(
     ordering: str,
     ordering_direction: str,
@@ -342,7 +354,7 @@ def generate_test_results(
     test_ids: set[str] | None = None
 
     if term is not None:
-        totals = DailyTestRollup.objects.filter(repoid=repoid, date__gt=since)
+        totals = get_relevant_totals(repoid, branch, since)
 
         totals = totals.filter(test__name__icontains=term).values("test_id")
 
@@ -358,19 +370,21 @@ def generate_test_results(
         test_ids = test_ids & filtered_test_ids if test_ids else filtered_test_ids
 
     if parameter is not None:
+        totals = get_relevant_totals(repoid, branch, since)
         match parameter:
             case GENERATE_TEST_RESULT_PARAM.FLAKY:
-                flakes = Flake.objects.filter(
-                    Q(repository_id=repoid)
-                    & (Q(end_date__date__isnull=True) | Q(end_date__date__gt=since))
+                flaky_test_ids = (
+                    totals.values("test")
+                    .annotate(flaky_fail_count_sum=Sum("flaky_fail_count"))
+                    .filter(flaky_fail_count_sum__gt=0)
+                    .values("test_id")
                 )
+                flaky_test_id_set = {test["test_id"] for test in flaky_test_ids}
 
-                flaky_test_ids = set([flake.test_id for flake in flakes])
-
-                test_ids = test_ids & flaky_test_ids if test_ids else flaky_test_ids
+                test_ids = (
+                    test_ids & flaky_test_id_set if test_ids else flaky_test_id_set
+                )
             case GENERATE_TEST_RESULT_PARAM.FAILED:
-                totals = DailyTestRollup.objects.filter(repoid=repoid, date__gt=since)
-
                 failed_test_ids = (
                     totals.values("test")
                     .annotate(fail_count_sum=Sum("fail_count"))
@@ -383,8 +397,6 @@ def generate_test_results(
                     test_ids & failed_test_id_set if test_ids else failed_test_id_set
                 )
             case GENERATE_TEST_RESULT_PARAM.SKIPPED:
-                totals = DailyTestRollup.objects.filter(repoid=repoid, date__gt=since)
-
                 skipped_test_ids = (
                     totals.values("test")
                     .annotate(
@@ -401,8 +413,6 @@ def generate_test_results(
                     test_ids & skipped_test_id_set if test_ids else skipped_test_id_set
                 )
             case GENERATE_TEST_RESULT_PARAM.SLOWEST:
-                totals = DailyTestRollup.objects.filter(repoid=repoid, date__gt=since)
-
                 num_tests = totals.distinct("test_id").count()
 
                 slowest_test_ids = (