Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Stop hitting the database when no courses are blocked.

Browse Source
This commit is contained in:
Will Daly
2015-02-20 14:17:14 -05:00
parent 0e3f40b948
commit 1624720f48
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
common/djangoapps/embargo/models.py
View File

@@ -156,7 +156,7 @@ class RestrictedCourse(models.Model):
Cache all restricted courses and returns the list of course_keys that are restricted
"""
restricted_courses = cache.get(cls.COURSE_LIST_CACHE_KEY)
if not restricted_courses:
if restricted_courses is None:
restricted_courses = list(RestrictedCourse.objects.values_list('course_key', flat=True))
cache.set(cls.COURSE_LIST_CACHE_KEY, restricted_courses)
return restricted_courses
@@ -413,7 +413,7 @@ class CountryAccessRule(models.Model):
"""
cache_key = cls.CACHE_KEY.format(course_key=course_id)
allowed_countries = cache.get(cache_key)
if not allowed_countries:
if allowed_countries is None:
allowed_countries = cls._get_country_access_list(course_id)
cache.set(cache_key, allowed_countries)

10
common/djangoapps/embargo/tests/test_api.py
View File

@@ -166,6 +166,16 @@ class EmbargoCheckAccessApiTests(ModuleStoreTestCase):
with self.assertNumQueries(0):
embargo_api.check_course_access(self.course.id, user=self.user, ip_address='0.0.0.0')
def test_caching_no_restricted_courses(self):
RestrictedCourse.objects.all().delete()
cache.clear()
with self.assertNumQueries(1):
embargo_api.check_course_access(self.course.id, user=self.user, ip_address='0.0.0.0')
with self.assertNumQueries(0):
embargo_api.check_course_access(self.course.id, user=self.user, ip_address='0.0.0.0')
@ddt.ddt
@override_settings(MODULESTORE=MODULESTORE_CONFIG)