[合并]与dev合并并修复了冲突

contest/views.py

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