mattdrayer/api-modulestore-direct: Added utility method

lms/djangoapps/api_manager/courses/tests.py

@@ -1526,8 +1526,9 @@ class CoursesApiTests(TestCase):
         response = self.do_get(test_uri)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(len(response.data.keys()), 2)
-        self.assertIn('1', response.data)
-        self.assertIn('2', response.data)
+        users = response.data['users']
+        self.assertTrue(users.get('1'))
+        self.assertTrue(users.get('2'))
 
         # make the first user an observer to asset that its content is being filtered out from
         # the aggregates
@@ -1536,8 +1537,9 @@ class CoursesApiTests(TestCase):
         response = self.do_get(test_uri)
         self.assertEqual(response.status_code, 200)
         self.assertTrue(len(response.data.keys()), 1)
-        self.assertNotIn('1', response.data)
-        self.assertIn('2', response.data)
+        users = response.data['users']
+        self.assertFalse(users.get('1'))
+        self.assertTrue(users.get('2'))
 
     def test_courses_leaders_list_get(self):
         # make the last user an observer to asset that its content is being filtered out from

lms/djangoapps/api_manager/courses/views.py

@@ -28,7 +28,7 @@ from student.roles import CourseRole, CourseAccessRole, CourseInstructorRole, Co
 
 from xmodule.modulestore.django import modulestore
 
-from api_manager.courseware_access import get_course, get_course_child, get_course_leaf_nodes, get_course_key, course_exists
+from api_manager.courseware_access import get_course, get_course_child, get_course_leaf_nodes, get_course_key, course_exists, get_modulestore
 from api_manager.models import CourseGroupRelationship, CourseContentGroupRelationship, GroupProfile, \
     CourseModuleCompletion
 from api_manager.permissions import SecureAPIView, SecureListAPIView
@@ -525,8 +525,7 @@ class CoursesList(SecureListAPIView):
     serializer_class = CourseSerializer
 
     def get_queryset(self):
-        store = modulestore()
-        course_descriptors = store.get_courses()
+        course_descriptors = get_modulestore().get_courses()
         return course_descriptors
 
 

lms/djangoapps/api_manager/courseware_access.py

@@ -10,6 +10,10 @@ from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.exceptions import ItemNotFoundError
 
 
+def get_modulestore():
+    return modulestore('direct')
+
+
 def get_course(request, user, course_id, depth=0, load_content=False):
     """
     Utility method to obtain course components
@@ -55,7 +59,7 @@ def get_course_leaf_nodes(course_key, detached_categories):
     Get count of the leaf nodes with ability to exclude some categories
     """
     nodes = []
-    verticals = modulestore().get_items(course_key, category='vertical')
+    verticals = get_modulestore().get_items(course_key, category='vertical')
     for vertical in verticals:
         nodes.extend([unit for unit in vertical.children
                       if getattr(unit, 'category') not in detached_categories])
@@ -96,7 +100,7 @@ def course_exists(request, user, course_id):
     course_key = get_course_key(course_id)
     if not course_key:
         return False
-    if not modulestore().has_course(course_key):
+    if not get_modulestore().has_course(course_key):
         return False
     return True
 
@@ -114,7 +118,7 @@ def get_course_child_key(content_id):
 
 def get_course_child_descriptor(child_key):
     try:
-        content_descriptor = modulestore().get_item(child_key)
+        content_descriptor = get_modulestore().get_item(child_key)
     except ItemNotFoundError:
         content_descriptor = None
     return content_descriptor