Add command to manifest and fix bugs

Author: ahmedxgouda

backend/apps/nest/controllers/calendar_events.py

@@ -16,15 +16,15 @@ def schedule_reminder(
     reminder: Reminder,
     scheduled_time: timezone.datetime,
     recurrence=ReminderSchedule.Recurrence.ONCE,
-):
+) -> ReminderSchedule:
     """Schedule a reminder."""
     if scheduled_time < timezone.now():
         message = "Scheduled time must be in the future."
         raise ValidationError(message)
     if recurrence not in ReminderSchedule.Recurrence.values:
         message = "Invalid recurrence value."
         raise ValidationError(message)
-    ReminderSchedule.objects.create(
+    return ReminderSchedule.objects.create(
         reminder=reminder,
         scheduled_time=scheduled_time,
         recurrence=recurrence,
@@ -38,7 +38,7 @@ def set_reminder(
     minutes_before: int,
     recurrence: str | None = None,
     message: str = "",
-) -> Reminder:
+) -> ReminderSchedule:
     """Set a reminder for a user."""
     auth = GoogleAccountAuthorization.authorize(slack_user_id)
     if not isinstance(auth, GoogleAccountAuthorization):
@@ -62,16 +62,16 @@ def set_reminder(
     if recurrence and recurrence not in ReminderSchedule.Recurrence.values:
         message = "Invalid recurrence value."
         raise ValidationError(message)
+    event.save()
     member = Member.objects.get(slack_user_id=slack_user_id)
     reminder = Reminder.objects.create(
         channel_id=channel,
         event=event,
         member=member,
         message=f"{event.name} - {message}" if message else event.name,
     )
-    schedule_reminder(
+    return schedule_reminder(
         reminder=reminder,
         scheduled_time=reminder_time,
         recurrence=recurrence or ReminderSchedule.Recurrence.ONCE,
     )
-    return reminder

backend/apps/owasp/migrations/0053_alter_event_key.py

@@ -0,0 +1,17 @@
+# Generated by Django 5.2.4 on 2025-09-07 16:11
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0052_remove_event_calendar_id_event_google_calendar_id"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="event",
+            name="key",
+            field=models.CharField(max_length=100, null=True, unique=True, verbose_name="Key"),
+        ),
+    ]

backend/apps/owasp/models/event.py

@@ -60,7 +60,7 @@ class Status(models.TextChoices):
     start_date = models.DateField(verbose_name="Start Date")
     end_date = models.DateField(verbose_name="End Date", null=True, blank=True)
     description = models.TextField(verbose_name="Description", default="", blank=True)
-    key = models.CharField(verbose_name="Key", max_length=100, unique=True)
+    key = models.CharField(verbose_name="Key", max_length=100, unique=True, null=True)
     status = models.CharField(
         verbose_name="Status",
         max_length=11,
@@ -360,10 +360,11 @@ def save(self, *args, **kwargs):
             **kwargs: Arbitrary keyword arguments.
 
         """
-        if not self.suggested_location:
-            self.generate_suggested_location()
+        if self.category != Event.Category.COMMUNITY:
+            if not self.suggested_location:
+                self.generate_suggested_location()
 
-        if not self.latitude or not self.longitude:
-            self.generate_geo_location()
+            if not self.latitude or not self.longitude:
+                self.generate_geo_location()
 
         super().save(*args, **kwargs)

backend/apps/slack/MANIFEST.yaml

@@ -61,6 +61,11 @@ features:
       url: https://nest.owasp.org/integrations/slack/commands/
       description: Check out available job opportunities
       should_escape: false
+    - command: /set-reminder
+      url: https://nest.owasp.org/integrations/slack/commands/
+      description: Set a reminder for a specific channel
+      usage_hint: --channel <#channel_name> --event_number <event_number> --minutes_before <minutes_before_event> --message <optional_message>
+      should_escape: false
     - command: /sponsor
       url: https://nest.owasp.org/integrations/slack/commands/
       description: Coming soon

backend/apps/slack/commands/__init__.py

@@ -18,6 +18,7 @@
     owasp,
     policies,
     projects,
+    set_reminder,
     sponsor,
     sponsors,
     staff,

backend/apps/slack/common/handlers/calendar_events.py

@@ -3,6 +3,8 @@
 from django.core.cache import cache
 from django.core.exceptions import ValidationError
 from django.utils import timezone
+from googleapiclient.errors import Error
+from httplib2.error import ServerNotFoundError
 
 from apps.common.constants import NL
 from apps.slack.blocks import get_pagination_buttons, markdown
@@ -60,7 +62,7 @@ def get_reminder_blocks(args, slack_user_id: str) -> list[dict]:
     from apps.nest.controllers.calendar_events import set_reminder
 
     try:
-        reminder = set_reminder(
+        reminder_schedule = set_reminder(
             channel=args.channel,
             event_number=args.event_number,
             slack_user_id=slack_user_id,
@@ -70,7 +72,16 @@ def get_reminder_blocks(args, slack_user_id: str) -> list[dict]:
         )
     except ValidationError as e:
         return [markdown(f"*{e.message}*")]
-
+    except (ServerNotFoundError, Error):
+        return [markdown("*An unexpected error occurred. Please try again later.*")]
     return [
-        markdown(f"*{args.minutes_before}-minutes Reminder set for event '{reminder.event.name}'*")
+        markdown(
+            f"*{args.minutes_before}-minutes Reminder set for event"
+            f" '{reminder_schedule.reminder.event.name}'*"
+            f" in {args.channel}"
+            f"{NL} Scheduled Time: "
+            f"{reminder_schedule.scheduled_time.strftime('%Y-%m-%d %H:%M %Z')}"
+            f"{NL} Recurrence: {reminder_schedule.recurrence}"
+            f"{f'{NL} Message: {args.message}' if args.message else ''}"
+        )
     ]

backend/apps/slack/utils.py

@@ -228,24 +228,31 @@ def parse_slack_reminder_args(text: str):
 
     """
     parser = ArgumentParser(prog="/set-reminder", description="Set a reminder for a Slack event.")
-    parser.add_argument("channel", type=str, help="The channel to send the reminder to.")
-    parser.add_argument("event_number", type=int, help="The event number to set the reminder for.")
     parser.add_argument(
-        "minutes_before", type=int, help="Minutes before the event to send the reminder."
+        "--channel", type=str, help="The channel to send the reminder to.", required=True
     )
     parser.add_argument(
-        "message",
+        "--event_number", type=int, help="The event number to set the reminder for.", required=True
+    )
+    parser.add_argument(
+        "--minutes_before",
+        type=int,
+        help="Minutes before the event to send the reminder.",
+        default=10,
+    )
+    parser.add_argument(
+        "--message",
         type=str,
         nargs="?",
         default="",
         help="Optional message to include in the reminder.",
     )
     parser.add_argument(
-        "recurrence",
+        "--recurrence",
         type=str,
         nargs="?",
-        choices=["once", "daily", "weekly"],
-        default=None,
+        choices=["once", "daily", "weekly", "monthly"],
+        default="once",
         help="Optional recurrence pattern for the reminder.",
     )