前台比赛、比赛题目与普通题目的一系列界面

submission/views.py

@@ -19,7 +19,7 @@ from contest.models import Contest, ContestProblem
 
 from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page, paginate
 from .models import Submission
-from .serializers import CreateSubmissionSerializer, SubmissionSerializer, CreateContestSubmissionSerializer
+from .serializers import CreateSubmissionSerializer, SubmissionSerializer
 
 
 class SubmissionAPIView(APIView):
@@ -73,34 +73,24 @@ class SubmissionAPIView(APIView):
 
 @login_required
 def problem_my_submissions_list_page(request, problem_id):
+    """
+    我单个题目所有提交的列表页
+    """
     try:
         problem = Problem.objects.get(id=problem_id, visible=True)
     except Problem.DoesNotExist:
         return error_page(request, u"问题不存在")
-    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id).order_by("-create_time"). \
+    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=problem.id, contest_id__isnull=True).order_by("-create_time"). \
         values("id", "result", "create_time", "accepted_answer_time", "language")
     return render(request, "oj/problem/my_submissions_list.html",
                   {"submissions": submissions, "problem": problem})
 
 
-@login_required
-def contest_problem_my_submissions_list_page(request, contest_id, contest_problem_id):
-    try:
-        Contest.objects.get(id=contest_id)
-    except Contest.DoesNotExist:
-        return error_page(request, u"比赛不存在")
-    try:
-        contest_problem = ContestProblem.objects.get(id=contest_problem_id, visible=True)
-    except Problem.DoesNotExist:
-        return error_page(request, u"比赛问题不存在")
-    submissions = Submission.objects.filter(user_id=request.user.id, problem_id=contest_problem.id).order_by("-create_time"). \
-        values("id", "result", "create_time", "accepted_answer_time", "language")
-    return render(request, "oj/contest/my_submissions_list.html",
-                  {"submissions": submissions, "contest_problem": contest_problem})
-
-
 @login_required
 def my_submission(request, submission_id):
+    """
+    单个题目的提交详情页
+    """
     try:
         # 超级管理员可以查看所有的提交
         if request.user.admin_type != SUPER_ADMIN:
@@ -110,10 +100,18 @@ def my_submission(request, submission_id):
     except Submission.DoesNotExist:
         return error_page(request, u"提交不存在")
 
-    try:
-        problem = Problem.objects.get(id=submission.problem_id, visible=True)
-    except Problem.DoesNotExist:
-        return error_page(request, u"提交不存在")
+    if submission.contest_id:
+        try:
+            problem = ContestProblem.objects.get(id=submission.problem_id,
+                                                 visible=True)
+        except ContestProblem.DoesNotExist:
+            return error_page(request, u"提交不存在")
+    else:
+        try:
+            problem = Problem.objects.get(id=submission.problem_id, visible=True)
+        except Problem.DoesNotExist:
+            return error_page(request, u"提交不存在")
+
     if submission.info:
         try:
             info = json.loads(submission.info)
@@ -136,6 +134,9 @@ class SubmissionAdminAPIView(APIView):
 
 @login_required
 def my_submission_list_page(request, page=1):
+    """
+    我的所有提交的列表页
+    """
     submissions = Submission.objects.filter(user_id=request.user.id). \
         values("id", "result", "create_time", "accepted_answer_time", "language").order_by("-create_time")
     paginator = Paginator(submissions, 20)
@@ -158,41 +159,4 @@ def my_submission_list_page(request, page=1):
                    "previous_page": previous_page, "next_page": next_page, "start_id": int(page) * 20 - 20})
 
 
-class ContestSubmissionAPIView(APIView):
-    @check_user_contest_permission
-    def post(self, request):
-        """
-        创建比赛的提交
-        ---
-        request_serializer: ConestSubmissionSerializer
-        """
-        serializer = CreateContestSubmissionSerializer(data=request.data)
-        if serializer.is_valid():
-            data = serializer.data
-            try:
-                contest = Contest.objects.get(id=data["contest_id"])
-            except Contest.DoesNotExist:
-                return error_response(u"比赛不存在")
-            try:
-                problem = ContestProblem.objects.get(contest=contest, id=data["problem_id"])
-                # 更新题目提交计数器
-                problem.total_submit_number += 1
-                problem.save()
-            except Problem.DoesNotExist:
-                return error_response(u"题目不存在")
 
-            submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]),
-                                                   contest_id=contest.id, code=data["code"], problem_id=problem.id)
-            try:
-                judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
-            except Exception:
-                return error_response(u"提交判题任务失败")
-
-            # 增加redis 中判题队列长度的计数器
-            r = redis.Redis(host=redis_config["host"], port=redis_config["port"], db=redis_config["db"])
-            r.incr("judge_queue_length")
-
-            return success_response({"submission_id": submission.id})
-
-        else:
-            return serializer_invalid_response(serializer)