updated the code and test cases

edx_proctoring/tests/test_views.py

@@ -758,7 +758,7 @@ class TestStudentProctoredExamAttempt(LoggedInTestCase):
         attempt_id = response_data['exam_attempt_id']
         self.assertGreater(attempt_id, 0)
 
-        # now set the user is_staff t0 false
+        # now set the user is_staff to False
         # and also user is not a course staff
         self.user.is_staff = False
         self.user.save()
@@ -770,7 +770,7 @@ class TestStudentProctoredExamAttempt(LoggedInTestCase):
 
         self.assertEqual(response.status_code, 403)
         response_data = json.loads(response.content)
-        self.assertEqual(response_data['detail'], 'Must be a instructor of the course to Perform this request.')
+        self.assertEqual(response_data['detail'], 'Must be a Staff User to Perform this request.')
 
     def test_read_others_attempt(self):
         """
@@ -1788,7 +1788,7 @@ class TestExamAllowanceView(LoggedInTestCase):
         self.user.save()
         set_runtime_service('instructor', MockInstructorService(is_user_course_staff=False))
         # Create an exam.
-        proctored_exam = ProctoredExam.objects.create(
+        timed_exam = ProctoredExam.objects.create(
             course_id='a/b/c',
             content_id='test_content',
             exam_name='Test Exam',
@@ -1797,7 +1797,7 @@ class TestExamAllowanceView(LoggedInTestCase):
             is_proctored=False
         )
         allowance_data = {
-            'exam_id': proctored_exam.id,
+            'exam_id': timed_exam.id,
             'user_info': self.student_taking_exam.username,
             'key': 'a_key',
             'value': '30'
@@ -1808,7 +1808,7 @@ class TestExamAllowanceView(LoggedInTestCase):
         )
         self.assertEqual(response.status_code, 403)
         response_data = json.loads(response.content)
-        self.assertEqual(response_data['detail'], 'Must be a instructor of the course to Perform this request.')
+        self.assertEqual(response_data['detail'], 'Must be a Staff User to Perform this request.')
 
     def test_get_allowances_for_course(self):
         """
@@ -1881,7 +1881,7 @@ class TestExamAllowanceView(LoggedInTestCase):
 
         self.assertEqual(response.status_code, 403)
         response_data = json.loads(response.content)
-        self.assertEqual(response_data['detail'], 'Must be a instructor of the course to Perform this request.')
+        self.assertEqual(response_data['detail'], 'Must be a Staff User to Perform this request.')
 
     def test_get_timed_exam_allowances_for_course(self):  # pylint: disable=invalid-name
         """

edx_proctoring/views.py

@@ -71,38 +71,30 @@ def require_course_or_global_staff(func):
         course_id = kwargs['course_id'] if 'course_id' in kwargs else None
         exam_id = request.DATA.get('exam_id', None)
         attempt_id = kwargs['attempt_id'] if 'attempt_id' in kwargs else None
-        response_message = _("Must be a instructor of the course to Perform this request.")
         if request.user.is_staff:
-            is_request_allowed = True
-        elif course_id is not None:
+            return func(request, *args, **kwargs)
+        else:
+            if course_id is None:
+                if exam_id is not None:
+                    exam = ProctoredExam.get_exam_by_id(exam_id)
+                    course_id = exam.course_id
+                elif attempt_id is not None:
+                    exam_attempt = ProctoredExamStudentAttempt.objects.get_exam_attempt_by_id(attempt_id)
+                    course_id = exam_attempt.proctored_exam.course_id
+                else:
+                    response_message = _("could not determine the course_id")
+                    return Response(
+                        status=status.HTTP_403_FORBIDDEN,
+                        data={"detail": response_message}
+                    )
             if instructor_service.is_course_staff(request.user, course_id):
-                is_request_allowed = True
+                return func(request, *args, **kwargs)
             else:
-                is_request_allowed = False
-        elif exam_id is not None:
-            # get the course_id from the exam
-            exam = ProctoredExam.get_exam_by_id(exam_id)
-            if instructor_service.is_course_staff(request.user, exam.course_id):
-                is_request_allowed = True
-            else:
-                is_request_allowed = False
-        elif attempt_id is not None:
-            exam_attempt = ProctoredExamStudentAttempt.objects.get_exam_attempt_by_id(attempt_id)
-            if instructor_service.is_course_staff(request.user, exam_attempt.proctored_exam.course_id):
-                is_request_allowed = True
-            else:
-                is_request_allowed = False
-        else:
-            is_request_allowed = False
-            response_message = _("Must be a Staff User to Perform this request.")
+                return Response(
+                    status=status.HTTP_403_FORBIDDEN,
+                    data={"detail": _("Must be a Staff User to Perform this request.")}
+                )
 
-        if is_request_allowed:
-            return func(request, *args, **kwargs)
-        else:
-            return Response(
-                status=status.HTTP_403_FORBIDDEN,
-                data={"detail": response_message}
-            )
     return wrapped