SLA Calculations 2/2: Simplify logic (#11924)

* sla calc: add unit tests

* sla calc: add unit tests

* sla calc: add unit tests

* linting

* sla: simplify

* sla config: cleanup

* Update unittests/test_sla_calculations.py

Co-authored-by: Blake Owens <76979297+blakeaowens@users.noreply.github.com>

* Update unittests/test_sla_calculations.py

Co-authored-by: Blake Owens <76979297+blakeaowens@users.noreply.github.com>

* Update unittests/test_sla_calculations.py

Co-authored-by: Blake Owens <76979297+blakeaowens@users.noreply.github.com>

* Update unittests/test_sla_calculations.py

Co-authored-by: Blake Owens <76979297+blakeaowens@users.noreply.github.com>

---------

Co-authored-by: Blake Owens <76979297+blakeaowens@users.noreply.github.com>

Author: valentijnscholten

dojo/models.py

@@ -3053,22 +3053,11 @@ def set_sla_expiration_date(self):
         if not system_settings.enable_finding_sla:
             return
 
-        days_remaining = None
         sla_period, enforce_period = self.get_sla_period()
         if sla_period is not None and enforce_period:
-            days_remaining = sla_period - self.sla_age
+            self.sla_expiration_date = self.get_sla_start_date() + relativedelta(days=sla_period)
         else:
-            self.sla_expiration_date = Finding().sla_expiration_date
-            return
-
-        if days_remaining:
-            if self.mitigated:
-                mitigated_date = self.mitigated
-                if isinstance(mitigated_date, datetime):
-                    mitigated_date = self.mitigated.date()
-                self.sla_expiration_date = mitigated_date + relativedelta(days=days_remaining)
-            else:
-                self.sla_expiration_date = get_current_date() + relativedelta(days=days_remaining)
+            self.sla_expiration_date = None
 
     def sla_days_remaining(self):
         if self.sla_expiration_date:

dojo/templatetags/display_tags.py

@@ -261,33 +261,33 @@ def finding_sla(finding):
     if not get_system_setting("enable_finding_sla"):
         return ""
 
-    sla_age, enforce_sla = finding.get_sla_period()
+    sla_period, enforce_sla = finding.get_sla_period()
     if not enforce_sla:
         return ""
 
     title = ""
     severity = finding.severity
-    find_sla = finding.sla_days_remaining()
+    days_remaining = finding.sla_days_remaining()
     if finding.mitigated:
         status = "blue"
-        status_text = "Remediated within SLA for " + severity.lower() + " findings (" + str(sla_age) + " days since " + finding.get_sla_start_date().strftime("%b %d, %Y") + ")"
-        if find_sla and find_sla < 0:
+        status_text = "Remediated within SLA for " + severity.lower() + " findings (" + str(sla_period) + " days since " + finding.get_sla_start_date().strftime("%b %d, %Y") + ")"
+        if days_remaining and days_remaining < 0:
             status = "orange"
-            find_sla = abs(find_sla)
+            days_remaining = abs(days_remaining)
             status_text = "Out of SLA: Remediated " + str(
-                find_sla) + " days past SLA for " + severity.lower() + " findings (" + str(sla_age) + " days since " + finding.get_sla_start_date().strftime("%b %d, %Y") + ")"
+                days_remaining) + " days past SLA for " + severity.lower() + " findings (" + str(sla_period) + " days since " + finding.get_sla_start_date().strftime("%b %d, %Y") + ")"
     else:
         status = "green"
-        status_text = "Remediation for " + severity.lower() + " findings in " + str(sla_age) + " days or less since " + finding.get_sla_start_date().strftime("%b %d, %Y")
-        if find_sla and find_sla < 0:
+        status_text = "Remediation for " + severity.lower() + " findings in " + str(sla_period) + " days or less since " + finding.get_sla_start_date().strftime("%b %d, %Y")
+        if days_remaining and days_remaining < 0:
             status = "red"
             status_text = "Overdue: Remediation for " + severity.lower() + " findings in " + str(
-                sla_age) + " days or less since " + finding.get_sla_start_date().strftime("%b %d, %Y")
+                sla_period) + " days or less since " + finding.get_sla_start_date().strftime("%b %d, %Y")
 
-    if find_sla is not None:
+    if days_remaining is not None:
         title = (
             f'<a class="has-popover" data-toggle="tooltip" data-placement="bottom" title="" href="#" data-content="{status_text}">'
-            f'<span class="label severity age-{status}">{find_sla}</span></a>'
+            f'<span class="label severity age-{status}">{days_remaining}</span></a>'
         )
 
     return mark_safe(title)

unittests/test_sla_calculations.py

@@ -45,7 +45,7 @@ def test_new_finding(self):
         self.assertEqual((self.now + relativedelta(days=self.sla_config.high)).date(), finding.sla_expiration_date)
         self.assertEqual(self.sla_config.high, finding.sla_days_remaining())
 
-    # Finding within SLA should have correct sla_exration_date and days_remaining
+    # Finding within SLA should have correct sla_expiration_date and days_remaining
     def test_active_within_sla(self):
         finding = Finding(test=Test.objects.get(id=89), title="Test Finding", severity="High")
         finding.save()
@@ -58,7 +58,7 @@ def test_active_within_sla(self):
             self.assertEqual((self.now + relativedelta(days=self.sla_config.high)).date(), finding.sla_expiration_date)
             self.assertEqual(self.sla_config.high - 10, finding.sla_days_remaining())
 
-    # Finding outside SLA should have correct sla_exration_date and days_remaining
+    # Finding outside SLA should have correct sla_expiration_date and days_remaining
     def test_active_outside_sla(self):
         finding = Finding(test=Test.objects.get(id=89), title="Test Finding", severity="High")
         finding.save()
@@ -71,7 +71,7 @@ def test_active_outside_sla(self):
             self.assertEqual((self.now + relativedelta(days=self.sla_config.high)).date(), finding.sla_expiration_date)
             self.assertEqual(self.sla_config.high - 50, finding.sla_days_remaining())
 
-    # Finding mitigated inside SLA should have correct sla_exration_date and days_remaining
+    # Finding mitigated inside SLA should have correct sla_expiration_date and days_remaining
     def test_mitigated_inside_sla(self):
         finding = Finding(test=Test.objects.get(id=89), title="Test Finding", severity="High")
         finding.save()
@@ -111,7 +111,7 @@ def test_mitigated_inside_sla(self):
             self.assertTrue("within SLA" in finding_sla(finding))
             self.assertTrue(">20<" in finding_sla(finding))
 
-    # Finding mitigated outside SLA should have correct sla_exration_date and days_remaining
+    # Finding mitigated outside SLA should have correct sla_expiration_date and days_remaining
     def test_mitigated_outside_sla(self):
         finding = Finding(test=Test.objects.get(id=89), title="Test Finding", severity="High")
         finding.save()