去除不必要的serializer

problem/serializers.py

@@ -1,7 +1,7 @@
 from django import forms
 
 from judge.languages import language_names, spj_language_names
-from utils.api import DateTimeTZField, UsernameSerializer, serializers
+from utils.api import UsernameSerializer, serializers
 
 from .models import Problem, ProblemRuleType, ProblemTag
 from .utils import parse_problem_template
@@ -87,15 +87,8 @@ class CompileSPJSerializer(serializers.Serializer):
 
 
 class BaseProblemSerializer(serializers.ModelSerializer):
-    samples = serializers.JSONField()
-    test_case_score = serializers.JSONField()
-    languages = serializers.JSONField()
-    template = serializers.JSONField()
     tags = serializers.SlugRelatedField(many=True, slug_field="name", read_only=True)
-    create_time = DateTimeTZField()
-    last_update_time = DateTimeTZField()
     created_by = UsernameSerializer()
-    statistic_info = serializers.JSONField()
 
 
 class ProblemAdminSerializer(BaseProblemSerializer):
@@ -104,12 +97,6 @@ class ProblemAdminSerializer(BaseProblemSerializer):
         fields = "__all__"
 
 
-class ContestProblemAdminSerializer(BaseProblemSerializer):
-    class Meta:
-        model = Problem
-        fields = "__all__"
-
-
 class ProblemSerializer(BaseProblemSerializer):
     template = serializers.SerializerMethodField()
 
@@ -121,21 +108,16 @@ class ProblemSerializer(BaseProblemSerializer):
 
     class Meta:
         model = Problem
-        exclude = ("contest", "test_case_score", "test_case_id", "visible", "is_public",
-                   "template", "spj_code", "spj_version", "spj_compile_ok")
+        exclude = ("test_case_score", "test_case_id", "visible", "is_public",
+                   "spj_code", "spj_version", "spj_compile_ok")
 
 
-class ContestProblemSerializer(BaseProblemSerializer):
+class ProblemSafeSerializer(BaseProblemSerializer):
     class Meta:
         model = Problem
-        exclude = ("test_case_score", "test_case_id", "visible", "is_public", "difficulty")
-
-
-class ContestProblemSafeSerializer(BaseProblemSerializer):
-    class Meta:
-        model = Problem
-        exclude = ("test_case_score", "test_case_id", "visible", "is_public", "difficulty",
-                   "submission_number", "accepted_number", "statistic_info")
+        exclude = ("test_case_score", "test_case_id", "visible", "is_public",
+                   "spj_code", "spj_version", "spj_compile_ok",
+                   "difficulty", "submission_number", "accepted_number", "statistic_info")
 
 
 class ContestProblemMakePublicSerializer(serializers.Serializer):

problem/views/admin.py

@@ -16,7 +16,7 @@ from utils.api import APIView, CSRFExemptAPIView, validate_serializer
 from utils.shortcuts import rand_str, natural_sort_key
 
 from ..models import Problem, ProblemRuleType, ProblemTag
-from ..serializers import (CreateContestProblemSerializer, ContestProblemAdminSerializer, CompileSPJSerializer,
+from ..serializers import (CreateContestProblemSerializer, CompileSPJSerializer,
                            CreateProblemSerializer, EditProblemSerializer, EditContestProblemSerializer,
                            ProblemAdminSerializer, TestCaseUploadForm, ContestProblemMakePublicSerializer)
 
@@ -320,7 +320,7 @@ class ContestProblemAPI(ProblemBase):
             except ProblemTag.DoesNotExist:
                 tag = ProblemTag.objects.create(name=item)
             problem.tags.add(tag)
-        return self.success(ContestProblemAdminSerializer(problem).data)
+        return self.success(ProblemAdminSerializer(problem).data)
 
     @problem_permission_required
     def get(self, request):
@@ -345,7 +345,7 @@ class ContestProblemAPI(ProblemBase):
         keyword = request.GET.get("keyword")
         if keyword:
             problems = problems.filter(title__contains=keyword)
-        return self.success(self.paginate_data(request, problems, ContestProblemAdminSerializer))
+        return self.success(self.paginate_data(request, problems, ProblemAdminSerializer))
 
     @validate_serializer(EditContestProblemSerializer)
     @problem_permission_required

problem/views/oj.py

@@ -3,8 +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
-from ..serializers import ContestProblemSerializer, ContestProblemSafeSerializer
+from ..serializers import ProblemSerializer, TagSerializer, ProblemSafeSerializer
 from contest.models import ContestRuleType
 
 
@@ -102,16 +101,16 @@ class ContestProblemAPI(APIView):
             except Problem.DoesNotExist:
                 return self.error("Problem does not exist.")
             if self.contest.problem_details_permission(request.user):
-                problem_data = ContestProblemSerializer(problem).data
+                problem_data = ProblemSerializer(problem).data
                 self._add_problem_status(request, [problem_data, ])
             else:
-                problem_data = ContestProblemSafeSerializer(problem).data
+                problem_data = ProblemSafeSerializer(problem).data
             return self.success(problem_data)
 
         contest_problems = Problem.objects.select_related("created_by").filter(contest=self.contest, visible=True)
         if self.contest.problem_details_permission(request.user):
-            data = ContestProblemSerializer(contest_problems, many=True).data
+            data = ProblemSerializer(contest_problems, many=True).data
             self._add_problem_status(request, data)
         else:
-            data = ContestProblemSafeSerializer(contest_problems, many=True).data
+            data = ProblemSafeSerializer(contest_problems, many=True).data
         return self.success(data)