#597 대회 랭킹 페이지 오류 수정 및 디자인 개선 (#605)

* 대회 랭킹 상태 표시 개선

* 대회 랭킹 페이지에서 제출 수 표시 스타일 개선 및 API 타겟 설정 수정

* 대회 참가자 API에서 닉네임 변경된 사용자가 다른 2명으로 보이던 문제 해결

* 대회 랭킹 페이지에서 로딩 상태 표시 개선 및 사용자 데이터가 없을 때의 조건 수정

* 대회 랭킹 페이지에서 제출 상태(WA) 색상 스타일 수정

* 대회 랭킹 페이지 스타일 추가 개선 및 ACM OI 랭킹 디자인 통일

* contest 랭킹 로딩 실패 처리 및 참가자 정보 fallback 보완

* 최신 제출 기준으로 참가자 fallback 조회 및 ACM 랭킹 가드 추가

* 잘못된 코드 수정(index.js) 제거

* 대회 참가자 API contest_id 검증 추가 및 문제 목록 조회 실패 표시

* 대회 참가자 목록 요청 검증 강화 및 응답 이메일 타입 정리

Author: Neibce

backend/contest/serializers.py

@@ -8,13 +8,13 @@
 
 class ContestUserSubmissionSummarySerializer(serializers.Serializer):
     user_id = serializers.IntegerField()
-    username = serializers.CharField()
-    email = serializers.EmailField()
-    avatar = serializers.CharField()
-    school = serializers.CharField()
-    major = serializers.CharField()
+    username = serializers.CharField(allow_blank=True)
+    email = serializers.EmailField(allow_blank=True, required=False)
+    avatar = serializers.CharField(allow_blank=True)
+    school = serializers.CharField(allow_blank=True)
+    major = serializers.CharField(allow_blank=True)
     submission_count = serializers.IntegerField()
-    last_submission_ip = serializers.CharField()
+    last_submission_ip = serializers.CharField(allow_blank=True)
 
 
 class CreateConetestSeriaizer(serializers.Serializer):

backend/contest/tests.py

@@ -1,6 +1,7 @@
 import copy
 from datetime import datetime, timedelta
 
+from django.conf import settings
 from django.utils import timezone
 
 from utils.api.tests import APITestCase
@@ -181,3 +182,111 @@ def setUp(self):
     def get_contest_rank(self):
         resp = self.client.get(self.url + "?contest_id=" + self.acm_contest.id)
         self.assertSuccess(resp)
+
+
+class ContestParticipantsAPITest(APITestCase):
+
+    def setUp(self):
+        from problem.tests import DEFAULT_PROBLEM_DATA, ProblemCreateTestBase
+
+        self.create_school_fixtures(college_id=1, college_name="Test", department_id=1, department_name="Test")
+        self.admin = self.create_admin()
+        self.user = self.create_user(email="test@test.com", username="test", password="test1234!", login=False)
+        self.contest = Contest.objects.create(created_by=self.admin, **DEFAULT_CONTEST_DATA)
+        self.problem = ProblemCreateTestBase.add_problem(DEFAULT_PROBLEM_DATA, self.admin)
+        self.problem.contest_id = self.contest.id
+        self.problem.save()
+        self.url = self.reverse("contest_participants_api")
+
+    def test_participants_are_grouped_by_user_id(self):
+        from submission.models import JudgeStatus, Submission
+
+        Submission.objects.create(
+            user_id=self.user.id,
+            username="oldname",
+            language="C++",
+            code="test code",
+            problem_id=self.problem.id,
+            ip="127.0.0.1",
+            contest_id=self.contest.id,
+            result=JudgeStatus.PENDING,
+            statistic_info={"time_cost": "100", "memory_cost": "1024"},
+            shared=False,
+            first_failed_tc_idx=None,
+        )
+        Submission.objects.create(
+            user_id=self.user.id,
+            username="newname",
+            language="C++",
+            code="test code",
+            problem_id=self.problem.id,
+            ip="127.0.0.1",
+            contest_id=self.contest.id,
+            result=JudgeStatus.PENDING,
+            statistic_info={"time_cost": "100", "memory_cost": "1024"},
+            shared=False,
+            first_failed_tc_idx=None,
+        )
+
+        resp = self.client.get(f"{self.url}?contest_id={self.contest.id}")
+        self.assertSuccess(resp)
+
+        participants = resp.data["data"]
+        self.assertEqual(len(participants), 1)
+        self.assertEqual(participants[0]["user_id"], self.user.id)
+        self.assertEqual(participants[0]["username"], self.user.username)
+        self.assertEqual(participants[0]["submission_count"], 2)
+
+    def test_participants_requires_contest_id(self):
+        resp = self.client.get(self.url)
+        self.assertFailed(resp, "Invalid parameter, contest_id is required")
+
+    def test_participants_rejects_invalid_contest_id(self):
+        resp = self.client.get(f"{self.url}?contest_id=abc")
+        self.assertFailed(resp, "Invalid parameter, contest_id is required")
+
+    def test_participants_fallback_to_submission_username_when_user_is_missing(self):
+        from submission.models import JudgeStatus, Submission
+
+        older_submission = Submission.objects.create(
+            user_id=self.user.id,
+            username="zzz_user",
+            language="C++",
+            code="test code",
+            problem_id=self.problem.id,
+            ip="9.9.9.9",
+            contest_id=self.contest.id,
+            result=JudgeStatus.PENDING,
+            statistic_info={"time_cost": "100", "memory_cost": "1024"},
+            shared=False,
+            first_failed_tc_idx=None,
+        )
+        latest_submission = Submission.objects.create(
+            user_id=self.user.id,
+            username="aaa_user",
+            language="C++",
+            code="test code",
+            problem_id=self.problem.id,
+            ip="1.1.1.1",
+            contest_id=self.contest.id,
+            result=JudgeStatus.PENDING,
+            statistic_info={"time_cost": "100", "memory_cost": "1024"},
+            shared=False,
+            first_failed_tc_idx=None,
+        )
+        Submission.objects.filter(id=older_submission.id).update(create_time=timezone.now() - timedelta(minutes=1))
+        Submission.objects.filter(id=latest_submission.id).update(create_time=timezone.now())
+
+        self.user.delete()
+
+        resp = self.client.get(f"{self.url}?contest_id={self.contest.id}")
+        self.assertSuccess(resp)
+
+        participants = resp.data["data"]
+        self.assertEqual(len(participants), 1)
+        self.assertEqual(participants[0]["username"], "aaa_user")
+        self.assertEqual(participants[0]["email"], "")
+        self.assertEqual(participants[0]["avatar"], f"{settings.AVATAR_URI_PREFIX}/default.png")
+        self.assertEqual(participants[0]["school"], "")
+        self.assertEqual(participants[0]["major"], "")
+        self.assertEqual(participants[0]["last_submission_ip"], "1.1.1.1")

backend/contest/views/oj.py

@@ -1,4 +1,5 @@
-from django.db.models import OuterRef, Count, Subquery, F, Max
+from django.conf import settings
+from django.db.models import OuterRef, Count, Subquery
 from django.http import HttpResponse
 from django.utils.timezone import now
 from django.core.cache import cache
@@ -8,7 +9,7 @@
 from utils.contest_ranking_writer import ContestRankingWriter
 from utils.shortcuts import datetime2str, check_is_id
 from account.models import AdminType, User, UserProfile
-from account.decorators import login_required, check_contest_permission, check_contest_password
+from account.decorators import login_required, check_contest_permission, check_contest_password, ensure_created_by
 
 from utils.constants import ContestRuleType, ContestStatus
 from ..models import ContestAnnouncement, Contest, OIContestRank, ACMContestRank
@@ -154,11 +155,22 @@ class ContestParticipantsAPI(APIView):
     @login_required
     def get(self, request):
         contest_id = request.GET.get("contest_id")
+        if not contest_id or not check_is_id(contest_id):
+            return self.error("Invalid parameter, contest_id is required")
+
+        try:
+            contest = Contest.objects.get(id=contest_id)
+            ensure_created_by(contest, request.user)
+        except Contest.DoesNotExist:
+            return self.error("Contest does not exist")
 
         submissions = Submission.objects.filter(contest_id=contest_id)
+        latest_submission = submissions.filter(user_id=OuterRef('user_id')).order_by('-create_time', '-id')
 
-        user_submissions = submissions.values('user_id', 'username').annotate(
-            submission_count=Count('id'), last_submission_ip=Max('ip')).order_by('user_id')
+        user_submissions = submissions.values('user_id').annotate(
+            submission_count=Count('id'),
+            last_submission_ip=Subquery(latest_submission.values('ip')[:1]),
+            fallback_username=Subquery(latest_submission.values('username')[:1])).order_by('user_id')
 
         # UserProfile 정보 가져오기
         user_profiles = UserProfile.objects.filter(user_id__in=[sub['user_id'] for sub in user_submissions])
@@ -172,15 +184,20 @@ def get(self, request):
         for submission in user_submissions:
             user = user_dict.get(submission['user_id'])
             profile = user_profile_dict.get(submission['user_id'])
+            username = user.username if user else (submission['fallback_username'] or "")
+            email = user.email if user and user.email else ""
+            avatar = profile.avatar if profile else f"{settings.AVATAR_URI_PREFIX}/default.png"
+            school = profile.school if profile and profile.school else ""
+            major = profile.major if profile and profile.major else ""
             result.append({
                 'user_id': submission['user_id'],
-                'username': submission['username'],
-                'email': user.email if user else None,
-                'avatar': profile.avatar if profile else None,
-                'school': profile.school if profile else None,
-                'major': profile.major if profile else None,
+                'username': username,
+                'email': email,
+                'avatar': avatar,
+                'school': school,
+                'major': major,
                 'submission_count': submission['submission_count'],
-                'last_submission_ip': submission['last_submission_ip']
+                'last_submission_ip': submission['last_submission_ip'] or ""
             })
 
         serializer = ContestUserSubmissionSummarySerializer(result, many=True)

frontend/src/pages/oj/App.vue

@@ -42,7 +42,6 @@ export default {
   },
   mounted() {
     this.getWebsiteConfig()
-    this.init()
   },
   methods: {
     ...mapActions(["getWebsiteConfig", "changeDomTitle"]),

frontend/src/pages/oj/components/CustomTooltip.vue

@@ -12,7 +12,10 @@
 export default {
   name: "custom-tooltip",
   props: {
-    content: HTMLElement,
+    content: {
+      type: [String, Number],
+      default: "",
+    },
     placement: {
       type: String,
       default: "top",