Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add tests to check the workout cache is correctly cleared

Roland Geider34a9044f5312
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index b2aac04e8..663d862cc 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -34,7 +34,7 @@ from easy_thumbnails.signals import saved_file
from easy_thumbnails.signal_handlers import generate_aliases_global
from wger.utils.constants import EMAIL_FROM
-from wger.utils.cache import delete_template_fragment_cache
+from wger.utils.cache import delete_template_fragment_cache, reset_workout_canonical_form
from wger.utils.cache import cache_mapper
@@ -267,6 +267,10 @@ class Exercise(models.Model):
delete_template_fragment_cache('exercise-detail-header', self.id, language.id)
delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)
+ # Cached workouts
+ for set in self.set_set.all():
+ reset_workout_canonical_form(set.exerciseday.training_id)
+
def delete(self, *args, **kwargs):
'''
Reset all cached infos
@@ -283,6 +287,10 @@ class Exercise(models.Model):
delete_template_fragment_cache('exercise-detail-header', self.id, language.id)
delete_template_fragment_cache('exercise-detail-muscles', self.id, language.id)
+ # Cached workouts
+ for set in self.set_set.all():
+ reset_workout_canonical_form(set.exerciseday.training.pk)
+
super(Exercise, self).delete(*args, **kwargs)
def __unicode__(self):
@@ -511,6 +519,24 @@ class ExerciseComment(models.Model):
'''
return self.comment
+ def save(self, *args, **kwargs):
+ '''
+ Reset cached workouts
+ '''
+ for set in self.exercise.set_set.all():
+ reset_workout_canonical_form(set.exerciseday.training_id)
+
+ super(ExerciseComment, self).save(*args, **kwargs)
+
+ def delete(self, *args, **kwargs):
+ '''
+ Reset cached workouts
+ '''
+ for set in self.exercise.set_set.all():
+ reset_workout_canonical_form(set.exerciseday.training.pk)
+
+ super(ExerciseComment, self).delete(*args, **kwargs)
+
def get_owner_object(self):
'''
Comment has no owner information
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 5e9353cd0..00dbc136b 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -456,6 +456,42 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
self.assertNotEqual(old_detail_muscles, new_detail_muscles)
+class WorkoutCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Workout cache test case
+ '''
+
+ def test_canonical_form_cache_save(self):
+ '''
+ Tests the workout cache when saving
+ '''
+ exercise = Exercise.objects.get(pk=2)
+ for set in exercise.set_set.all():
+ set.exerciseday.training.canonical_representation
+ workout_id = set.exerciseday.training_id
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+ exercise.save()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+ def test_canonical_form_cache_delete(self):
+ '''
+ Tests the workout cache when deleting
+ '''
+ exercise = Exercise.objects.get(pk=2)
+
+ workout_ids = []
+ for set in exercise.set_set.all():
+ workout_id = set.exerciseday.training_id
+ workout_ids.append(workout_id)
+ set.exerciseday.training.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+ exercise.delete()
+ for workout_id in workout_ids:
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+
class ExerciseApiTestCase(ApiBaseResourceTestCase):
'''
Tests the exercise overview resource
diff --git a/wger/exercises/tests/test_exercise_comments.py b/wger/exercises/tests/test_exercise_comments.py
index 5ced94ec3..2fd6f4c95 100644
--- a/wger/exercises/tests/test_exercise_comments.py
+++ b/wger/exercises/tests/test_exercise_comments.py
@@ -14,6 +14,7 @@
from django.core.urlresolvers import reverse
+from django.core.cache import cache
from wger.exercises.models import Exercise
from wger.exercises.models import ExerciseComment
@@ -22,6 +23,7 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
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 cache_mapper
class AddExerciseCommentTestCase(WorkoutManagerAddTestCase):
@@ -101,6 +103,42 @@ class ExercisecommentsTestCase(WorkoutManagerTestCase):
self.exercise_delete_comment(fail=False)
+class WorkoutCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Workout cache test case
+ '''
+
+ def test_canonical_form_cache_save(self):
+ '''
+ Tests the workout cache when saving
+ '''
+ comment = ExerciseComment.objects.get(pk=1)
+ for set in comment.exercise.set_set.all():
+ set.exerciseday.training.canonical_representation
+ workout_id = set.exerciseday.training_id
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+ comment.save()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+ def test_canonical_form_cache_delete(self):
+ '''
+ Tests the workout cache when deleting
+ '''
+ comment = ExerciseComment.objects.get(pk=1)
+
+ workout_ids = []
+ for set in comment.exercise.set_set.all():
+ workout_id = set.exerciseday.training_id
+ workout_ids.append(workout_id)
+ set.exerciseday.training.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+ comment.delete()
+ for workout_id in workout_ids:
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
+
+
class ExerciseCommentApiTestCase(ApiBaseResourceTestCase):
'''
Tests the exercise comment overview resource
diff --git a/wger/manager/models.py b/wger/manager/models.py
index e536dad15..9ec9f1e60 100644
--- a/wger/manager/models.py
+++ b/wger/manager/models.py
@@ -37,8 +37,7 @@ from wger.exercises.models import Language
from wger.utils.helpers import DecimalJsonEncoder
from wger.utils.helpers import disable_for_loaddata
-from wger.utils.cache import delete_template_fragment_cache
-from wger.utils.cache import cache_mapper
+from wger.utils.cache import cache_mapper, reset_workout_canonical_form
from wger.weight.models import WeightEntry
from wger.utils.fields import Html5DateField
from wger.utils.fields import Html5DecimalField
@@ -47,13 +46,6 @@ from wger.utils.fields import Html5IntegerField
logger = logging.getLogger('wger.custom')
-#
-# Helper functions
-#
-def reset_workout_canonical_form(workout_id):
- cache.delete(cache_mapper.get_workout_canonical(workout_id))
-
-
#
# Classes
#
@@ -91,6 +83,20 @@ class Workout(models.Model):
else:
return u"{0} ({1})".format(_('Workout'), self.creation_date)
+ def save(self, *args, **kwargs):
+ '''
+ Reset all cached infos
+ '''
+ reset_workout_canonical_form(self.id)
+ super(Workout, self).save(*args, **kwargs)
+
+ def delete(self, *args, **kwargs):
+ '''
+ Reset all cached infos
+ '''
+ reset_workout_canonical_form(self.id)
+ super(Workout, self).delete(*args, **kwargs)
+
def get_owner_object(self):
'''
Returns the object that has owner information
@@ -438,7 +444,10 @@ class Day(models.Model):
# "Smart" textual representation
# This is a human representation of the settings, in a way that humans
# would also write: e.g. "8 8 10 10" but "4 x 10" and not "10 10 10 10"
- if len(setting_tmp) > 1:
+ if len(setting_tmp) == 0:
+ setting_text = ''
+ setting_list = []
+ elif len(setting_tmp) > 1:
tmp_reps_text = []
tmp_reps = []
for i in setting_tmp:
diff --git a/wger/manager/tests/test_day.py b/wger/manager/tests/test_day.py
index ce46fbc82..f4e14b2d5 100644
--- a/wger/manager/tests/test_day.py
+++ b/wger/manager/tests/test_day.py
@@ -21,7 +21,7 @@ from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import WorkoutManagerEditTestCase
from wger.manager.tests.testcase import ApiBaseResourceTestCase
-from wger.utils.cache import get_template_cache_name
+from wger.utils.cache import get_template_cache_name, cache_mapper
class AddWorkoutDayTestCase(WorkoutManagerAddTestCase):
@@ -116,7 +116,7 @@ class RenderWorkoutDayTestCase(WorkoutManagerTestCase):
response = self.client.get(reverse('wger.manager.views.day.view', kwargs={'id': 5}))
if fail:
- self.assertIn(response.status_code, (302, 403))
+ self.assertEqual(response.status_code, 404)
self.assertTemplateUsed('login.html')
else:
@@ -152,34 +152,27 @@ class WorkoutCacheTestCase(WorkoutManagerTestCase):
Workout cache test case
'''
- def test_workout_view_day(self):
+ def test_canonical_form_cache_save(self):
'''
- Test the workout view cache is correctly generated on visit
+ Tests the workout cache when saving
'''
+ day = Day.objects.get(pk=1)
+ day.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(day.training_id)))
- self.user_login('admin')
- self.client.get(reverse('workout-view', kwargs={'id': 1}))
-
- old_day1 = cache.get(get_template_cache_name('day-view', 1))
- old_day2 = cache.get(get_template_cache_name('day-view', 2))
- self.assertTrue(old_day1)
- self.assertTrue(old_day2)
-
- day1 = Day.objects.get(pk=1)
- day1.description = 'A new name'
- day1.save()
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
-
- self.client.get(reverse('workout-view', kwargs={'id': 1}))
- new_day1 = cache.get(get_template_cache_name('day-view', 1))
- new_day2 = cache.get(get_template_cache_name('day-view', 2))
- self.assertNotEqual(old_day1, new_day1)
- self.assertEqual(old_day2, new_day2)
-
- day1.delete()
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
+ day.save()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(day.training_id)))
+
+ def test_canonical_form_cache_delete(self):
+ '''
+ Tests the workout cache when deleting
+ '''
+ day = Day.objects.get(pk=1)
+ day.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(day.training_id)))
+
+ day.delete()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(day.training_id)))
class DayTestCase(WorkoutManagerTestCase):
diff --git a/wger/manager/tests/test_set.py b/wger/manager/tests/test_set.py
index 9bc40223a..e93521a33 100644
--- a/wger/manager/tests/test_set.py
+++ b/wger/manager/tests/test_set.py
@@ -27,7 +27,7 @@ from wger.manager.tests.testcase import STATUS_CODES_FAIL
from wger.manager.tests.testcase import WorkoutManagerTestCase
from wger.manager.tests.testcase import WorkoutManagerAddTestCase
from wger.manager.tests.testcase import ApiBaseResourceTestCase
-from wger.utils.cache import get_template_cache_name
+from wger.utils.cache import get_template_cache_name, cache_mapper
logger = logging.getLogger('wger.custom')
@@ -289,51 +289,65 @@ class SetEditEditTestCase(WorkoutManagerTestCase):
self.edit_set(fail=False)
-class WorkoutCacheTestCase(WorkoutManagerTestCase):
+class SetWorkoutCacheTestCase(WorkoutManagerTestCase):
'''
Workout cache test case
'''
- def test_workout_view_set(self):
+ def test_canonical_form_cache_save(self):
'''
- Test the workout view cache is correctly generated on visit
+ Tests the workout cache when saving
'''
+ set = Set.objects.get(pk=1)
+ set.exerciseday.training.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(set.exerciseday.training_id)))
- self.user_login('admin')
- self.client.get(reverse('workout-view', kwargs={'id': 1}))
+ set.save()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(set.exerciseday.training_id)))
+
+ def test_canonical_form_cache_delete(self):
+ '''
+ Tests the workout cache when deleting
+ '''
+ set = Set.objects.get(pk=1)
+ set.exerciseday.training.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(set.exerciseday.training_id)))
- # Edit a set
- set1 = Set.objects.get(pk=1)
- set1.order = 99
- set1.save()
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
+ set.delete()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(set.exerciseday.training_id)))
- set1.delete()
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
- def test_workout_view_setting(self):
+class SettingWorkoutCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Workout cache test case
+ '''
+
+ def test_canonical_form_cache_save(self):
'''
- Test the workout view cache is correctly generated on visit
+ Tests the workout cache when saving
'''
+ setting = Setting.objects.get(pk=1)
+ workout_id = setting.set.exerciseday.training_id
+ setting.set.exerciseday.training.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
- self.user_login('admin')
- self.client.get(reverse('workout-view', kwargs={'id': 1}))
+ setting.save()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
- # Edit a setting
- setting1 = Setting.objects.get(pk=1)
- setting1.reps = 20
- setting1.save()
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
+ def test_canonical_form_cache_delete(self):
+ '''
+ Tests the workout cache when deleting
+ '''
+ setting = Setting.objects.get(pk=1)
+ workout_id = setting.set.exerciseday.training_id
+ setting.set.exerciseday.training.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(workout_id)))
- setting1.delete()
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
+ setting.delete()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(workout_id)))
-class SetpiTestCase(ApiBaseResourceTestCase):
+class SetApiTestCase(ApiBaseResourceTestCase):
'''
Tests the set overview resource
'''
diff --git a/wger/manager/tests/test_timer.py b/wger/manager/tests/test_timer.py
index e7282f867..d5b37c23b 100644
--- a/wger/manager/tests/test_timer.py
+++ b/wger/manager/tests/test_timer.py
@@ -52,26 +52,26 @@ class WorkoutTimerTestCase(WorkoutManagerTestCase):
self.assertEqual(step_list[0]['weight'], '')
self.assertEqual(step_list[1]['step_nr'], 2)
- self.assertEqual(math.floor(step_list[0]['step_percent']), 28)
+ self.assertEqual(math.floor(step_list[1]['step_percent']), 28)
self.assertEqual(step_list[1]['time'], 90)
self.assertEqual(step_list[1]['type'], 'pause')
self.assertEqual(step_list[2]['exercise'], Exercise.objects.get(pk=2))
self.assertEqual(step_list[2]['reps'], 10)
self.assertEqual(step_list[2]['step_nr'], 3)
- self.assertEqual(math.floor(step_list[0]['step_percent']), 42)
+ self.assertEqual(math.floor(step_list[2]['step_percent']), 42)
self.assertEqual(step_list[2]['type'], 'exercise')
self.assertEqual(step_list[2]['weight'], '')
self.assertEqual(step_list[3]['step_nr'], 4)
- self.assertEqual(math.floor(step_list[0]['step_percent']), 57)
+ self.assertEqual(math.floor(step_list[3]['step_percent']), 57)
self.assertEqual(step_list[3]['time'], 90)
self.assertEqual(step_list[3]['type'], 'pause')
self.assertEqual(step_list[4]['exercise'], Exercise.objects.get(pk=2))
self.assertEqual(step_list[4]['reps'], 10)
self.assertEqual(step_list[4]['step_nr'], 5)
- self.assertEqual(math.floor(step_list[0]['step_percent']), 71)
+ self.assertEqual(math.floor(step_list[4]['step_percent']), 71)
self.assertEqual(step_list[4]['type'], 'exercise')
self.assertEqual(step_list[4]['weight'], '')
diff --git a/wger/manager/tests/test_workout.py b/wger/manager/tests/test_workout.py
index 66697926b..0dc58907d 100644
--- a/wger/manager/tests/test_workout.py
+++ b/wger/manager/tests/test_workout.py
@@ -15,7 +15,6 @@
import datetime
from django.core.urlresolvers import reverse
-from django.core.cache import cache
from wger.manager.models import Workout
@@ -23,7 +22,6 @@ 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 ApiBaseResourceTestCase
-from wger.utils.cache import get_template_cache_name
class AddWorkoutTestCase(WorkoutManagerTestCase):
@@ -132,26 +130,6 @@ class WorkoutModelTestCase(WorkoutManagerTestCase):
self.assertEqual(workout.__unicode__(), u'my description')
-class WorkoutCacheTestCase(WorkoutManagerTestCase):
- '''
- Workout cache test case
- '''
-
- def test_workout_view_day(self):
- '''
- Test the workout view cache is correctly generated on visit
- '''
-
- self.user_login('admin')
- self.assertFalse(cache.get(get_template_cache_name('day-view', 1)))
- self.assertFalse(cache.get(get_template_cache_name('day-view', 2)))
-
- self.client.get(reverse('workout-view', kwargs={'id': 1}))
-
- self.assertTrue(cache.get(get_template_cache_name('day-view', 1)))
- self.assertTrue(cache.get(get_template_cache_name('day-view', 2)))
-
-
class WorkoutApiTestCase(ApiBaseResourceTestCase):
'''
Tests the workout overview resource
diff --git a/wger/manager/tests/test_workout_canonical.py b/wger/manager/tests/test_workout_canonical.py
index 4e2b28eff..7545e31f8 100644
--- a/wger/manager/tests/test_workout_canonical.py
+++ b/wger/manager/tests/test_workout_canonical.py
@@ -12,6 +12,8 @@
#
# You should have received a copy of the GNU Affero General Public License
+from django.core.cache import cache
+
from wger.exercises.models import Exercise
from wger.manager.models import Workout
from wger.manager.models import DaysOfWeek
@@ -20,6 +22,7 @@ from wger.manager.models import Set
from wger.manager.models import Setting
from wger.manager.tests.testcase import WorkoutManagerTestCase
+from wger.utils.cache import cache_mapper
class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
@@ -99,3 +102,41 @@ class WorkoutCanonicalFormTestCase(WorkoutManagerTestCase):
'obj': Set.objects.get(pk=3)}]
self.assertEqual(day.canonical_representation['set_list'], canonical_form)
+
+
+class WorkoutCacheTestCase(WorkoutManagerTestCase):
+ '''
+ Test case for the workout canonical representation
+ '''
+
+ def test_canonical_form_cache(self):
+ '''
+ Tests that the workout cache of the canonical form is correctly generated
+ '''
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(1)))
+
+ workout = Workout.objects.get(pk=1)
+ workout.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(1)))
+
+ def test_canonical_form_cache_save(self):
+ '''
+ Tests the workout cache when saving
+ '''
+ workout = Workout.objects.get(pk=1)
+ workout.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(1)))
+
+ workout.save()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(1)))
+
+ def test_canonical_form_cache_delete(self):
+ '''
+ Tests the workout cache when deleting
+ '''
+ workout = Workout.objects.get(pk=1)
+ workout.canonical_representation
+ self.assertTrue(cache.get(cache_mapper.get_workout_canonical(1)))
+
+ workout.delete()
+ self.assertFalse(cache.get(cache_mapper.get_workout_canonical(1)))
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index c002ad79e..36c386b73 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -39,6 +39,10 @@ def delete_template_fragment_cache(fragment_name='', *args):
cache.delete(get_template_cache_name(fragment_name, *args))
+def reset_workout_canonical_form(workout_id):
+ cache.delete(cache_mapper.get_workout_canonical(workout_id))
+
+
class CacheKeyMapper(object):
'''
Simple class for mapping the cache keys of different objects