From 32d8da213137fc6f050a824e185e9cd717f60465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20Poyatos?=
 <victor@prowler.com>
Date: Tue, 3 Dec 2024 14:59:49 +0100
Subject: [PATCH] fix(api): cascade deletion and next scan at time (#5999)

---
 api/src/backend/tasks/beat.py          | 4 ++++
 api/src/backend/tasks/jobs/deletion.py | 7 ++++++-
 api/src/backend/tasks/tasks.py         | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/api/src/backend/tasks/beat.py b/api/src/backend/tasks/beat.py
index d3446bf85a..81dc04abba 100644
--- a/api/src/backend/tasks/beat.py
+++ b/api/src/backend/tasks/beat.py
@@ -1,4 +1,5 @@
 import json
+from datetime import datetime, timedelta, timezone
 
 from django_celery_beat.models import IntervalSchedule, PeriodicTask
 from rest_framework_json_api.serializers import ValidationError
@@ -28,6 +29,9 @@ def schedule_provider_scan(provider_instance: Provider):
             }
         ),
         one_off=False,
+        defaults={
+            "start_time": datetime.now(timezone.utc) + timedelta(hours=24),
+        },
     )
     if not created:
         raise ValidationError(
diff --git a/api/src/backend/tasks/jobs/deletion.py b/api/src/backend/tasks/jobs/deletion.py
index 1d730d22d8..126b8f3693 100644
--- a/api/src/backend/tasks/jobs/deletion.py
+++ b/api/src/backend/tasks/jobs/deletion.py
@@ -2,7 +2,7 @@ from celery.utils.log import get_task_logger
 from django.db import transaction
 
 from api.db_utils import batch_delete
-from api.models import Finding, Provider, Resource, Scan
+from api.models import Finding, Provider, Resource, Scan, ScanSummary
 
 logger = get_task_logger(__name__)
 
@@ -25,6 +25,11 @@ def delete_provider(pk: str):
     deletion_summary = {}
 
     with transaction.atomic():
+        # Delete Scan Summaries
+        scan_summaries_qs = ScanSummary.all_objects.filter(scan__provider=instance)
+        _, scans_summ_summary = batch_delete(scan_summaries_qs)
+        deletion_summary.update(scans_summ_summary)
+
         # Delete Findings
         findings_qs = Finding.all_objects.filter(scan__provider=instance)
         _, findings_summary = batch_delete(findings_qs)
diff --git a/api/src/backend/tasks/tasks.py b/api/src/backend/tasks/tasks.py
index 4c1ec9cd9b..54c98c51e1 100644
--- a/api/src/backend/tasks/tasks.py
+++ b/api/src/backend/tasks/tasks.py
@@ -105,7 +105,7 @@ def perform_scheduled_scan_task(self, tenant_id: str, provider_id: str):
             name=f"scan-perform-scheduled-{provider_id}"
         )
         next_scan_date = datetime.combine(
-            datetime.now(timezone.utc), periodic_task_instance.date_changed.time()
+            datetime.now(timezone.utc), periodic_task_instance.start_time.time()
         ) + timedelta(hours=24)
 
         scan_instance = Scan.objects.create(