Rename get_submission_by_uuid to differentiate from get_submission

apps/openassessment/assessment/self_api.py

@@ -3,7 +3,7 @@ Public interface for self-assessment.
 """
 from django.utils.translation import ugettext as _
 from submissions.api import (
-    get_submission_by_uuid, get_submissions,
+    get_submission_and_student, get_submissions,
     SubmissionNotFoundError, SubmissionRequestError
 )
 from openassessment.assessment.serializers import (
@@ -52,7 +52,7 @@ def create_assessment(submission_uuid, user_id, options_selected, rubric_dict, s
 
     # Check that the student is allowed to assess this submission
     try:
-        submission = get_submission_by_uuid(submission_uuid)
+        submission = get_submission_and_student(submission_uuid)
         if submission is None or submission['student_item']['student_id'] != user_id:
             raise SelfAssessmentRequestError(_("Cannot self-assess this submission"))
     except SubmissionNotFoundError:

apps/submissions/api.py

@@ -192,9 +192,9 @@ def get_submission(submission_uuid):
 
     return SubmissionSerializer(submission).data
 
-def get_submission_by_uuid(uuid):
+def get_submission_and_student(uuid):
     """
-    Retrieve a submission by its unique identifier.
+    Retrieve a submission by its unique identifier, including the associated student item.
 
     Args:
         uuid (str): the unique identifier of the submission.

apps/submissions/tests/test_api.py

@@ -41,15 +41,15 @@ class TestSubmissionsApi(TestCase):
         student_item = self._get_student_item(STUDENT_ITEM)
         self._assert_submission(submission, ANSWER_ONE, student_item.pk, 1)
 
-    def test_get_submission_by_uuid(self):
+    def test_get_submission_and_student(self):
         submission = api.create_submission(STUDENT_ITEM, ANSWER_ONE)
 
         # Retrieve the submission by its uuid
-        retrieved = api.get_submission_by_uuid(submission['uuid'])
+        retrieved = api.get_submission_and_student(submission['uuid'])
         self.assertItemsEqual(submission, retrieved)
 
         # Should get None if we retrieve a submission that doesn't exist
-        retrieved = api.get_submission_by_uuid(u'no such uuid')
+        retrieved = api.get_submission_and_student(u'no such uuid')
         self.assertIs(retrieved, None)
 
     def test_get_submissions(self):