Switch to using status instead of time.

edx_proctoring/callbacks.py

@@ -23,7 +23,6 @@ from edx_proctoring.api import (
 from edx_proctoring.backends import get_backend_provider
 from edx_proctoring.exceptions import ProctoredBaseException
 from edx_proctoring.models import ProctoredExamStudentAttemptStatus
-from edx_proctoring.utils import get_time_remaining_for_attempt
 
 from edx_proctoring import constants
 
@@ -157,9 +156,8 @@ class AttemptStatus(APIView):
             )
 
         update_exam_attempt(attempt['id'], last_poll_timestamp=timestamp, last_poll_ipaddr=ip_address)
-        time_remaining_seconds = get_time_remaining_for_attempt(attempt)
         polling_interval = constants.DEFAULT_CLIENT_POLLING_INTERVAL
-        if time_remaining_seconds < constants.EXAM_CONCLUDING_INTERVAL:
+        if ProctoredExamStudentAttemptStatus.is_completed_status(attempt['status']):
             polling_interval = constants.REDUCED_CLIENT_POLLING_INTERVAL
 
         return Response(

edx_proctoring/constants.py

@@ -64,13 +64,7 @@ DEFAULT_CLIENT_POLLING_INTERVAL = (
 REDUCED_CLIENT_POLLING_INTERVAL = (
     settings.PROCTORING_SETTINGS['REDUCED_CLIENT_POLLING_INTERVAL'] if
     'REDUCED_CLIENT_POLLING_INTERVAL' in settings.PROCTORING_SETTINGS
-    else getattr(settings, 'REDUCED_CLIENT_POLLING_INTERVAL', 10)
-)
-
-EXAM_CONCLUDING_INTERVAL = (
-    settings.PROCTORING_SETTINGS['EXAM_CONCLUDING_INTERVAL'] if
-    'EXAM_CONCLUDING_INTERVAL' in settings.PROCTORING_SETTINGS
-    else getattr(settings, 'EXAM_CONCLUDING_INTERVAL', 180)
+    else getattr(settings, 'REDUCED_CLIENT_POLLING_INTERVAL', 15)
 )
 
 

edx_proctoring/tests/test_views.py

@@ -837,8 +837,7 @@ class TestStudentProctoredExamAttempt(LoggedInTestCase):
                 )
                 self.assertEqual(response.status_code, 200)
 
-    @patch('edx_proctoring.callbacks.get_time_remaining_for_attempt')
-    def test_attempt_status_poll_interval(self, time_remaining_mock):
+    def test_attempt_status_poll_interval(self):
         """
         Test that the poll interval is correct depending on the amount of time remaining.
         """
@@ -850,12 +849,14 @@ class TestStudentProctoredExamAttempt(LoggedInTestCase):
         )
 
         # When the exam has not reached the concluding interval.
-        time_remaining_mock.return_value = constants.EXAM_CONCLUDING_INTERVAL + 5
+        exam_attempt.status = ProctoredExamStudentAttemptStatus.started
+        exam_attempt.save()
         response = self.client.get(polling_status_endpoint)
         response_data = json.loads(response.content)
         self.assertEqual(response_data['polling_interval'], constants.DEFAULT_CLIENT_POLLING_INTERVAL)
 
-        time_remaining_mock.return_value = constants.EXAM_CONCLUDING_INTERVAL - 5
+        exam_attempt.status = ProctoredExamStudentAttemptStatus.submitted
+        exam_attempt.save()
         response = self.client.get(polling_status_endpoint)
         response_data = json.loads(response.content)
         self.assertEqual(response_data['polling_interval'], constants.REDUCED_CLIENT_POLLING_INTERVAL)