Improved NestBot /events command

backend/Makefile

@@ -88,7 +88,11 @@ owasp-scrape-committees:
 
 owasp-scrape-projects:
 	@echo "Scraping OWASP site projects data"
-	@CMD="python manage.py owasp_scrape_projects" $(MAKE) exec-backend-command
+	@CMD="poetry run python manage.py owasp_scrape_projects" $(MAKE) exec-backend-command
+
+owasp-update-events:
+	@echo "Getting OWASP events data"
+	@CMD="poetry run python manage.py owasp_update_events" $(MAKE) exec-backend-command
 
 purge-data:
 	@CMD="python manage.py purge_data" $(MAKE) exec-backend-command
@@ -97,7 +101,7 @@ recreate-schema:
 	@CMD="psql -U nest_user_dev -d nest_db_dev -c \
 		'DROP SCHEMA public CASCADE; CREATE SCHEMA public; GRANT ALL ON SCHEMA public TO nest_user_dev'" \
 	  	$(MAKE) exec-db-command 2>/dev/null
-	$(MAKE) migrate
+	$(MAKE) migrateNestBot goes directly to the DB
 
 setup:
 	@CMD="python manage.py createsuperuser" $(MAKE) exec-backend-command-it
@@ -123,4 +127,5 @@ update-data: \
 	owasp-scrape-committees \
 	owasp-scrape-projects \
 	github-update-project-related-repositories \
-	owasp-aggregate-projects
+	owasp-aggregate-projects \
+	owasp-update-events

backend/apps/github/management/commands/github_update_owasp_organization.py

@@ -13,7 +13,6 @@
 from apps.owasp.constants import OWASP_ORGANIZATION_NAME
 from apps.owasp.models.chapter import Chapter
 from apps.owasp.models.committee import Committee
-from apps.owasp.models.event import Event
 from apps.owasp.models.project import Project
 
 logger = logging.getLogger(__name__)
@@ -48,7 +47,6 @@ def handle(self, *_args, **options):
 
         chapters = []
         committees = []
-        events = []
         projects = []
 
         offset = options["offset"]
@@ -84,17 +82,12 @@ def handle(self, *_args, **options):
             elif entity_key.startswith("www-project-"):
                 projects.append(Project.update_data(gh_repository, repository, save=False))
 
-            # OWASP events.
-            elif entity_key.startswith("www-event-"):
-                events.append(Event.update_data(gh_repository, repository, save=False))
-
             # OWASP committees.
             elif entity_key.startswith("www-committee-"):
                 committees.append(Committee.update_data(gh_repository, repository, save=False))
 
         Chapter.bulk_save(chapters)
         Committee.bulk_save(committees)
-        Event.bulk_save(events)
         Project.bulk_save(projects)
 
         # Check repository counts.

backend/apps/owasp/admin.py

@@ -63,7 +63,6 @@ class CommitteeAdmin(admin.ModelAdmin):
 
 
 class EventAdmin(admin.ModelAdmin):
-    autocomplete_fields = ("owasp_repository",)
     list_display = ("name",)
     search_fields = ("name",)
 

backend/apps/owasp/api/event.py

@@ -15,8 +15,6 @@ class Meta:
             "name",
             "description",
             "url",
-            "created_at",
-            "updated_at",
         )
 
 

backend/apps/owasp/graphql/nodes/event.py

@@ -0,0 +1,20 @@
+"""OWASP event GraphQL node."""
+
+from apps.common.graphql.nodes import BaseNode
+from apps.owasp.models.event import Event
+
+
+class EventNode(BaseNode):
+    """Event node."""
+
+    class Meta:
+        model = Event
+        fields = (
+            "category",
+            "end_date",
+            "description",
+            "key",
+            "name",
+            "start_date",
+            "url",
+        )

backend/apps/owasp/graphql/queries/__init__.py

@@ -2,9 +2,10 @@
 
 from .chapter import ChapterQuery
 from .committee import CommitteeQuery
+from .event import EventQuery
 from .project import ProjectQuery
 from .stats import StatsQuery
 
 
-class OwaspQuery(ChapterQuery, CommitteeQuery, ProjectQuery, StatsQuery):
+class OwaspQuery(ChapterQuery, CommitteeQuery, EventQuery, ProjectQuery, StatsQuery):
     """OWASP queries."""

backend/apps/owasp/graphql/queries/event.py

@@ -0,0 +1,23 @@
+"""OWASP event GraphQL queries."""
+
+from datetime import timezone
+
+import graphene
+
+from apps.common.graphql.queries import BaseQuery
+from apps.owasp.graphql.nodes.event import EventNode
+from apps.owasp.models.event import Event
+
+
+class EventQuery(BaseQuery):
+    """Event queries."""
+
+    events = graphene.List(EventNode)
+
+    def resolve_events(root, info):
+        """Resolve all events."""
+        today = timezone.now()
+
+        base_query = Event.objects.filter(start_date__gte=today)
+
+        return base_query.order_by("start_date")

backend/apps/owasp/management/commands/owasp_update_events.py

@@ -0,0 +1,67 @@
+"""A command to update OWASP events."""
+
+import yaml
+from django.core.management.base import BaseCommand
+from django.utils.text import slugify
+
+from apps.github.utils import get_repository_file_content, normalize_url
+from apps.owasp.models.event import Event, EventCategory
+from apps.owasp.utils import parse_event_dates
+
+
+class Command(BaseCommand):
+    help = "Import events from the provided YAML file"
+
+    def handle(self, *args, **kwargs):
+        url = "https://raw.githubusercontent.com/OWASP/owasp.github.io/main/_data/events.yml"
+        yaml_content = get_repository_file_content(url)
+        data = yaml.safe_load(yaml_content)
+        events = []
+
+        for category in data:
+            category_name = category.get("category", "")
+
+            for event_data in category["events"]:
+                event_name_slug = slugify(event_data.get("name", ""))
+                key = event_name_slug
+                end_date = parse_event_dates(
+                    event_data.get("dates", ""), event_data.get("start-date")
+                )
+
+                fields = {
+                    "category": get_event_category(category_name),
+                    "end_date": end_date,
+                    "key": key,
+                    "name": event_data.get("name", ""),
+                    "description": event_data.get("optional-text", ""),
+                    "start_date": event_data.get("start-date", None),
+                    "url": normalize_url(event_data.get("url", "")) or "",
+                }
+
+                try:
+                    event = Event.objects.get(key=key)
+                    # Update existing event
+                    for key, value in fields.items():
+                        setattr(event, key, value)
+                    events.append(event)
+                except Event.DoesNotExist:
+                    # Create new event
+                    event = Event(**fields)
+                    events.append(event)
+
+        if events:
+            self.stdout.write(f"Saving {len(events)} events...")
+            Event.bulk_save(events, fields)
+            self.stdout.write(self.style.SUCCESS("Successfully saved events"))
+        else:
+            self.stdout.write(self.style.WARNING("No events to save"))
+
+
+def get_event_category(category_name):
+    """Get event category."""
+    category_map = {
+        "Global": EventCategory.GLOBAL,
+        "AppSec Days": EventCategory.APPSEC_DAYS,
+        "Partner": EventCategory.PARTNER,
+    }
+    return category_map.get(category_name, EventCategory.OTHER)

backend/apps/owasp/migrations/0016_remove_event_created_at_and_more.py

@@ -0,0 +1,86 @@
+# Generated by Django 5.1.5 on 2025-02-28 07:53
+
+import datetime
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("owasp", "0015_snapshot"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="event",
+            name="created_at",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="has_active_repositories",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="is_active",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="level",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="owasp_repository",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="summary",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="tags",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="topics",
+        ),
+        migrations.RemoveField(
+            model_name="event",
+            name="updated_at",
+        ),
+        migrations.AddField(
+            model_name="event",
+            name="category",
+            field=models.CharField(
+                choices=[
+                    ("global", "Global"),
+                    ("appsec_days", "AppSec Days"),
+                    ("partner", "Partner"),
+                    ("other", "Other"),
+                ],
+                default="other",
+                max_length=20,
+                verbose_name="Category",
+            ),
+        ),
+        migrations.AddField(
+            model_name="event",
+            name="end_date",
+            field=models.DateField(blank=True, null=True, verbose_name="End Date"),
+        ),
+        migrations.AddField(
+            model_name="event",
+            name="start_date",
+            field=models.DateField(
+                default=datetime.datetime(
+                    2025, 2, 28, 7, 53, 17, 155842, tzinfo=datetime.timezone.utc
+                ),
+                verbose_name="Start Date",
+            ),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name="event",
+            name="description",
+            field=models.TextField(blank=True, default="", verbose_name="Description"),
+        ),
+    ]

backend/apps/owasp/models/event.py

@@ -3,56 +3,43 @@
 from django.db import models
 
 from apps.common.models import BulkSaveModel, TimestampedModel
-from apps.owasp.models.common import RepositoryBasedEntityModel
 
 
-class Event(BulkSaveModel, RepositoryBasedEntityModel, TimestampedModel):
+class EventCategory(models.TextChoices):
+    """Event category choices."""
+
+    GLOBAL = "global", "Global"
+    APPSEC_DAYS = "appsec_days", "AppSec Days"
+    PARTNER = "partner", "Partner"
+    OTHER = "other", "Other"
+
+
+class Event(BulkSaveModel, TimestampedModel):
     """Event model."""
 
     class Meta:
         db_table = "owasp_events"
         verbose_name_plural = "Events"
 
-    level = models.CharField(verbose_name="Level", max_length=5, default="", blank=True)
-    url = models.URLField(verbose_name="URL", default="", blank=True)
-
-    owasp_repository = models.ForeignKey(
-        "github.Repository", on_delete=models.SET_NULL, blank=True, null=True
+    category = models.CharField(
+        verbose_name="Category",
+        max_length=20,
+        choices=EventCategory.choices,
+        default=EventCategory.OTHER,
     )
 
+    end_date = models.DateField(verbose_name="End Date", null=True, blank=True)
+    key = models.CharField(verbose_name="Key", max_length=100, unique=True)
+    name = models.CharField(verbose_name="Name", max_length=100)
+    description = models.TextField(verbose_name="Description", default="", blank=True)
+    start_date = models.DateField(verbose_name="Start Date")
+    url = models.URLField(verbose_name="URL", default="", blank=True)
+
     def __str__(self):
         """Event human readable representation."""
         return f"{self.name or self.key}"
 
-    def from_github(self, repository):
-        """Update instance based on GitHub repository data."""
-        field_mapping = {
-            "description": "pitch",
-            "level": "level",
-            "name": "title",
-            "tags": "tags",
-        }
-        RepositoryBasedEntityModel.from_github(self, field_mapping, repository)
-
-        # FKs.
-        self.owasp_repository = repository
-
     @staticmethod
     def bulk_save(events, fields=None):
         """Bulk save events."""
         BulkSaveModel.bulk_save(Event, events, fields=fields)
-
-    @staticmethod
-    def update_data(gh_repository, repository, save=True):
-        """Update event data."""
-        key = gh_repository.name.lower()
-        try:
-            event = Event.objects.get(key=key)
-        except Event.DoesNotExist:
-            event = Event(key=key)
-
-        event.from_github(repository)
-        if save:
-            event.save()
-
-        return event