reimport: prefetch endpoint status

Author: valentijnscholten

dojo/finding/deduplication.py

@@ -252,10 +252,20 @@ def build_candidate_scope_queryset(test, mode="deduplication", service=None):
             )
         queryset = Finding.objects.filter(scope_q)
 
+    # Base prefetches for both modes
+    prefetch_list = ["endpoints", "vulnerability_id_set"]
+
+    # Additional prefetches for reimport mode
+    if mode == "reimport":
+        prefetch_list.extend([
+            "status_finding",
+            "status_finding__endpoint",
+        ])
+
     return (
         queryset
         .select_related("test", "test__engagement", "test__test_type")
-        .prefetch_related("endpoints", "vulnerability_id_set")
+        .prefetch_related(*prefetch_list)
     )
 
 

unittests/test_importers_performance.py

@@ -244,9 +244,9 @@ def test_import_reimport_reimport_performance_async(self):
         self._import_reimport_performance(
             expected_num_queries1=340,
             expected_num_async_tasks1=7,
-            expected_num_queries2=276,
+            expected_num_queries2=238,
             expected_num_async_tasks2=18,
-            expected_num_queries3=163,
+            expected_num_queries3=120,
             expected_num_async_tasks3=17,
         )
 
@@ -262,9 +262,9 @@ def test_import_reimport_reimport_performance_pghistory_async(self):
         self._import_reimport_performance(
             expected_num_queries1=306,
             expected_num_async_tasks1=7,
-            expected_num_queries2=269,
+            expected_num_queries2=231,
             expected_num_async_tasks2=18,
-            expected_num_queries3=158,
+            expected_num_queries3=115,
             expected_num_async_tasks3=17,
         )
 
@@ -286,9 +286,9 @@ def test_import_reimport_reimport_performance_no_async(self):
         self._import_reimport_performance(
             expected_num_queries1=346,
             expected_num_async_tasks1=6,
-            expected_num_queries2=282,
+            expected_num_queries2=244,
             expected_num_async_tasks2=17,
-            expected_num_queries3=169,
+            expected_num_queries3=126,
             expected_num_async_tasks3=16,
         )
 
@@ -308,9 +308,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async(self):
         self._import_reimport_performance(
             expected_num_queries1=312,
             expected_num_async_tasks1=6,
-            expected_num_queries2=275,
+            expected_num_queries2=237,
             expected_num_async_tasks2=17,
-            expected_num_queries3=164,
+            expected_num_queries3=121,
             expected_num_async_tasks3=16,
         )
 
@@ -334,9 +334,9 @@ def test_import_reimport_reimport_performance_no_async_with_product_grading(self
         self._import_reimport_performance(
             expected_num_queries1=348,
             expected_num_async_tasks1=8,
-            expected_num_queries2=284,
+            expected_num_queries2=246,
             expected_num_async_tasks2=19,
-            expected_num_queries3=171,
+            expected_num_queries3=128,
             expected_num_async_tasks3=18,
         )
 
@@ -357,9 +357,9 @@ def test_import_reimport_reimport_performance_pghistory_no_async_with_product_gr
         self._import_reimport_performance(
             expected_num_queries1=314,
             expected_num_async_tasks1=8,
-            expected_num_queries2=277,
+            expected_num_queries2=239,
             expected_num_async_tasks2=19,
-            expected_num_queries3=166,
+            expected_num_queries3=123,
             expected_num_async_tasks3=18,
         )