Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
# Generated by Django 5.2.4 on 2025-08-26 00:34

import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("owasp", "0048_entitymember"),
("slack", "0018_conversation_sync_messages"),
]

operations = [
migrations.AddField(
model_name="event",
name="calendar_id",
field=models.CharField(
blank=True, default="", max_length=1024, verbose_name="Calendar ID"
),
),
migrations.AddField(
model_name="event",
name="channel_id",
field=models.CharField(default="", max_length=15, verbose_name="Channel ID"),
),
migrations.AddField(
model_name="event",
name="member",
field=models.ForeignKey(
null=True,
on_delete=django.db.models.deletion.CASCADE,
related_name="calendar_events",
to="slack.member",
verbose_name="Slack Member",
),
),
migrations.AddField(
model_name="event",
name="status",
field=models.CharField(
choices=[
("confirmed", "Confirmed"),
("tentative", "Tentative"),
("canceled", "Canceled"),
],
default="confirmed",
max_length=11,
verbose_name="Status",
),
),
migrations.AddField(
model_name="event",
name="type",
field=models.CharField(
choices=[("calendar", "Calendar"), ("existing", "Existing")],
default="existing",
max_length=11,
verbose_name="Type",
),
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Generated by Django 5.2.4 on 2025-08-26 01:52

from django.db import migrations, models


class Migration(migrations.Migration):
dependencies = [
("owasp", "0049_event_calendar_id_event_channel_id_event_member_and_more"),
("slack", "0018_conversation_sync_messages"),
]

operations = [
migrations.AlterField(
model_name="event",
name="status",
field=models.CharField(
choices=[
("confirmed", "Confirmed"),
("tentative", "Tentative"),
("cancelled", "Cancelled"),
],
default="confirmed",
max_length=11,
verbose_name="Status",
),
),
migrations.AddIndex(
model_name="event",
index=models.Index(fields=["type"], name="event_type_idx"),
),
]
38 changes: 38 additions & 0 deletions backend/apps/owasp/models/event.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ 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"

Expand All @@ -40,21 +41,57 @@ class Category(models.TextChoices):
OTHER = "other", "Other"
PARTNER = "partner", "Partner"

class Type(models.TextChoices):
"""Event type."""

CALENDAR = "calendar", "Calendar"
EXISTING = "existing", "Existing"

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,
)
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)
description = models.TextField(verbose_name="Description", default="", blank=True)
key = models.CharField(verbose_name="Key", max_length=100, unique=True)
status = models.CharField(
verbose_name="Status",
max_length=11,
choices=Status.choices,
default=Status.CONFIRMED,
)
summary = models.TextField(verbose_name="Summary", blank=True, default="")
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)
Expand All @@ -74,6 +111,7 @@ def upcoming_events():
return (
Event.objects.filter(
start_date__gt=timezone.now(),
type=Event.Type.EXISTING,
)
.exclude(
Q(name__exact="") | Q(url__exact=""),
Expand Down