Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Refactor the cache used for the calendar

Roland Geider805b7cd3810c
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.py
index 4a2a32185..9720ac8f4 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -58,11 +58,30 @@ class Command(BaseCommand):
# Exercises, cached template fragments
if options['clear_template']:
+ if int(options['verbosity']) >= 2:
+ self.stdout.write("*** Clearing templates")
+
for user in User.objects.all():
- for entry in WorkoutLog.objects.dates('date', 'year'):
- for month in range(1, 13):
- # print("User {0}, year {1}, month {2}".format(user.pk, entry.year, month))
- reset_workout_log(user.id, entry.year, month)
+ if int(options['verbosity']) >= 2:
+ self.stdout.write("* Processing user {0}".format(user.username))
+
+ for entry in WorkoutLog.objects.filter(user=user).dates('date', 'year'):
+
+ if int(options['verbosity']) >= 3:
+ self.stdout.write(" Year {0}".format(entry.year))
+ for month in WorkoutLog.objects.filter(user=user,
+ date__year=entry.year).dates('date',
+ 'month'):
+ if int(options['verbosity']) >= 3:
+ self.stdout.write(" Month {0}".format(entry.month))
+ reset_workout_log(user.id, entry.year, entry.month)
+ for day in WorkoutLog.objects.filter(user=user,
+ date__year=entry.year,
+ date__month=month.month).dates('date',
+ 'day'):
+ if int(options['verbosity']) >= 3:
+ self.stdout.write(" Day {0}".format(day.day))
+ reset_workout_log(user.id, entry.year, entry.month, day)
for language in Language.objects.all():
delete_template_fragment_cache('muscle-overview', language.id)
diff --git a/wger/manager/models.py b/wger/manager/models.py
index fdb29df5b..45c1c25f3 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -660,14 +660,14 @@ class WorkoutLog(models.Model):
'''
Reset cache
'''
- reset_workout_log(self.user_id, self.date.year, self.date.month)
+ reset_workout_log(self.user_id, self.date.year, self.date.month, self.date.day)
super(WorkoutLog, self).save(*args, **kwargs)
def delete(self, *args, **kwargs):
'''
Reset cache
'''
- reset_workout_log(self.user_id, self.date.year, self.date.month)
+ reset_workout_log(self.user_id, self.date.year, self.date.month, self.date.day)
super(WorkoutLog, self).delete(*args, **kwargs)
diff --git a/wger/manager/templates/calendar/month.html b/wger/manager/templates/calendar/month.html
index 8281df529..b06f6521b 100644
--- a/wger/manager/templates/calendar/month.html
+++ b/wger/manager/templates/calendar/month.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n staticfiles wger_extras cache %}
+{% load i18n staticfiles wger_extras %}
{# #}
@@ -42,7 +42,6 @@ $(document).ready(function() {
{# Content #}
{# #}
{% block content %}
-{% cache cache_timeout workout-log-full is_owner owner_user.id current_year current_month %}
{{calendar|safe}}
{% for date, value in logs.items %}
@@ -93,7 +92,6 @@ $(document).ready(function() {
</div>
</div>
{% endfor %}
-{% endcache %}
{% endblock %}
diff --git a/wger/manager/templates/mobile/calendar/month.html b/wger/manager/templates/mobile/calendar/month.html
index 232c139ad..6678fa2f4 100644
--- a/wger/manager/templates/mobile/calendar/month.html
+++ b/wger/manager/templates/mobile/calendar/month.html
@@ -1,5 +1,5 @@
{% extends "base.html" %}
-{% load i18n staticfiles wger_extras cache %}
+{% load i18n staticfiles wger_extras %}
{# #}
@@ -45,7 +45,6 @@ $(document).ready(function() {
{# Content #}
{# #}
{% block content %}
-{% cache cache_timeout workout-log-mobile is_owner owner_user.id current_year current_month %}
{{calendar|safe}}
{% for date in logs %}
@@ -138,7 +137,6 @@ $(document).ready(function() {
{% endfor %}
{% endfor %}
-{% endcache %}
{% endblock %}
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index a279d033b..d63dcf7d7 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -375,94 +375,133 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
def test_calendar(self):
'''
- Test the exercise overview cache is correctly generated on visit
+ Test the log cache is correctly generated on visit
'''
+ log_hash = hash((1, 2012, 10))
self.user_login('admin')
- self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- for cache_key in ('workout-log-full', 'workout-log-mobile'):
- self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+
+ def test_calendar_day(self):
+ '''
+ Test the log cache on the calendar day view is correctly generated on visit
+ '''
+ log_hash = hash((1, 2012, 10, 1))
+ self.user_login('admin')
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
- cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
- self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
- self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
+ self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1}))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
def test_calendar_anonymous(self):
'''
- Test the exercise overview cache is correctly generated on visit
- by anonymous users
+ Test the log cache is correctly generated on visit by anonymous users
'''
+ log_hash = hash((1, 2012, 10))
self.user_logout()
- self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- for cache_key in ('workout-log-full', 'workout-log-mobile'):
- self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name(cache_key, False, 1, 2012, 10)))
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+
self.client.get(reverse('manager:workout:calendar', kwargs={'username': 'admin',
'year': 2012,
'month': 10}))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+
+ def test_calendar_day_anonymous(self):
+ '''
+ Test the log cache is correctly generated on visit by anonymous users
+ '''
+ log_hash = hash((1, 2012, 10, 1))
+ self.user_logout()
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
- cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
- self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertTrue(cache.get(get_template_cache_name(cache_key, False, 1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1}))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
def test_cache_update_log(self):
'''
Test that the caches are cleared when saving a log
'''
+ log_hash = hash((1, 2012, 10))
+ log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+ self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1}))
log = WorkoutLog.objects.get(pk=1)
log.weight = 35
log.save()
- cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
- self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))
def test_cache_update_log_2(self):
'''
Test that the caches are only cleared for a the log's month
'''
+ log_hash = hash((1, 2012, 10))
+ log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+ self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1}))
log = WorkoutLog.objects.get(pk=3)
log.weight = 35
log.save()
- cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
- self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))
def test_cache_delete_log(self):
'''
Test that the caches are cleared when deleting a log
'''
+ log_hash = hash((1, 2012, 10))
+ log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+ self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1}))
log = WorkoutLog.objects.get(pk=1)
log.delete()
- cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
- self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertFalse(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))
def test_cache_delete_log_2(self):
'''
Test that the caches are only cleared for a the log's month
'''
+ log_hash = hash((1, 2012, 10))
+ log_hash_day = hash((1, 2012, 10, 1))
self.user_login('admin')
self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+ self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin',
+ 'year': 2012,
+ 'month': 10,
+ 'day': 1}))
log = WorkoutLog.objects.get(pk=3)
log.delete()
- cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
- self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
- self.assertTrue(cache.get(get_template_cache_name(cache_key, True, 1, 2012, 10)))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))
class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 83ee0c3e4..2033e95f7 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -415,7 +415,7 @@ def calendar(request, username=None, year=None, month=None):
(current_workout, schedule) = Schedule.objects.get_current_workout(user)
context['calendar'] = WorkoutCalendar(logs_filtered).formatmonth(year, month)
- context['logs'] = group_log_entries(logs)
+ context['logs'] = group_log_entries(logs, (user.pk, year, month))
context['current_year'] = year
context['current_month'] = month
context['current_workout'] = current_workout
@@ -441,7 +441,7 @@ def day(request, username, year, month, day):
logs = WorkoutLog.objects.filter(user=user,
date=date).order_by('id', 'exercise')
context = {}
- context['logs'] = group_log_entries(logs)
+ context['logs'] = group_log_entries(logs, (user.pk, date.year, date.month, date.day))
context['date'] = date
context['owner_user'] = user
context['is_owner'] = is_owner
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 45e171984..129359dd8 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -43,12 +43,15 @@ def reset_workout_canonical_form(workout_id):
cache.delete(cache_mapper.get_workout_canonical(workout_id))
-def reset_workout_log(user_pk, year, month):
- delete_template_fragment_cache('workout-log-full', True, user_pk, year, month)
- delete_template_fragment_cache('workout-log-full', False, user_pk, year, month)
- delete_template_fragment_cache('workout-log-mobile', True, user_pk, year, month)
- delete_template_fragment_cache('workout-log-mobile', False, user_pk, year, month)
- cache.delete(cache_mapper.get_workout_log(user_pk, year, month))
+def reset_workout_log(user_pk, year, month, day=None):
+ '''
+ Resets the cached workout logs
+ '''
+ log_hash = hash((user_pk, year, month))
+ cache.delete(cache_mapper.get_workout_log_list(log_hash))
+
+ log_hash = hash((user_pk, year, month, day))
+ cache.delete(cache_mapper.get_workout_log_list(log_hash))
class CacheKeyMapper(object):
@@ -64,6 +67,7 @@ class CacheKeyMapper(object):
INGREDIENT_CACHE_KEY = 'ingredient-{0}'
WORKOUT_CANONICAL_REPRESENTATION = 'workout-canonical-representation-{0}'
WORKOUT_LOG = 'workout-log-user{0}-year{1}-month{2}'
+ WORKOUT_LOG_LIST = 'workout-log-hash-{0}'
def get_exercise_key(self, param):
'''
@@ -137,4 +141,10 @@ class CacheKeyMapper(object):
'''
return self.WORKOUT_LOG.format(user_pk, year, month)
+ def get_workout_log_list(self, hash_value):
+ '''
+ Return the workout canonical representation
+ '''
+ return self.WORKOUT_LOG_LIST.format(hash_value)
+
cache_mapper = CacheKeyMapper()
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index 8d129a08b..c58ba648f 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -22,7 +22,10 @@ import csv
import json
from collections import OrderedDict
+from django.core.cache import cache
+
from wger.utils.helpers import DecimalJsonEncoder
+from wger.utils.cache import cache_mapper
from wger.weight.models import WeightEntry
logger = logging.getLogger(__name__)
@@ -56,27 +59,34 @@ def parse_weight_csv(request, cleaned_data):
return (weight_list, error_list)
-def group_log_entries(logs):
+def group_log_entries(logs, hash_dict):
'''
Processes and regroups a list of log entries so they can be more easily
used in the different calendar pages
:param logs: a list of logs
+ :param hash_dict: a dictionary in the form (username, year, month)
:return: a dictionary with grouped logs by date and exercise
'''
- out = {}
- for entry in logs:
- if not out.get(entry.date):
- out[entry.date] = {'date': entry.date,
- 'workout': entry.workout,
- 'session': entry.get_workout_session(),
- 'logs': {}}
+ log_hash = hash(hash_dict)
+ out = cache.get(cache_mapper.get_workout_log_list(log_hash))
+
+ if not out:
+
+ out = {}
+ for entry in logs:
+ if not out.get(entry.date):
+ out[entry.date] = {'date': entry.date,
+ 'workout': entry.workout,
+ 'session': entry.get_workout_session(),
+ 'logs': {}}
- if not out[entry.date]['logs'].get(entry.exercise):
- out[entry.date]['logs'][entry.exercise] = []
+ if not out[entry.date]['logs'].get(entry.exercise):
+ out[entry.date]['logs'][entry.exercise] = []
- out[entry.date]['logs'][entry.exercise].append(entry)
+ out[entry.date]['logs'][entry.exercise].append(entry)
+ cache.set(cache_mapper.get_workout_log_list(log_hash), out)
return out