Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Move muscle cache logic to signals

Roland Geider799031d2115f
diff --git a/wger/exercises/models.py b/wger/exercises/models.py
index 6e0f79ed4..ae91e5707 100644
--- a/wger/exercises/models.py
+++ b/wger/exercises/models.py
@@ -78,19 +78,6 @@ class Muscle(models.Model):
'''
return False
- def delete(self, *args, **kwargs):
- '''
- Clear template cache and delete a muscle
- '''
- exercises = Exercise.objects.filter(Q(muscles=self) | Q(muscles_secondary=self)).all()
-
- for exercise in exercises:
- for language in Language.objects.all():
- delete_template_fragment_cache('exercise-detail-muscles',
- exercise.id, language.id)
-
- super(Muscle, self).delete(*args, **kwargs)
-
@python_2_unicode_compatible
class Equipment(models.Model):
diff --git a/wger/exercises/tests/test_exercise.py b/wger/exercises/tests/test_exercise.py
index 18160972f..225b35e65 100644
--- a/wger/exercises/tests/test_exercise.py
+++ b/wger/exercises/tests/test_exercise.py
@@ -475,7 +475,7 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
else:
self.assertNotEqual(old_exercise_overview_mobile, new_exercise_overview_mobile)
- def test_muscles_cache_update(self):
+ def test_muscles_cache_update_on_delete(self):
'''
Test that the template cache for the overview is correctly reset when
performing certain operations
@@ -488,6 +488,20 @@ class ExercisesCacheTestCase(WorkoutManagerTestCase):
muscle.delete()
self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+ def test_muscles_cache_update_on_update(self):
+ '''
+ Test that the template cache for the overview is correctly reset when
+ performing certain operations
+ '''
+ 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-muscles', 2, 2)))
+
+ muscle = Muscle.objects.get(pk=2)
+ muscle.name = 'foo'
+ muscle.save()
+ self.assertFalse(cache.get(get_template_cache_name('exercise-detail-muscles', 2, 2)))
+
class WorkoutCacheTestCase(WorkoutManagerTestCase):
'''
diff --git a/wger/manager/signals.py b/wger/manager/signals.py
index 205a60fc6..ee5ccb95c 100644
--- a/wger/manager/signals.py
+++ b/wger/manager/signals.py
@@ -14,12 +14,14 @@
#
# You should have received a copy of the GNU Affero General Public License
+from django.db.models import Q
+from django.db.models.signals import post_save, pre_delete
-from django.db.models.signals import post_save, post_delete
-
+from wger.core.models import Language
+from wger.exercises.models import Exercise, Muscle
from wger.gym.helpers import get_user_last_activity
from wger.manager.models import WorkoutLog, WorkoutSession
-from wger.core.models import UserCache
+from wger.utils.cache import delete_template_fragment_cache
def update_activity_cache(sender, instance, **kwargs):
@@ -39,3 +41,16 @@ post_save.connect(update_activity_cache, sender=WorkoutLog)
# perhaps because of the cascading, needs to be checked
# post_delete.connect(update_activity_cache, sender=WorkoutSession)
# post_delete.connect(update_activity_cache, sender=WorkoutLog)
+
+
+def reset_muscle_cache(sender, instance, **kwargs):
+ exercises = Exercise.objects.filter(Q(muscles=instance) | Q(muscles_secondary=instance)).all()
+ languages = Language.objects.all()
+
+ for exercise in exercises:
+ for language in languages:
+ delete_template_fragment_cache('exercise-detail-muscles',
+ exercise.id, language.id)
+
+post_save.connect(reset_muscle_cache, sender=Muscle)
+pre_delete.connect(reset_muscle_cache, sender=Muscle)