Skip to content

Commit 440fd38

Browse files
authored
homework API: removed stale question.text field in favour of raw question.markdown_text (#2746)
1 parent 30c189f commit 440fd38

File tree

6 files changed

+3
-18
lines changed

6 files changed

+3
-18
lines changed

src/apps/homework/api/serializers/question.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,26 +4,22 @@
44

55
from apps.homework.api.serializers.stats import HomeworkStatsSerializer
66
from apps.homework.models import Question
7-
from core.serializers import MarkdownField
87

98

109
class QuestionSerializer(serializers.ModelSerializer):
11-
text = MarkdownField()
1210
markdown_text = serializers.CharField(source="text")
1311

1412
class Meta:
1513
model = Question
1614
fields = [
1715
"slug",
1816
"name",
19-
"text",
2017
"markdown_text",
2118
"deadline",
2219
]
2320

2421

2522
class QuestionDetailSerializer(serializers.ModelSerializer):
26-
text = MarkdownField()
2723
markdown_text = serializers.CharField(source="text")
2824
breadcrumbs = serializers.SerializerMethodField()
2925
homework = HomeworkStatsSerializer(source="*")
@@ -35,7 +31,6 @@ class Meta:
3531
"breadcrumbs",
3632
"slug",
3733
"name",
38-
"text",
3934
"markdown_text",
4035
"deadline",
4136
"homework",

src/apps/homework/api/serializers/stats.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
from rest_framework import serializers
22

33
from apps.homework.models import Question
4-
from core.serializers import MarkdownField
54

65

76
class CrossCheckStatsSerializer(serializers.Serializer):
@@ -25,14 +24,11 @@ def to_representation(self, instance: Question) -> dict:
2524

2625

2726
class TemporarySoonToBeDepricatedQuestionSerializer(serializers.ModelSerializer):
28-
text = MarkdownField()
29-
3027
class Meta:
3128
model = Question
3229
fields = [
3330
"slug",
3431
"name",
35-
"text",
3632
"deadline",
3733
]
3834

src/apps/homework/tests/homework/api/crosschecks/tests_crosschecks_api.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ def test_base_response(api, question, crosscheck):
4040

4141
assert got["answer"]["question"]["slug"] == str(question.slug)
4242
assert got["answer"]["question"]["name"] == question.name
43-
assert "text" in got["answer"]["question"]
43+
assert "markdown_text" in got["answer"]["question"]
4444

4545

4646
@pytest.mark.parametrize(("checked", "is_checked"), [(None, False), (datetime(2032, 1, 1, tzinfo=timezone.utc), True)])

src/apps/homework/tests/homework/api/questions/tests_question_retrieve.py

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,9 @@ def test_markdown(api, question, course):
3535

3636
got = api.get(f"/api/v2/homework/questions/{question.slug}/")
3737

38-
assert "<em>should be rendered" in got["text"]
39-
assert "*" not in got["text"]
40-
assert "<em>should be rendered" in got["course"]["homework_check_recommendations"]
41-
4238
assert "*" in got["markdown_text"], "The field is not rendered"
4339
assert "<em>" not in got["markdown_text"], "The field is not rendered"
40+
assert "<em>should be rendered" in got["course"]["homework_check_recommendations"]
4441

4542

4643
def test_breadcrumbs(api, question, factory, another_course):

src/apps/lms/tests/api/homework_status_in_lesson_list/test_generic_homework_data.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,14 @@ def test_question_to_deprecate(api, module, question):
1717
got = api.get(f"/api/v2/lms/lessons/?module={module.pk}")["results"][0]["homework"]["question"]
1818

1919
assert got["name"] == question.name
20-
assert "<em>" in got["text"], "text is rendered"
2120

2221

2322
def test_question(api, module, question):
2423
got = api.get(f"/api/v2/lms/lessons/?module={module.pk}")["results"][0]["question"]
2524

2625
assert got["name"] == question.name
27-
assert "<em>" in got["text"], "text is rendered"
28-
assert "<em>" not in got["markdown_text"], "text is not rendered"
2926
assert "*" in got["markdown_text"], "text is not rendered"
27+
assert "<em>" not in got["markdown_text"], "text is not rendered"
3028

3129

3230
@pytest.mark.xfail(reason="Moved N+1 out of scope, cuz too few real-world users will encounter it")

src/apps/lms/tests/api/test_lesson_retrieve.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,4 +72,3 @@ def test_question(api, lesson, question):
7272
got = api.get(f"/api/v2/lms/lessons/{lesson.pk}/")
7373

7474
assert got["homework"]["question"]["name"] == question.name
75-
assert "<em>" in got["homework"]["question"]["text"], "Make sure text is rendered"

0 commit comments

Comments
 (0)