cleanup model deletes

Author: valentijnscholten

dojo/importers/base_importer.py

@@ -24,7 +24,6 @@
     Endpoint,
     FileUpload,
     Finding,
-    System_Settings,
     Test,
     Test_Import,
     Test_Import_Finding_Action,
@@ -34,7 +33,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 calculate_grade, max_safe
+from dojo.utils import max_safe
 
 logger = logging.getLogger(__name__)
 
@@ -812,9 +811,3 @@ 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,6 +20,7 @@
     Test_Import,
 )
 from dojo.notifications.helper import create_notification
+from dojo.utils import perform_product_grading
 from dojo.validators import clean_tags
 
 logger = logging.getLogger(__name__)
@@ -297,7 +298,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.
-        self.perform_product_grading()
+        perform_product_grading(self.test.engagement.product)
 
         sync = kwargs.get("sync", True)
         if not sync:
@@ -385,7 +386,7 @@ def close_old_findings(
 
         # Calculate grade once after all findings have been closed
         if old_findings:
-            self.perform_product_grading()
+            perform_product_grading(self.test.engagement.product)
 
         return old_findings
 

dojo/importers/default_reimporter.py

@@ -19,6 +19,7 @@
     Test,
     Test_Import,
 )
+from dojo.utils import perform_product_grading
 from dojo.validators import clean_tags
 
 logger = logging.getLogger(__name__)
@@ -311,7 +312,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
-        self.perform_product_grading()
+        perform_product_grading(self.test.engagement.product)
 
         # Process the results and return them back
         return self.process_results(**kwargs)
@@ -357,7 +358,7 @@ def close_old_findings(
 
         # Calculate grade once after all findings have been closed
         if mitigated_findings:
-            self.perform_product_grading()
+            perform_product_grading(self.test.engagement.product)
 
         return mitigated_findings
 

dojo/models.py

@@ -1652,7 +1652,8 @@ def delete(self, *args, **kwargs):
         with suppress(Engagement.DoesNotExist, Product.DoesNotExist):
             # Suppressing a potential issue created from async delete removing
             # related objects in a separate task
-            calculate_grade(self.product)
+            from dojo.utils import perform_product_grading  # noqa: PLC0415 circular import
+            perform_product_grading(self.test.engagement.product)
 
     def inherit_tags(self, potentially_existing_tags):
         # get a copy of the tags to be inherited
@@ -2258,9 +2259,8 @@ def delete(self, *args, product_grading_option=True, **kwargs):
             with suppress(Test.DoesNotExist, Engagement.DoesNotExist, Product.DoesNotExist):
                 # Suppressing a potential issue created from async delete removing
                 # related objects in a separate task
-                system_settings = System_Settings.objects.get()
-                if system_settings.enable_product_grade:
-                    calculate_grade(self.engagement.product)
+                from dojo.utils import perform_product_grading  # noqa: PLC0415 circular import
+                perform_product_grading(self.test.engagement.product)
 
     @property
     def statistics(self):
@@ -2868,9 +2868,8 @@ def delete(self, *args, product_grading_option=True, **kwargs):
             with suppress(Finding.DoesNotExist, Test.DoesNotExist, Engagement.DoesNotExist, Product.DoesNotExist):
                 # Suppressing a potential issue created from async delete removing
                 # related objects in a separate task
-                system_settings = System_Settings.objects.get()
-                if system_settings.enable_product_grade:
-                    calculate_grade(self.test.engagement.product)
+                from dojo.utils import perform_product_grading  # noqa: PLC0415 circular import
+                perform_product_grading(self.test.engagement.product)
 
     # only used by bulk risk acceptance api
     @classmethod
@@ -4713,7 +4712,6 @@ def __str__(self):
 
 
 from dojo.utils import (  # noqa: E402  # there is issue due to a circular import
-    calculate_grade,
     parse_cvss_data,
     to_str_typed,
 )

dojo/utils.py

@@ -1619,6 +1619,12 @@ def calculate_grade_internal(product, *args, **kwargs):
             logger.debug("Product %s grade %i is up to date", product.id, prod_numeric_grade)
 
 
+def perform_product_grading(product):
+    system_settings = System_Settings.objects.get()
+    if system_settings.enable_product_grade:
+        calculate_grade(product)
+
+
 def get_celery_worker_status():
     from .tasks import celery_status  # noqa: PLC0415 circular import
     res = celery_status.apply_async()