Merge branch 'tkt_white_7676_fix_hosts_stats_on_bulk_delete' into 'white/dev'

Resolve "Bulk delete no modifica las estadísticas de assets"

Closes #7676

See merge request faradaysec/faraday!2340

Author: Diego Nadares

CHANGELOG/current/7676.json

@@ -0,0 +1,4 @@
+{
+  "level": "community",
+  "md": "[FIX] Fix hosts stats when bulk delete is applied to vulns. #7676"
+}

faraday/server/api/modules/vulns.py

@@ -1396,39 +1396,6 @@ def bulk_delete(self, workspace_name, **kwargs):
                                          workspace_name=workspace_name, **kwargs), 200
     bulk_delete.__doc__ = BulkDeleteWorkspacedMixin.bulk_delete.__doc__
 
-    def _perform_bulk_delete(self, values, **kwargs):
-        # Get host and service ids in order to update host stats
-        host_ids = db.session.query(
-            VulnerabilityGeneric.host_id,
-            VulnerabilityGeneric.service_id
-        )
-
-        by_severity = kwargs.get('by', None)
-        if by_severity == 'severity':
-            for severity in values:
-                if severity not in VulnerabilityABC.SEVERITIES:
-                    flask.abort(http.client.BAD_REQUEST, "Severity type not valid")
-
-            host_ids = host_ids.filter(
-                            VulnerabilityGeneric.severity.in_(values)
-                        ).all()
-        else:
-            host_ids = host_ids.filter(
-                            VulnerabilityGeneric.id.in_(values)
-                        ).all()
-
-        response = super()._perform_bulk_delete(values, **kwargs)
-        deleted = response.json.get('deleted', 0)
-        if deleted > 0:
-            from faraday.server.tasks import update_host_stats  # pylint:disable=import-outside-toplevel
-            host_id_list = [data[0] for data in host_ids if data[0]]
-            service_id_list = [data[1] for data in host_ids if data[1]]
-            if faraday_server.celery_enabled:
-                update_host_stats.delay(host_id_list, service_id_list)
-            else:
-                update_host_stats(host_id_list, service_id_list)
-        return response
-
     def _bulk_update_query(self, ids, **kwargs):
         # It IS better to as is but warn of ON CASCADE
         query = self.model_class.query.filter(self.model_class.id.in_(ids))
@@ -1510,5 +1477,38 @@ def _post_bulk_update(self, ids, extracted_data, workspace_name, **kwargs):
             else:
                 update_host_stats(host_id_list, service_id_list)
 
+    def _perform_bulk_delete(self, values, **kwargs):
+        # Get host and service ids in order to update host stats
+        host_ids = db.session.query(
+            VulnerabilityGeneric.host_id,
+            VulnerabilityGeneric.service_id
+        )
+
+        by_severity = kwargs.get('by', None)
+        if by_severity == 'severity':
+            for severity in values:
+                if severity not in VulnerabilityABC.SEVERITIES:
+                    flask.abort(http.client.BAD_REQUEST, "Severity type not valid")
+
+            host_ids = host_ids.filter(
+                            VulnerabilityGeneric.severity.in_(values)
+                        ).all()
+        else:
+            host_ids = host_ids.filter(
+                            VulnerabilityGeneric.id.in_(values)
+                        ).all()
+
+        response = super()._perform_bulk_delete(values, **kwargs)
+        deleted = response.json.get('deleted', 0)
+        if deleted > 0:
+            from faraday.server.tasks import update_host_stats  # pylint:disable=import-outside-toplevel
+            host_id_list = [data[0] for data in host_ids if data[0]]
+            service_id_list = [data[1] for data in host_ids if data[1]]
+            if faraday_server.celery_enabled:
+                update_host_stats.delay(host_id_list, service_id_list)
+            else:
+                update_host_stats(host_id_list, service_id_list)
+        return response
+
 
 VulnerabilityView.register(vulns_api)