diff --git a/problem/migrations/0005_auto_20150813_1807.py b/problem/migrations/0005_auto_20150813_1807.py new file mode 100644 index 00000000..7d50f750 --- /dev/null +++ b/problem/migrations/0005_auto_20150813_1807.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('problem', '0004_auto_20150813_1459'), + ] + + operations = [ + migrations.RenameField( + model_name='problem', + old_name='description_input', + new_name='input_description', + ), + migrations.RenameField( + model_name='problem', + old_name='description_output', + new_name='output_description', + ), + ] diff --git a/problem/models.py b/problem/models.py index 82b99f6b..3be37837 100644 --- a/problem/models.py +++ b/problem/models.py @@ -17,9 +17,9 @@ class AbstractProblem(models.Model): # 问题描述 HTML 格式 description = models.TextField() # 输入描述 - description_input = models.CharField(max_length=10000) + input_description = models.CharField(max_length=10000) # 输出描述 - description_output = models.CharField(max_length=10000) + output_description = models.CharField(max_length=10000) # 样例输入 可能会存储 json 格式的数据 samples = models.TextField(blank=True) # 测试用例id 这个id 可以用来拼接得到测试用例的文件存储位置 diff --git a/problem/serizalizers.py b/problem/serizalizers.py index 989c068a..d7a18568 100644 --- a/problem/serizalizers.py +++ b/problem/serizalizers.py @@ -20,8 +20,8 @@ class JSONField(serializers.Field): class CreateProblemSerializer(serializers.Serializer): title = serializers.CharField(max_length=50) description = serializers.CharField(max_length=10000) - description_input = serializers.CharField(max_length=10000) - description_output = serializers.CharField(max_length=10000) + input_description = serializers.CharField(max_length=10000) + output_description = serializers.CharField(max_length=10000) # [{"input": "1 1", "output": "2"}] samples = ProblemSampleSerializer() test_case_id = serializers.CharField(max_length=40) @@ -51,8 +51,8 @@ class EditProblemSerializer(serializers.Serializer): id = serializers.IntegerField() title = serializers.CharField(max_length=50) description = serializers.CharField(max_length=10000) - description_input = serializers.CharField(max_length=10000) - description_output = serializers.CharField(max_length=10000) + input_description = serializers.CharField(max_length=10000) + output_description = serializers.CharField(max_length=10000) test_case_id = serializers.CharField(max_length=40) source = serializers.CharField(max_length=30) time_limit = serializers.IntegerField() diff --git a/problem/tests.py b/problem/tests.py index 8838cce8..18236552 100644 --- a/problem/tests.py +++ b/problem/tests.py @@ -19,8 +19,8 @@ class ProblemAdminTest(APITestCase): data = {"id": problem_id, "title": "title0", "description": "description0", - "description_input": "description_input0", - "description_output": "description_output0", + "input_description": "input_description0", + "output_description": "output_description0", "test_case_id": "1", "source": "source1", "samples": [{"input": "1 1", "output": "2"}], @@ -43,8 +43,8 @@ class ProblemAdminTest(APITestCase): ProblemTag.objects.create(name="tag2") self.problem = Problem.objects.create(title="title1", description="description1", - description_input="description_input1", - description_output="description_output1", + input_description="input1_description", + output_description="output1_description", test_case_id="1", source="source1", samples=[{"input": "1 1", "output": "2"}], @@ -63,8 +63,8 @@ class ProblemAdminTest(APITestCase): def test_release_problem_successfully(self): data = {"title": "title2", "description": "description2", - "description_input": "description_input2", - "description_output": "description_output2", + "input_description": "input_description2", + "output_description": "output_description2", "test_case_id": "1", "source": "source1", "samples": [{"input": "1 1", "output": "2"}], diff --git a/problem/views.py b/problem/views.py index 73fc81ab..0f618cd4 100644 --- a/problem/views.py +++ b/problem/views.py @@ -74,8 +74,8 @@ class ProblemAdminAPIView(APIView): data = serializer.data problem = Problem.objects.create(title=data["title"], description=data["description"], - description_input=data["description_input"], - description_output=data["description_output"], + input_description=data["input_description"], + output_description=data["output_description"], test_case_id=data["test_case_id"], source=data["source"], samples=json.dumps(data["samples"]), @@ -112,8 +112,8 @@ class ProblemAdminAPIView(APIView): problem.title = data["title"] problem.description = data["description"] - problem.description_input = data["description_input"] - problem.description_output = data["description_output"] + problem.input_description = data["input_description"] + problem.output_description = data["output_description"] problem.test_case_id = data["test_case_id"] problem.source = data["source"] problem.time_limit = data["time_limit"]