fixup! feat: Change queries to use lab column information

Keep lab as the standard Django FK field and resolve build test lab names
via raw SQL, matching the hardware query pattern.

Signed-off-by: Alan Peixinho <alan.peixinho@profusion.mobi>

Author: alanpeixinho

backend/kernelCI_app/migrations/0020_rename_builds_tests_lab_to_lab_id.py

@@ -132,12 +132,8 @@ class Builds(models.Model):
     log_url = models.TextField(blank=True, null=True)
     log_excerpt = models.CharField(max_length=16384, blank=True, null=True)
     misc = models.JSONField(blank=True, null=True)
-    lab_id = models.ForeignKey(
-        Labs,
-        db_column="lab_id",
-        db_constraint=False,
-        null=True,
-        on_delete=models.DO_NOTHING,
+    lab = models.ForeignKey(
+        Labs, db_constraint=False, null=True, on_delete=models.DO_NOTHING
     )
     status = models.CharField(
         max_length=10, choices=StatusChoices.choices, blank=True, null=True
@@ -197,12 +193,8 @@ class UnitPrefix(models.TextChoices):
     input_files = models.JSONField(blank=True, null=True)
     output_files = models.JSONField(blank=True, null=True)
     misc = models.JSONField(blank=True, null=True)
-    lab_id = models.ForeignKey(
-        Labs,
-        db_column="lab_id",
-        db_constraint=False,
-        null=True,
-        on_delete=models.DO_NOTHING,
+    lab = models.ForeignKey(
+        Labs, db_constraint=False, null=True, on_delete=models.DO_NOTHING
     )
     number_value = models.FloatField(blank=True, null=True)
     environment_compatible = ArrayField(models.TextField(), blank=True, null=True)

backend/kernelCI_app/models.py

@@ -1,11 +1,10 @@
 from typing import Optional
 
-from django.db.models import TextField
-from django.db.models.expressions import F
-from django.db.models.functions import Cast, Coalesce
+from django.db import connection
 from querybuilder.query import Query
 
-from kernelCI_app.models import Builds, Tests
+from kernelCI_app.helpers.database import dict_fetchall
+from kernelCI_app.models import Builds
 
 
 def get_build_details(build_id: str) -> Optional[list[dict]]:
@@ -51,26 +50,24 @@ def get_build_details(build_id: str) -> Optional[list[dict]]:
 
 
 def get_build_tests(build_id: str) -> Optional[list[dict]]:
-    result = (
-        Tests.objects.filter(build_id=build_id)
-        # TODO remove misc__runtime fallback after lab backfill
-        .annotate(
-            lab=Coalesce(
-                F("lab_id__name"),
-                Cast(F("misc__runtime"), output_field=TextField()),
-            )
-        )
-        .values(
-            "id",
-            "duration",
-            "status",
-            "path",
-            "start_time",
-            "environment_compatible",
-            "environment_misc",
-            "build__status",
-            "lab_id",
-            "lab",
-        )
-    )
-    return list(result)
+    query = """
+        SELECT
+            tests.id,
+            tests.duration,
+            tests.status,
+            tests.path,
+            tests.start_time,
+            tests.environment_compatible,
+            tests.environment_misc,
+            builds.status AS build__status,
+            tests.lab_id,
+            -- TODO remove misc->>'runtime' fallback after lab backfill
+            COALESCE(labs.name, tests.misc->>'runtime') AS lab
+        FROM tests
+        INNER JOIN builds ON tests.build_id = builds.id
+        LEFT JOIN labs ON tests.lab_id = labs.id
+        WHERE tests.build_id = %s
+    """
+    with connection.cursor() as cursor:
+        cursor.execute(query, [build_id])
+        return dict_fetchall(cursor)

backend/kernelCI_app/queries/build.py

@@ -1,10 +1,7 @@
 from unittest.mock import patch
 
 from kernelCI_app.queries.build import get_build_details, get_build_tests
-from kernelCI_app.tests.unitTests.queries.conftest import (
-    setup_mock_filter_values_queryset,
-    setup_mock_query_builder,
-)
+from kernelCI_app.tests.unitTests.queries.conftest import setup_mock_query_builder
 
 
 class TestGetBuildDetails:
@@ -28,25 +25,35 @@ def test_get_build_details_empty_result(self, mock_query_class):
 
 
 class TestGetBuildTests:
-    @patch("kernelCI_app.queries.build.Tests")
-    def test_get_build_tests_success(self, mock_tests_model):
-        setup_mock_filter_values_queryset(
-            mock_tests_model,
-            [
-                {
-                    "id": "test",
-                    "duration": 30,
-                    "status": "PASS",
-                    "path": "test.path",
-                    "start_time": "2024-01-15T10:00:00Z",
-                    "environment_compatible": ["hardware1"],
-                    "environment_misc": {"platform": "x86_64"},
-                    "build__status": "PASS",
-                    "lab_id": 1,
-                    "lab": "lab-a",
-                }
-            ],
-        )
+    @patch("kernelCI_app.queries.build.connection")
+    def test_get_build_tests_success(self, mock_connection):
+        mock_cursor = mock_connection.cursor.return_value.__enter__.return_value
+        mock_cursor.fetchall.return_value = [
+            (
+                "test",
+                30,
+                "PASS",
+                "test.path",
+                "2024-01-15T10:00:00Z",
+                ["hardware1"],
+                {"platform": "x86_64"},
+                "PASS",
+                1,
+                "lab-a",
+            )
+        ]
+        mock_cursor.description = [
+            ("id",),
+            ("duration",),
+            ("status",),
+            ("path",),
+            ("start_time",),
+            ("environment_compatible",),
+            ("environment_misc",),
+            ("build__status",),
+            ("lab_id",),
+            ("lab",),
+        ]
 
         result = get_build_tests("build")
 
@@ -64,11 +71,13 @@ def test_get_build_tests_success(self, mock_tests_model):
                 "lab": "lab-a",
             }
         ]
-        mock_tests_model.objects.filter.assert_called_once_with(build_id="build")
+        mock_cursor.execute.assert_called_once()
 
-    @patch("kernelCI_app.queries.build.Tests")
-    def test_get_build_tests_empty_result(self, mock_tests_model):
-        setup_mock_filter_values_queryset(mock_tests_model, [])
+    @patch("kernelCI_app.queries.build.connection")
+    def test_get_build_tests_empty_result(self, mock_connection):
+        mock_cursor = mock_connection.cursor.return_value.__enter__.return_value
+        mock_cursor.fetchall.return_value = []
+        mock_cursor.description = []
 
         result = get_build_tests("build")