Fix #1176 : deduplication: remove date from the comparison as GUI imported scans have a different date than scan imported by APIv1

Author: ptrovatelli

dojo/utils.py

@@ -90,33 +90,39 @@ def sync_dedupe(new_finding, *args, **kwargs):
             test__engagement=new_finding.test.engagement,
             cwe=new_finding.cwe,
             static_finding=new_finding.static_finding,
-            dynamic_finding=new_finding.dynamic_finding,
-            date__lte=new_finding.date).exclude(id=new_finding.id).exclude(
-            cwe=0).exclude(duplicate=True)
+            dynamic_finding=new_finding.dynamic_finding
+                                                  ).exclude(id=new_finding.id
+                                                            ).exclude(cwe=0
+                                                                      ).exclude(duplicate=True)
         eng_findings_title = Finding.objects.filter(
             test__engagement=new_finding.test.engagement,
             title=new_finding.title,
             static_finding=new_finding.static_finding,
-            dynamic_finding=new_finding.dynamic_finding,
-            date__lte=new_finding.date).exclude(id=new_finding.id).exclude(
-            duplicate=True)
+            dynamic_finding=new_finding.dynamic_finding
+                                                   ).exclude(id=new_finding.id
+                                                             ).exclude(duplicate=True)
     else:
         eng_findings_cwe = Finding.objects.filter(
             test__engagement__product=new_finding.test.engagement.product,
             cwe=new_finding.cwe,
             static_finding=new_finding.static_finding,
-            dynamic_finding=new_finding.dynamic_finding,
-            date__lte=new_finding.date).exclude(id=new_finding.id).exclude(
-            cwe=0).exclude(duplicate=True)
+            dynamic_finding=new_finding.dynamic_finding
+                                                  ).exclude(id=new_finding.id
+                                                            ).exclude(cwe=0
+                                                                      ).exclude(duplicate=True)
         eng_findings_title = Finding.objects.filter(
             test__engagement__product=new_finding.test.engagement.product,
             title=new_finding.title,
             static_finding=new_finding.static_finding,
-            dynamic_finding=new_finding.dynamic_finding,
-            date__lte=new_finding.date).exclude(id=new_finding.id).exclude(
-            duplicate=True)
+            dynamic_finding=new_finding.dynamic_finding
+                                                    ).exclude(id=new_finding.id
+                                                              ).exclude(duplicate=True)
 
     total_findings = eng_findings_cwe | eng_findings_title
+    deduplicationLogger.debug("Found " +
+        str(len(eng_findings_cwe)) + " findings with same cwe, " +
+        str(len(eng_findings_title)) + " findings with same title: " +
+        str(len(total_findings)) + " findings with either same title or same cwe")
     # total_findings = total_findings.order_by('date')
 
     for find in total_findings: