Add a way to track organizer issues

core/admin/__init__.py

@@ -5,12 +5,15 @@
 from core.admin.event_page_content import EventPageContentAdmin
 from core.admin.event_page_menu import EventPageMenuAdmin
 from core.admin.flat_page import MyFlatPageAdmin
+from core.admin.organizerissue import OrganizerIssueAdmin
 from core.admin.user import UserAdmin
 from core.models import Event, EventPageContent, EventPageMenu, User
+from core.models.organizerissue import OrganizerIssue
 
 admin.site.unregister(FlatPage)
 admin.site.register(FlatPage, MyFlatPageAdmin)
 admin.site.register(Event, EventAdmin)
 admin.site.register(EventPageContent, EventPageContentAdmin)
 admin.site.register(EventPageMenu, EventPageMenuAdmin)
 admin.site.register(User, UserAdmin)
+admin.site.register(OrganizerIssue, OrganizerIssueAdmin)

core/admin/forms/organizer.py → core/admin/forms/organizerissue.py

@@ -1,7 +1,8 @@
 from django import forms
-from models.event import Event
-from models.organizer import OrganizerIssue
-from models.user import User
+
+from core.models.event import Event
+from core.models.organizerissue import OrganizerIssue
+from core.models.user import User
 
 
 class OrganizerIssueForm(forms.ModelForm):
@@ -21,5 +22,4 @@ class Meta:
             "issue_handled_by",
             "findings",
             "comments",
-            "last_updated",
         )

core/admin/organizerissue.py

@@ -0,0 +1,68 @@
+from django.contrib import admin, messages
+from django.shortcuts import get_object_or_404, redirect
+from django.urls import path
+from django.utils.translation import gettext_lazy as _
+
+from core.models.organizerissue import OrganizerIssue
+
+from .forms.organizerissue import OrganizerIssueForm
+
+
+class OrganizerIssueAdmin(admin.ModelAdmin):
+    form = OrganizerIssueForm
+    list_display = (
+        "organizer",
+        "event",
+        "date_reported",
+        "reported_by",
+        "issue_handled",
+        "issue_handled_by",
+        "last_updated",
+    )
+    list_filter = (
+        "organizer",
+        "event",
+        "reported_by",
+    )
+    search_fields = (
+        "organizer",
+        "event",
+        "reported_by",
+    )
+
+    def get_urls(self):
+        urls = super().get_urls()
+
+        my_urls = [
+            path(
+                "<int:organizerissue_id>/triage/blacklist/",
+                self.admin_site.admin_view(self.blacklist),
+                name="core_organizerissue_blacklist",
+            ),
+            path(
+                "<int:organizerissue_id>/triage/reverse_blacklist/",
+                self.admin_site.admin_view(self.reverse_blacklist),
+                name="core_organizerissue_reverse_blacklist",
+            ),
+        ]
+        return my_urls + urls
+
+    def blacklist(self, request, organizerissue_id):
+        organizer = get_object_or_404(OrganizerIssue, id=organizerissue_id)
+        organizer.blacklist_organizer()
+        messages.success(
+            request,
+            _("Organizer %(organizer)s, of %(event)s has been blacklisted.")
+            % {"organizer": f"{organizer.organizer.get_full_name()}", "event": organizer.event},
+        )
+        return redirect("admin:core_organizerissue_changelist")
+
+    def reverse_blacklist(self, request, organizerissue_id):
+        organizer = get_object_or_404(OrganizerIssue, id=organizerissue_id)
+        organizer.reverse_blacklist_organizer()
+        messages.success(
+            request,
+            _("Blacklisting for organizer %(organizer)s, of %(event)s has been reversed.")
+            % {"organizer": f"{organizer.organizer.get_full_name()}", "event": organizer.event},
+        )
+        return redirect("admin:core_organizerissue_changelist")

core/migrations/0006_auto_20240130_1644.py

@@ -0,0 +1,69 @@
+# Generated by Django 3.2.20 on 2024-01-30 16:44
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+import django.db.models.manager
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("core", "0005_auto_20220422_1321"),
+    ]
+
+    operations = [
+        migrations.AlterModelManagers(
+            name="event",
+            managers=[
+                ("all_objects", django.db.models.manager.Manager()),
+            ],
+        ),
+        migrations.AddField(
+            model_name="user",
+            name="is_blacklisted",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.CreateModel(
+            name="OrganizerIssue",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("created_at", models.DateTimeField(auto_now_add=True)),
+                ("date_reported", models.DateField()),
+                ("reported_by", models.CharField(max_length=100)),
+                ("reporter_email", models.EmailField(max_length=100)),
+                ("issue", models.TextField()),
+                ("issue_handled", models.BooleanField()),
+                ("findings", models.TextField(blank=True, null=True)),
+                ("comments", models.TextField(blank=True, null=True)),
+                ("last_updated", models.DateTimeField(auto_now=True)),
+                (
+                    "event",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="event",
+                        to="core.event",
+                    ),
+                ),
+                (
+                    "issue_handled_by",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        related_name="staff_responsible",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+                (
+                    "organizer",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="oganizer",
+                        to=settings.AUTH_USER_MODEL,
+                    ),
+                ),
+            ],
+        ),
+    ]

core/models.py

@@ -1,28 +0,0 @@
-from django.db import models
-from models.event import Event
-from models.user import User
-
-
-class OrganizerIssue(models.Model):
-    created_at = models.DateTimeField(auto_now_add=True)
-    organizer = models.ForeignKey(User, related_name="oganizer", on_delete=models.deletion.CASCADE)
-    event = models.ForeignKey(to=Event, null=True, blank=True, related_name="event", on_delete=models.deletion.SET_NULL)
-    date_reported = models.DateField()
-    reported_by = models.CharField(max_length=100)
-    reporter_email = models.EmailField(max_length=100)
-    issue = models.TextField()
-    issue_handled = models.BooleanField()
-    issue_handled_by = models.ForeignKey(
-        to=User, null=True, blank=True, related_name="staff_responsible", on_delete=models.deletion.SET_NULL
-    )
-    findings = models.TextChoices(blank=True, null=True)
-    comments = models.TextField(blank=True, null=True)
-    last_updated = models.DateTimeField(auto_now=True)
-
-    def __str__(self):
-        return f"{self.organizer.get_full_name()} - {self.event}"
-
-    def blacklist_organizer(self):
-        user = User.objects.get(id=self.organizer)
-        user.is_blacklisted = True
-        user.save()

core/models/managers/organizer.py

@@ -0,0 +1,5 @@
+from django.db import models
+
+
+class OrganizerManager(models.Manager):
+    pass

core/models/organizer.py → core/models/organizerissue.py

@@ -1,7 +1,7 @@
 from django.db import models
 
-from .event import Event
-from .user import User
+from core.models.event import Event
+from core.models.user import User
 
 
 class OrganizerIssue(models.Model):
@@ -16,14 +16,19 @@ class OrganizerIssue(models.Model):
     issue_handled_by = models.ForeignKey(
         to=User, null=True, blank=True, related_name="staff_responsible", on_delete=models.deletion.SET_NULL
     )
-    findings = models.TextChoices(blank=True, null=True)
+    findings = models.TextField(blank=True, null=True)
     comments = models.TextField(blank=True, null=True)
     last_updated = models.DateTimeField(auto_now=True)
 
     def __str__(self):
         return f"{self.organizer.get_full_name()} - {self.event}"
 
     def blacklist_organizer(self):
-        user = User.objects.get(id=self.organizer)
+        user = User.objects.get(id=self.organizer.id)
         user.is_blacklisted = True
         user.save()
+
+    def reverse_blacklist_organizer(self):
+        user = User.objects.get(id=self.organizer.id)
+        user.is_blacklisted = False
+        user.save()

core/models/user.py

@@ -42,9 +42,11 @@ def add_to_organizers_group(self):
         self.groups.add(group)
 
     def __str__(self):
+        status = "- (Organizer is Blacklisted)" if self.is_blacklisted else ""
+
         if not self.first_name and not self.last_name:
-            return f"{self.email}"
-        return f"{self.get_full_name()} ({self.email})"
+            return f"{self.email} {status}"
+        return f"{self.get_full_name()} ({self.email}) {status}"
 
     def get_short_name(self):
         return self.first_name

organize/admin.py

@@ -50,6 +50,7 @@ class EventApplicationAdmin(admin.ModelAdmin):
         "status",
         "created_at",
         "status_changed_at",
+        "organizer_blacklisted",
         "about_you",
         "why",
         "involvement",
@@ -126,7 +127,12 @@ class EventApplicationAdmin(admin.ModelAdmin):
         (
             _("Main organizer"),
             {
-                "fields": ["main_organizer_email", "main_organizer_first_name", "main_organizer_last_name"],
+                "fields": [
+                    "main_organizer_email",
+                    "main_organizer_first_name",
+                    "main_organizer_last_name",
+                    "organizer_blacklisted",
+                ],
                 "classes": (
                     "suit-tab",
                     "suit-tab-organizers",