per cliff's review

common/djangoapps/util/milestones_helpers.py

@@ -35,15 +35,14 @@ def is_entrance_exams_enabled():
     Checks to see if the Entrance Exams feature is enabled
     Use this operation instead of checking the feature flag all over the place
     """
-    return settings.FEATURES.get('ENTRANCE_EXAMS', False)
+    return settings.FEATURES.get('ENTRANCE_EXAMS')
 
 
 def is_prerequisite_courses_enabled():
     """
     Returns boolean indicating prerequisite courses enabled system wide or not.
     """
-    return settings.FEATURES.get('ENABLE_PREREQUISITE_COURSES', False) \
-        and settings.FEATURES.get('MILESTONES_APP', False)
+    return settings.FEATURES.get('ENABLE_PREREQUISITE_COURSES') and settings.FEATURES.get('MILESTONES_APP')
 
 
 def add_prerequisite_course(course_key, prerequisite_course_key):
@@ -185,7 +184,7 @@ def fulfill_course_milestone(course_key, user):
     Marks the course specified by the given course_key as complete for the given user.
     If any other courses require this course as a prerequisite, their milestones will be appropriately updated.
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     try:
         course_milestones = milestones_api.get_course_milestones(course_key=course_key, relationship="fulfills")
@@ -201,7 +200,7 @@ def remove_course_milestones(course_key, user, relationship):
     """
     Remove all user milestones for the course specified by course_key.
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     course_milestones = milestones_api.get_course_milestones(course_key=course_key, relationship=relationship)
     for milestone in course_milestones:
@@ -214,7 +213,7 @@ def get_required_content(course, user):
     and if those milestones can be fulfilled via completion of a particular course content module
     """
     required_content = []
-    if settings.FEATURES.get('MILESTONES_APP', False):
+    if settings.FEATURES.get('MILESTONES_APP'):
         # Get all of the outstanding milestones for this course, for this user
         try:
             milestone_paths = get_course_milestones_fulfillment_paths(
@@ -237,7 +236,7 @@ def milestones_achieved_by_user(user, namespace):
     """
     It would fetch list of milestones completed by user
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.get_user_milestones({'id': user.id}, namespace)
 
@@ -257,7 +256,7 @@ def seed_milestone_relationship_types():
     """
     Helper method to pre-populate MRTs so the tests can run
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     MilestoneRelationshipType.objects.create(name='requires')
     MilestoneRelationshipType.objects.create(name='fulfills')
@@ -285,7 +284,7 @@ def add_milestone(milestone_data):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.add_milestone(milestone_data)
 
@@ -294,7 +293,7 @@ def get_milestones(namespace):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return []
     return milestones_api.get_milestones(namespace)
 
@@ -303,7 +302,7 @@ def get_milestone_relationship_types():
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return {}
     return milestones_api.get_milestone_relationship_types()
 
@@ -312,7 +311,7 @@ def add_course_milestone(course_id, relationship, milestone):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.add_course_milestone(course_id, relationship, milestone)
 
@@ -321,7 +320,7 @@ def get_course_milestones(course_id):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return []
     return milestones_api.get_course_milestones(course_id)
 
@@ -330,7 +329,7 @@ def add_course_content_milestone(course_id, content_id, relationship, milestone)
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.add_course_content_milestone(course_id, content_id, relationship, milestone)
 
@@ -341,7 +340,7 @@ def get_course_content_milestones(course_id, content_id, relationship, user_id=N
     Uses the request cache to store all of a user's
     milestones
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return []
 
     if user_id is None:
@@ -352,7 +351,7 @@ def get_course_content_milestones(course_id, content_id, relationship, user_id=N
         request_cache_dict[user_id] = {}
 
     if relationship not in request_cache_dict[user_id]:
-        request_cache_dict[user_id]['requires'] = milestones_api.get_course_content_milestones(
+        request_cache_dict[user_id][relationship] = milestones_api.get_course_content_milestones(
             course_key=course_id,
             relationship=relationship,
             user={"id": user_id}
@@ -365,7 +364,7 @@ def remove_course_content_user_milestones(course_key, content_key, user, relatio
     """
     Removes the specified User-Milestone link from the system for the specified course content module.
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return []
 
     course_content_milestones = milestones_api.get_course_content_milestones(course_key, content_key, relationship)
@@ -377,14 +376,14 @@ def remove_content_references(content_id):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.remove_content_references(content_id)
 
 
 def any_unfulfilled_milestones(course_id, user_id):
     """ Returns a boolean if user has any unfulfilled milestones """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return False
     return bool(
         get_course_milestones_fulfillment_paths(course_id, {"id": user_id})
@@ -395,7 +394,7 @@ def get_course_milestones_fulfillment_paths(course_id, user_id):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.get_course_milestones_fulfillment_paths(
         course_id,
@@ -407,7 +406,7 @@ def add_user_milestone(user, milestone):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.add_user_milestone(user, milestone)
 
@@ -416,6 +415,6 @@ def remove_user_milestone(user, milestone):
     """
     Client API operation adapter/wrapper
     """
-    if not settings.FEATURES.get('MILESTONES_APP', False):
+    if not settings.FEATURES.get('MILESTONES_APP'):
         return None
     return milestones_api.remove_user_milestone(user, milestone)