Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cache the workout log's data

Roland Geidercfa63ede0991
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.py
index 9db854512..4a2a32185 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -16,12 +16,13 @@
from optparse import make_option
+from django.contrib.auth.models import User
from django.core.management.base import BaseCommand, CommandError
from wger.core.models import Language
-from wger.manager.models import Workout
+from wger.manager.models import Workout, WorkoutLog
from wger.exercises.models import Exercise
-from wger.utils.cache import reset_workout_canonical_form
+from wger.utils.cache import reset_workout_canonical_form, reset_workout_log
from wger.utils.cache import delete_template_fragment_cache
@@ -57,6 +58,12 @@ class Command(BaseCommand):
# Exercises, cached template fragments
if options['clear_template']:
+ 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)
+
for language in Language.objects.all():
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
diff --git a/wger/manager/fixtures/test-workout-data.json b/wger/manager/fixtures/test-workout-data.json
index 583d2cafe..079d7383b 100644
--- a/wger/manager/fixtures/test-workout-data.json
+++ b/wger/manager/fixtures/test-workout-data.json
@@ -189,7 +189,7 @@
"workout": 1,
"reps": 8,
"user": 1,
- "date": "2012-10-30",
+ "date": "2013-10-30",
"exercise": 1
}
},
diff --git a/wger/manager/fixtures/test-workout-session.json b/wger/manager/fixtures/test-workout-session.json
index 46835e343..dc71aa377 100644
--- a/wger/manager/fixtures/test-workout-session.json
+++ b/wger/manager/fixtures/test-workout-session.json
@@ -8,7 +8,7 @@
"workout": 1,
"time_end": "18:30:00",
"user": 1,
- "date": "2014-01-15",
+ "date": "2012-10-15",
"notes": "Notes come here"
}
},
diff --git a/wger/manager/models.py b/wger/manager/models.py
index 2e24429cf..7a435e338 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -32,7 +32,7 @@ from django.core.validators import MinValueValidator
from wger.core.models import DaysOfWeek
from wger.exercises.models import Exercise
from wger.manager.helpers import reps_smart_text
-from wger.utils.cache import cache_mapper, reset_workout_canonical_form
+from wger.utils.cache import cache_mapper, reset_workout_canonical_form, reset_workout_log
from wger.utils.fields import Html5DateField
@@ -648,6 +648,20 @@ class WorkoutLog(models.Model):
except WorkoutSession.DoesNotExist:
return None
+ def save(self, *args, **kwargs):
+ '''
+ Reset cache
+ '''
+ reset_workout_log(self.user_id, self.date.year, self.date.month)
+ 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)
+ super(WorkoutLog, self).delete(*args, **kwargs)
+
class WorkoutSession(models.Model):
'''
@@ -745,3 +759,17 @@ class WorkoutSession(models.Model):
Returns the object that has owner information
'''
return self
+
+ def save(self, *args, **kwargs):
+ '''
+ Reset cache
+ '''
+ reset_workout_log(self.user_id, self.date.year, self.date.month)
+ super(WorkoutSession, self).save(*args, **kwargs)
+
+ def delete(self, *args, **kwargs):
+ '''
+ Reset cache
+ '''
+ reset_workout_log(self.user_id, self.date.year, self.date.month)
+ super(WorkoutSession, self).delete(*args, **kwargs)
diff --git a/wger/manager/templates/mobile/workout/calendar.html b/wger/manager/templates/mobile/workout/calendar.html
index 0c7da9df8..02e25b945 100644
--- a/wger/manager/templates/mobile/workout/calendar.html
+++ b/wger/manager/templates/mobile/workout/calendar.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% load staticfiles %}
{% load wger_extras %}
+{% load cache %}
{% block title %}{% trans "Workout log calendar" %}{% endblock %}
@@ -22,6 +23,7 @@ $(document).ready(function() {
{% endblock %}
{% block content %}
+{% cache cache_timeout workout-log-mobile user.id current_year current_month %}
{{calendar|safe}}
{% for date in logs %}
@@ -131,6 +133,8 @@ $(document).ready(function() {
</div>
</div>
{% endfor %}
+
+{% endcache %}
{% endblock %}
diff --git a/wger/manager/templates/workout/calendar.html b/wger/manager/templates/workout/calendar.html
index 15a9ebb38..c3444a2ca 100644
--- a/wger/manager/templates/workout/calendar.html
+++ b/wger/manager/templates/workout/calendar.html
@@ -2,6 +2,7 @@
{% load i18n %}
{% load staticfiles %}
{% load wger_extras %}
+{% load cache %}
{% block title %}{% trans "Workout log calendar" %}{% endblock %}
@@ -19,9 +20,9 @@ $(document).ready(function() {
{% endblock %}
{% block content %}
+{% cache cache_timeout workout-log-full user.id current_year current_month %}
{{calendar|safe}}
-
{% for date in logs %}
<div id="log-{{date|date:'Y-m-d'}}" class="calendar-log-data">
<h3>{{date}}</h3>
@@ -102,6 +103,7 @@ $(document).ready(function() {
</div>
</div>
{% endfor %}
+{% endcache %}
{% endblock %}
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 140367401..e9f0b6e8d 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -16,6 +16,7 @@ import logging
import datetime
from django.contrib.auth.models import User
+from django.core.cache import cache
from django.core.urlresolvers import reverse, reverse_lazy
from wger.core.tests import api_base_test
@@ -26,6 +27,7 @@ from wger.manager.models import WorkoutSession
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
+from wger.utils.cache import get_template_cache_name, cache_mapper
logger = logging.getLogger('wger.custom')
@@ -246,6 +248,84 @@ class WeightLogEntryEditTestCase(WorkoutManagerTestCase):
self.edit_log_entry(fail=True)
+class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Workout log cache test case
+ '''
+
+ def test_calendar(self):
+ '''
+ Test the exercise overview cache is correctly generated on visit
+ '''
+ self.user_login('admin')
+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
+ self.assertFalse(cache.get(get_template_cache_name('workout-log-full', 1, 2012, 10)))
+ self.assertFalse(cache.get(get_template_cache_name('workout-log-mobile', 1, 2012, 10)))
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ cache_key = 'workout-log-mobile' if self.is_mobile else 'workout-log-full'
+ self.assertTrue(cache.get(get_template_cache_name(cache_key, 1, 2012, 10)))
+ self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))
+
+ def test_cache_update_log(self):
+ '''
+ Test that the caches are cleared when saving a log
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ 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, 1, 2012, 10)))
+
+ def test_cache_update_log_2(self):
+ '''
+ Test that the caches are only cleared for a the log's month
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ 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, 1, 2012, 10)))
+
+ def test_cache_delete_log(self):
+ '''
+ Test that the caches are cleared when deleting a log
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ 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, 1, 2012, 10)))
+
+ def test_cache_delete_log_2(self):
+ '''
+ Test that the caches are only cleared for a the log's month
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ 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, 1, 2012, 10)))
+
+
class WorkoutLogApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the workout log overview resource
diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.py
index 5e6059e65..f9271295c 100644
--- a/wger/manager/tests/test_workout_session.py
+++ b/wger/manager/tests/test_workout_session.py
@@ -15,14 +15,16 @@
import datetime
from django.contrib.auth.models import User
+from django.core.cache import cache
from django.core.exceptions import ValidationError
-from django.core.urlresolvers import reverse_lazy
+from django.core.urlresolvers import reverse, reverse_lazy
from wger.core.tests import api_base_test
from wger.manager.models import Workout, WorkoutSession
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
+from wger.utils.cache import cache_mapper, get_template_cache_name
'''
@@ -130,6 +132,71 @@ class WorkoutSessionTestCase(WorkoutManagerTestCase):
self.assertRaises(ValidationError, session.full_clean)
+class WorkoutLogCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Workout log cache test case
+ '''
+
+ def test_cache_update_session(self):
+ '''
+ Test that the caches are cleared when updating a workout session
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ session = WorkoutSession.objects.get(pk=1)
+ session.notes = 'Lorem ipsum'
+ session.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, 1, 2012, 10)))
+
+ def test_cache_update_session_2(self):
+ '''
+ Test that the caches are only cleared for a the session's month
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ # Session is from 2014
+ session = WorkoutSession.objects.get(pk=2)
+ session.notes = 'Lorem ipsum'
+ session.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, 1, 2012, 10)))
+
+ def test_cache_delete_session(self):
+ '''
+ Test that the caches are cleared when deleting a workout session
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ session = WorkoutSession.objects.get(pk=1)
+ session.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, 1, 2012, 10)))
+
+ def test_cache_delete_session_2(self):
+ '''
+ Test that the caches are only cleared for a the session's month
+ '''
+ self.user_login('admin')
+ self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))
+
+ session = WorkoutSession.objects.get(pk=2)
+ session.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, 1, 2012, 10)))
+
+
class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):
'''
Tests the workout overview resource
diff --git a/wger/manager/views/log.py b/wger/manager/views/log.py
index 6b78c0b27..3fca3c302 100644
--- a/wger/manager/views/log.py
+++ b/wger/manager/views/log.py
@@ -23,6 +23,7 @@ from django.shortcuts import render
from django.shortcuts import get_object_or_404
from django.http import HttpResponseRedirect
from django.http import HttpResponseForbidden
+from django.core.cache import cache
from django.core.context_processors import csrf
from django.core.urlresolvers import reverse
from django.core.urlresolvers import reverse_lazy
@@ -43,6 +44,7 @@ from wger.manager.models import Schedule
from wger.manager.forms import HelperDateForm
from wger.manager.forms import HelperWorkoutSessionForm
from wger.manager.forms import WorkoutLogForm
+from wger.utils.cache import cache_mapper
from wger.utils.generic_views import WgerFormMixin
from wger.utils.generic_views import WgerDeleteMixin
from wger.utils.generic_views import WgerPermissionMixin
@@ -383,24 +385,27 @@ def calendar(request, year=None, month=None):
month = int(month)
context = {}
- logs_filtered = {}
logs = WorkoutLog.objects.filter(user=request.user,
date__year=year,
date__month=month).order_by('exercise')
+ logs_filtered = cache.get(cache_mapper.get_workout_log(request.user.pk, year, month))
+ if not logs_filtered:
+ logs_filtered = {}
- # Process the logs. Group by date and check for impressions
- for log in logs:
- if log.date not in logs_filtered:
- session = log.get_workout_session()
+ # Process the logs. Group by date and check for impressions
+ for log in logs:
+ if log.date not in logs_filtered:
+ session = log.get_workout_session()
- if session:
- impression = session.impression
- else:
- # Default is 'neutral'
- impression = WorkoutSession.IMPRESSION_NEUTRAL
+ if session:
+ impression = session.impression
+ else:
+ # Default is 'neutral'
+ impression = WorkoutSession.IMPRESSION_NEUTRAL
- logs_filtered[log.date.day] = {'impression': impression,
- 'log': log}
+ logs_filtered[log.date.day] = {'impression': impression,
+ 'log': log}
+ cache.set(cache_mapper.get_workout_log(request.user.pk, year, month), logs_filtered)
(current_workout, schedule) = Schedule.objects.get_current_workout(request.user)
context['calendar'] = WorkoutCalendar(logs_filtered).formatmonth(year, month)
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 36c386b73..dcd11b077 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -43,6 +43,12 @@ 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', user_pk, year, month)
+ delete_template_fragment_cache('workout-log-mobile', user_pk, year, month)
+ cache.delete(cache_mapper.get_workout_log(user_pk, year, month))
+
+
class CacheKeyMapper(object):
'''
Simple class for mapping the cache keys of different objects
@@ -55,6 +61,7 @@ class CacheKeyMapper(object):
EXERCISE_CACHE_KEY_MUSCLE_BG = 'exercise-muscle-bg-{0}'
INGREDIENT_CACHE_KEY = 'ingredient-{0}'
WORKOUT_CANONICAL_REPRESENTATION = 'workout-canonical-representation-{0}'
+ WORKOUT_LOG = 'workout-log-user{0}-year{1}-month{2}'
def get_exercise_key(self, param):
'''
@@ -122,4 +129,10 @@ class CacheKeyMapper(object):
return self.WORKOUT_CANONICAL_REPRESENTATION.format(pk)
+ def get_workout_log(self, user_pk, year, month):
+ '''
+ Return the workout canonical representation
+ '''
+ return self.WORKOUT_LOG.format(user_pk, year, month)
+
cache_mapper = CacheKeyMapper()