Merge branch 'dev' of https://git.coding.net/virusdefender/qduoj into dev

problem/serizalizers.py

@@ -4,7 +4,7 @@ import json
 from rest_framework import serializers
 
 from account.models import User
-from .models import Problem
+from .models import Problem, ProblemTag
 
 
 class ProblemSampleSerializer(serializers.ListField):
@@ -21,18 +21,18 @@ class CreateProblemSerializer(serializers.Serializer):
     title = serializers.CharField(max_length=50)
     description = serializers.CharField(max_length=10000)
     # [{"input": "1 1", "output": "2"}]
-    sample = ProblemSampleSerializer()
+    samples = ProblemSampleSerializer()
     test_case_id = serializers.CharField(max_length=40)
     source = serializers.CharField(max_length=30, required=False, default=None)
     time_limit = serializers.IntegerField()
     memory_limit = serializers.IntegerField()
     difficulty = serializers.IntegerField()
-    tags = serializers.ListField(child=serializers.IntegerField())
+    tags = serializers.ListField(child=serializers.CharField(max_length=10))
     hint = serializers.CharField(max_length=3000, required=False, default=None)
 
 
 class ProblemSerializer(serializers.ModelSerializer):
-    sample = JSONField()
+    samples = JSONField()
 
     class UserSerializer(serializers.ModelSerializer):
         class Meta:
@@ -55,7 +55,16 @@ class EditProblemSerializer(serializers.Serializer):
     memory_limit = serializers.IntegerField()
     difficulty = serializers.IntegerField()
     tags = serializers.ListField(child=serializers.IntegerField())
-    sample = ProblemSampleSerializer()
+    samples = ProblemSampleSerializer()
     hint = serializers.CharField(max_length=10000)
     visible = serializers.BooleanField()
 
+
+
+class ProblemTagSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = ProblemTag
+
+
+class CreateProblemTagSerializer(serializers.Serializer):
+    name = serializers.CharField(max_length=10)