[合并]与dev合并并修复了冲突
This commit is contained in:
esp
86
contest/decorators.py
Normal file
86
contest/decorators.py
Normal file
@@ -0,0 +1,86 @@
|
||||
# coding=utf-8
|
||||
from functools import wraps
|
||||
|
||||
from django.http import HttpResponse
|
||||
from django.shortcuts import render
|
||||
from django.utils.timezone import now
|
||||
|
||||
from utils.shortcuts import error_response, error_page
|
||||
|
||||
from account.models import SUPER_ADMIN
|
||||
from .models import Contest
|
||||
|
||||
|
||||
def check_user_contest_permission(func):
|
||||
@wraps(func)
|
||||
def _check_user_contest_permission(*args, **kwargs):
|
||||
"""
|
||||
这个函数检查当前的这个比赛对于 request 的用户来说能不能参加
|
||||
需要比较：比赛的开始和结束时间、比赛是否有密码、比赛是不是限定指定小组参加
|
||||
如果是有密码或者限定指定小组参加的话，即使比赛已经结束，那么也是可以看到所有的题目和结果的
|
||||
否则不能看到这个比赛的题目结果排名等等
|
||||
"""
|
||||
# CBV 的情况，第一个参数是self，第二个参数是request
|
||||
if len(args) == 2:
|
||||
request = args[-1]
|
||||
else:
|
||||
request = args[0]
|
||||
|
||||
if not request.user.is_authenticated():
|
||||
if request.is_ajax():
|
||||
return error_response(u"请先登录")
|
||||
else:
|
||||
return error_page(request, u"请先登录")
|
||||
|
||||
# kwargs 就包含了url 里面的播或参数
|
||||
if "contest_id" in kwargs:
|
||||
contest_id = kwargs["contest_id"]
|
||||
elif "contest_id" in request.data:
|
||||
contest_id = request.data["contest_id"]
|
||||
else:
|
||||
if request.is_ajax():
|
||||
return error_response(u"参数错误")
|
||||
else:
|
||||
return error_page(request, u"参数错误")
|
||||
|
||||
try:
|
||||
contest = Contest.objects.get(id=contest_id)
|
||||
except Contest.DoesNotExist:
|
||||
if request.is_ajax():
|
||||
return error_response(u"比赛不存在")
|
||||
else:
|
||||
return error_page(request, u"比赛不存在")
|
||||
|
||||
if request.user.admin_type == SUPER_ADMIN or request.user == contest.created_by:
|
||||
return func(*args, **kwargs)
|
||||
|
||||
# 有密码的公开赛
|
||||
if contest.contest_type == 2:
|
||||
# 没有输入过密码
|
||||
if contest.id not in request.session.get("contests", []):
|
||||
if request.is_ajax():
|
||||
return error_response(u"请先输入密码")
|
||||
else:
|
||||
return render(request, "oj/contest/no_contest_permission.html",
|
||||
{"reason": "password_protect", "show_tab": False, "contest": contest})
|
||||
|
||||
# 指定小组参加的
|
||||
if contest.contest_type == 0:
|
||||
if not contest.groups.filter(id__in=request.user.group_set.all()).exists():
|
||||
if request.is_ajax():
|
||||
return error_response(u"只有指定小组的可以参加这场比赛")
|
||||
else:
|
||||
return render(request, "oj/contest/no_contest_permission.html",
|
||||
{"reason": "group_limited", "show_tab": False, "contest": contest})
|
||||
|
||||
# 比赛没有开始
|
||||
if contest.start_time > now():
|
||||
if request.is_ajax():
|
||||
return error_response(u"比赛还没有开始")
|
||||
else:
|
||||
return render(request, "oj/contest/no_contest_permission.html",
|
||||
{"reason": "contest_not_start", "show_tab": False, "contest": contest})
|
||||
|
||||
return func(*args, **kwargs)
|
||||
|
||||
return _check_user_contest_permission
|
||||
@@ -9,19 +9,17 @@ from group.models import Group
|
||||
class Contest(models.Model):
|
||||
title = models.CharField(max_length=40, unique=True)
|
||||
description = models.TextField()
|
||||
# 比赛模式：0 即为是acm模式，1 即为是按照总的 ac 题目数量排名模式，2 即为按照 ac 的题目的总分排名模式
|
||||
# 比赛模式：0 即为是acm模式，1 即为是按照总的 ac 题目数量排名模式
|
||||
mode = models.IntegerField()
|
||||
# 是否显示排名结果
|
||||
show_rank = models.BooleanField()
|
||||
# 是否显示别人的提交记录
|
||||
show_user_submission = models.BooleanField()
|
||||
|
||||
# 只能超级管理员创建公开赛，管理员只能创建小组内部的比赛
|
||||
# 如果这一项不为空，即为有密码的公开赛，没有密码的可以为小组赛或者是公开赛（此时用比赛的类型来表示）
|
||||
password = models.CharField(max_length=30, blank=True, null=True)
|
||||
# 比赛的类型： 0 即为是小组赛，1 即为是无密码的公开赛，2 即为是有密码的公开赛
|
||||
contest_type = models.IntegerField()
|
||||
|
||||
# 开始时间
|
||||
start_time = models.DateTimeField()
|
||||
# 结束时间
|
||||
|
||||
@@ -103,3 +103,8 @@ class EditContestProblemSerializer(serializers.Serializer):
|
||||
sort_index = serializers.CharField(max_length=30)
|
||||
|
||||
|
||||
class ContestPasswordVerifySerializer(serializers.Serializer):
|
||||
contest_id = serializers.IntegerField()
|
||||
password = serializers.CharField(max_length=30)
|
||||
|
||||
|
||||
|
||||
@@ -1,23 +1,28 @@
|
||||
# coding=utf-8
|
||||
import json
|
||||
import datetime
|
||||
from functools import wraps
|
||||
from django.utils.timezone import now
|
||||
from django.shortcuts import render
|
||||
from django.db import IntegrityError
|
||||
from django.utils import dateparse
|
||||
from django.db.models import Q
|
||||
from django.core.paginator import Paginator
|
||||
from rest_framework.views import APIView
|
||||
from utils.shortcuts import (serializer_invalid_response, error_response,
|
||||
success_response, paginate, rand_str, error_page)
|
||||
|
||||
from account.models import REGULAR_USER, ADMIN, SUPER_ADMIN
|
||||
from account.decorators import login_required
|
||||
from group.models import Group
|
||||
from announcement.models import Announcement
|
||||
|
||||
from .models import Contest, ContestProblem
|
||||
from .decorators import check_user_contest_permission
|
||||
from .serializers import (CreateContestSerializer, ContestSerializer, EditContestSerializer,
|
||||
CreateContestProblemSerializer, ContestProblemSerializer, EditContestProblemSerializer)
|
||||
|
||||
|
||||
def contest_page(request, contest_id):
|
||||
pass
|
||||
CreateContestProblemSerializer, ContestProblemSerializer,
|
||||
EditContestProblemSerializer, ContestPasswordVerifySerializer,
|
||||
EditContestProblemSerializer)
|
||||
|
||||
|
||||
class ContestAdminAPIView(APIView):
|
||||
@@ -230,4 +235,83 @@ class ContestProblemAdminAPIView(APIView):
|
||||
return error_response(u"非法的比赛ID")
|
||||
contest_problem = contest_problem.filter(contest=contest).order_by("sort_index")
|
||||
|
||||
return paginate(request, contest_problem, ContestProblemSerializer)
|
||||
return paginate(request, contest_problem, ContestProblemSerializer)
|
||||
|
||||
|
||||
class ContestPasswordVerifyAPIView(APIView):
|
||||
@login_required
|
||||
def post(self, request):
|
||||
serializer = ContestPasswordVerifySerializer(data=request.data)
|
||||
if serializer.is_valid():
|
||||
data = request.data
|
||||
try:
|
||||
contest = Contest.objects.get(id=data["contest_id"], contest_type=2)
|
||||
except Contest.DoesNotExist:
|
||||
return error_response(u"密码错误")
|
||||
|
||||
if data["password"] != contest.password:
|
||||
return error_response(u" 密码错误")
|
||||
else:
|
||||
if "contests" not in request.session:
|
||||
request.session["contests"] = []
|
||||
request.session["contests"].append(int(data["contest_id"]))
|
||||
# https://docs.djangoproject.com/en/dev/topics/http/sessions/#when-sessions-are-saved
|
||||
request.session.modified = True
|
||||
|
||||
return success_response(True)
|
||||
else:
|
||||
return serializer_invalid_response(serializer)
|
||||
|
||||
|
||||
@check_user_contest_permission
|
||||
def contest_page(request, contest_id):
|
||||
try:
|
||||
contest = Contest.objects.get(id=contest_id)
|
||||
except Contest.DoesNotExist:
|
||||
return error_page(request, u"比赛不存在")
|
||||
|
||||
return render(request, "oj/contest/contest_index.html", {"contest": contest})
|
||||
|
||||
|
||||
def contest_list_page(request, page=1):
|
||||
# 正常情况
|
||||
contests = Contest.objects.filter(visible=True)
|
||||
|
||||
# 搜索的情况
|
||||
keyword = request.GET.get("keyword", None)
|
||||
if keyword:
|
||||
contests = contests.filter(title__contains=keyword)
|
||||
|
||||
# 筛选我能参加的比赛
|
||||
join = request.GET.get("join", None)
|
||||
if join:
|
||||
contests = Contest.objects.filter(Q(contest_type__in=[1, 2]) | Q(groups__in=request.user.group_set.all())).\
|
||||
filter(end_time__gt=datetime.datetime.now(), start_time__lt=datetime.datetime.now())
|
||||
|
||||
paginator = Paginator(contests, 20)
|
||||
try:
|
||||
current_page = paginator.page(int(page))
|
||||
except Exception:
|
||||
return error_page(request, u"不存在的页码")
|
||||
|
||||
previous_page = next_page = None
|
||||
|
||||
try:
|
||||
previous_page = current_page.previous_page_number()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
try:
|
||||
next_page = current_page.next_page_number()
|
||||
except Exception:
|
||||
pass
|
||||
|
||||
# 右侧的公告列表
|
||||
announcements = Announcement.objects.filter(is_global=True, visible=True).order_by("-create_time")
|
||||
# 系统当前时间
|
||||
now = datetime.datetime.now()
|
||||
return render(request, "oj/contest/contest_list.html",
|
||||
{"contests": current_page, "page": int(page),
|
||||
"previous_page": previous_page, "next_page": next_page,
|
||||
"keyword": keyword, "announcements": announcements,
|
||||
"join": join, "now": now})
|
||||
|
||||
Reference in New Issue
Block a user