From 11f5bcfa3e99bb46495312c52b2efa5ea446ca5a Mon Sep 17 00:00:00 2001 From: Tanner Prestegard <tanner.prestegard@ligo.org> Date: Wed, 6 Mar 2019 09:28:06 -0600 Subject: [PATCH] Squash migrations for alerts app into one --- gracedb/alerts/migrations/0001_initial.py | 26 +++++-- .../migrations/0002_auto_20190121_1557.py | 33 -------- .../migrations/0003_auto_20190121_1657.py | 26 ------- .../migrations/0004_contact_verified.py | 20 ----- .../migrations/0005_auto_20190121_1703.py | 20 ----- .../migrations/0006_auto_20190123_2119.py | 25 ------ .../migrations/0007_auto_20190123_2120.py | 20 ----- .../migrations/0008_auto_20190123_2120.py | 20 ----- .../migrations/0009_auto_20190131_1916.py | 70 ----------------- ...010_supereventnotification_ns_candidate.py | 20 ----- .../migrations/0011_auto_20190131_1953.py | 40 ---------- .../migrations/0012_auto_20190131_2027.py | 77 ------------------- .../migrations/0013_auto_20190201_1150.py | 26 ------- .../migrations/0014_auto_20190201_1159.py | 20 ----- 14 files changed, 18 insertions(+), 425 deletions(-) delete mode 100644 gracedb/alerts/migrations/0002_auto_20190121_1557.py delete mode 100644 gracedb/alerts/migrations/0003_auto_20190121_1657.py delete mode 100644 gracedb/alerts/migrations/0004_contact_verified.py delete mode 100644 gracedb/alerts/migrations/0005_auto_20190121_1703.py delete mode 100644 gracedb/alerts/migrations/0006_auto_20190123_2119.py delete mode 100644 gracedb/alerts/migrations/0007_auto_20190123_2120.py delete mode 100644 gracedb/alerts/migrations/0008_auto_20190123_2120.py delete mode 100644 gracedb/alerts/migrations/0009_auto_20190131_1916.py delete mode 100644 gracedb/alerts/migrations/0010_supereventnotification_ns_candidate.py delete mode 100644 gracedb/alerts/migrations/0011_auto_20190131_1953.py delete mode 100644 gracedb/alerts/migrations/0012_auto_20190131_2027.py delete mode 100644 gracedb/alerts/migrations/0013_auto_20190201_1150.py delete mode 100644 gracedb/alerts/migrations/0014_auto_20190201_1159.py diff --git a/gracedb/alerts/migrations/0001_initial.py b/gracedb/alerts/migrations/0001_initial.py index cc806622e..d33e61d3c 100644 --- a/gracedb/alerts/migrations/0001_initial.py +++ b/gracedb/alerts/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-17 20:40 +# Generated by Django 1.11.18 on 2019-03-05 20:50 from __future__ import unicode_literals import alerts.fields @@ -13,7 +13,7 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('events', '0031_hwinj_labels'), + ('events', '0032_create_imbh_search'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -22,23 +22,33 @@ class Migration(migrations.Migration): name='Contact', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('desc', models.CharField(max_length=20)), - ('email', models.EmailField(blank=True, max_length=254)), - ('phone', alerts.fields.PhoneNumberField(blank=True, max_length=255)), - ('call_phone', models.BooleanField(default=False)), - ('text_phone', models.BooleanField(default=False)), + ('description', models.CharField(max_length=30)), + ('email', models.EmailField(blank=True, max_length=254, null=True)), + ('phone', alerts.fields.PhoneNumberField(blank=True, max_length=255, null=True)), + ('phone_method', models.CharField(blank=True, choices=[(b'C', b'Call'), (b'T', b'Text'), (b'B', b'Call and text')], default=None, max_length=1, null=True)), + ('verified', models.BooleanField(default=False, editable=False)), + ('verification_code', models.IntegerField(editable=False, null=True)), + ('verification_expiration', models.DateTimeField(editable=False, null=True)), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], + options={ + 'abstract': False, + }, ), migrations.CreateModel( name='Notification', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('description', models.CharField(max_length=40)), ('far_threshold', models.FloatField(blank=True, null=True)), - ('label_query', models.CharField(blank=True, max_length=100)), + ('label_query', models.CharField(blank=True, max_length=100, null=True)), + ('category', models.CharField(choices=[(b'E', b'Event'), (b'S', b'Superevent')], default=b'S', max_length=1)), + ('ns_candidate', models.BooleanField(default=False)), ('contacts', models.ManyToManyField(to='alerts.Contact')), + ('groups', models.ManyToManyField(blank=True, to='events.Group')), ('labels', models.ManyToManyField(blank=True, to='events.Label')), ('pipelines', models.ManyToManyField(blank=True, to='events.Pipeline')), + ('searches', models.ManyToManyField(blank=True, to='events.Search')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), diff --git a/gracedb/alerts/migrations/0002_auto_20190121_1557.py b/gracedb/alerts/migrations/0002_auto_20190121_1557.py deleted file mode 100644 index b0603f3e9..000000000 --- a/gracedb/alerts/migrations/0002_auto_20190121_1557.py +++ /dev/null @@ -1,33 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-21 15:57 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0001_initial'), - ] - - operations = [ - migrations.RenameField( - model_name='contact', - old_name='desc', - new_name='description', - ), - migrations.RemoveField( - model_name='contact', - name='call_phone', - ), - migrations.RemoveField( - model_name='contact', - name='text_phone', - ), - migrations.AddField( - model_name='contact', - name='phone_method', - field=models.CharField(blank=True, choices=[(b'C', b'Call'), (b'T', b'Text'), (b'B', b'Call and text')], default=None, max_length=1, null=True), - ), - ] diff --git a/gracedb/alerts/migrations/0003_auto_20190121_1657.py b/gracedb/alerts/migrations/0003_auto_20190121_1657.py deleted file mode 100644 index d7cd635d1..000000000 --- a/gracedb/alerts/migrations/0003_auto_20190121_1657.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-21 16:57 -from __future__ import unicode_literals - -import alerts.fields -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0002_auto_20190121_1557'), - ] - - operations = [ - migrations.AlterField( - model_name='contact', - name='email', - field=models.EmailField(blank=True, max_length=254, null=True), - ), - migrations.AlterField( - model_name='contact', - name='phone', - field=alerts.fields.PhoneNumberField(blank=True, max_length=255, null=True), - ), - ] diff --git a/gracedb/alerts/migrations/0004_contact_verified.py b/gracedb/alerts/migrations/0004_contact_verified.py deleted file mode 100644 index 0610c38e2..000000000 --- a/gracedb/alerts/migrations/0004_contact_verified.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-21 17:00 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0003_auto_20190121_1657'), - ] - - operations = [ - migrations.AddField( - model_name='contact', - name='verified', - field=models.BooleanField(default=False), - ), - ] diff --git a/gracedb/alerts/migrations/0005_auto_20190121_1703.py b/gracedb/alerts/migrations/0005_auto_20190121_1703.py deleted file mode 100644 index bcd398948..000000000 --- a/gracedb/alerts/migrations/0005_auto_20190121_1703.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-21 17:03 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0004_contact_verified'), - ] - - operations = [ - migrations.AlterField( - model_name='contact', - name='verified', - field=models.BooleanField(default=False, editable=False), - ), - ] diff --git a/gracedb/alerts/migrations/0006_auto_20190123_2119.py b/gracedb/alerts/migrations/0006_auto_20190123_2119.py deleted file mode 100644 index e56930778..000000000 --- a/gracedb/alerts/migrations/0006_auto_20190123_2119.py +++ /dev/null @@ -1,25 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-23 21:19 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0005_auto_20190121_1703'), - ] - - operations = [ - migrations.AddField( - model_name='contact', - name='verification_code', - field=models.IntegerField(editable=False, null=True), - ), - migrations.AddField( - model_name='contact', - name='verification_requested', - field=models.DateTimeField(editable=False, null=True), - ), - ] diff --git a/gracedb/alerts/migrations/0007_auto_20190123_2120.py b/gracedb/alerts/migrations/0007_auto_20190123_2120.py deleted file mode 100644 index 8d576f920..000000000 --- a/gracedb/alerts/migrations/0007_auto_20190123_2120.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-23 21:20 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0006_auto_20190123_2119'), - ] - - operations = [ - migrations.RenameField( - model_name='contact', - old_name='verification_requested', - new_name='verification_expires', - ), - ] diff --git a/gracedb/alerts/migrations/0008_auto_20190123_2120.py b/gracedb/alerts/migrations/0008_auto_20190123_2120.py deleted file mode 100644 index 70dac577b..000000000 --- a/gracedb/alerts/migrations/0008_auto_20190123_2120.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-23 21:20 -from __future__ import unicode_literals - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0007_auto_20190123_2120'), - ] - - operations = [ - migrations.RenameField( - model_name='contact', - old_name='verification_expires', - new_name='verification_expiration', - ), - ] diff --git a/gracedb/alerts/migrations/0009_auto_20190131_1916.py b/gracedb/alerts/migrations/0009_auto_20190131_1916.py deleted file mode 100644 index ba0b22ff6..000000000 --- a/gracedb/alerts/migrations/0009_auto_20190131_1916.py +++ /dev/null @@ -1,70 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-31 19:16 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('events', '0031_hwinj_labels'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('alerts', '0008_auto_20190123_2120'), - ] - - operations = [ - migrations.CreateModel( - name='EventNotification', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('far_threshold', models.FloatField(blank=True, null=True)), - ('label_query', models.CharField(blank=True, max_length=100, null=True)), - ('ns_candidate', models.BooleanField(default=False)), - ('contacts', models.ManyToManyField(to='alerts.Contact')), - ('groups', models.ManyToManyField(to='events.Group')), - ('labels', models.ManyToManyField(to='events.Label')), - ('pipelines', models.ManyToManyField(to='events.Pipeline')), - ('searches', models.ManyToManyField(to='events.Search')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - ), - migrations.CreateModel( - name='SupereventNotification', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('far_threshold', models.FloatField(blank=True, null=True)), - ('label_query', models.CharField(blank=True, max_length=100, null=True)), - ('contacts', models.ManyToManyField(to='alerts.Contact')), - ('labels', models.ManyToManyField(to='events.Label')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - options={ - 'abstract': False, - }, - ), - migrations.RemoveField( - model_name='notification', - name='contacts', - ), - migrations.RemoveField( - model_name='notification', - name='labels', - ), - migrations.RemoveField( - model_name='notification', - name='pipelines', - ), - migrations.RemoveField( - model_name='notification', - name='user', - ), - migrations.DeleteModel( - name='Notification', - ), - ] diff --git a/gracedb/alerts/migrations/0010_supereventnotification_ns_candidate.py b/gracedb/alerts/migrations/0010_supereventnotification_ns_candidate.py deleted file mode 100644 index 13e905749..000000000 --- a/gracedb/alerts/migrations/0010_supereventnotification_ns_candidate.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-31 19:34 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0009_auto_20190131_1916'), - ] - - operations = [ - migrations.AddField( - model_name='supereventnotification', - name='ns_candidate', - field=models.BooleanField(default=False), - ), - ] diff --git a/gracedb/alerts/migrations/0011_auto_20190131_1953.py b/gracedb/alerts/migrations/0011_auto_20190131_1953.py deleted file mode 100644 index 3e4304a62..000000000 --- a/gracedb/alerts/migrations/0011_auto_20190131_1953.py +++ /dev/null @@ -1,40 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-31 19:53 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0010_supereventnotification_ns_candidate'), - ] - - operations = [ - migrations.AlterField( - model_name='eventnotification', - name='groups', - field=models.ManyToManyField(blank=True, to='events.Group'), - ), - migrations.AlterField( - model_name='eventnotification', - name='labels', - field=models.ManyToManyField(blank=True, to='events.Label'), - ), - migrations.AlterField( - model_name='eventnotification', - name='pipelines', - field=models.ManyToManyField(blank=True, to='events.Pipeline'), - ), - migrations.AlterField( - model_name='eventnotification', - name='searches', - field=models.ManyToManyField(blank=True, to='events.Search'), - ), - migrations.AlterField( - model_name='supereventnotification', - name='labels', - field=models.ManyToManyField(blank=True, to='events.Label'), - ), - ] diff --git a/gracedb/alerts/migrations/0012_auto_20190131_2027.py b/gracedb/alerts/migrations/0012_auto_20190131_2027.py deleted file mode 100644 index 867b785a7..000000000 --- a/gracedb/alerts/migrations/0012_auto_20190131_2027.py +++ /dev/null @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-01-31 20:27 -from __future__ import unicode_literals - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion - - -class Migration(migrations.Migration): - - dependencies = [ - ('events', '0031_hwinj_labels'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('alerts', '0011_auto_20190131_1953'), - ] - - operations = [ - migrations.CreateModel( - name='Notification', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('far_threshold', models.FloatField(blank=True, null=True)), - ('label_query', models.CharField(blank=True, max_length=100, null=True)), - ('category', models.CharField(choices=[(b'E', b'Event'), (b'S', b'Superevent')], default=b'S', max_length=1)), - ('ns_candidate', models.BooleanField(default=False)), - ('contacts', models.ManyToManyField(to='alerts.Contact')), - ('groups', models.ManyToManyField(blank=True, to='events.Group')), - ('labels', models.ManyToManyField(blank=True, to='events.Label')), - ('pipelines', models.ManyToManyField(blank=True, to='events.Pipeline')), - ('searches', models.ManyToManyField(blank=True, to='events.Search')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ], - ), - migrations.RemoveField( - model_name='eventnotification', - name='contacts', - ), - migrations.RemoveField( - model_name='eventnotification', - name='groups', - ), - migrations.RemoveField( - model_name='eventnotification', - name='labels', - ), - migrations.RemoveField( - model_name='eventnotification', - name='pipelines', - ), - migrations.RemoveField( - model_name='eventnotification', - name='searches', - ), - migrations.RemoveField( - model_name='eventnotification', - name='user', - ), - migrations.RemoveField( - model_name='supereventnotification', - name='contacts', - ), - migrations.RemoveField( - model_name='supereventnotification', - name='labels', - ), - migrations.RemoveField( - model_name='supereventnotification', - name='user', - ), - migrations.DeleteModel( - name='EventNotification', - ), - migrations.DeleteModel( - name='SupereventNotification', - ), - ] diff --git a/gracedb/alerts/migrations/0013_auto_20190201_1150.py b/gracedb/alerts/migrations/0013_auto_20190201_1150.py deleted file mode 100644 index ffd91bf32..000000000 --- a/gracedb/alerts/migrations/0013_auto_20190201_1150.py +++ /dev/null @@ -1,26 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-02-01 11:50 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0012_auto_20190131_2027'), - ] - - operations = [ - migrations.AddField( - model_name='notification', - name='description', - field=models.CharField(default='description', max_length=30), - preserve_default=False, - ), - migrations.AlterField( - model_name='contact', - name='description', - field=models.CharField(max_length=30), - ), - ] diff --git a/gracedb/alerts/migrations/0014_auto_20190201_1159.py b/gracedb/alerts/migrations/0014_auto_20190201_1159.py deleted file mode 100644 index b4c8a07a1..000000000 --- a/gracedb/alerts/migrations/0014_auto_20190201_1159.py +++ /dev/null @@ -1,20 +0,0 @@ -# -*- coding: utf-8 -*- -# Generated by Django 1.11.18 on 2019-02-01 11:59 -from __future__ import unicode_literals - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('alerts', '0013_auto_20190201_1150'), - ] - - operations = [ - migrations.AlterField( - model_name='notification', - name='description', - field=models.CharField(max_length=40), - ), - ] -- GitLab