xuyue/OnlineJudge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完成ACM ContestProblem相关判题逻辑

Browse Source 
contest,submission等表默认-create_time排序
This commit is contained in:
zemal
2017-08-01 16:52:48 +08:00
parent 17432b4c81
commit 14b850c652
13 changed files with 224 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
submission/views/oj.py
View File

@@ -1,17 +1,19 @@
from django_redis import get_redis_connection
from account.decorators import login_required
from problem.models import Problem, ProblemRuleType
from account.decorators import login_required, check_contest_permission
from problem.models import Problem, ProblemRuleType, ContestProblem
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
from ..serializers import CreateSubmissionSerializer, SubmissionModelSerializer
from ..serializers import SubmissionSafeSerializer, SubmissionListSerializer
from utils.api import APIView, validate_serializer
from utils.throttling import TokenBucket, BucketController
def _submit(response, user, problem_id, language, code, contest_id=None):
def _submit(response, user, problem_id, language, code, contest_id):
# TODO: 预设默认值，需修改
controller = BucketController(user_id=user.id,
redis_conn=get_redis_connection("Throttling"),
@@ -24,9 +26,11 @@ def _submit(response, user, problem_id, language, code, contest_id=None):
controller.last_capacity -= 1
else:
return response.error("Please wait %d seconds" % int(bucket.expected_time() + 1))
try:
problem = Problem.objects.get(_id=problem_id)
if contest_id:
problem = ContestProblem.objects.get(_id=problem_id, visible=True)
else:
problem = Problem.objects.get(_id=problem_id, visible=True)
except Problem.DoesNotExist:
return response.error("Problem not exist")
@@ -35,9 +39,9 @@ def _submit(response, user, problem_id, language, code, contest_id=None):
code=code,
problem_id=problem._id,
contest_id=contest_id)
# todo 暂时保留 方便排错
# JudgeDispatcher(submission.id, problem.id).judge()
judge_task.delay(submission.id, problem.id)
# use this for debug
# JudgeDispatcher(submission.id, problem._id).judge()
judge_task.delay(submission.id, problem._id)
return response.success({"submission_id": submission.id})
@@ -46,7 +50,7 @@ class SubmissionAPI(APIView):
@login_required
def post(self, request):
data = request.data
return _submit(self, request.user, data["problem_id"], data["language"], data["code"])
return _submit(self, request.user, data["problem_id"], data["language"], data["code"], data.get("contest_id"))
@login_required
def get(self, request):
@@ -71,11 +75,7 @@ class SubmissionAPI(APIView):
class SubmissionListAPI(APIView):
def get(self, request):
contest_id = request.GET.get("contest_id")
if contest_id:
subs = Submission.objects.filter(contest_id=contest_id)
else:
subs = Submission.objects.filter(contest_id__isnull=True)
subs = Submission.objects.filter(contest_id__isnull=True)
problem_id = request.GET.get("problem_id")
if problem_id:
@@ -86,3 +86,18 @@ class SubmissionListAPI(APIView):
data = self.paginate_data(request, subs)
data["results"] = SubmissionListSerializer(data["results"], many=True, user=request.user).data
return self.success(data)
class ContestSubmissionListAPI(APIView):
@check_contest_permission
def get(self, request):
subs = Submission.objects.filter(contest_id=self.contest.id)
problem_id = request.GET.get("problem_id")
if problem_id:
subs = subs.filter(problem_id=problem_id)
if request.GET.get("myself") and request.GET["myself"] == "1":
subs = subs.filter(user_id=request.user.id)
data = self.paginate_data(request, subs)
data["results"] = SubmissionListSerializer(data["results"], many=True, user=request.user).data
return self.success(data)