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

修改判题数据库

Browse Source
This commit is contained in:
virusdefender
2015-08-17 12:48:10 +08:00
parent 3f76df3079
commit 537da5d795
18 changed files with 217 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
submission/migrations/0001_initial.py Normal file
View File

@@ -0,0 +1,32 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
from django.db import models, migrations
import utils.shortcuts
class Migration(migrations.Migration):
dependencies = [
]
operations = [
migrations.CreateModel(
name='Submission',
fields=[
('id', models.CharField(default=utils.shortcuts.rand_str, max_length=32, serialize=False, primary_key=True, db_index=True)),
('user_id', models.IntegerField()),
('create_time', models.DateTimeField(auto_now_add=True)),
('result', models.IntegerField(default=8)),
('language', models.IntegerField()),
('code', models.TextField()),
('problem_id', models.IntegerField()),
('info', models.TextField(null=True, blank=True)),
('accepted_answer_time', models.IntegerField(null=True, blank=True)),
('accepted_answer_info', models.TextField(null=True, blank=True)),
],
options={
'db_table': 'submission',
},
),
]

22
submission/models.py
View File

@@ -1 +1,23 @@
# coding=utf-8
from django.db import models
from utils.shortcuts import rand_str
from judge.judger.result import result
class Submission(models.Model):
id = models.CharField(max_length=32, default=rand_str, primary_key=True, db_index=True)
user_id = models.IntegerField()
create_time = models.DateTimeField(auto_now_add=True)
result = models.IntegerField(default=result["waiting"])
language = models.IntegerField()
code = models.TextField()
problem_id = models.IntegerField()
# 这个字段可能存储很多数据 比如编译错误、系统错误的时候，存储错误原因字符串
# 正常运行的时候存储 lrun 的判题结果，比如cpu时间内存之类的
info = models.TextField(blank=True, null=True)
accepted_answer_time = models.IntegerField(blank=True, null=True)
# 这个字段只有在题目是accepted 的时候才会用到，比赛题目的提交可能还会有得分等信息，存储在这里面
accepted_answer_info = models.TextField(blank=True, null=True)
class Meta:
db_table = "submission"

58
submission/views.py
View File

@@ -1,28 +1,19 @@
# coding=utf-8
import datetime
import pymongo
from bson.objectid import ObjectId
import json
from django.shortcuts import render
from rest_framework.views import APIView
from django.conf import settings
from judge.judger.result import result
from judge.judger_controller.tasks import judge
from account.decorators import login_required
from problem.models import Problem
from utils.shortcuts import serializer_invalid_response, error_response, success_response, error_page
from .models import Submission
from .serializers import CreateSubmissionSerializer
def _create_mongodb_connection():
mongodb_setting = settings.MONGODB
connection = pymongo.MongoClient(host=mongodb_setting["HOST"], port=mongodb_setting["PORT"])
return connection["oj"]["oj_submission"]
class SubmissionAPIView(APIView):
@login_required
def post(self, request):
@@ -34,23 +25,19 @@ class SubmissionAPIView(APIView):
serializer = CreateSubmissionSerializer(data=request.data)
if serializer.is_valid():
data = serializer.data
# data["language"] = int(data["language"])
data["user_id"] = request.user.id
data["result"] = result["waiting"]
data["create_time"] = datetime.datetime.now()
try:
problem = Problem.objects.get(id=data["problem_id"])
except Problem.DoesNotExist:
return error_response(u"题目不存在")
collection = _create_mongodb_connection()
submission_id = str(collection.insert_one(data).inserted_id)
submission = Submission.objects.create(user_id=request.user.id, language=int(data["language"]),
code=data["code"], problem_id=problem.id)
try:
judge.delay(submission_id, problem.time_limit, problem.memory_limit, problem.test_case_id)
judge.delay(submission.id, problem.time_limit, problem.memory_limit, problem.test_case_id)
except Exception:
return error_response(u"提交判题任务失败")
return success_response({"submission_id": submission_id})
return success_response({"submission_id": submission.id})
else:
return serializer_invalid_response(serializer)
@@ -59,41 +46,36 @@ class SubmissionAPIView(APIView):
submission_id = request.GET.get("submission_id", None)
if not submission_id:
return error_response(u"参数错误")
submission = _create_mongodb_connection().find_one({"_id": ObjectId(submission_id), "user_id": request.user.id})
if submission:
response_data = {"result": submission["result"]}
if submission["result"] == 0:
response_data["accepted_answer_info"] = submission["accepted_answer_info"]
return success_response(response_data)
else:
try:
submission = Submission.objects.get(id=submission_id, user_id=request.user.id)
except Submission.DoesNotExist:
return error_response(u"提交不存在")
response_data = {"result": submission.result}
if submission.result == 0:
response_data["accepted_answer_time"] = submission.accepted_answer_time
return success_response(response_data)
@login_required
def problem_my_submissions_list_page(request, problem_id):
collection = _create_mongodb_connection()
submissions = collection.find({"problem_id": int(problem_id), "user_id": request.user.id},
projection=["result", "accepted_answer_info", "create_time", "language"],
sort=[["create_time", -pymongo.ASCENDING]])
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")
return render(request, "oj/problem/my_submissions_list.html",
{"submissions": submissions, "problem": problem})
@login_required
def my_submission(request, submission_id):
collection = _create_mongodb_connection()
submission = collection.find_one({"user_id": request.user.id, "_id": ObjectId(submission_id)},
projection=["result", "accepted_answer_info", "create_time",
"language", "code", "problem_id", "info"])
if not submission:
try:
submission = Submission.objects.get(id=submission_id)
except Submission.DoesNotExist:
return error_page(request, u"提交不存在")
try:
problem = Problem.objects.get(id=submission["problem_id"], visible=True)
problem = Problem.objects.get(id=submission.problem_id, visible=True)
except Problem.DoesNotExist:
return error_page(request, u"提交不存在")
return render(request, "oj/problem/my_submission.html", {"submission": submission, "problem": problem})
return render(request, "oj/problem/my_submission.html",
{"submission": submission, "problem": problem})