Fix urls, reset new migrations

server/api/urls.py

@@ -5,7 +5,7 @@ from graphene_django.views import GraphQLView
 
 from api.schema_public import schema
 
-from core.views import PrivateGraphQLView, ConfirmationKeyView
+from core.views import PrivateGraphQLView, ConfirmationKeyDisplayView
 
 app_name = 'api'
 urlpatterns = [

server/registration/migrations/0003_auto_20200204_1331.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2020-01-27 09:32
+# Generated by Django 2.0.6 on 2020-02-04 13:31
 
 from django.db import migrations, models
 import django.db.models.deletion
@@ -7,7 +7,7 @@ import django.db.models.deletion
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('users', '0010_magentotoken'),
+        ('users', '0010_auto_20200204_1331'),
         ('registration', '0002_auto_20191010_0905'),
     ]
 

server/users/migrations/0010_auto_20200204_1331.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.0.6 on 2020-01-30 05:50
+# Generated by Django 2.0.6 on 2020-02-04 13:31
 
 from django.db import migrations, models
 
@@ -6,7 +6,7 @@ from django.db import migrations, models
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('users', '0011_user_hep_id'),
+        ('users', '0009_auto_20191009_0905'),
     ]
 
     operations = [
@@ -15,4 +15,9 @@ class Migration(migrations.Migration):
             name='hep_group_id',
             field=models.PositiveIntegerField(null=True),
         ),
+        migrations.AddField(
+            model_name='user',
+            name='hep_id',
+            field=models.PositiveIntegerField(null=True),
+        ),
     ]

server/users/migrations/0010_magentotoken.py

@@ -1,24 +0,0 @@
-# Generated by Django 2.0.6 on 2020-01-27 09:32
-
-from django.conf import settings
-from django.db import migrations, models
-import django.db.models.deletion
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0009_auto_20191009_0905'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='MagentoToken',
-            fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('token', models.CharField(blank=True, max_length=64, null=True)),
-                ('created_at', models.DateTimeField(auto_now=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='user_token', to=settings.AUTH_USER_MODEL)),
-            ],
-        ),
-    ]

server/users/migrations/0011_user_hep_id.py

@@ -1,18 +0,0 @@
-# Generated by Django 2.0.6 on 2020-01-27 13:20
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('users', '0010_magentotoken'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='hep_id',
-            field=models.PositiveIntegerField(null=True),
-        ),
-    ]

server/users/models.py

@@ -173,9 +173,3 @@ class UserRole(models.Model):
 class UserSetting(models.Model):
     user = models.OneToOneField(get_user_model(), on_delete=models.CASCADE, related_name='user_setting')
     selected_class = models.ForeignKey(SchoolClass, blank=True, null=True, on_delete=models.CASCADE)
-
-
-class MagentoToken(models.Model):
-    token = models.CharField(blank=True, null=True, max_length=64)
-    created_at = models.DateTimeField(auto_now=True)
-    user = models.ForeignKey(User, blank=False, null=False, on_delete=models.CASCADE, related_name='user_token')