From 93fb4c2612d57e6ddcccca742cc4a2f435bf9f6c Mon Sep 17 00:00:00 2001 From: Ramon Wenger Date: Mon, 9 Dec 2019 10:38:59 +0100 Subject: [PATCH] Refactor code --- server/assignments/schema/mutations.py | 4 +--- server/assignments/tests/test_feedback.py | 14 +++++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/server/assignments/schema/mutations.py b/server/assignments/schema/mutations.py index c8c29332..0a3951fa 100644 --- a/server/assignments/schema/mutations.py +++ b/server/assignments/schema/mutations.py @@ -52,9 +52,7 @@ class UpdateSubmissionFeedback(relay.ClientIDMutation): (submission_feedback, created) = SubmissionFeedback.objects.get_or_create(teacher=user, student_submission_id=student_submission_id) - final = submission_feedback.final - if 'final' in submission_feedback_data: - final = submission_feedback_data.get('final') + final = submission_feedback_data.get('final') if 'final' in submission_feedback_data else submission_feedback.final submission_feedback.final = final submission_feedback.text = submission_feedback_data.get('text') diff --git a/server/assignments/tests/test_feedback.py b/server/assignments/tests/test_feedback.py index d7263986..54f34347 100644 --- a/server/assignments/tests/test_feedback.py +++ b/server/assignments/tests/test_feedback.py @@ -68,7 +68,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase): id text document - submission_feedback { + submissionFeedback { text } } @@ -89,7 +89,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase): id text document - submission_feedback { + submissionFeedback { text } } @@ -110,7 +110,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase): id text document - submission_feedback { + submissionFeedback { text } } @@ -173,14 +173,14 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase): SubmissionFeedbackFactory(teacher=self.teacher, final=False, student_submission=self.student_submission) result = self._fetch_assignment_student(self.student1) - self.assertIsNone(result.get('data').get('submission_feedback')) + self.assertIsNone(result.get('data').get('submissionFeedback')) def test_student_does_see_final_feedback(self): submission_feedback = SubmissionFeedbackFactory(teacher=self.teacher, final=True, student_submission=self.student_submission) result = self._fetch_assignment_student(self.student1) - self.assertEqual(result.get('data').get('assignment').get('submission').get('submission_feedback') + self.assertEqual(result.get('data').get('assignment').get('submission').get('submissionFeedback') .get('text'), submission_feedback.text) def test_teacher_can_see_feedback_for_submission(self): @@ -190,7 +190,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase): self.student_submission.save() result = self._fetch_assignment_teacher(self.teacher) - self.assertEqual(result.get('data').get('assignment').get('submissions')[0].get('submission_feedback') + self.assertEqual(result.get('data').get('assignment').get('submissions')[0].get('submissionFeedback') .get('text'), submission_feedback.text) def test_rogue_teacher_cannot_see_feedback(self): @@ -200,4 +200,4 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase): self.student_submission.save() result = self._fetch_assignment_teacher(self.teacher2) - self.assertIsNone(result.get('data').get('assignment').get('submissions')[0].get('submission_feedback')) + self.assertIsNone(result.get('data').get('assignment').get('submissions')[0].get('submissionFeedback'))