修改比赛的views及部分问题

announcement/serializers.py

@@ -9,7 +9,7 @@ class CreateAnnouncementSerializer(serializers.Serializer):
     title = serializers.CharField(max_length=50)
     content = serializers.CharField(max_length=10000)
     is_global = serializers.BooleanField()
-    groups = serializers.ListField(child=serializers.IntegerField(), allow_empty=True)
+    groups = serializers.ListField(child=serializers.IntegerField())
 
 
 class AnnouncementSerializer(serializers.ModelSerializer):

announcement/views.py

@@ -68,7 +68,7 @@ class AnnouncementAdminAPIView(APIView):
                 if request.user.admin_type == SUPER_ADMIN:
                     announcement = Announcement.objects.get(id=data["id"])
                 else:
-                    announcement = Announcement.objects.get(id=data["id"], admin=request.user)
+                    announcement = Announcement.objects.get(id=data["id"], created_by=request.user)
             except Announcement.DoesNotExist:
                 return error_response(u"公告不存在")
             groups = []
@@ -101,7 +101,7 @@ class AnnouncementAdminAPIView(APIView):
         if request.user.admin_type == SUPER_ADMIN:
             announcement = Announcement.objects.all().order_by("-last_update_time")
         else:
-            announcement = Announcement.objects.filter(admin=request.user)
+            announcement = Announcement.objects.filter(created_by=request.user)
         visible = request.GET.get("visible", None)
         if visible:
             announcement = announcement.filter(visible=(visible == "true"))

contest/models.py

@@ -7,7 +7,7 @@ from group.models import Group
 
 
 class Contest(models.Model):
-    title = models.CharField(max_length=40)
+    title = models.CharField(max_length=40, unique=True)
     description = models.TextField()
     # 比赛模式：0 即为是acm模式，1 即为是按照总的 ac 题目数量排名模式，2 即为按照 ac 的题目的总分排名模式
     mode = models.IntegerField()
@@ -34,7 +34,6 @@ class Contest(models.Model):
     created_by = models.ForeignKey(User)
     groups = models.ManyToManyField(Group)
 
-
     class Meta:
         db_table = "contest"
 

contest/views.py

@@ -33,48 +33,34 @@ class ContestAdminAPIView(APIView):
             data = serializer.data
             groups = []
             # 首先判断比赛的类型： 0 即为是小组赛，1 即为是无密码的公开赛，2 即为是有密码的公开赛
-                # 密码字段不为空的情况，此时为有密码的公开赛，
             # 此时为有密码的公开赛，并且此时只能超级管理员才有权限此创建比赛
+            if data["contest_type"] in [1, 2]:
+                if request.user.admin_type != SUPER_ADMIN:
+                    return error_response(u"只有超级管理员才可创建公开赛")
             if data["contest_type"] == 2:
-                if data["password"]:
-                    if request.user.admin_type == SUPER_ADMIN:
-                        pass
-                    else:
-                        return error_response(u"只有超级管理员才可创建公开赛（有密码）")
-                else:
-                    return error_response(u"此比赛为有密码的公开赛，密码不可为空")
-            # 此时为没有密码的公开赛，并且此时只能是超级管理员才有权限创建此比赛
-            elif data["contest_type"]:
                 if not data["password"]:
-                    if request.user.admin_type == SUPER_ADMIN:
+                    return error_response(u"此比赛为有密码的公开赛，密码不可为空")
-                        pass
+
-                    else:
+            # 没有密码的公开赛 没有密码的小组赛
-                        return error_response(u"只有超级管理员才可创建公开赛（没有密码）")
+            elif data["contest_type"] == 0:
+                if request.user.admin_type == SUPER_ADMIN:
+                    groups = Group.objects.filter(id__in=data["groups"])
                 else:
-                    return error_response(u"此比赛为没有密码的公开赛，密码无需填写")
+                    groups = Group.objects.filter(id__in=data["groups"], admin=request.user)
-            # 此时为没有密码的小组赛，并且此时只能是超级管理员和管理员才有权限创建此比赛
+                if not groups.count():
-            else:
+                    return error_response(u"请至少选择一个小组")
-                if request.user.admin_type == REGULAR_USER:
-                    return error_response(u"只有超级管理员和管理员才有权限创建比赛")
-                else:
-                    if not data["password"]:
-                        groups = Group.objects.filter(id__in=data["groups"], admin=request.user)
-                    else:
-                        return error_response(u"此比赛为没有密码的小组赛，密码无需填写")
             try:
                 contest = Contest.objects.create(title=data["title"], description=data["description"],
                                                  mode=data["mode"], show_rank=data["show_rank"],
                                                  show_user_submission=data["show_user_submission"],
-                                                 start_time=["start_time"], end_time=data["end_time"])
+                                                 start_time=["start_time"], end_time=data["end_time"],
-                if data["password"]:
+                                                 password=data["password"])
-                    contest.setpassword(data["password"])
-                contest.save()
             except IntegrityError:
                 return error_response(u"比赛名已经存在")
             contest.groups.add(*groups)
             return success_response(ContestSerializer(contest).data)
         else:
-            serializer_invalid_response(serializer)
+            return serializer_invalid_response(serializer)
 
     def put(self, request):
         """
@@ -86,24 +72,45 @@ class ContestAdminAPIView(APIView):
         serializer = EditContestSerializer(data=request.data)
         if serializer.is_valid():
             data = serializer.data
+            groups = []
             try:
                 contest = Contest.objects.get(id=data["id"])
             except Contest.DoesNotExist:
-                error_response(u"该比赛不存在！")
+                return error_response(u"该比赛不存在！")
             try:
-                contest.title = data["contest"]
+                contest = Contest.objects.get(title=data["title"])
-                contest.description = data["description"]
+                if contest.id != data["id"]:
-                contest.mode = data["mode"]
+                    return error_response(u"该比赛名称已经存在")
-                contest.show_rank = data["show_"]
+            except Contest.DoesNotExist:
-                if data["password"]:
+                pass
-                    contest.set_password(data["password"])
+            if data["contest_type"] in [1, 2]:
-                contest.save()
+                if request.user.admin_type != SUPER_ADMIN:
-            except IntegrityError:
+                    return error_response(u"只有超级管理员才可创建公开赛")
-                return error_response(u"比赛名已经存在")
+            if data["contest_type"] == 2:
+                if not data["password"]:
+                    return error_response(u"此比赛为有密码的公开赛，密码不可为空")
+            elif data["contest_type"] == 0:
+                if request.user.admin_type == SUPER_ADMIN:
+                    groups = Group.objects.filter(id__in=data["groups"])
+                else:
+                    groups = Group.objects.filter(id__in=data["groups"], admin=request.user)
+                if not groups.count():
+                    return error_response(u"请至少选择一个小组")
+            contest.title = data["title"]
+            contest.description = data["description"]
+            contest.mode = data["mode"]
+            contest.show_rank = data["show_rank"]
+            contest.show_user_submission = data["show_user_submission"]
+            contest.start_time = ["start_time"]
+            contest.end_time = data["end_time"]
+            contest.password = data["password"]
+            contest.save()
 
+            contest.groups.clear()
+            contest.groups.add(*groups)
             return success_response(ContestSerializer(contest).data)
         else:
-            serializer_invalid_response(serializer)
+            return serializer_invalid_response(serializer)
 
     def get(self, request):
         """
@@ -148,7 +155,7 @@ class ContestProblemAdminAPIView(APIView):
                                                             sort_index=data["sort_index"])
             return success_response(ContestProblemSerializer(contest_problem).data)
         else:
-            serializer_invalid_response(serializer)
+            return serializer_invalid_response(serializer)
 
     def put(self, request):
         """
@@ -190,9 +197,9 @@ class ContestProblemAdminAPIView(APIView):
         contest_problem_id = request.GET.get("contest_problem_id", None)
         if contest_problem_id:
             try:
-                contest_problem = ContestProblemSerializer.objects.get(id=contest_problem_id)
+                contest_problem = ContestProblem.objects.get(id=contest_problem_id)
                 return success_response(ContestProblemSerializer(contest_problem).data)
-            except contest_problem.DoesNotExist:
+            except ContestProblem.DoesNotExist:
                 return error_response(u"比赛题目不存在")
         contest_problem = ContestProblem.objects.all().order_by("sort_index")
         visible = request.GET.get("visible", None)