finding/test delete grading only if enabled

Author: valentijnscholten

dojo/finding/helper.py

@@ -477,7 +477,6 @@ def finding_post_delete(sender, instance, **kwargs):
     # Catch instances in async delete where a single object is deleted more than once
     with suppress(Finding.DoesNotExist):
         logger.debug("finding post_delete, sender: %s instance: %s", to_str_typed(sender), to_str_typed(instance))
-        # calculate_grade(instance.test.engagement.product)
 
 
 def reset_duplicate_before_delete(dupe):

dojo/models.py

@@ -2260,7 +2260,9 @@ def delete(self, *args, **kwargs):
         with suppress(Test.DoesNotExist, Engagement.DoesNotExist, Product.DoesNotExist):
             # Suppressing a potential issue created from async delete removing
             # related objects in a separate task
-            calculate_grade(self.engagement.product)
+            system_settings = System_Settings.objects.get()
+            if system_settings.enable_product_grade:
+                calculate_grade(self.engagement.product)
 
     @property
     def statistics(self):
@@ -2869,7 +2871,9 @@ def delete(self, *args, **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
-            calculate_grade(self.test.engagement.product)
+            system_settings = System_Settings.objects.get()
+            if system_settings.enable_product_grade:
+                calculate_grade(self.test.engagement.product)
 
     # only used by bulk risk acceptance api
     @classmethod