Merge pull request #84 from ox-it/update-old-talks

Push events to (old) talks.ox

talks/events/__init__.py

@@ -0,0 +1,12 @@
+from django.apps import AppConfig
+
+default_app_config = 'talks.events.EventsConfig'
+
+
+class EventsConfig(AppConfig):
+    name = 'talks.events'
+    verbose_name = "Events"
+
+    def ready(self):
+        super(EventsConfig, self).ready()
+        import talks.events.signals

talks/events/migrations/0001_squashed_0009_merge.py

@@ -0,0 +1,199 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    replaces = [(b'events', '0001_initial'), (b'events', '0002_speaker_email_address'), (b'events', '0003_eventgroup_group_type'), (b'events', '0004_auto_20140715_1013'), (b'events', '0005_auto_20140716_1432'), (b'events', '0006_auto_20141028_1132'), (b'events', '0007_auto_20141028_1746'), (b'events', '0008_auto_20141029_1234'), (b'events', '0006_auto_20141027_1754'), (b'events', '0007_merge'), (b'events', '0009_merge')]
+
+    dependencies = [
+        ('contenttypes', '__first__'),
+        ('api_ox', '__first__'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EventGroup',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('title', models.CharField(max_length=250)),
+                ('slug', models.SlugField()),
+                ('description', models.TextField()),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Speaker',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(max_length=250)),
+                ('slug', models.SlugField()),
+                ('bio', models.TextField()),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='Event',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('start', models.DateTimeField(null=True, blank=True)),
+                ('end', models.DateTimeField(null=True, blank=True)),
+                ('title', models.CharField(max_length=250)),
+                ('slug', models.SlugField()),
+                ('description', models.TextField()),
+                ('group', models.ForeignKey(to_field='id', blank=True, to='events.EventGroup', null=True)),
+                ('location', models.ForeignKey(to_field='id', blank=True, to='api_ox.Location', null=True)),
+                ('department_organiser', models.ForeignKey(to_field='id', blank=True, to='api_ox.Organisation', null=True)),
+                ('speakers', models.ManyToManyField(to=b'events.Speaker', null=True, blank=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AddField(
+            model_name='speaker',
+            name='email_address',
+            field=models.EmailField(default='example@example.com', max_length=254),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='eventgroup',
+            name='group_type',
+            field=models.CharField(blank=True, max_length=2, null=True, choices=[(b'SE', b'Seminar Series'), (b'CO', b'Conference')]),
+            preserve_default=True,
+        ),
+        migrations.CreateModel(
+            name='Topic',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('name', models.CharField(unique=True, max_length=250)),
+                ('uri', models.URLField(unique=True, db_index=True)),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.CreateModel(
+            name='TopicItem',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('object_id', models.PositiveIntegerField()),
+                ('content_type', models.ForeignKey(to='contenttypes.ContentType')),
+                ('topic', models.ForeignKey(to='events.Topic')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.AlterField(
+            model_name='topic',
+            name='name',
+            field=models.CharField(max_length=250),
+        ),
+        migrations.CreateModel(
+            name='PersonEvent',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('affiliation', models.TextField(blank=True)),
+                ('role', models.TextField(default=b'speaker', choices=[(b'speaker', b'Speaker'), (b'host', b'Host'), (b'organizer', b'Organizer')])),
+                ('url', models.URLField(blank=True)),
+                ('event', models.ForeignKey(to='events.Event')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+        migrations.RenameModel(
+            old_name='Speaker',
+            new_name='Person',
+        ),
+        migrations.AddField(
+            model_name='personevent',
+            name='person',
+            field=models.ForeignKey(to='events.Person'),
+            preserve_default=True,
+        ),
+        migrations.RunSQL(
+            sql="INSERT INTO events_personevent (event_id, person_id, affiliation, role, url) SELECT event_id, person_id, '', 'speaker', '' FROM events_event_speakers;",
+            reverse_sql=None,
+            state_operations=None,
+        ),
+        migrations.RemoveField(
+            model_name='event',
+            name='speakers',
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='person_set',
+            field=models.ManyToManyField(to=b'events.Person', through='events.PersonEvent', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='group',
+            field=models.ForeignKey(related_name=b'events', blank=True, to='events.EventGroup', null=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='audience',
+            field=models.TextField(default=b'oxonly', verbose_name=b'Who can attend', choices=[(b'public', b'Public'), (b'oxonly', b'Members of the University only')]),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='booking_type',
+            field=models.TextField(default=b'nr', verbose_name=b'Booking required', choices=[(b'nr', b'Not required'), (b're', b'Required'), (b'rc', b'Recommended')]),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='booking_url',
+            field=models.URLField(default=b'', verbose_name=b'Web address for booking', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='cost',
+            field=models.TextField(default=b'', help_text=b'If applicable', verbose_name=b'Cost', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='special_message',
+            field=models.TextField(default=b'', help_text=b'Use this for important notices - e.g.: cancellation or a last minute change of venue.', verbose_name=b'Special message', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='title_not_announced',
+            field=models.BooleanField(default=False, verbose_name=b'Title to be announced'),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='description',
+            field=models.TextField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='title',
+            field=models.CharField(max_length=250, blank=True),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='location_details',
+            field=models.TextField(default=b'', help_text=b'e.g.: room number or accessibility information', verbose_name=b'Additional details', blank=True),
+            preserve_default=True,
+        ),
+        migrations.AlterField(
+            model_name='event',
+            name='group',
+            field=models.ForeignKey(related_name=b'events', blank=True, to='events.EventGroup', null=True),
+        ),
+    ]

talks/events/migrations/0006_auto_20141027_1754.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0005_auto_20140716_1432'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='event',
+            name='group',
+            field=models.ForeignKey(related_name=b'events', blank=True, to='events.EventGroup', null=True),
+        ),
+    ]

talks/events/migrations/0007_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0006_auto_20141028_1132'),
+        ('events', '0006_auto_20141027_1754'),
+    ]
+
+    operations = [
+    ]

talks/events/migrations/0009_merge.py

@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0007_merge'),
+        ('events', '0008_auto_20141029_1234'),
+    ]
+
+    operations = [
+    ]

talks/events/signals.py

@@ -0,0 +1,7 @@
+from django.dispatch import Signal
+
+# signal used when an Event has been created or updated
+event_updated = Signal(providing_args=['instance'])
+
+# signal used when an EventGroup has been created or updated
+eventgroup_updated = Signal(providing_args=['instance'])

talks/events/views.py

@@ -17,6 +17,7 @@
 from talks.api import serializers
 from talks.events.forms import PersonForm
 from talks.events.models import ROLES_SPEAKER
+from talks.events.signals import event_updated, eventgroup_updated
 from talks.events.datasources import TOPICS_DATA_SOURCE
 
 logger = logging.getLogger(__name__)
@@ -127,6 +128,7 @@ def edit_event(request, event_slug):
     if request.method == 'POST':
         if form.is_valid():
             event = form.save()
+            event_updated.send(event.__class__, instance=event)
             messages.success(request, "Talk was updated")
             return redirect(event.get_absolute_url())
         else:
@@ -161,6 +163,7 @@ def create_event(request, group_slug=None):
             if request.user not in event.editor_set.all():
                 event.editor_set.add(request.user)
                 event.save()
+            event_updated.send(event.__class__, instance=event)
             messages.success(request, "New talk has been created")
             if 'another' in request.POST:
                 if event_group:
@@ -237,6 +240,7 @@ def edit_event_group(request, event_group_slug):
         logging.debug("incoming post: %s", request.POST)
         if form.is_valid():
             event_group = form.save()
+            eventgroup_updated.send(event_group.__class__, instance=event_group)
             messages.success(request, "Series was updated")
             return redirect(event_group.get_absolute_url())
         else:
@@ -259,6 +263,7 @@ def create_event_group(request):
     if request.method == 'POST':
         if form.is_valid():
             event_group = form.save()
+            eventgroup_updated.send(event_group.__class__, instance=event_group)
             if is_modal:
                 response = json.dumps(serializers.EventGroupSerializer(event_group).data)
                 return HttpResponse(response, status=201, content_type='application/json')

talks/old_talks/__init__.py

@@ -0,0 +1,3 @@
+"""This module contains tools to update
+the old Oxford Talks, it will be entirely removed
+at some points in the future..."""

talks/old_talks/admin.py

@@ -0,0 +1,15 @@
+from django.contrib import admin
+
+from .models import OldTalk, OldSeries
+
+
+class OldTalkAdmin(admin.ModelAdmin):
+    list_display = ('old_talk_id', 'event')
+
+
+class OldSeriesAdmin(admin.ModelAdmin):
+    list_display = ('old_series_id', 'group')
+
+
+admin.site.register(OldTalk, OldTalkAdmin)
+admin.site.register(OldSeries, OldSeriesAdmin)

talks/old_talks/migrations/0001_initial.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0006_auto_20141027_1754'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OldTalk',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('old_talk_id', models.CharField(max_length=20)),
+                ('event', models.ForeignKey(to='events.Event')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]

talks/old_talks/migrations/0002_oldseries.py

@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0009_merge'),
+        ('old_talks', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OldSeries',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('old_series_id', models.CharField(max_length=20)),
+                ('group', models.ForeignKey(to='events.EventGroup')),
+            ],
+            options={
+            },
+            bases=(models.Model,),
+        ),
+    ]