extract product grading method call

Author: valentijnscholten

dojo/importers/base_importer.py

@@ -24,6 +24,7 @@
     Endpoint,
     FileUpload,
     Finding,
+    System_Settings,
     Test,
     Test_Import,
     Test_Import_Finding_Action,
@@ -33,7 +34,7 @@
 from dojo.notifications.helper import create_notification
 from dojo.tools.factory import get_parser
 from dojo.tools.parser_test import ParserTest
-from dojo.utils import max_safe
+from dojo.utils import calculate_grade, max_safe
 
 logger = logging.getLogger(__name__)
 
@@ -811,3 +812,9 @@ def notify_scan_added(
             url=reverse("view_test", args=(test.id,)),
             url_api=reverse("test-detail", args=(test.id,)),
         )
+
+    def perform_product_grading(self):
+        product = self.test.engagement.product
+        system_settings = System_Settings.objects.get()
+        if system_settings.enable_product_grade:
+            calculate_grade(product)

dojo/importers/default_importer.py

@@ -20,7 +20,6 @@
     Test_Import,
 )
 from dojo.notifications.helper import create_notification
-from dojo.utils import calculate_grade
 from dojo.validators import clean_tags
 
 logger = logging.getLogger(__name__)
@@ -298,10 +297,7 @@ def process_findings(
         # Note: All chord batching is now handled within the loop above
 
         # Always perform an initial grading, even though it might get overwritten later.
-        product = self.test.engagement.product
-        system_settings = System_Settings.objects.get()
-        if system_settings.enable_product_grade:
-            calculate_grade(product)
+        self.perform_product_grading()
 
         sync = kwargs.get("sync", True)
         if not sync:
@@ -389,10 +385,7 @@ def close_old_findings(
 
         # Calculate grade once after all findings have been closed
         if old_findings:
-            product = self.test.engagement.product
-            system_settings = System_Settings.objects.get()
-            if system_settings.enable_product_grade:
-                calculate_grade(product)
+            self.perform_product_grading()
 
         return old_findings
 

dojo/importers/default_reimporter.py

@@ -19,7 +19,6 @@
     Test,
     Test_Import,
 )
-from dojo.utils import calculate_grade
 from dojo.validators import clean_tags
 
 logger = logging.getLogger(__name__)
@@ -312,10 +311,7 @@ def process_findings(
         # Note: All chord batching is now handled within the loop above
 
         # Synchronous tasks were already executed during processing, just calculate grade
-        product = self.test.engagement.product
-        system_settings = System_Settings.objects.get()
-        if system_settings.enable_product_grade:
-            calculate_grade(product)
+        self.perform_product_grading()
 
         # Process the results and return them back
         return self.process_results(**kwargs)
@@ -361,10 +357,7 @@ def close_old_findings(
 
         # Calculate grade once after all findings have been closed
         if mitigated_findings:
-            product = self.test.engagement.product
-            system_settings = System_Settings.objects.get()
-            if system_settings.enable_product_grade:
-                calculate_grade(product)
+            self.perform_product_grading()
 
         return mitigated_findings