Filtered users with admin roles for relevant courses. (#58)

edx · Jun 29, 2020 · ba3e8b3 · ba3e8b3
1 parent 95d666a
commit ba3e8b3
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 18 deletions.
diff --git a/edx_solutions_organizations/views.py b/edx_solutions_organizations/views.py
@@ -318,29 +318,29 @@ def courses(self, request, pk):  # pylint: disable=W0613
         """
         exclude_admins = str2bool(request.query_params.get('exclude_admins'))
         organization = self.get_object()
-        organization_courses = []
-        organization_course_ids = []
-        roles_to_exclude = []
+
+        course_access_roles = {}
         if exclude_admins:
-            organization_courses = CourseEnrollment.objects\
-                .filter(user__organizations=organization, is_active=True)\
-                .order_by('course_id').distinct().values_list('course_id', flat=True)
-            for course_id in organization_courses:
-                organization_course_ids.append(course_id.to_deprecated_string())
-            organization_courses = map(get_course_key, filter(None, organization_course_ids))
-            roles_to_exclude = [CourseInstructorRole.ROLE, CourseStaffRole.ROLE, CourseObserverRole.ROLE, CourseAssistantRole.ROLE]
+            roles_to_exclude = [CourseInstructorRole.ROLE, CourseStaffRole.ROLE, CourseObserverRole.ROLE,
+                                CourseAssistantRole.ROLE]
+
+            for course_access in CourseAccessRole.objects.filter(role__in=roles_to_exclude,
+                                                                 user__organizations=organization):
+                if not course_access_roles.get(course_access.user_id):
+                    course_access_roles[course_access.user_id] = [course_access.course_id]
 
-        enrollment_qs = CourseEnrollment.objects\
-            .filter(user__organizations=organization, is_active=True)\
-            .exclude(
-                user_id__in=CourseAccessRole.objects.filter(
-                    course_id__in=organization_courses, role__in=roles_to_exclude
-                ).values_list('user_id', flat=True)
-            ).values_list('course_id', 'user_id')
+                course_access_roles[course_access.user_id] += [course_access.course_id]
+
+        enrollment_qs = CourseEnrollment.objects.filter(
+            user__organizations=organization, is_active=True
+        ).values_list('course_id', 'user_id')
 
         enrollments = {}
         course_ids = []
         for (course_id, user_id) in enrollment_qs:
+            if course_id in course_access_roles.get(user_id, []):
+                continue
+
             enrollments.setdefault(course_id.to_deprecated_string(), []).append(user_id)
             if course_id.to_deprecated_string() not in course_ids:
                 course_ids.append(course_id.to_deprecated_string())

diff --git a/setup.py b/setup.py
@@ -4,7 +4,7 @@
 
 setup(
     name='organizations-edx-platform-extensions',
-    version='2.0.1',
+    version='2.0.2',
     description='Organization management extension for edX platform',
     long_description=open('README.rst').read(),
     author='edX',