Migrate from left_untouched to untouched

Author: Maffooch

docs/content/en/open_source/upgrading/2.46.md

@@ -9,7 +9,7 @@ description: Import Payload Changes
 
 Following a successful import or reimport, a JSON blob for `statistics` is generated to provide the differential of finding activity.
 There was a section in the `delta` JSON blob that referred to a key labeled `left untouched`. This value does not comply with REST
-norms, and has been renamed to `left_untouched`. Here is a before and after to make it clear:
+norms, and has been renamed to `untouched`. Here is a before and after to make it clear:
 
 Before:
 
@@ -32,7 +32,7 @@ After:
         "created": {},
         "closed": {},
         "reactivated": {},
-        "left_untouched": {}
+        "untouched": {}
         },
         "after": {}
     }

dojo/db_migrations/0226_import_history_left_untouched_rename.py

@@ -3,25 +3,25 @@
 from django.db import migrations, models
 
 
-original_left_untouched_value = "left untouched"
-updated_left_untouched_value = "left_untouched"
+original_untouched_value = "left untouched"
+updated_untouched_value = "untouched"
 
 
 def convert_space_to_underscore(apps, schema_editor):
     test_import_finding_action = apps.get_model("dojo", "Test_Import_Finding_Action")
     for test_import_action in test_import_finding_action.objects.filter(
-        action=original_left_untouched_value
+        action=original_untouched_value
     ):
-        test_import_action.action = updated_left_untouched_value
+        test_import_action.action = updated_untouched_value
         test_import_action.save()
 
 
 def convert_underscore_to_space(apps, schema_editor):
     test_import_finding_action = apps.get_model("dojo", "Test_Import_Finding_Action")
     for test_import_action in test_import_finding_action.objects.filter(
-        action=updated_left_untouched_value
+        action=updated_untouched_value
     ):
-        test_import_action.action = original_left_untouched_value
+        test_import_action.action = original_untouched_value
         test_import_action.save()
 
 
@@ -34,7 +34,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='test_import_finding_action',
             name='action',
-            field=models.CharField(blank=True, choices=[('N', 'created'), ('C', 'closed'), ('R', 'reactivated'), ('U', 'left_untouched')], max_length=100, null=True),
+            field=models.CharField(blank=True, choices=[('N', 'created'), ('C', 'closed'), ('R', 'reactivated'), ('U', 'untouched')], max_length=100, null=True),
         ),
         migrations.RunPython(
             convert_space_to_underscore, reverse_code=convert_underscore_to_space

dojo/models.py

@@ -67,7 +67,7 @@
     (IMPORT_CREATED_FINDING, "created"),
     (IMPORT_CLOSED_FINDING, "closed"),
     (IMPORT_REACTIVATED_FINDING, "reactivated"),
-    (IMPORT_UNTOUCHED_FINDING, "left_untouched"),
+    (IMPORT_UNTOUCHED_FINDING, "untouched"),
 ]
 
 

dojo/templates/dojo/view_test.html

@@ -275,7 +275,7 @@ <h4 class="has-filters">
                                         {% regroup test_import.test_import_finding_action_set.all by get_action_display as finding_action_list %}
                                         <a href="{% url 'engagement_all_findings' test.engagement.id %}?test={{ test.id }}&test_import_finding_action__test_import={{ test_import.id }}">
                                             {% for action in finding_action_list %}
-                                                {{ action.list|length }} {{ action.grouper|replace_underscore_with_space }}
+                                                {{ action.list|length }} {{ action.grouper }}
                                                 {% if not forloop.last %},{% endif %}
                                             {% empty %}
                                                 There were no findings created, closed, or modified

dojo/templatetags/display_tags.py

@@ -173,11 +173,6 @@ def remove_string(string, value):
     return string.replace(value, "")
 
 
-@register.filter
-def replace_underscore_with_space(string):
-    return string.replace("_", " ")
-
-
 @register.filter
 def percentage(fraction, value):
     return_value = ""

unittests/test_import_reimport.py

@@ -1554,7 +1554,7 @@ def test_import_0_reimport_1_active_verified_reimport_0_active_verified_statisti
                     "low": {"active": 1, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 1, "verified": 0},
                     "medium": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "total": {"active": 1, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 1, "verified": 0}},
-                "left_untouched": {
+                "untouched": {
                     "critical": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "high": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "info": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
@@ -1604,7 +1604,7 @@ def test_import_0_reimport_1_active_verified_reimport_0_active_verified_statisti
                     "low": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "medium": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "total": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0}},
-                "left_untouched": {
+                "untouched": {
                     "critical": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "high": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},
                     "info": {"active": 0, "duplicate": 0, "false_p": 0, "is_mitigated": 0, "out_of_scope": 0, "risk_accepted": 0, "total": 0, "verified": 0},