Renaming PyCon SpecialEvent to ScheduledEvent

This is intended to reduce the "special" nature of these objects, and encourage/enforce that they're for _any_ scheduled event!

Summary of changes:
  - Renamed the model, view, and template names
  - Edited the url prefix to be `/event/` rather than `special_event`
  - Created the necessary migration by manually editing the output of Django's `makemigrations`

Author: ewdurbin

docs/index.rst

@@ -22,7 +22,7 @@ Apps:
    sponsorship
    registration
    finaid
-   special_events
+   scheduled_events
    deploying
    translation
    api

docs/special_events.rst

@@ -26,5 +26,5 @@ Add events to Menus
 To add an event to the site menus, go to the Django admin, find the
 site tree called "main" and open it, then add a new item. Set the
 URL to the event's URL, minus the hostname part - e.g. if the
-full URL is ``https://us.pycon.org/2017/special_events/bigbash/``,
-just include ``/2017/special_events/bigbash/``.
+full URL is ``https://us.pycon.org/2018/scheduled_events/bigbash/``,
+just include ``/2018/scheduled_events/bigbash/``.

pycon/admin.py

@@ -6,7 +6,7 @@
 from pycon.models import (PyConProposalCategory, PyConSponsorTutorialProposal,
                           PyConTalkProposal, PyConTutorialProposal,
                           PyConPosterProposal, PyConLightningTalkProposal,
-                          PyConOpenSpaceProposal, SpecialEvent, EduSummitTalkProposal)
+                          PyConOpenSpaceProposal, ScheduledEvent, EduSummitTalkProposal)
 
 
 class ProposalMarkEditAdmin(MarkEditAdmin):
@@ -136,7 +136,7 @@ class SponsorTutorialAdmin(ProposalMarkEditAdmin):
     ]
 
 
-class SpecialEventAdmin(MarkEditAdmin):
+class ScheduledEventAdmin(MarkEditAdmin):
     list_display = [
         'name',
         'start',
@@ -171,7 +171,7 @@ class EduSummitTalkAdmin(ProposalMarkEditAdmin):
 admin.site.register(PyConSponsorTutorialProposal, SponsorTutorialAdmin)
 admin.site.register(PyConLightningTalkProposal, LightningTalkAdmin)
 admin.site.register(EduSummitTalkProposal, EduSummitTalkAdmin)
-admin.site.register(SpecialEvent, SpecialEventAdmin)
+admin.site.register(ScheduledEvent, ScheduledEventAdmin)
 
 
 from account.models import Account, EmailAddress

pycon/migrations/0010_rename_special_event_to_scheduled_event.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('pycon', '0009_auto_20161002_1710'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='SpecialEvent',
+            new_name='ScheduledEvent',
+        ),
+        migrations.AlterModelOptions(
+            name='scheduledevent',
+            options={'verbose_name': 'PyCon Scheduled Event'},
+        ),
+    ]

pycon/models.py

@@ -333,7 +333,7 @@ class Meta:
 register_proposal_model('open-space', PyConOpenSpaceProposal, 'Open Spaces')
 
 
-class SpecialEvent(models.Model):
+class ScheduledEvent(models.Model):
     name = models.CharField(max_length=100)
     slug = models.SlugField()
     location = models.CharField(max_length=100)
@@ -343,7 +343,7 @@ class SpecialEvent(models.Model):
     published = models.BooleanField(default=False)
 
     class Meta:
-        verbose_name = "PyCon Special Event"
+        verbose_name = "PyCon Scheduled Event"
 
     def get_absolute_url(self):
-        return reverse('special_event', kwargs={'slug': self.slug})
+        return reverse('scheduled_event', kwargs={'slug': self.slug})

pycon/program_export.py

@@ -12,7 +12,7 @@
 
 from symposion.proposals.models import ProposalKind
 from symposion.schedule.models import Presentation, Schedule
-from pycon.models import SpecialEvent
+from pycon.models import ScheduledEvent
 from pycon.sponsorship.models import Sponsor, SponsorLevel
 
 from django.core.urlresolvers import reverse
@@ -29,7 +29,7 @@ def export(pardir='program_export/'):
     SponsorsExporter(pardir).export()
     PresentationsExporter(pardir).export()
     ScheduleExporter(pardir).export()
-    SpecialEventsExporter(pardir).export()
+    ScheduledEventsExporter(pardir).export()
 
 
 def full_url(url):
@@ -212,9 +212,9 @@ def export(self):
                 self.write(filename, presentations)
 
 
-class SpecialEventsExporter(BaseExporter):
+class ScheduledEventsExporter(BaseExporter):
     fields = ['name', 'location', 'day', 'time', 'description', 'url']
-    basedir = 'special_events/'
+    basedir = 'scheduled_events/'
     description_fields = ['description']
 
     def prepare_url(self, event):
@@ -230,8 +230,8 @@ def prepare_time(self, event):
         )
 
     def export(self):
-        queryset = SpecialEvent.objects.filter(published=True).order_by('start', 'name')
-        filename = 'special_events_schedule'
+        queryset = ScheduledEvent.objects.filter(published=True).order_by('start', 'name')
+        filename = 'scheduled_events_schedule'
         self.write(filename, queryset)
 
 

pycon/templates/special_event.html renamed to pycon/templates/scheduled_event.html

@@ -10,7 +10,7 @@
 
 from pycon.models import PyConProposalCategory, PyConProposal, \
     PyConTalkProposal, PyConTutorialProposal, ThunderdomeGroup, PyConLightningTalkProposal, \
-    SpecialEvent, EduSummitTalkProposal
+    ScheduledEvent, EduSummitTalkProposal
 
 from symposion.proposals.models import ProposalKind
 from symposion.proposals.tests.factories import ProposalBaseFactory
@@ -87,9 +87,9 @@ class Meta:
     audience = "audience"
 
 
-class SpecialEventFactory(factory.django.DjangoModelFactory):
+class ScheduledEventFactory(factory.django.DjangoModelFactory):
     class Meta:
-        model = SpecialEvent
+        model = ScheduledEvent
 
     name = factory.fuzzy.FuzzyText()
     slug = factory.fuzzy.FuzzyText()

pycon/tests/factories.py

@@ -10,7 +10,7 @@
 from django.utils.timezone import now
 from pycon.sponsorship.models import Benefit
 from pycon.sponsorship.tests.factories import SponsorFactory
-from pycon.tests.factories import PyConTutorialProposalFactory, SpecialEventFactory
+from pycon.tests.factories import PyConTutorialProposalFactory, ScheduledEventFactory
 from symposion.conference.models import Conference, current_conference, Section
 from symposion.proposals.models import ProposalKind
 from symposion.schedule.models import Schedule, Slot, Day, SlotKind
@@ -39,9 +39,9 @@ def setUp(self):
             section = Section.objects.get(conference=conference, slug=slug)
             Schedule.objects.get_or_create(section=section)
 
-    def test_special_events_export(self):
-        self.unpublished_special = SpecialEventFactory(published=False)
-        self.published_special = SpecialEventFactory(published=True)
+    def test_scheduled_events_export(self):
+        self.unpublished_special = ScheduledEventFactory(published=False)
+        self.published_special = ScheduledEventFactory(published=True)
         rsp = self.client.get(self.url)
         self.assertEqual(OK, rsp.status_code)
         self.assertEqual('attachment; filename=program_export.zip', rsp['Content-Disposition'])
@@ -50,7 +50,7 @@ def test_special_events_export(self):
         # Check out the zip - testzip() returns None if no errors found
         self.assertIsNone(zipfile.testzip())
 
-        fname = "program_export/special_events/csv/special_events_schedule.csv"
+        fname = "program_export/scheduled_events/csv/scheduled_events_schedule.csv"
         file_contents = zipfile.open(fname, "U").read().decode('utf-8')
         self.assertIn(self.published_special.name, file_contents)
         self.assertIn(self.published_special.description, file_contents)

pycon/tests/test_export.py

@@ -11,7 +11,7 @@
 
 from pycon.finaid.tests.utils import TestMixin
 from pycon.models import EduSummitTalkProposal, PyConTalkProposal, PyConProposal
-from pycon.tests.factories import SpecialEventFactory, PyConProposalCategoryFactory, \
+from pycon.tests.factories import ScheduledEventFactory, PyConProposalCategoryFactory, \
     PyConEduSummitProposalFactory, PyConLightningTalkProposalFactory, PyConTalkProposalFactory
 from symposion.conference.models import Conference, current_conference, Section
 from symposion.proposals.kinds import get_proposal_model
@@ -24,10 +24,10 @@ def format_datetime(dt):
     return format(dt, settings.DATE_FORMAT) + ", " + time_format(dt, settings.TIME_FORMAT)
 
 
-class SpecialEventViewTest(TestCase):
+class ScheduledEventViewTest(TestCase):
     def setUp(self):
         Conference.objects.get_or_create(id=settings.CONFERENCE_ID)
-        self.event = SpecialEventFactory()
+        self.event = ScheduledEventFactory()
 
     def test_view_event(self):
         rsp = self.client.get(self.event.get_absolute_url())

pycon/tests/test_views.py

@@ -6,5 +6,5 @@
 urlpatterns = patterns(
     '',
     url('program_export/', views.program_export, name='program_export'),
-    url(r'^special_event/(?P<slug>.*)/$', views.special_event, name='special_event'),
+    url(r'^event/(?P<slug>.*)/$', views.scheduled_event, name='scheduled_event'),
 )

pycon/urls.py

@@ -7,7 +7,7 @@
 from django.http import HttpResponse
 from django.shortcuts import get_object_or_404, render
 
-from pycon.models import SpecialEvent
+from pycon.models import ScheduledEvent
 from pycon.program_export import export
 
 
@@ -33,10 +33,10 @@ def program_export(request):
                 pass
 
 
-def special_event(request, slug):
-    """Special event detail page"""
-    event = get_object_or_404(SpecialEvent, slug=slug, published=True)
-    return render(request, "special_event.html", {
+def scheduled_event(request, slug):
+    """Scheduled event detail page"""
+    event = get_object_or_404(ScheduledEvent, slug=slug, published=True)
+    return render(request, "scheduled_event.html", {
         'event': event,
         'page': {
             'title': event.name,