fixup! feat: implement rollup data processing and querying

Author: gustavobtflores

backend/kernelCI_app/helpers/treeDetailsRollup.py

@@ -261,6 +261,33 @@ def process_rollup_summary(instance, *, row_dict: dict, is_boot_row: bool) -> No
         platforms_failing.add(test_platform)
 
 
+def _ensure_issue_in_table(
+    *,
+    instance,
+    issue_id: str,
+    issue_version: int,
+    issue_comment: str | None,
+    issue_report_url: str | None,
+    is_boot_row: bool,
+) -> Issue:
+    if is_boot_row:
+        table: IssueDict = instance.boot_issues_dict
+    else:
+        table: IssueDict = instance.test_issues_dict
+
+    issue: Issue | None = table.get((issue_id, issue_version))
+    if issue is None:
+        issue = create_issue_typed(
+            issue_id=issue_id,
+            issue_version=issue_version,
+            issue_comment=issue_comment,
+            issue_report_url=issue_report_url,
+            starting_count_status=None,
+        )
+        table[(issue_id, issue_version)] = issue
+    return issue
+
+
 def process_rollup_issues(instance, *, row_dict: dict, is_boot_row: bool) -> None:
     """Accumulate issue information from a rollup row."""
     issue_id = row_dict.get("issue_id")
@@ -282,30 +309,17 @@ def process_rollup_issues(instance, *, row_dict: dict, is_boot_row: bool) -> Non
     ]
 
     if test_issue_id and test_issue_version is not None and can_insert_issue:
-        table: IssueDict = (
-            instance.boot_issues_dict if is_boot_row else instance.test_issues_dict
+        current_issue = _ensure_issue_in_table(
+            instance=instance,
+            issue_id=test_issue_id,
+            issue_version=test_issue_version,
+            issue_comment=issue_comment,
+            issue_report_url=issue_report_url,
+            is_boot_row=is_boot_row,
         )
-        current_issue: Issue | None = table.get((test_issue_id, test_issue_version))
-        if current_issue:
-            for status, count in failure_counts:
-                for _ in range(count):
-                    current_issue.incidents_info.increment(status)
-        else:
-            first_status = next((s for s, c in failure_counts if c > 0), None)
-            table[(test_issue_id, test_issue_version)] = create_issue_typed(
-                issue_id=test_issue_id,
-                issue_version=test_issue_version,
-                issue_comment=issue_comment,
-                issue_report_url=issue_report_url,
-                starting_count_status=first_status,
-            )
-            for status, count in failure_counts:
-                remaining = count - 1 if status == first_status else count
-                for _ in range(max(0, remaining)):
-                    table[(test_issue_id, test_issue_version)].incidents_info.increment(
-                        status
-                    )
 
+        for status, count in failure_counts:
+            current_issue.incidents_info.increment(status, count)
     elif row_dict.get("issue_uncategorized", False):
         status_filter = _get_rollup_status_filter(instance, is_boot_row=is_boot_row)
         if not status_filter or "FAIL" in status_filter:

backend/kernelCI_app/typeModels/common.py

@@ -14,12 +14,12 @@ class StatusCount(BaseModel):
     DONE: Optional[int] = 0
     NULL: Optional[int] = 0
 
-    def increment(self, status: Optional[str]) -> None:
+    def increment(self, status: Optional[str], count: int = 1) -> None:
         if status is None:
             status = "NULL"
 
         try:
-            setattr(self, status.upper(), getattr(self, status.upper()) + 1)
+            setattr(self, status.upper(), getattr(self, status.upper()) + count)
         except AttributeError:
             log_message(f"Unknown status: {status}")
 

backend/kernelCI_app/utils.py

@@ -23,9 +23,11 @@ def create_issue_typed(
     issue_comment: Optional[str],
     issue_report_url: Optional[str],
     starting_count_status: Optional[DatabaseStatusValues],
+    autoincrement: bool = True,
 ) -> Issue:
     incident_count = StatusCount()
-    incident_count.increment(starting_count_status)
+    if autoincrement:
+        incident_count.increment(starting_count_status)
     return Issue(
         id=issue_id,
         version=issue_version,