From 7a152d65a38be869cef51eff520b116386f7084b Mon Sep 17 00:00:00 2001
From: yuetsh <517252939@qq.com>
Date: Tue, 7 May 2024 20:25:59 +0800
Subject: [PATCH] get what i want

---
 Dockerfile             | 17 ++++-------------
 account/views/oj.py    |  7 +++++--
 problem/serializers.py | 15 ++++++++++++++-
 problem/views/admin.py |  4 ++--
 problem/views/oj.py    |  8 ++++----
 5 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5b880e6..d7dd0b5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,19 +1,9 @@
-FROM alpine:3.19 AS downloader
-
-WORKDIR /app
-
-RUN <<EOS
-set -ex
-apk add unzip
-wget https://github.com/QingdaoU/OnlineJudgeFE/releases/download/oj_2.7.5/dist.zip
-unzip dist.zip
-rm -f dist.zip
-EOS
-
 FROM python:3.12-alpine
 ARG TARGETARCH
 ARG TARGETVARIANT
 
+RUN sed -i 's/dl-cdn.alpinelinux.org/mirrors.tuna.tsinghua.edu.cn/g' /etc/apk/repositories
+
 ENV OJ_ENV production
 WORKDIR /app
 
@@ -24,13 +14,14 @@ RUN --mount=type=cache,target=/etc/apk/cache,id=apk-cahce-$TARGETARCH$TARGETVARI
     --mount=type=cache,target=/root/.cache/pip,id=pip-cahce-$TARGETARCH$TARGETVARIANT-final \
     <<EOS
 set -ex
+pip config set global.index-url https://pypi.tuna.tsinghua.edu.cn/simple
 apk add gcc libc-dev python3-dev libpq libpq-dev libjpeg-turbo libjpeg-turbo-dev zlib zlib-dev freetype freetype-dev supervisor openssl nginx curl unzip
 pip install -r /app/deploy/requirements.txt
 apk del gcc libc-dev python3-dev libpq-dev libjpeg-turbo-dev zlib-dev freetype-dev
 EOS
 
 COPY ./ /app/
-COPY --from=downloader --link /app/dist/ /app/dist/
+RUN mkdir -p /app/dist/
 RUN chmod -R u=rwX,go=rX ./ && chmod +x ./deploy/entrypoint.sh
 
 HEALTHCHECK --interval=5s CMD [ "/usr/local/bin/python3", "/app/deploy/health_check.py" ]
diff --git a/account/views/oj.py b/account/views/oj.py
index 2a3c2e0..583fddf 100644
--- a/account/views/oj.py
+++ b/account/views/oj.py
@@ -376,10 +376,13 @@ class SessionManagementAPI(APIView):
 class UserRankAPI(APIView):
     def get(self, request):
         rule_type = request.GET.get("rule")
+        username = request.GET.get("username")
+        if not username:
+            username = ""
         if rule_type not in ContestRuleType.choices():
             rule_type = ContestRuleType.ACM
-        profiles = UserProfile.objects.filter(user__admin_type=AdminType.REGULAR_USER, user__is_disabled=False) \
-            .select_related("user")
+        profiles = UserProfile.objects.filter(user__admin_type=AdminType.REGULAR_USER, user__is_disabled=False,\
+                                              user__username__icontains=username).select_related("user")
         if rule_type == ContestRuleType.ACM:
             profiles = profiles.filter(submission_number__gt=0).order_by("-accepted_number", "submission_number")
         else:
diff --git a/problem/serializers.py b/problem/serializers.py
index 2c09a6c..099e1f3 100644
--- a/problem/serializers.py
+++ b/problem/serializers.py
@@ -126,6 +126,19 @@ class ProblemSerializer(BaseProblemSerializer):
                    "spj_code", "spj_version", "spj_compile_ok")
 
 
+class ProblemListSerializer(BaseProblemSerializer):
+    template = serializers.SerializerMethodField("get_public_template")
+
+    class Meta:
+        model = Problem
+        exclude = ("test_case_score", "test_case_id", "visible", "is_public",
+                   "spj_code", "spj_version", "spj_compile_ok", "description", 
+                   "input_description", "output_description", "samples", "hint",
+                   "source", "spj", "spj_language", "time_limit", "memory_limit",
+                   "io_mode", "create_time", "languages", "last_update_time",
+                   "total_score", "statistic_info", "share_submission")
+
+
 class ProblemSafeSerializer(BaseProblemSerializer):
     template = serializers.SerializerMethodField("get_public_template")
 
@@ -203,7 +216,7 @@ class AddContestProblemSerializer(serializers.Serializer):
     display_id = serializers.CharField()
 
 
-class ExportProblemRequestSerialzier(serializers.Serializer):
+class ExportProblemRequestSerializer(serializers.Serializer):
     problem_id = serializers.ListField(child=serializers.IntegerField(), allow_empty=False)
 
 
diff --git a/problem/views/admin.py b/problem/views/admin.py
index 5ce9413..22730c9 100644
--- a/problem/views/admin.py
+++ b/problem/views/admin.py
@@ -26,7 +26,7 @@ from ..serializers import (CreateContestProblemSerializer, CompileSPJSerializer,
                            CreateProblemSerializer, EditProblemSerializer, EditContestProblemSerializer,
                            ProblemAdminSerializer, TestCaseUploadForm, ContestProblemMakePublicSerializer,
                            AddContestProblemSerializer, ExportProblemSerializer,
-                           ExportProblemRequestSerialzier, UploadProblemForm, ImportProblemSerializer,
+                           ExportProblemRequestSerializer, UploadProblemForm, ImportProblemSerializer,
                            FPSProblemSerializer)
 from ..utils import TEMPLATE_BASE, build_problem_template
 
@@ -527,7 +527,7 @@ class ExportProblemAPI(APIView):
                                arcname=f"{index}/testcase/{v['output_name']}",
                                compress_type=compression)
 
-    @validate_serializer(ExportProblemRequestSerialzier)
+    @validate_serializer(ExportProblemRequestSerializer)
     def get(self, request):
         problems = Problem.objects.filter(id__in=request.data["problem_id"])
         for problem in problems:
diff --git a/problem/views/oj.py b/problem/views/oj.py
index 534fa60..dbc49a9 100644
--- a/problem/views/oj.py
+++ b/problem/views/oj.py
@@ -3,7 +3,7 @@ from django.db.models import Q, Count
 from utils.api import APIView
 from account.decorators import check_contest_permission
 from ..models import ProblemTag, Problem, ProblemRuleType
-from ..serializers import ProblemSerializer, TagSerializer, ProblemSafeSerializer
+from ..serializers import ProblemSerializer, TagSerializer, ProblemSafeSerializer, ProblemListSerializer
 from contest.models import ContestRuleType
 
 
@@ -62,7 +62,7 @@ class ProblemAPI(APIView):
         if not limit:
             return self.error("Limit is needed")
 
-        problems = Problem.objects.select_related("created_by").filter(contest_id__isnull=True, visible=True)
+        problems = Problem.objects.select_related("created_by").filter(contest_id__isnull=True, visible=True).order_by("-create_time")
         # 按照标签筛选
         tag_text = request.GET.get("tag")
         if tag_text:
@@ -78,7 +78,7 @@ class ProblemAPI(APIView):
         if difficulty:
             problems = problems.filter(difficulty=difficulty)
         # 根据profile 为做过的题目添加标记
-        data = self.paginate_data(request, problems, ProblemSerializer)
+        data = self.paginate_data(request, problems, ProblemListSerializer)
         self._add_problem_status(request, data)
         return self.success(data)
 
@@ -113,7 +113,7 @@ class ContestProblemAPI(APIView):
 
         contest_problems = Problem.objects.select_related("created_by").filter(contest=self.contest, visible=True)
         if self.contest.problem_details_permission(request.user):
-            data = ProblemSerializer(contest_problems, many=True).data
+            data = ProblemListSerializer(contest_problems, many=True).data
             self._add_problem_status(request, data)
         else:
             data = ProblemSafeSerializer(contest_problems, many=True).data