[BUGFIX] Fix deleting projects without farm #659

Author: vincent-olivert-riera

promgen/management/commands/register-host.py

@@ -18,7 +18,7 @@ def add_arguments(self, parser):
         parser.add_argument("host", help=help_text("name"))
 
     def handle(self, project, **kwargs):
-        if getattr(project, "farm", None) is None:
+        if not hasattr(project, "farm"):
             raise CommandError("Project currently not associated with a farm :%s" % project)
 
         host, created = project.farm.host_set.get_or_create(name=kwargs["host"])

promgen/prometheus.py

@@ -107,7 +107,7 @@ def render_config(service=None, project=None):
         "project__shard",
         "project",
     ):
-        if getattr(exporter.project, "farm", None) is None:
+        if not hasattr(exporter.project, "farm"):
             continue
         if service and exporter.project.service.name != service.name:
             continue

promgen/signals.py

@@ -224,28 +224,22 @@ def delete_farm(sender, instance, **kwargs):
 @skip_raw
 def save_exporter(sender, instance, **kwargs):
     """Only trigger write if parent project also has hosts"""
-    if (
-        getattr(instance.project, "farm", None) is not None
-        and instance.project.farm.host_set.exists()
-    ):
+    if hasattr(instance.project, "farm") and instance.project.farm.host_set.exists():
         trigger_write_config.send(instance)
 
 
 @receiver(pre_delete, sender=models.Exporter)
 def delete_exporter(sender, instance, **kwargs):
     """Only trigger write if parent project also has hosts"""
-    if (
-        getattr(instance.project, "farm", None) is not None
-        and instance.project.farm.host_set.exists()
-    ):
+    if hasattr(instance.project, "farm") and instance.project.farm.host_set.exists():
         trigger_write_config.send(instance)
 
 
 @receiver(post_save, sender=models.Project)
 @skip_raw
 def save_project(instance, **kwargs):
     if (
-        getattr(instance, "farm", None) is not None
+        hasattr(instance, "farm")
         and instance.farm.host_set.exists()
         and instance.exporter_set.exists()
     ):
@@ -255,7 +249,11 @@ def save_project(instance, **kwargs):
 
 @receiver(pre_delete, sender=models.Project)
 def delete_project(sender, instance, **kwargs):
-    if instance.farm and instance.farm.host_set.exists() and instance.exporter_set.exists():
+    if (
+        hasattr(instance, "farm")
+        and instance.farm.host_set.exists()
+        and instance.exporter_set.exists()
+    ):
         trigger_write_config.send(instance)
 
 

promgen/tests/test_web.py

@@ -2,7 +2,7 @@
 # These sources are released under the terms of the MIT license: see LICENSE
 from django.urls import reverse
 
-from promgen import tests, views
+from promgen import models, tests, views
 
 
 class WebTests(tests.PromgenTest):
@@ -48,3 +48,23 @@ def test_routes(self):
             with self.subTest(viewname=viewname, params=params):
                 response = self.client.get(reverse(viewname, kwargs=params))
                 self.assertRoute(response, viewclass, status_code)
+
+    def test_delete_project_without_farm(self):
+        # Create a project without associating it with a farm
+        shard = models.Shard.objects.get(pk=1)
+        service = models.Service.objects.get(pk=1)
+        project = models.Project.objects.create(
+            name="test delete project",
+            owner=self.user,
+            service=service,
+            shard=shard,
+        )
+
+        self.assertFalse(hasattr(project, "farm"))
+
+        # Attempt to delete the project
+        response = self.client.post(reverse("project-delete", kwargs={"pk": project.pk}))
+
+        # Assert the project is deleted successfully
+        self.assertEqual(response.status_code, 302)
+        self.assertFalse(models.Project.objects.filter(pk=project.pk).exists())