fix(admin): cleaned up app admin

Author: Kl0ven

controller/sentry/admin.py

@@ -1,4 +1,5 @@
 """Admin."""
+from datetime import timedelta
 from typing import TYPE_CHECKING, Optional
 
 from admin_action_tools import (
@@ -177,7 +178,7 @@ class AppAdmin(
         "reference",
         "get_event_status",
         "get_project",
-        "last_seen",
+        "get_active_status",
         "default_sample_rate",
         "active_sample_rate",
         "active_window_end",
@@ -258,6 +259,19 @@ def get_event_status(self, obj: App) -> str:
             return format_html(text, "red", "Yes")
         return format_html(text, "gray", "Pending")
 
+    @admin.display(description="Active", boolean=True)
+    def get_active_status(self, obj: App) -> str:
+        """This method return the status of the app based on last_seen.
+
+        Args:
+            obj (App): The app
+
+        Returns:
+            bool: is active
+        """
+        half_hour_mark = timezone.now() - timedelta(minutes=30)
+        return obj.last_seen is not None and obj.last_seen > half_hour_mark
+
     def get_changelist_actions(self, request: "HttpRequest") -> list[str]:
         """This method return allowed changelist actions.
 

controller/sentry/migrations/0014_alter_app_celery_collect_metrics_and_more.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.1.6 on 2023-02-17 16:08
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("sentry", "0013_project_last_event"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="app",
+            name="celery_collect_metrics",
+            field=models.BooleanField(default=False, verbose_name="celery metrics"),
+        ),
+        migrations.AlterField(
+            model_name="app",
+            name="wsgi_collect_metrics",
+            field=models.BooleanField(default=False, verbose_name="wsgi metrics"),
+        ),
+    ]

controller/sentry/models.py

@@ -39,7 +39,7 @@ class Project(models.Model):
 
     def __str__(self) -> str:
         """Return Project string."""
-        return f"Project({self.sentry_id} - {self.sentry_project_slug if self.sentry_project_slug else 'Pending'})"
+        return f"Project({self.sentry_project_slug if self.sentry_project_slug else 'Pending'})"
 
 
 class Event(models.Model):
@@ -78,7 +78,7 @@ class App(models.Model):
         blank=True,
         default=partial(settings_default_value, "DEFAULT_WSGI_IGNORE_PATHS"),
     )
-    wsgi_collect_metrics = models.BooleanField(default=False)
+    wsgi_collect_metrics = models.BooleanField(default=False, verbose_name="wsgi metrics")
     wsgi_metrics = models.JSONField(null=True, blank=True)
 
     # celery
@@ -87,7 +87,7 @@ class App(models.Model):
         blank=True,
         default=partial(settings_default_value, "DEFAULT_CELERY_IGNORE_TASKS"),
     )
-    celery_collect_metrics = models.BooleanField(default=False)
+    celery_collect_metrics = models.BooleanField(default=False, verbose_name="celery metrics")
     celery_metrics = models.JSONField(null=True, blank=True)
 
     def __str__(self) -> str:

controller/sentry/tests/test_admin.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 from unittest.mock import Mock, patch
 
 import pytest
@@ -320,6 +321,21 @@ def test_app_get_event_status(admin_with_user):
     assert site.get_event_status(app) == '<b style="color:red;">Yes</b>'
 
 
+@pytest.mark.django_db
+@pytest.mark.parametrize("user_group", ["Developer"])
+@pytest.mark.admin_site(model_class=App)
+def test_app_get_app_status(admin_with_user):
+    site, request = admin_with_user
+    app = App(reference="abc", last_seen=timezone.now())
+    assert site.get_active_status(app) == True
+
+    app = App(reference="abc", last_seen=None)
+    assert site.get_active_status(app) == False
+
+    app = App(reference="abc", last_seen=timezone.now() - timedelta(minutes=60))
+    assert site.get_active_status(app) == False
+
+
 @pytest.mark.parametrize("user_group", ["Developer"])
 @pytest.mark.admin_site(model_class=Project)
 def test_project_event_inlines(admin_with_user):