QingdaoU/OnlineJudge
1
0
Fork 0
mirror of https://github.com/QingdaoU/OnlineJudge.git synced 2024-09-21 00:13:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

reformat code.

Browse Source
This commit is contained in:
zemal 2017-07-18 11:25:08 +08:00
parent ee49d0a815
commit 8b85f86124
6 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
account/decorators.py
View File

@ -4,7 +4,7 @@ from utils.api import JSONResponse
from .models import ProblemPermission
from contest.models import Contest, ContestType, ContestStatus
from contest.models import Contest, ContestType
class BasePermissionDecorator(object):
@ -67,10 +67,10 @@ def check_contest_permission(func):
self = args[0]
request = args[1]
user = request.user
if kwargs.get('contest_id'):
contest_id = kwargs.pop('contest_id')
if kwargs.get("contest_id"):
contest_id = kwargs.pop("contest_id")
else:
contest_id = request.GET.get('contest_id')
contest_id = request.GET.get("contest_id")
if not contest_id:
return self.error("Parameter contest_id not exist.")

4
contest/serializers.py
View File

@ -2,8 +2,6 @@ from utils.api import DateTimeTZField, UsernameSerializer, serializers
from .models import Contest, ContestAnnouncement, ContestRuleType
from problem.serializers import ContestProblemSerializer
class CreateConetestSeriaizer(serializers.Serializer):
title = serializers.CharField(max_length=128)
@ -43,7 +41,7 @@ class ContestAdminSerializer(serializers.ModelSerializer):
class ContestSerializer(ContestAdminSerializer):
class Meta:
model = Contest
exclude = ('password', 'visible')
exclude = ("password", "visible")
class ContestAnnouncementSerializer(serializers.ModelSerializer):

7
problem/tests.py
View File

@ -208,18 +208,17 @@ class ContestProblemTest(APITestCase):
def test_get_one_contest_problem(self):
contest_id = self.contest.data["data"]["id"]
problem_id = self.problem.data["data"]["_id"]
resp = self.client.get("{}?contest_id={}&problem_id={}".format(self.url,contest_id, problem_id))
resp = self.client.get("{}?contest_id={}&problem_id={}".format(self.url, contest_id, problem_id))
self.assertSuccess(resp)
def test_regular_user_get_contest_problem(self):
self.create_user("test", "test123")
contest_id = self.contest.data["data"]["id"]
problem_id = self.problem.data["data"]["_id"]
resp = self.client.get("{}?contest_id={}&problem_id={}".format(self.url,contest_id, problem_id))
resp = self.client.get("{}?contest_id={}&problem_id={}".format(self.url, contest_id, problem_id))
self.assertFailed(resp)
url = self.reverse("contest_password_api")
self.client.post(url, {"contest_id": contest_id, "password": DEFAULT_CONTEST_DATA["password"]})
resp = self.client.get("{}?contest_id={}&problem_id={}".format(self.url,contest_id, problem_id))
resp = self.client.get("{}?contest_id={}&problem_id={}".format(self.url, contest_id, problem_id))
self.assertSuccess(resp)

2
problem/views/oj.py
View File

@ -1,6 +1,6 @@
from django.db.models import Q
from utils.api import APIView
from account.decorators import login_required, check_contest_permission
from account.decorators import check_contest_permission
from ..models import ProblemTag, Problem, ContestProblem
from ..serializers import ProblemSerializer, TagSerializer
from ..serializers import ContestProblemSerializer

5
submission/views/oj.py
View File

@ -1,13 +1,12 @@
from django_redis import get_redis_connection
from account.decorators import login_required
from account.models import AdminType, User
from problem.models import Problem, ProblemRuleType
from submission.tasks import judge_task
# from judge.dispatcher import JudgeDispatcher
from utils.api import APIView, validate_serializer
from utils.throttling import TokenBucket, BucketController
from ..models import Submission, JudgeStatus
from ..models import Submission
from ..serializers import CreateSubmissionSerializer, SubmissionModelSerializer
from ..serializers import SubmissionSafeSerializer, SubmissionListSerializer
@ -87,5 +86,3 @@ class SubmissionListAPI(APIView):
data = self.paginate_data(request, subs)
data["results"] = SubmissionListSerializer(data["results"], many=True, user=request.user).data
return self.success(data)