feat: Address review comments

- Remove comments
- Use django rq
- Use update instead of save

Signed-off-by: Jayanth Kumar <[email protected]>

Author: jayanth-kumar-morem

scanpipe/filters.py

@@ -349,9 +349,7 @@ def __init__(self, data=None, *args, **kwargs):
 
         # Default filtering by "Active" projects.
         if not data or data.get("is_archived", "") == "":
-            self.queryset = self.queryset.filter(
-                is_archived=False, is_marked_for_deletion=False
-            )
+            self.queryset = self.queryset.active()
 
         active_count = Project.objects.filter(
             is_archived=False, is_marked_for_deletion=False

scanpipe/models.py

@@ -489,6 +489,9 @@ def with_counts(self, *fields):
 
         return self.annotate(**annotations)
 
+    def active(self):
+        return self.filter(is_archived=False, is_marked_for_deletion=False)
+
 
 class UUIDTaggedItem(GenericUUIDTaggedItemBase, TaggedItemBase):
     class Meta:
@@ -532,10 +535,10 @@ class Project(UUIDPKModel, ExtraDataFieldMixin, UpdateMixin, models.Model):
     )
     notes = models.TextField(blank=True)
     settings = models.JSONField(default=dict, blank=True)
+    is_marked_for_deletion = models.BooleanField(default=False)
     labels = TaggableManager(through=UUIDTaggedItem)
 
     objects = ProjectQuerySet.as_manager()
-    is_marked_for_deletion = models.BooleanField(default=False)
 
     class Meta:
         ordering = ["-created_date"]
@@ -636,14 +639,12 @@ def delete(self, *args, **kwargs):
         return super().delete(*args, **kwargs)
 
     def mark_for_deletion(self):
-        self.is_marked_for_deletion = True
-        self.save()
+        self.update(is_marked_for_deletion=True)
 
     def delete_in_background(self):
         # Mark the project for deletion and enqueue background deletion task
         self.mark_for_deletion()
-        q = Queue("default", connection=redis.Redis())
-        job = q.enqueue(tasks.background_delete_task, self)
+        django_rq.enqueue(tasks.background_delete_task, self)
 
     def reset(self, keep_input=True):
         """

scanpipe/tasks.py

@@ -86,11 +86,9 @@ def background_delete_task(project):
     if not project.is_marked_for_deletion:
         return
 
-    # Perform the deletion process
     try:
         project.delete()
     except Exception as e:
-        # Handle errors and update project errors or display a banner
-        project.is_marked_for_deletion = False
-        project.save()
+        info(f"Deletion failed: {str(e)}", project.pk)
+        project.update(is_marked_for_deletion=True)
         project.add_error(description=f"Deletion failed: {str(e)}")

scanpipe/tests/test_views.py

@@ -183,9 +183,9 @@ def test_scanpipe_views_project_actions_view(self):
         }
         response = self.client.post(url, data=data, follow=True)
         self.assertRedirects(response, reverse("project_list"))
-        expected = '<div class="message-body">1 project is being deleted in the background.</div>'
+        expected = '<div class="message-body">1 projects have been delete.</div>'
         self.assertContains(response, expected, html=True)
-        expected = f"1 project is being deleted in the background."
+        expected = f"1 projects have been delete."
         self.assertContains(response, expected, html=True)
 
     def test_scanpipe_views_project_details_is_archived(self):

scanpipe/views.py

@@ -1089,8 +1089,6 @@ def perform_action(self, action, project_uuid, action_kwargs=None):
             raise Http404
 
     def get_success_message(self, action, count):
-        if action == "delete":
-            return f"{count} project{'s' if count != 1 else ''} {'is' if count == 1 else 'are'} being deleted in the background."
         return f"{count} projects have been {action}."