Merge branch '117-cache' into 'develop'

Fix #117: Use django-cacheops to cache common ORM requests

Closes #117

See merge request funkwhale/funkwhale!86

.gitlab-ci.yml

@@ -23,6 +23,8 @@ test_api:
     DJANGO_ALLOWED_HOSTS: "localhost"
     DATABASE_URL: "postgresql://postgres@postgres/postgres"
     FUNKWHALE_URL: "https://funkwhale.ci"
+    CACHEOPS_ENABLED: "false"
+
   before_script:
     - cd api
     - pip install -r requirements/base.txt

api/config/settings/common.py

@@ -60,6 +60,7 @@ THIRD_PARTY_APPS = (
     'mptt',
     'dynamic_preferences',
     'django_filters',
+    'cacheops',
 )
 
 
@@ -369,6 +370,15 @@ MUSICBRAINZ_CACHE_DURATION = env.int(
     'MUSICBRAINZ_CACHE_DURATION',
     default=300
 )
+CACHEOPS_REDIS = env('CACHE_URL', default=CACHE_DEFAULT)
+CACHEOPS_ENABLED = env.bool('CACHEOPS_ENABLED', default=True)
+CACHEOPS = {
+    'music.artist': {'ops': 'all', 'timeout': 60 * 60},
+    'music.album': {'ops': 'all', 'timeout': 60 * 60},
+    'music.track': {'ops': 'all', 'timeout': 60 * 60},
+    'music.trackfile': {'ops': 'all', 'timeout': 60 * 60},
+    'taggit.tag': {'ops': 'all', 'timeout': 60 * 60},
+}
 
 # Custom Admin URL, use {% url 'admin:index' %}
 ADMIN_URL = env('DJANGO_ADMIN_URL', default='^api/admin/')

api/requirements/base.txt

@@ -58,3 +58,4 @@ python-magic==0.4.15
 ffmpeg-python==0.1.10
 channels>=2,<2.1
 channels_redis>=2.1,<2.2
+django-cacheops>=4,<4.1

api/test.yml

@@ -13,5 +13,6 @@ services:
       - "DJANGO_ALLOWED_HOSTS=localhost"
       - "DATABASE_URL=postgresql://postgres@postgres/postgres"
       - "FUNKWHALE_URL=https://funkwhale.test"
+      - "CACHEOPS_ENABLED=False"
   postgres:
     image: postgres

changes/changelog.d/117.feature

+Use django-cacheops to cache common ORM requests (#117)