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

remove contest type

Browse Source
This commit is contained in:
yuetsh
2026-05-26 23:10:27 -06:00
parent 6b81856bfd
commit 6ab2886f77
12 changed files with 69 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
contest/migrations/0006_remove_oi_and_realtime.py Normal file
View File

@@ -0,0 +1,13 @@
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("contest", "0005_alter_acmcontestrank_accepted_number_and_more"),
]
operations = [
migrations.DeleteModel(name="OIContestRank"),
migrations.RemoveField(model_name="contest", name="real_time_rank"),
migrations.RemoveField(model_name="contest", name="rule_type"),
]

22
contest/models.py
View File

@@ -1,4 +1,3 @@
from utils.constants import ContestRuleType # noqa
from django.db import models
from django.utils.timezone import now
from utils.models import JSONField
@@ -12,10 +11,7 @@ class Contest(models.Model):
title = models.TextField()
description = RichTextField()
tag = models.TextField()
# show real time rank or cached rank
real_time_rank = models.BooleanField()
password = models.TextField(null=True)
rule_type = models.TextField(choices=ContestRuleType.choices)
start_time = models.DateTimeField()
end_time = models.DateTimeField()
create_time = models.DateTimeField(auto_now_add=True)
@@ -45,7 +41,7 @@ class Contest(models.Model):
# 是否有权查看problem 的一些统计信息 诸如submission_number, accepted_number 等
def problem_details_permission(self, user):
return self.rule_type == ContestRuleType.ACM or self.status == ContestStatus.CONTEST_ENDED or user.is_authenticated and user.is_contest_admin(self) or self.real_time_rank
return self.status == ContestStatus.CONTEST_ENDED or user.is_authenticated and user.is_contest_admin(self)
class Meta:
db_table = "contest"
@@ -80,22 +76,6 @@ class ACMContestRank(AbstractContestRank):
]
class OIContestRank(AbstractContestRank):
total_score = models.IntegerField(default=0, db_default=0)
# {"23": 333}
# key is problem id, value is current score
submission_info = JSONField(default=dict, db_default=models.Value({}, output_field=models.JSONField()))
class Meta:
db_table = "oi_contest_rank"
constraints = [
models.UniqueConstraint(fields=["user", "contest"], name="unique_oi_rank_user_contest"),
]
indexes = [
models.Index(fields=["contest", "total_score"], name="oi_rank_order_idx"),
models.Index(fields=["contest", "user"], name="oi_rank_contest_user_idx"),
]
class ContestAnnouncement(models.Model):
contest = models.ForeignKey(Contest, on_delete=models.CASCADE)

19
contest/serializers.py
View File

@@ -1,6 +1,6 @@
from utils.api import UsernameSerializer, serializers
from .models import ACMContestRank, Contest, ContestAnnouncement, ContestRuleType, OIContestRank
from .models import ACMContestRank, Contest, ContestAnnouncement
class CreateConetestSeriaizer(serializers.Serializer):
@@ -9,10 +9,8 @@ class CreateConetestSeriaizer(serializers.Serializer):
tag = serializers.CharField()
start_time = serializers.DateTimeField()
end_time = serializers.DateTimeField()
rule_type = serializers.ChoiceField(choices=ContestRuleType.choices)
password = serializers.CharField(allow_blank=True, max_length=32)
visible = serializers.BooleanField()
real_time_rank = serializers.BooleanField()
allowed_ip_ranges = serializers.ListField(child=serializers.CharField(max_length=32), allow_empty=True)
@@ -25,7 +23,6 @@ class EditConetestSeriaizer(serializers.Serializer):
end_time = serializers.DateTimeField()
password = serializers.CharField(allow_blank=True, allow_null=True, max_length=32)
visible = serializers.BooleanField()
real_time_rank = serializers.BooleanField()
allowed_ip_ranges = serializers.ListField(child=serializers.CharField(max_length=32))
@@ -87,20 +84,6 @@ class ACMContestRankSerializer(serializers.ModelSerializer):
return UsernameSerializer(obj.user, need_real_name=self.is_contest_admin).data
class OIContestRankSerializer(serializers.ModelSerializer):
user = serializers.SerializerMethodField()
class Meta:
model = OIContestRank
fields = "__all__"
def __init__(self, *args, **kwargs):
self.is_contest_admin = kwargs.pop("is_contest_admin", False)
super().__init__(*args, **kwargs)
def get_user(self, obj):
return UsernameSerializer(obj.user, need_real_name=self.is_contest_admin).data
class ACMContesHelperSerializer(serializers.Serializer):
contest_id = serializers.IntegerField()

8
contest/views/admin.py
View File

@@ -13,8 +13,6 @@ from account.models import User
from problem.models import Problem
from submission.models import JudgeStatus, Submission
from utils.api import APIView, validate_serializer
from utils.cache import cache
from utils.constants import CacheKey
from utils.shortcuts import rand_str
from utils.tasks import delete_files
@@ -70,10 +68,6 @@ class ContestAPI(APIView):
ip_network(ip_range, strict=False)
except ValueError:
return self.error(f"{ip_range} is not a valid cidr network")
if not contest.real_time_rank and data.get("real_time_rank"):
cache_key = f"{CacheKey.contest_rank_cache}:{contest.id}"
cache.delete(cache_key)
for k, v in data.items():
setattr(contest, k, v)
contest.save()
@@ -279,9 +273,7 @@ class ContestCloneAPI(APIView):
title=original.title,
description=original.description,
tag=original.tag,
rule_type=original.rule_type,
password=original.password,
real_time_rank=original.real_time_rank,
visible=False,
allowed_ip_ranges=original.allowed_ip_ranges,
start_time=new_start,

104
contest/views/oj.py
View File

@@ -1,7 +1,6 @@
import io
import xlsxwriter
from django.core.cache import cache
from django.http import HttpResponse
from django.utils.timezone import now
@@ -13,11 +12,11 @@ from account.decorators import (
from account.models import AdminType
from problem.models import Problem
from utils.api import APIView, AsyncAPIView, validate_serializer
from utils.constants import CONTEST_PASSWORD_SESSION_KEY, CacheKey, ContestRuleType, ContestStatus
from utils.constants import CONTEST_PASSWORD_SESSION_KEY, ContestStatus
from utils.shortcuts import check_is_id, datetime2str
from ..models import ACMContestRank, Contest, ContestAnnouncement, OIContestRank
from ..serializers import ACMContestRankSerializer, ContestAnnouncementSerializer, ContestPasswordVerifySerializer, ContestSerializer, OIContestRankSerializer
from ..models import ACMContestRank, Contest, ContestAnnouncement
from ..serializers import ACMContestRankSerializer, ContestAnnouncementSerializer, ContestPasswordVerifySerializer, ContestSerializer
# DEPRECATED: 前端未调用 (2026-05-26)
@@ -60,13 +59,10 @@ class ContestListAPI(AsyncAPIView):
async def get(self, request):
contests = Contest.objects.select_related("created_by").filter(visible=True)
keyword = request.GET.get("keyword")
rule_type = request.GET.get("rule_type")
status = request.GET.get("status")
tag = request.GET.get("tag")
if keyword:
contests = contests.filter(title__icontains=keyword)
if rule_type:
contests = contests.filter(rule_type=rule_type)
if tag:
contests = contests.filter(tag=tag)
if status:
@@ -125,26 +121,15 @@ class ContestAccessAPI(APIView):
class ContestRankAPI(APIView):
def get_rank(self):
if self.contest.rule_type == ContestRuleType.ACM:
return (
ACMContestRank.objects.filter(
contest=self.contest,
user__admin_type=AdminType.REGULAR_USER,
user__is_disabled=False,
)
.select_related("user")
.order_by("-accepted_number", "total_time")
)
else:
return (
OIContestRank.objects.filter(
contest=self.contest,
user__admin_type=AdminType.REGULAR_USER,
user__is_disabled=False,
)
.select_related("user")
.order_by("-total_score")
return (
ACMContestRank.objects.filter(
contest=self.contest,
user__admin_type=AdminType.REGULAR_USER,
user__is_disabled=False,
)
.select_related("user")
.order_by("-accepted_number", "total_time")
)
def column_string(self, n):
string = ""
@@ -156,28 +141,15 @@ class ContestRankAPI(APIView):
@check_contest_permission(check_type="ranks")
def get(self, request):
download_csv = request.GET.get("download_csv")
force_refresh = request.GET.get("force_refresh")
is_contest_admin = (
request.user.is_authenticated
and request.user.is_contest_admin(self.contest)
)
if self.contest.rule_type == ContestRuleType.OI:
serializer = OIContestRankSerializer
else:
serializer = ACMContestRankSerializer
# if force_refresh == "1" and is_contest_admin:
if force_refresh == "1":
qs = self.get_rank()
else:
cache_key = f"{CacheKey.contest_rank_cache}:{self.contest.id}"
qs = cache.get(cache_key)
if not qs:
qs = list(self.get_rank())
cache.set(cache_key, qs)
qs = self.get_rank()
if download_csv:
data = serializer(qs, many=True, is_contest_admin=is_contest_admin).data
data = ACMContestRankSerializer(qs, many=True, is_contest_admin=is_contest_admin).data
contest_problems = list(Problem.objects.filter(
contest=self.contest, visible=True
).order_by("_id"))
@@ -190,41 +162,25 @@ class ContestRankAPI(APIView):
worksheet.write("A1", "User ID")
worksheet.write("B1", "Username")
worksheet.write("C1", "Real Name")
if self.contest.rule_type == ContestRuleType.OI:
worksheet.write("D1", "Total Score")
for i, p in enumerate(contest_problems):
worksheet.write(self.column_string(5 + i) + "1", p.title)
for index, item in enumerate(data):
worksheet.write_string(index + 1, 0, str(item["user"]["id"]))
worksheet.write_string(index + 1, 1, item["user"]["username"])
worksheet.write_string(
index + 1, 2, item["user"]["real_name"] or ""
)
worksheet.write_string(index + 1, 3, str(item["total_score"]))
for k, v in item["submission_info"].items():
worksheet.write_string(
index + 1, 4 + problem_id_to_col[int(k)], str(v)
)
else:
worksheet.write("D1", "AC")
worksheet.write("E1", "Total Submission")
worksheet.write("F1", "Total Time")
for i, p in enumerate(contest_problems):
worksheet.write(self.column_string(7 + i) + "1", p.title)
worksheet.write("D1", "AC")
worksheet.write("E1", "Total Submission")
worksheet.write("F1", "Total Time")
for i, p in enumerate(contest_problems):
worksheet.write(self.column_string(7 + i) + "1", p.title)
for index, item in enumerate(data):
worksheet.write_string(index + 1, 0, str(item["user"]["id"]))
worksheet.write_string(index + 1, 1, item["user"]["username"])
for index, item in enumerate(data):
worksheet.write_string(index + 1, 0, str(item["user"]["id"]))
worksheet.write_string(index + 1, 1, item["user"]["username"])
worksheet.write_string(
index + 1, 2, item["user"]["real_name"] or ""
)
worksheet.write_string(index + 1, 3, str(item["accepted_number"]))
worksheet.write_string(index + 1, 4, str(item["submission_number"]))
worksheet.write_string(index + 1, 5, str(item["total_time"]))
for k, v in item["submission_info"].items():
worksheet.write_string(
index + 1, 2, item["user"]["real_name"] or ""
index + 1, 6 + problem_id_to_col[int(k)], str(v["is_ac"])
)
worksheet.write_string(index + 1, 3, str(item["accepted_number"]))
worksheet.write_string(index + 1, 4, str(item["submission_number"]))
worksheet.write_string(index + 1, 5, str(item["total_time"]))
for k, v in item["submission_info"].items():
worksheet.write_string(
index + 1, 6 + problem_id_to_col[int(k)], str(v["is_ac"])
)
workbook.close()
f.seek(0)
@@ -236,7 +192,7 @@ class ContestRankAPI(APIView):
return response
page_qs = self.paginate_data(request, qs)
page_qs["results"] = serializer(
page_qs["results"] = ACMContestRankSerializer(
page_qs["results"], many=True, is_contest_admin=is_contest_admin
).data
return self.success(page_qs)