Merge pull request #188 from edx/cdodge/hotfix-2015-10-05

Cdodge/hotfix 2015 10 05

edx_proctoring/api.py

@@ -1124,12 +1124,12 @@ def get_student_view(user_id, course_id, content_id,
                     # so we can mark it as declined
                     create_exam_attempt(exam_id, user_id)
 
-                update_attempt_status(
-                    exam_id,
-                    user_id,
-                    ProctoredExamStudentAttemptStatus.declined,
-                    raise_if_not_found=False
-                )
+                    update_attempt_status(
+                        exam_id,
+                        user_id,
+                        ProctoredExamStudentAttemptStatus.declined,
+                        raise_if_not_found=False
+                    )
 
             # don't override context, let the courseware show
             return None

edx_proctoring/models.py

@@ -518,10 +518,16 @@ class ProctoredExamStudentAttemptHistory(TimeStampedModel):
         Returns the Student Exam Attempt object if found
         else Returns None.
         """
-        try:
-            exam_attempt_obj = cls.objects.get(attempt_code=attempt_code)
-        except ObjectDoesNotExist:  # pylint: disable=no-member
-            exam_attempt_obj = None
+        # NOTE: compared to the ProctoredExamAttempt table
+        # we can have multiple rows with the same attempt_code
+        # So, just return the first one (most recent) if
+        # there are any
+        exam_attempt_obj = None
+
+        items = cls.objects.filter(attempt_code=attempt_code).order_by("-created")
+        if items:
+            exam_attempt_obj = items[0]
+
         return exam_attempt_obj
 
     class Meta:

edx_proctoring/tests/test_api.py

@@ -726,6 +726,7 @@ class ProctoredExamApiTests(LoggedInTestCase):
     @ddt.data(
         ('reverification', None, True, True, False),
         ('reverification', 'failed', False, False, True),
+        ('reverification', 'failed', False, True, False),
         ('reverification', 'satisfied', True, True, False),
         ('grade', 'failed', True, False, False)
     )
@@ -775,6 +776,10 @@ class ProctoredExamApiTests(LoggedInTestCase):
         if mark_as_declined:
             attempt = get_exam_attempt(self.proctored_exam_id, self.user_id)
             self.assertEqual(attempt['status'], ProctoredExamStudentAttemptStatus.declined)
+        else:
+            attempt = get_exam_attempt(self.proctored_exam_id, self.user_id)
+            if attempt:
+                self.assertNotEqual(attempt['status'], ProctoredExamStudentAttemptStatus.declined)
 
     def test_student_view_non_student(self):
         """

edx_proctoring/tests/test_models.py

@@ -150,6 +150,30 @@ class ProctoredExamStudentAttemptTests(LoggedInTestCase):
         attempt_history = ProctoredExamStudentAttemptHistory.objects.filter(user_id=1)
         self.assertEqual(len(attempt_history), 1)
 
+        # make sure we can ready it back with helper class method
+        deleted_item = ProctoredExamStudentAttemptHistory.get_exam_attempt_by_code("123456")
+        self.assertEqual(deleted_item.student_name, "John. D")
+
+        # re-create and delete again using same attempt_cde
+        attempt = ProctoredExamStudentAttempt.objects.create(
+            proctored_exam_id=proctored_exam.id,
+            user_id=1,
+            student_name="John. D Updated",
+            allowed_time_limit_mins=10,
+            attempt_code="123456",
+            taking_as_proctored=True,
+            is_sample_attempt=True,
+            external_id=1
+        )
+
+        attempt.delete_exam_attempt()
+
+        attempt_history = ProctoredExamStudentAttemptHistory.objects.filter(user_id=1)
+        self.assertEqual(len(attempt_history), 2)
+
+        deleted_item = ProctoredExamStudentAttemptHistory.get_exam_attempt_by_code("123456")
+        self.assertEqual(deleted_item.student_name, "John. D Updated")
+
     def test_get_exam_attempts(self):
         """
         Test to get all the exam attempts for a course

setup.py

@@ -34,7 +34,7 @@ def load_requirements(*requirements_paths):
 
 setup(
     name='edx-proctoring',
-    version='0.9.14',
+    version='0.9.16',
     description='Proctoring subsystem for Open edX',
     long_description=open('README.md').read(),
     author='edX',