Delete userprofile app and move functionality to alerts app

config/settings/base.py

@@ -326,7 +326,6 @@ INSTALLED_APPS = [
     'ligoauth',
     'search',
     'superevents',
-    'userprofile',
     'rest_framework',
     'guardian',
     'django_twilio',
@@ -580,11 +579,6 @@ LOGGING = {
             'propagate': True,
             'level': LOG_LEVEL,
         },
-        'userprofile': {
-            'handlers': ['debug_file','error_file'],
-            'propagate': True,
-            'level': LOG_LEVEL,
-        },
        'django.request': {
             'handlers': ['mail_admins'],
             'level': 'ERROR',

config/urls.py

@@ -33,7 +33,7 @@ urlpatterns = [
         template_name='discovery.html'), name="discovery"),
     url(r'^events/', include('events.urls')),
     url(r'^superevents/', include('superevents.urls')),
-    url(r'^options/', include('userprofile.urls')),
+    url(r'^options/', include('alerts.urls')),
     url(r'^feeds/(?P<url>.*)/$', EventFeed()),
     url(r'^feeds/$', feedview, name="feeds"),
 

gracedb/alerts/main.py

@@ -18,7 +18,7 @@ from events.permission_utils import is_external
 from events.shortcuts import is_event
 from search.query.labels import filter_for_labels
 from superevents.shortcuts import is_superevent
-from userprofile.models import Contact
+from .models import Contact
 from .email import issue_email_alerts
 from .phone import issue_phone_alerts
 from .xmpp import issue_xmpp_alerts

gracedb/userprofile/management/commands/remove_inactive_alerts.py → gracedb/alerts/management/commands/remove_inactive_alerts.py

@@ -4,7 +4,7 @@ from django.conf import settings
 from django.contrib.auth.models import Group
 from django.core.management.base import BaseCommand, CommandError
 
-from userprofile.models import Contact, Trigger
+from alerts.models import Contact, Trigger
 
 
 class Command(BaseCommand):

gracedb/alerts/migrations/0001_initial.py

+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.18 on 2019-01-17 20:11
+from __future__ import unicode_literals
+
+import alerts.models
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('events', '0031_hwinj_labels'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            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.models.PhoneNumberField(blank=True, max_length=255, validators=[alerts.models.validate_phone])),
+                ('call_phone', models.BooleanField(default=False)),
+                ('text_phone', models.BooleanField(default=False)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Trigger',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('triggerType', models.CharField(blank=True, choices=[(b'create', b'create'), (b'change', b'change'), (b'label', b'label')], max_length=20)),
+                ('farThresh', models.FloatField(blank=True, null=True)),
+                ('label_query', models.CharField(blank=True, max_length=100)),
+                ('contacts', models.ManyToManyField(to='alerts.Contact')),
+                ('labels', models.ManyToManyField(blank=True, to='events.Label')),
+                ('pipelines', models.ManyToManyField(blank=True, to='events.Pipeline')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+    ]

gracedb/userprofile/tests/test_access.py → gracedb/alerts/tests/test_access.py

@@ -5,7 +5,7 @@ from django.contrib.auth.models import Group as AuthGroup
 from django.urls import reverse
 
 from core.tests.utils import GraceDbTestBase
-from userprofile.models import Contact, Trigger
+from alerts.models import Contact, Trigger
 
 
 class TestIndexView(GraceDbTestBase):

gracedb/userprofile/migrations/0001_initial.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('events', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Contact',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('desc', models.CharField(max_length=20)),
-                ('email', models.EmailField(max_length=75)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-        migrations.CreateModel(
-            name='Trigger',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('triggerType', models.CharField(blank=True, max_length=20, choices=[(b'create', b'create'), (b'change', b'change'), (b'label', b'label')])),
-                ('farThresh', models.FloatField(null=True, blank=True)),
-                ('contacts', models.ManyToManyField(to='userprofile.Contact', blank=True)),
-                ('labels', models.ManyToManyField(to='events.Label', blank=True)),
-                ('pipelines', models.ManyToManyField(to='events.Pipeline', blank=True)),
-                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
-            ],
-            options={
-            },
-            bases=(models.Model,),
-        ),
-    ]

gracedb/userprofile/migrations/0002_alter_email_field_length.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import models, migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('userprofile', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='contact',
-            name='email',
-            field=models.EmailField(max_length=254),
-        ),
-    ]

gracedb/userprofile/migrations/0003_trigger_label_query.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('userprofile', '0002_alter_email_field_length'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='trigger',
-            name='label_query',
-            field=models.CharField(max_length=100, blank=True),
-        ),
-    ]

gracedb/userprofile/migrations/0004_add_contact_phone_number.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import userprofile.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('userprofile', '0003_trigger_label_query'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contact',
-            name='phone',
-            field=userprofile.models.PhoneNumberField(blank=True, max_length=255, validators=[userprofile.models.validate_phone, userprofile.models.validate_phone, userprofile.models.validate_phone]),
-        ),
-        migrations.AlterField(
-            model_name='contact',
-            name='email',
-            field=models.EmailField(max_length=254, blank=True),
-        ),
-    ]

gracedb/userprofile/migrations/0005_separate_call_and_text_alerts.py

-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-import userprofile.models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('userprofile', '0004_add_contact_phone_number'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='contact',
-            name='call_phone',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AddField(
-            model_name='contact',
-            name='text_phone',
-            field=models.BooleanField(default=False),
-        ),
-        migrations.AlterField(
-            model_name='contact',
-            name='phone',
-            field=userprofile.models.PhoneNumberField(blank=True, max_length=255, validators=[userprofile.models.validate_phone]),
-        ),
-    ]