完成ACM ContestProblem相关判题逻辑

contest,submission等表默认-create_time排序

submission/migrations/0004_auto_20170717_1324.py

@@ -12,8 +12,13 @@ class Migration(migrations.Migration):
     ]
 
     operations = [
+        migrations.RenameField(
+            model_name='submission',
+            old_name='created_time',
+            new_name='create_time',
+        ),
         migrations.AlterModelOptions(
             name='submission',
-            options={'ordering': ('-created_time',)},
-        ),
+            options={'ordering': ('-create_time',)},
+        )
     ]

submission/models.py

@@ -23,7 +23,7 @@ class Submission(models.Model):
     id = models.CharField(max_length=32, default=rand_str, primary_key=True, db_index=True)
     contest_id = models.IntegerField(db_index=True, null=True)
     problem_id = models.IntegerField(db_index=True)
-    created_time = models.DateTimeField(auto_now_add=True)
+    create_time = models.DateTimeField(auto_now_add=True)
     user_id = models.IntegerField(db_index=True)
     code = models.TextField()
     result = models.IntegerField(default=JudgeStatus.PENDING)
@@ -42,7 +42,7 @@ class Submission(models.Model):
 
     class Meta:
         db_table = "submission"
-        ordering = ("-created_time",)
+        ordering = ("-create_time",)
 
     def __str__(self):
         return self.id

submission/serializers.py

@@ -8,6 +8,7 @@ class CreateSubmissionSerializer(serializers.Serializer):
     problem_id = serializers.IntegerField()
     language = serializers.ChoiceField(choices=language_names)
     code = serializers.CharField(max_length=20000)
+    contest_id = serializers.IntegerField(required=False)
 
 
 class SubmissionModelSerializer(serializers.ModelSerializer):
@@ -32,7 +33,7 @@ class SubmissionSafeSerializer(serializers.ModelSerializer):
         return User.objects.get(id=obj.user_id).username
 
 
-class SubmissionListSerializer(SubmissionSafeSerializer):
+class SubmissionListSerializer(serializers.ModelSerializer):
     username = serializers.SerializerMethodField()
     statistic_info = serializers.JSONField()
     show_link = serializers.SerializerMethodField()

submission/urls/oj.py

@@ -1,8 +1,9 @@
 from django.conf.urls import url
 
-from ..views.oj import SubmissionAPI, SubmissionListAPI
+from ..views.oj import SubmissionAPI, SubmissionListAPI, ContestSubmissionListAPI
 
 urlpatterns = [
     url(r"^submission/?$", SubmissionAPI.as_view(), name="submission_api"),
     url(r"^submissions/?$", SubmissionListAPI.as_view(), name="submission_list_api"),
+    url(r"^contest/submissions/?$", ContestSubmissionListAPI.as_view(), name="contest_submission_list_api"),
 ]

submission/views/oj.py

@@ -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)