Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove template cache from exercise detail page

Roland Geiderd771bc87674d
diff --git a/wger/core/management/commands/clear-cache.py b/wger/core/management/commands/clear-cache.py
index 08b856826..1704e8ae5 100644
--- a/wger/core/management/commands/clear-cache.py
+++ b/wger/core/management/commands/clear-cache.py
@@ -101,14 +101,6 @@ class Command(BaseCommand):
delete_template_fragment_cache('exercise-overview-mobile', language.id)
delete_template_fragment_cache('equipment-overview', language.id)
- for language in Language.objects.all():
- for exercise in Exercise.objects.all():
- delete_template_fragment_cache('exercise-detail-header',
- exercise.id,
- language.id)
- delete_template_fragment_cache('exercise-detail-muscles',
- exercise.id,
- language.id)
# Workout canonical form
if options['clear_workout']:
for w in Workout.objects.all():
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 192a54db4..804f8bea8 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -225,7 +225,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
super(Exercise, self).save(*args, **kwargs)
# Cached objects
- cache.delete(cache_mapper.get_exercise_key(self))
cache.delete(cache_mapper.get_exercise_muscle_bg_key(self))
# Cached template fragments
@@ -233,8 +232,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-detail-header', self.id, language.id)
- delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)
delete_template_fragment_cache('equipment-overview', language.id)
# Cached workouts
@@ -247,7 +244,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
'''
# Cached objects
- cache.delete(cache_mapper.get_exercise_key(self))
cache.delete(cache_mapper.get_exercise_muscle_bg_key(self))
# Cached template fragments
@@ -255,8 +251,6 @@ class Exercise(AbstractSubmissionModel, AbstractLicenseModel, models.Model):
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-detail-header', self.id, language.id)
- delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)
delete_template_fragment_cache('equipment-overview', language.id)
# Cached workouts
@@ -401,12 +395,6 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
delete_template_fragment_cache('equipment-overview', language.id)
- delete_template_fragment_cache('exercise-detail-header',
- self.exercise.id,
- language.id)
- delete_template_fragment_cache('exercise-detail-muscles',
- self.exercise.id,
- language.id)
# And go on
super(ExerciseImage, self).save(*args, **kwargs)
@@ -421,8 +409,6 @@ class ExerciseImage(AbstractSubmissionModel, AbstractLicenseModel, models.Model)
delete_template_fragment_cache('muscle-overview', language.id)
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
- delete_template_fragment_cache('exercise-detail-header', self.exercise.id, language.id)
- delete_template_fragment_cache('exercise-detail-muscles', self.exercise.id, language.id)
delete_template_fragment_cache('equipment-overview', language.id)
# Make sure there is always a main image
diff --git a/wger/exercises/templates/exercise/view.html b/wger/exercises/templates/exercise/view.html
index a7fb58086..5713c1fe2 100644
--- a/wger/exercises/templates/exercise/view.html
+++ b/wger/exercises/templates/exercise/view.html
@@ -82,7 +82,6 @@
-{% cache cache_timeout exercise-detail-header exercise.id language.id %}
<div class="row" style="margin-top:1em;">
<div class="col-xs-3">
<strong>{% trans "Category" %}:</strong>
@@ -115,7 +114,7 @@
{{ exercise.description|safe }}
</div>
</div>
-{% endcache %}
+
{# Images #}
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index c3ed3ef89..456dd03c9 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -158,7 +158,6 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
self.client.get(reverse('exercise:equipment:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- old_exercise = cache.get(cache_mapper.get_exercise_key(2))
old_overview = cache.get(get_template_cache_name('equipment-overview', 2))
exercise = Exercise.objects.get(pk=2)
@@ -172,10 +171,8 @@ class EquipmentCacheTestCase(WorkoutManagerTestCase):
self.client.get(reverse('exercise:equipment:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- new_exercise = cache.get(cache_mapper.get_exercise_key(2))
new_overview = cache.get(get_template_cache_name('equipment-overview', 2))
- self.assertNotEqual(old_exercise.name, new_exercise.name)
self.assertNotEqual(old_overview, new_overview)
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index e017d845b..449961113 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -428,38 +428,25 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
Test that the exercise detail cache is correctly generated on visit
'''
- if not self.is_mobile:
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
- self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- self.assertTrue(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
- self.assertTrue(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
-
def test_overview_cache_update(self):
'''
Test that the template cache for the overview is correctly reseted when
performing certain operations
'''
- self.assertFalse(cache.get(cache_mapper.get_exercise_key(2)))
self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))
self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('muscle-overview-mobile', 2)))
self.assertFalse(cache.get(get_template_cache_name('muscle-overview-search', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
self.client.get(reverse('exercise:exercise:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- old_exercise = cache.get(cache_mapper.get_exercise_key(2))
old_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))
old_muscle_overview = cache.get(get_template_cache_name('muscle-overview', 2))
old_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
old_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',
2))
- old_detail_header = cache.get(get_template_cache_name('exercise-detail-header', 2, 2))
- old_detail_muscles = cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2))
exercise = Exercise.objects.get(pk=2)
exercise.name = 'Very cool exercise 2'
@@ -467,34 +454,25 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
exercise.muscles_secondary.add(Muscle.objects.get(pk=2))
exercise.save()
- self.assertFalse(cache.get(cache_mapper.get_exercise_key(2)))
self.assertFalse(cache.get(cache_mapper.get_exercise_muscle_bg_key(2)))
self.assertFalse(cache.get(get_template_cache_name('muscle-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview', 2)))
self.assertFalse(cache.get(get_template_cache_name('exercise-overview-mobile', 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-header', 2, 2)))
- self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
self.client.get(reverse('exercise:exercise:overview'))
self.client.get(reverse('exercise:muscle:overview'))
self.client.get(reverse('exercise:exercise:view', kwargs={'id': 2}))
- new_exercise = cache.get(cache_mapper.get_exercise_key(2))
new_exercise_bg = cache.get(cache_mapper.get_exercise_muscle_bg_key(2))
new_muscle_overview = cache.get(get_template_cache_name('muscle-overview', 2))
new_exercise_overview = cache.get(get_template_cache_name('exercise-overview', 2))
new_exercise_overview_mobile = cache.get(get_template_cache_name('exercise-overview-mobile',
2))
- new_detail_header = cache.get(get_template_cache_name('exercise-detail-header', 2, 2))
- new_detail_muscles = cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2))
- self.assertNotEqual(old_exercise.name, new_exercise.name)
if not self.is_mobile:
self.assertNotEqual(old_exercise_bg, new_exercise_bg)
self.assertNotEqual(old_exercise_overview, new_exercise_overview)
self.assertNotEqual(old_muscle_overview, new_muscle_overview)
- self.assertNotEqual(old_detail_header, new_detail_header)
- self.assertNotEqual(old_detail_muscles, new_detail_muscles)
else:
self.assertNotEqual(old_exercise_overview_mobile, new_exercise_overview_mobile)
diff --git a/wger/exercises/views/exercises.py b/wger/exercises/views/exercises.py
index 17ddee75e..5a2ee8480 100644
--- a/wger/exercises/views/exercises.py
+++ b/wger/exercises/views/exercises.py
@@ -101,11 +101,7 @@ def view(request, id, slug=None):
template_data['comment_edit'] = False
template_data['show_shariff'] = True
- # Load the exercise itself
- exercise = cache.get(cache_mapper.get_exercise_key(int(id)))
- if not exercise:
- exercise = get_object_or_404(Exercise, pk=id)
- cache.set(cache_mapper.get_exercise_key(exercise), exercise)
+ exercise = get_object_or_404(Exercise, pk=id)
template_data['exercise'] = exercise
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 585805e07..1cda24d75 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -63,23 +63,11 @@ class CacheKeyMapper(object):
# Keys used by the cache
LANGUAGE_CACHE_KEY = 'language-{0}'
LANGUAGE_CONFIG_CACHE_KEY = 'language-config-{0}-{1}'
- EXERCISE_CACHE_KEY = 'exercise-{0}'
EXERCISE_CACHE_KEY_MUSCLE_BG = 'exercise-muscle-bg-{0}'
INGREDIENT_CACHE_KEY = 'ingredient-{0}'
WORKOUT_CANONICAL_REPRESENTATION = 'workout-canonical-representation-{0}'
WORKOUT_LOG_LIST = 'workout-log-hash-{0}'
- def get_exercise_key(self, param):
- '''
- Return the exercise cache key
- '''
- try:
- pk = param.pk
- except AttributeError:
- pk = param
-
- return self.EXERCISE_CACHE_KEY.format(pk)
-
def get_exercise_muscle_bg_key(self, param):
'''
Return the exercise muscle background cache key