diff --git a/server/api/urls.py b/server/api/urls.py index 51835b5f..8667c1fe 100644 --- a/server/api/urls.py +++ b/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 = [ diff --git a/server/registration/migrations/0003_auto_20200127_0932.py b/server/registration/migrations/0003_auto_20200204_1331.py similarity index 91% rename from server/registration/migrations/0003_auto_20200127_0932.py rename to server/registration/migrations/0003_auto_20200204_1331.py index 521374f9..f18bb95c 100644 --- a/server/registration/migrations/0003_auto_20200127_0932.py +++ b/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'), ] diff --git a/server/users/migrations/0012_user_hep_group_id.py b/server/users/migrations/0010_auto_20200204_1331.py similarity index 54% rename from server/users/migrations/0012_user_hep_group_id.py rename to server/users/migrations/0010_auto_20200204_1331.py index b2e624d7..9d19221b 100644 --- a/server/users/migrations/0012_user_hep_group_id.py +++ b/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), + ), ] diff --git a/server/users/migrations/0010_magentotoken.py b/server/users/migrations/0010_magentotoken.py deleted file mode 100644 index 32fd768f..00000000 --- a/server/users/migrations/0010_magentotoken.py +++ /dev/null @@ -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)), - ], - ), - ] diff --git a/server/users/migrations/0011_user_hep_id.py b/server/users/migrations/0011_user_hep_id.py deleted file mode 100644 index e1b4ef4d..00000000 --- a/server/users/migrations/0011_user_hep_id.py +++ /dev/null @@ -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), - ), - ] diff --git a/server/users/models.py b/server/users/models.py index c70bc8c8..f071bed6 100644 --- a/server/users/models.py +++ b/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')