From 60263632f7e113d5f1d2ccf6d94e327cc862f27e Mon Sep 17 00:00:00 2001
From: Erwan Rouchet <rouchet@teklia.com>
Date: Thu, 13 Jun 2024 15:41:14 +0200
Subject: [PATCH] Fetch worker runs along with elements in element lists
---
arkindex/documents/api/elements.py | 1 +
arkindex/documents/tests/test_children_elements.py | 2 +-
arkindex/sql_validation/list_elements.sql | 13 ++++++++++++-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/arkindex/documents/api/elements.py b/arkindex/documents/api/elements.py
index 0be67b421e..46590a7441 100644
--- a/arkindex/documents/api/elements.py
+++ b/arkindex/documents/api/elements.py
@@ -945,6 +945,7 @@ class ElementsListBase(CorpusACLMixin, DestroyModelMixin, ListAPIView):
def filter_queryset(self, queryset):
queryset = queryset \
.filter(self.get_filters()) \
+ .select_related("worker_run") \
.prefetch_related(*self.get_prefetch()) \
.order_by(*self.get_order_by())
diff --git a/arkindex/documents/tests/test_children_elements.py b/arkindex/documents/tests/test_children_elements.py
index 50cb778c54..1eeb278e71 100644
--- a/arkindex/documents/tests/test_children_elements.py
+++ b/arkindex/documents/tests/test_children_elements.py
@@ -303,7 +303,7 @@ class TestChildrenElements(FixtureAPITestCase):
worker_run_child = Element.objects.create(name="bob", type=self.page.type, worker_run=self.worker_run, worker_version=self.worker_version, corpus=self.corpus)
worker_run_child.add_parent(self.vol)
- with self.assertNumQueries(6):
+ with self.assertNumQueries(5):
response = self.client.get(
reverse("api:elements-children", kwargs={"pk": str(self.vol.id)}),
data={"worker_run": str(self.worker_run.id)}
diff --git a/arkindex/sql_validation/list_elements.sql b/arkindex/sql_validation/list_elements.sql
index 9d23eaa4b2..8ae34bce85 100644
--- a/arkindex/sql_validation/list_elements.sql
+++ b/arkindex/sql_validation/list_elements.sql
@@ -28,8 +28,19 @@ SELECT "documents_element"."id",
"documents_element"."polygon"::bytea,
"documents_element"."rotation_angle",
"documents_element"."mirrored",
- "documents_element"."confidence"
+ "documents_element"."confidence",
+ "process_workerrun"."id",
+ "process_workerrun"."process_id",
+ "process_workerrun"."version_id",
+ "process_workerrun"."model_version_id",
+ "process_workerrun"."parents",
+ "process_workerrun"."configuration_id",
+ "process_workerrun"."summary",
+ "process_workerrun"."created",
+ "process_workerrun"."updated",
+ "process_workerrun"."has_results"
FROM "documents_element"
+LEFT OUTER JOIN "process_workerrun" ON ("documents_element"."worker_run_id" = "process_workerrun"."id")
WHERE ("documents_element"."corpus_id" = '{corpus_id}'::uuid
AND "documents_element"."corpus_id" = '{corpus_id}'::uuid)
ORDER BY "documents_element"."name" ASC,
--
GitLab