pythonprobr · renzon · Jul 31, 2020 · Jul 31, 2020
diff --git a/Pipfile b/Pipfile
@@ -34,6 +34,7 @@ inflection = "*"
 django-two-factor-auth = "*"
 django-recaptcha = "*"
 django-pagarme = "*"
+django-redis = "*"
 
 [dev-packages]
 faker = "*"

diff --git a/Pipfile.lock b/Pipfile.lock
diff --git a/conftest.py b/conftest.py
@@ -204,6 +204,14 @@ def turn_active_campaign_on(settings):
     settings.ACTIVE_CAMPAIGN_TURNED_ON = True
 
 
+@pytest.fixture(autouse=True)
+def turn_cache_off(settings):
+    """
+    This way test don't depend on local .env configuration
+    """
+    settings.CACHE_TURNED_ON = False
+
+
 @pytest.fixture(autouse=True)
 def turn_ssl_rediret_off_for_tests(settings):
     """

diff --git a/contrib/env-sample b/contrib/env-sample
@@ -35,7 +35,7 @@ DISCOURSE_API_USER=
 ACTIVE_CAMPAIGN_URL=
 ACTIVE_CAMPAIGN_KEY=
 # Make it False on dev to avoiding sending data to ActiveCampaign
-ACTIVE_CAMPAIGN_TURNED_ON=true
+ACTIVE_CAMPAIGN_TURNED_ON=false
 
 # Google Tag Manager Config
 GOOGLE_TAG_MANAGER_ID=GTM-ABC1234
@@ -49,4 +49,7 @@ REDIS_URL=redis://localhost:6379/1
 
 RECAPTCHA_PUBLIC_KEY=
 RECAPTCHA_PRIVATE_KEY=
-
+
+
+# Make it False to disable cache. Default is True
+CACHE_TURNED_ON=false
diff --git a/pythonpro/cohorts/facade.py b/pythonpro/cohorts/facade.py
@@ -1,3 +1,7 @@
+from functools import partial
+
+from django.conf import settings
+from django.core.cache import cache
 from django.db.models import Prefetch as _Prefetch
 from django.urls import reverse
 
@@ -15,7 +19,8 @@
 
 
 def get_all_cohorts_desc():
-    return tuple(_Cohort.objects.order_by('-start'))
+    lazy_all_cohorts = partial(tuple, _Cohort.objects.order_by('-start'))
+    return cache.get_or_set('ALL_COHORTS', lazy_all_cohorts, settings.CACHE_TTL)
 
 
 def find_cohort(slug):

diff --git a/pythonpro/modules/facade.py b/pythonpro/modules/facade.py
@@ -1,3 +1,7 @@
+from functools import partial
+
+from django.conf import settings
+from django.core.cache import cache
 from django.db.models import Prefetch
 
 from pythonpro.modules.models import (
@@ -14,7 +18,8 @@ def get_all_modules():
     Search all modules on database sorted by order
     :return: tuple of Module
     """
-    return tuple(_Module.objects.order_by('order'))
+    lazy_all_modules = partial(tuple, _Module.objects.order_by('order'))
+    return cache.get_or_set('ALL_MODULES', lazy_all_modules, settings.CACHE_TTL)
 
 
 def get_module_with_contents(slug):

diff --git a/pythonpro/settings.py b/pythonpro/settings.py
@@ -159,6 +159,32 @@
     'default': config('DATABASE_URL', default=default_db_url, cast=dburl),
 }
 
+# Cache configuration
+REDIS_URL = config('REDIS_URL')
+CACHE_REDIS_URL = f'{REDIS_URL}/1'
+
+CACHE_TTL = 60 * 15
+
+CACHE_TURNED_ON = config('CACHE_TURNED_ON', default=True, cast=bool)
+
+if CACHE_TURNED_ON:
+    CACHES = {
+        "default": {
+            "BACKEND": "django_redis.cache.RedisCache",
+            "LOCATION": CACHE_REDIS_URL,
+            "OPTIONS": {
+                "CLIENT_CLASS": "django_redis.client.DefaultClient"
+            },
+            "KEY_PREFIX": "example"
+        }
+    }
+else:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.dummy.DummyCache',
+        }
+    }
+
 # Password validation
 # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
 
@@ -274,6 +300,6 @@
 
 BROKER_URL = config('CLOUDAMQP_URL')
 
-CELERY_RESULT_BACKEND = config('REDIS_URL')
+CELERY_RESULT_BACKEND = f'{REDIS_URL}/0'
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_TIMEZONE = TIME_ZONE