ramon
/
skillbox
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects 1 Releases 1 Wiki Activity

Refactor code

This commit is contained in:
Ramon Wenger 2019-12-09 10:38:59 +01:00
parent 89e3925590
commit 93fb4c2612
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/assignments/schema/mutations.py
View File

@ -52,9 +52,7 @@ class UpdateSubmissionFeedback(relay.ClientIDMutation):
(submission_feedback, created) = SubmissionFeedback.objects.get_or_create(teacher=user, (submission_feedback, created) = SubmissionFeedback.objects.get_or_create(teacher=user,
student_submission_id=student_submission_id) student_submission_id=student_submission_id)
final = submission_feedback.final final = submission_feedback_data.get('final') if 'final' in submission_feedback_data else submission_feedback.final
if 'final' in submission_feedback_data:
final = submission_feedback_data.get('final')
submission_feedback.final = final submission_feedback.final = final
submission_feedback.text = submission_feedback_data.get('text') submission_feedback.text = submission_feedback_data.get('text')

14
server/assignments/tests/test_feedback.py
View File

@ -68,7 +68,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
id id
text text
document document
submission_feedback { submissionFeedback {
text text
} }
} }
@ -89,7 +89,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
id id
text text
document document
submission_feedback { submissionFeedback {
text text
} }
} }
@ -110,7 +110,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
id id
text text
document document
submission_feedback { submissionFeedback {
text text
} }
} }
@ -173,14 +173,14 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
SubmissionFeedbackFactory(teacher=self.teacher, final=False, student_submission=self.student_submission) SubmissionFeedbackFactory(teacher=self.teacher, final=False, student_submission=self.student_submission)
result = self._fetch_assignment_student(self.student1) 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): def test_student_does_see_final_feedback(self):
submission_feedback = SubmissionFeedbackFactory(teacher=self.teacher, final=True, submission_feedback = SubmissionFeedbackFactory(teacher=self.teacher, final=True,
student_submission=self.student_submission) student_submission=self.student_submission)
result = self._fetch_assignment_student(self.student1) 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) .get('text'), submission_feedback.text)
def test_teacher_can_see_feedback_for_submission(self): def test_teacher_can_see_feedback_for_submission(self):
@ -190,7 +190,7 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
self.student_submission.save() self.student_submission.save()
result = self._fetch_assignment_teacher(self.teacher) 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) .get('text'), submission_feedback.text)
def test_rogue_teacher_cannot_see_feedback(self): def test_rogue_teacher_cannot_see_feedback(self):
@ -200,4 +200,4 @@ class SubmissionFeedbackTestCase(DefaultUserTestCase):
self.student_submission.save() self.student_submission.save()
result = self._fetch_assignment_teacher(self.teacher2) 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'))