From f006c6ceef86041151b757a31824ba34748af576 Mon Sep 17 00:00:00 2001
From: Aarni <aarni.halinen@aalto.fi>
Date: Wed, 20 Sep 2017 18:01:44 +0300
Subject: [PATCH] Fix JSONField and add migration files

---
 webapp/migrations/0012_auto_20170913_1934.py | 58 ++++++++++++++++++++
 webapp/migrations/0013_auto_20170920_1800.py | 45 +++++++++++++++
 webapp/models.py                             |  5 +-
 3 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 webapp/migrations/0012_auto_20170913_1934.py
 create mode 100644 webapp/migrations/0013_auto_20170920_1800.py

diff --git a/webapp/migrations/0012_auto_20170913_1934.py b/webapp/migrations/0012_auto_20170913_1934.py
new file mode 100644
index 0000000..4604c90
--- /dev/null
+++ b/webapp/migrations/0012_auto_20170913_1934.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-09-13 16:34
+from __future__ import unicode_literals
+
+import django.contrib.postgres.fields.jsonb
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0011_auto_20170913_1841'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='OhlhafvChallenge',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('challenger', models.CharField(max_length=255)),
+                ('victim', models.CharField(max_length=255)),
+                ('challenger_email', models.EmailField(max_length=254)),
+                ('victim_email', models.EmailField(max_length=254)),
+                ('series', models.CharField(choices=[('0.33 L', '0.33 L'), ('0.5 L', '0.5 L'), ('1.0 L', '1.0 L')], max_length=10)),
+                ('message', models.TextField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Registration',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('email', models.EmailField(max_length=254)),
+                ('options', django.contrib.postgres.fields.jsonb.JSONField()),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='baserole',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='kaehmyform',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='kaehmymessage',
+            name='name',
+            field=models.CharField(max_length=255, verbose_name='Name'),
+        ),
+        migrations.AddField(
+            model_name='event',
+            name='registration',
+            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='webapp.Registration'),
+        ),
+    ]
diff --git a/webapp/migrations/0013_auto_20170920_1800.py b/webapp/migrations/0013_auto_20170920_1800.py
new file mode 100644
index 0000000..d367aab
--- /dev/null
+++ b/webapp/migrations/0013_auto_20170920_1800.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11 on 2017-09-20 15:00
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('webapp', '0012_auto_20170913_1934'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='baserole',
+            name='name',
+            field=models.CharField(max_length=256, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='kaehmyform',
+            name='name',
+            field=models.CharField(max_length=256, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='kaehmymessage',
+            name='name',
+            field=models.CharField(max_length=256, verbose_name='Name'),
+        ),
+        migrations.AlterField(
+            model_name='ohlhafvchallenge',
+            name='challenger',
+            field=models.CharField(max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='ohlhafvchallenge',
+            name='victim',
+            field=models.CharField(max_length=256),
+        ),
+        migrations.AlterField(
+            model_name='registration',
+            name='name',
+            field=models.CharField(max_length=256),
+        ),
+    ]
diff --git a/webapp/models.py b/webapp/models.py
index ff4e890..bf2f9af 100644
--- a/webapp/models.py
+++ b/webapp/models.py
@@ -7,6 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 from django.contrib.auth.models import User
 from auditlog.registry import auditlog
 from phonenumber_field.modelfields import PhoneNumberField
+from django.contrib.postgres.fields import JSONField
 
 
 class Tag(models.Model):
@@ -35,13 +36,13 @@ class Feed(BaseFeed):
 class Event(BaseFeed):
     start_time = models.DateTimeField(default=timezone.now)
     end_time = models.DateTimeField(default=timezone.now)
-    registration = models.ForeignKey('Registration', on_delete=models.CASCADE)
+    registration = models.ForeignKey('Registration', on_delete=models.CASCADE, null=True)
 
 
 class Registration(models.Model):
     name = models.CharField(max_length=256)
     email = models.EmailField()
-    options = models.JSONField()
+    options = JSONField()
 
 
 class BaseRole(models.Model):