Apply suggestions

Author: ahmedxgouda

backend/apps/owasp/migrations/0051_remove_event_event_type_idx_remove_event_channel_id_and_more.py

@@ -0,0 +1,54 @@
+# Generated by Django 5.2.4 on 2025-08-28 16:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0050_alter_event_status_event_event_type_idx"),
+    ]
+
+    operations = [
+        migrations.RemoveIndex(
+            model_name="event",
+            name="event_type_idx",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="channel_id",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="member",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="type",
+        ),
+        migrations.AlterField(
+            model_name="event",
+            name="category",
+            field=models.CharField(
+                choices=[
+                    ("appsec_days", "AppSec Days"),
+                    ("global", "Global"),
+                    ("other", "Other"),
+                    ("partner", "Partner"),
+                    ("community", "Community"),
+                ],
+                default="other",
+                max_length=11,
+                verbose_name="Category",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="event",
+            name="status",
+            field=models.CharField(
+                choices=[("confirmed", "Confirmed")],
+                default="confirmed",
+                max_length=11,
+                verbose_name="Status",
+            ),
+        ),
+    ]

backend/apps/owasp/models/event.py

@@ -29,7 +29,6 @@ class Meta:
         db_table = "owasp_events"
         indexes = [
             models.Index(fields=["-start_date"], name="event_start_date_desc_idx"),
-            models.Index(fields=["type"], name="event_type_idx"),
         ]
         verbose_name_plural = "Events"
 
@@ -40,37 +39,23 @@ class Category(models.TextChoices):
         GLOBAL = "global", "Global"
         OTHER = "other", "Other"
         PARTNER = "partner", "Partner"
-
-    class Type(models.TextChoices):
-        """Event type."""
-
-        CALENDAR = "calendar", "Calendar"
-        EXISTING = "existing", "Existing"
+        COMMUNITY = "community", "Community"
 
     class Status(models.TextChoices):
         """Event status."""
 
         CONFIRMED = "confirmed", "Confirmed"
-        TENTATIVE = "tentative", "Tentative"
-        CANCELLED = "cancelled", "Cancelled"
 
     category = models.CharField(
         verbose_name="Category",
         max_length=11,
         choices=Category.choices,
         default=Category.OTHER,
     )
+    # Google Calendar event entity ID
     calendar_id = models.CharField(
         verbose_name="Calendar ID", max_length=1024, blank=True, default=""
     )
-    channel_id = models.CharField(verbose_name="Channel ID", max_length=15, default="")
-    member = models.ForeignKey(
-        "slack.Member",
-        on_delete=models.CASCADE,
-        related_name="calendar_events",
-        verbose_name="Slack Member",
-        null=True,
-    )
     name = models.CharField(verbose_name="Name", max_length=100)
     start_date = models.DateField(verbose_name="Start Date")
     end_date = models.DateField(verbose_name="End Date", null=True, blank=True)
@@ -86,12 +71,6 @@ class Status(models.TextChoices):
     suggested_location = models.CharField(
         verbose_name="Suggested Location", max_length=255, blank=True, default=""
     )
-    type = models.CharField(
-        verbose_name="Type",
-        max_length=11,
-        choices=Type.choices,
-        default=Type.EXISTING,
-    )
     url = models.URLField(verbose_name="URL", default="", blank=True)
     latitude = models.FloatField(verbose_name="Latitude", null=True, blank=True)
     longitude = models.FloatField(verbose_name="Longitude", null=True, blank=True)
@@ -111,10 +90,10 @@ def upcoming_events():
         return (
             Event.objects.filter(
                 start_date__gt=timezone.now(),
-                type=Event.Type.EXISTING,
             )
             .exclude(
                 Q(name__exact="") | Q(url__exact=""),
+                category=Event.Category.COMMUNITY,
             )
             .order_by(
                 "start_date",

backend/apps/slack/models/remainder.py

@@ -0,0 +1,31 @@
+"""Slack remainder model."""
+
+from django.db import models
+
+
+class Remainder(models.Model):
+    """Model representing a slack channel remainder."""
+
+    class Meta:
+        db_table = "slack_remainders"
+        verbose_name = "Slack Remainder"
+        verbose_name_plural = "Slack Remainders"
+
+    member = models.ForeignKey(
+        "slack.Member",
+        verbose_name="Slack Member",
+        on_delete=models.SET_NULL,
+        null=True,
+    )
+    channel = models.ForeignKey(
+        "slack.EntityChannel",
+        verbose_name="Slack Channel",
+        on_delete=models.CASCADE,
+    )
+    message = models.TextField(verbose_name="Reminder Message")
+    remind_at = models.DateTimeField(verbose_name="Reminder Time")
+    periodic = models.BooleanField(default=False, verbose_name="Is Periodic")
+
+    def __str__(self) -> str:
+        """Remainder human readable representation."""
+        return f"Reminder for {self.member} in {self.channel}: {self.message} at {self.remind_at}"