Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Cache rendered equipment list, add tests

Roland Geidere47542914553
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 1f8707467..b8d0a5e8c 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -268,6 +268,8 @@ class Exercise(models.Model):
delete_template_fragment_cache('exercise-overview-search', 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)
+ delete_template_fragment_cache('equipment-overview-mobile', language.id)
# Cached workouts
for set in self.set_set.all():
@@ -290,6 +292,8 @@ class Exercise(models.Model):
delete_template_fragment_cache('exercise-overview-search', 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)
+ delete_template_fragment_cache('equipment-overview-mobile', language.id)
# Cached workouts
for set in self.set_set.all():
@@ -432,6 +436,8 @@ class ExerciseImage(models.Model):
delete_template_fragment_cache('exercise-overview', language.id)
delete_template_fragment_cache('exercise-overview-mobile', language.id)
delete_template_fragment_cache('exercise-overview-search', language.id)
+ delete_template_fragment_cache('equipment-overview', language.id)
+ delete_template_fragment_cache('equipment-overview-mobile', language.id)
delete_template_fragment_cache('exercise-detail-header',
self.exercise.id,
language.id)
@@ -455,6 +461,8 @@ class ExerciseImage(models.Model):
delete_template_fragment_cache('exercise-overview-search', 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)
+ delete_template_fragment_cache('equipment-overview-mobile', language.id)
# Make sure there is always a main image
if not ExerciseImage.objects.filter(exercise=self.exercise, is_main=True).count()\
diff --git a/wger/exercises/templates/equipment/overview.html b/wger/exercises/templates/equipment/overview.html
index 9e89758fa..61407e937 100644
--- a/wger/exercises/templates/equipment/overview.html
+++ b/wger/exercises/templates/equipment/overview.html
@@ -46,6 +46,7 @@ $(function() {
Main Content
-->
{% block content %}
+{% cache cache_timeout equipment-overview language.id %}
<div id="accordion">
{% for equipment in equipment_list %}
<h3>{% trans equipment.name %}</h3>
@@ -72,7 +73,7 @@ $(function() {
<tr>
<td>
<p>
- {% trans "No exercises in this category. Add or edit an exercise and set its category" %}
+ {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
</p>
</td>
</tr>
@@ -82,6 +83,7 @@ $(function() {
</div>
{% endfor %}
</div>
+{% endcache %}
{% endblock %}
diff --git a/wger/exercises/templates/mobile/equipment/overview.html b/wger/exercises/templates/mobile/equipment/overview.html
index ad28f1751..e2e893048 100644
--- a/wger/exercises/templates/mobile/equipment/overview.html
+++ b/wger/exercises/templates/mobile/equipment/overview.html
@@ -3,6 +3,7 @@
{% load staticfiles %}
{% load wger_extras %}
{% load thumbnail %}
+{% load cache %}
<!--
Title
@@ -14,7 +15,7 @@
Main Content
-->
{% block content %}
-
+{% cache cache_timeout equipment-overview-mobile language.id %}
<div data-role="collapsible-set" data-theme="c" data-content-theme="c">
{% for equipment in equipment_list %}
<div data-role="collapsible">
@@ -29,14 +30,16 @@
{% endif %}
{{ exercise.name }}</a>
</li>
- {% endfor %}
+ {% empty %}
+ <li>
+ {% trans "No exercises for this equipment. Add or edit an exercise and set the equipment." %}
+ </li>
+ {% endfor %}
</ul>
</div>
{% endfor %}
-
</div>
-
-
+{% endcache %}
{% endblock %}
@@ -47,6 +50,7 @@
<h3>{% trans "Search" %}</h3>
<br>
+{% cache cache_timeout exercise-overview-search language.id %}
<ul data-role="listview"
data-theme="c"
data-filter="true"
@@ -54,8 +58,8 @@
data-inset="true"
data-filter-placeholder="{% trans 'exercise name' %}"
id="exercise_search_form">
- {% for category in categories %}
- {% for exercise in category|get_active_exercises:active_languages %}
+ {% for equipment in equipment_list %}
+ {% for exercise in equipment.exercise_set.all %}
<li>
<a href="{{ exercise.get_absolute_url }}" data-ajax="false">
{% if exercise.main_image.image %}
@@ -66,7 +70,7 @@
{% endfor %}
{% endfor %}
</ul>
-
+{% endcache %}
<h3>{% trans "Add new exercise" %}</h3>
<p>
diff --git a/wger/exercises/tests/test_equipment.py b/wger/exercises/tests/test_equipment.py
index 6fd1bb619..eedea70db 100644
--- a/wger/exercises/tests/test_equipment.py
+++ b/wger/exercises/tests/test_equipment.py
@@ -14,14 +14,17 @@
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
from django.core.urlresolvers import reverse
+from django.core.cache import cache
from wger.exercises.models import Equipment
+from wger.exercises.models import Exercise
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerDeleteTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import ApiBaseResourceTestCase
+from wger.utils.cache import get_template_cache_name, cache_mapper
from wger.utils.constants import PAGINATION_OBJECTS_PER_PAGE
@@ -58,9 +61,9 @@ class EditEquipmentTestCase(WorkoutManagerEditTestCase):
data = {'name': 'A new name'}
-class EquipmentOverviewTestCase(WorkoutManagerTestCase):
+class EquipmentListTestCase(WorkoutManagerTestCase):
'''
- Tests the equipment overview page
+ Tests the equipment list page (admin view)
'''
def test_overview(self):
@@ -97,6 +100,72 @@ class EquipmentOverviewTestCase(WorkoutManagerTestCase):
self.assertEqual(response.status_code, 404)
+class EquipmentCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Equipment cache test case
+ '''
+
+ def test_equipment_overview(self):
+ '''
+ Test the equipment overview cache is correctly generated on visit
+ '''
+ if self.is_mobile:
+ self.assertFalse(cache.get(get_template_cache_name('equipment-overview-mobile', 2)))
+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
+ self.client.get(reverse('equipment-overview'))
+ if self.is_mobile:
+ self.assertTrue(cache.get(get_template_cache_name('equipment-overview-mobile', 2)))
+ else:
+ self.assertTrue(cache.get(get_template_cache_name('exercise-overview-search', 2)))
+ else:
+ self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.client.get(reverse('equipment-overview'))
+ self.assertTrue(cache.get(get_template_cache_name('equipment-overview', 2)))
+
+ def test_equipmet_cache_update(self):
+ '''
+ Test that the template cache for the overview is correctly reseted when
+ performing certain operations
+ '''
+
+ self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.assertFalse(cache.get(get_template_cache_name('equipment-overview-mobile', 2)))
+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
+
+ self.client.get(reverse('equipment-overview'))
+ self.client.get(reverse('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))
+ old_overview_mobile = cache.get(get_template_cache_name('equipment-overview-mobile', 2))
+ old_search = cache.get(get_template_cache_name('exercise-overview-search', 2))
+
+ exercise = Exercise.objects.get(pk=2)
+ exercise.name = 'Very cool exercise 2'
+ exercise.description = 'New description'
+ exercise.equipment.add(Equipment.objects.get(pk=2))
+ exercise.save()
+
+ self.assertFalse(cache.get(get_template_cache_name('equipment-overview', 2)))
+ self.assertFalse(cache.get(get_template_cache_name('equipment-overview-mobile', 2)))
+ self.assertFalse(cache.get(get_template_cache_name('exercise-overview-search', 2)))
+
+ self.client.get(reverse('equipment-overview'))
+ self.client.get(reverse('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))
+ new_overview_mobile = cache.get(get_template_cache_name('equipment-overview-mobile', 2))
+ new_search = cache.get(get_template_cache_name('exercise-overview-search', 2))
+
+ self.assertNotEqual(old_exercise.name, new_exercise.name)
+ if not self.is_mobile:
+ self.assertNotEqual(old_overview, new_overview)
+ else:
+ self.assertNotEqual(old_overview_mobile, new_overview_mobile)
+ self.assertNotEqual(old_search, new_search)
+
+
class EquipmentApiTestCase(ApiBaseResourceTestCase):
'''
Tests the equipment overview resource