Revert undesired changes

dojo/endpoint/views.py

@@ -49,9 +49,9 @@ def process_endpoints_view(request, host_view=False, vulnerable=False):
     else:
         endpoints = Endpoint.objects.all()
 
-    endpoints = endpoints.prefetch_related("product", "product__tags", "tags").distinct()
+    endpoints = endpoints.prefetch_related("product", "product__tags", "tags", "findings").distinct()
     endpoints = get_authorized_endpoints(Permissions.Endpoint_View, endpoints, request.user)
-    endpoints = endpoints.annotate(active_finding_count=Count("findings", filter=Q(findings__active=True)))
+    endpoints = endpoints.annotate(findings_count=Count("findings", filter=Q(findings__active=True)))
 
     filter_string_matching = get_system_setting("filter_string_matching", False)
     filter_class = EndpointFilterWithoutObjectLookups if filter_string_matching else EndpointFilter

dojo/filters.py

@@ -2393,10 +2393,10 @@ class EndpointFilterHelper(FilterSet):
         fields=(
             ("product", "product"),
             ("host", "host"),
-            ("av_findings_count", "av_findings_count"),
+            ("findings_count", "findings_count"),
         ),
         field_labels={
-            "av_findings_count": "Findings Count ",
+            "findings_count": "Findings Count ",
         }
     )
 

dojo/models.py

@@ -1839,15 +1839,9 @@ def vulnerable(self):
             risk_accepted=False,
         ).count() > 0
 
-    @cached_property
+    @property
     def findings_count(self):
-        try:
-            # if prefetched, it's already there
-            return self.active_finding_count
-        except AttributeError:
-            # ideally it's always prefetched and we can remove this code in the future
-            self.active_finding_count = self.findings.all().count()
-            return self.active_finding_count
+        return self.findings.all().count()
 
     def active_findings(self):
         return self.findings.filter(