include vuln_id_from_tool in group_by (#12744)

Author: LeoOMaia

dojo/finding/helper.py

@@ -255,6 +255,9 @@ def get_group_by_group_name(finding, finding_group_by_option):
             group_name = f"Filepath {finding.file_path}"
     elif finding_group_by_option == "finding_title":
         group_name = finding.title
+    elif finding_group_by_option == "vuln_id_from_tool":
+        if finding.vuln_id_from_tool:
+            group_name = f"Vulnerability ID {finding.vuln_id_from_tool}" if finding.vuln_id_from_tool else "None"
     else:
         msg = f"Invalid group_by option {finding_group_by_option}"
         raise ValueError(msg)

dojo/models.py

@@ -3449,7 +3449,8 @@ class Finding_Group(TimeStampedModel):
     GROUP_BY_OPTIONS = [("component_name", "Component Name"),
                         ("component_name+component_version", "Component Name + Version"),
                         ("file_path", "File path"),
-                        ("finding_title", "Finding Title")]
+                        ("finding_title", "Finding Title"),
+                        ("vuln_id_from_tool", "Vulnerability ID from Tool")]
 
     name = models.CharField(max_length=255, blank=False, null=False)
     test = models.ForeignKey(Test, on_delete=models.CASCADE)