diff --git a/backend/core/migrations/0001_initial.py b/backend/core/migrations/0001_initial.py index 8f531591b207dcbb13a24fdc092743b32da8f340..39b10c6dff91fd6ba136f6c7dd74e2870b375bb2 100644 --- a/backend/core/migrations/0001_initial.py +++ b/backend/core/migrations/0001_initial.py @@ -2,10 +2,11 @@ # Generated by Django 1.11.7 on 2017-11-04 19:10 from __future__ import unicode_literals -import core.models +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion + +import core.models class Migration(migrations.Migration): diff --git a/backend/core/models.py b/backend/core/models.py index 01218655b51f2038ba486d39aeac3ff74614ade8..3124992c15475cd0b6cbc939d66780cc26f961c3 100644 --- a/backend/core/models.py +++ b/backend/core/models.py @@ -10,8 +10,8 @@ from collections import OrderedDict from random import randrange, sample from string import ascii_lowercase -from django.contrib.auth.models import AbstractBaseUser, BaseUserManager from django.contrib.auth import get_user_model +from django.contrib.auth.models import AbstractBaseUser, BaseUserManager from django.db import models from django.db.models import Value as V from django.db.models import (BooleanField, Case, Count, F, IntegerField, Q, diff --git a/backend/core/serializers.py b/backend/core/serializers.py index 6ccd3c498281b2ccaaec8a145da7737f31ac41d9..b8f2e56fdd6c5fa857fea02fa2e08bee040668b6 100644 --- a/backend/core/serializers.py +++ b/backend/core/serializers.py @@ -1,5 +1,6 @@ from rest_framework import serializers -from core.models import Student, Submission, Feedback, ExamType + +from core.models import ExamType, Feedback, Student, Submission class ExamSerializer(serializers.ModelSerializer): diff --git a/backend/core/tests.py b/backend/core/tests.py index d9db4611624af0d5fa2d8253bf2e121ca19da2a1..9447b62443453bc2e8e251a092e812a2db790a77 100644 --- a/backend/core/tests.py +++ b/backend/core/tests.py @@ -1,6 +1,7 @@ from django.test import TestCase -from core.models import Submission, SubmissionType, Feedback, Student, Tutor, Reviewer +from core.models import (Feedback, Reviewer, Student, Submission, + SubmissionType, Tutor) from util.importer import GradyUserFactory diff --git a/backend/core/urls.py b/backend/core/urls.py index 6ce62b41e5696ab2ec47771ca3f4925cd14eb897..539e3183125cbdc9b55d83b91c356ed9757c5212 100644 --- a/backend/core/urls.py +++ b/backend/core/urls.py @@ -4,8 +4,6 @@ from rest_framework_jwt.views import obtain_jwt_token from core import views - - urlpatterns = [ url(r'^$', views.IndexView.as_view(), name='index'), url(r'^login/$', views.Login.as_view(), name='login'), diff --git a/backend/core/views/api.py b/backend/core/views/api.py index 5ab7f1ef20219d23f692d3915e7f9c56871bbf19..3f015b444b638508b0849bf517d4990ca431478c 100644 --- a/backend/core/views/api.py +++ b/backend/core/views/api.py @@ -1,6 +1,8 @@ -from core.serializers import SubmissionSerializer, StudentSerializer, FeedbackSerializer from rest_framework.generics import RetrieveAPIView + from core.permissions import IsStudent +from core.serializers import (FeedbackSerializer, StudentSerializer, + SubmissionSerializer) class StudentApiView(RetrieveAPIView): @@ -25,5 +27,3 @@ class FeedbackApiView(RetrieveAPIView): def get_queryset(self): return [submission.feedback for submission in self.request.user.submissions] serializer_class = FeedbackSerializer - - diff --git a/backend/grady/settings/default.py b/backend/grady/settings/default.py index 295139848043c5cdd49a4241e3d6f135975a72cb..deacf96ff165ddf6a11ac0079f4ab26d0df538bf 100644 --- a/backend/grady/settings/default.py +++ b/backend/grady/settings/default.py @@ -10,8 +10,8 @@ For the full list of settings and their values, see https://docs.djangoproject.com/en/1.10/ref/settings/ """ -import os import datetime +import os from django.contrib.messages import constants as messages @@ -159,4 +159,3 @@ REST_FRAMEWORK = { JWT_AUTH = { 'JWT_EXPIRATION_DELTA': datetime.timedelta(seconds=600), } - diff --git a/backend/util/importer.py b/backend/util/importer.py index 5c792deb3ea9c515b8b3e3e5a2ed5aca265db2d8..299f4ae547c1b8e1a8a9dcd2568bf3ca29d0b407 100644 --- a/backend/util/importer.py +++ b/backend/util/importer.py @@ -8,8 +8,9 @@ from typing import Callable import util.convert import util.processing -from core.models import (ExamType, Feedback, Student, Tutor, Reviewer, Submission, - SubmissionType, Test, UserAccount as User) +from core.models import UserAccount as User +from core.models import (ExamType, Feedback, Reviewer, Student, Submission, + SubmissionType, Test, Tutor) from util.messages import info, warn from util.processing import EmptyTest