From 4733eecef9b129015380c86dbc2951e202e9fcc5 Mon Sep 17 00:00:00 2001 From: zemal Date: Tue, 9 May 2017 14:47:54 +0800 Subject: [PATCH] Add migrations files --- account/models.py | 1 + judge/tasks.py | 4 +-- submission/migrations/0001_initial.py | 39 +++++++++++++++++++++++++++ submission/migrations/__init__.py | 0 submission/views/oj.py | 3 +-- 5 files changed, 42 insertions(+), 5 deletions(-) create mode 100644 submission/migrations/0001_initial.py create mode 100644 submission/migrations/__init__.py diff --git a/account/models.py b/account/models.py index 1e97429e..8802c29a 100644 --- a/account/models.py +++ b/account/models.py @@ -8,6 +8,7 @@ class AdminType(object): ADMIN = "Admin" SUPER_ADMIN = "Super Admin" + class ProblemPermission(object): NONE = "None" OWN = "Own" diff --git a/judge/tasks.py b/judge/tasks.py index ea330587..1a83ce44 100644 --- a/judge/tasks.py +++ b/judge/tasks.py @@ -1,4 +1,3 @@ -import time import json import requests import hashlib @@ -12,9 +11,8 @@ from django_redis import get_redis_connection from judge.languages import languages from account.models import User, UserProfile from conf.models import JudgeServer, JudgeServerToken -from contest.models import Contest from problem.models import Problem, ProblemRuleType -from submission.models import Submission, JudgeStatus +from submission.models import JudgeStatus logger = logging.getLogger(__name__) diff --git a/submission/migrations/0001_initial.py b/submission/migrations/0001_initial.py new file mode 100644 index 00000000..42a5352f --- /dev/null +++ b/submission/migrations/0001_initial.py @@ -0,0 +1,39 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2017-05-09 06:41 +from __future__ import unicode_literals + +from django.db import migrations, models +import jsonfield.fields +import utils.models +import utils.shortcuts + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Submission', + fields=[ + ('id', models.CharField(db_index=True, default=utils.shortcuts.rand_str, max_length=32, primary_key=True, serialize=False)), + ('contest_id', models.IntegerField(db_index=True, null=True)), + ('problem_id', models.IntegerField(db_index=True)), + ('created_time', models.DateTimeField(auto_now_add=True)), + ('user_id', models.IntegerField(db_index=True)), + ('code', utils.models.RichTextField()), + ('result', models.IntegerField(default=6)), + ('info', jsonfield.fields.JSONField(default={})), + ('language', models.CharField(max_length=20)), + ('shared', models.BooleanField(default=False)), + ('accepted_time', models.IntegerField(blank=True, null=True)), + ('accepted_info', jsonfield.fields.JSONField(default={})), + ], + options={ + 'db_table': 'submission', + }, + ), + ] diff --git a/submission/migrations/__init__.py b/submission/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/submission/views/oj.py b/submission/views/oj.py index eb43575d..c34ee5cd 100644 --- a/submission/views/oj.py +++ b/submission/views/oj.py @@ -5,7 +5,6 @@ from account.decorators import login_required from account.models import AdminType, User from problem.models import Problem -from utils.api import CSRFExemptAPIView from utils.api import APIView, validate_serializer from utils.shortcuts import build_query_string from utils.throttling import TokenBucket, BucketController @@ -40,7 +39,7 @@ def _submit_code(response, user, problem_id, language, code): try: _judge.delay(submission, problem) - except Exception as e: + except Exception: return response.error("Failed") return response.success({"submission_id": submission.id})