Self hosted FLOSS fitness/workout, nutrition and weight tracker
Test for presence of 'workout_log' cache, still used
Roland Geiderbbfde32b734a
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex d63dcf7d7..e81b06d6b 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -379,9 +379,11 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):'''log_hash = hash((1, 2012, 10))self.user_login('admin')+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))+ self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_calendar_day(self):@@ -390,12 +392,14 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):'''log_hash = hash((1, 2012, 10, 1))self.user_login('admin')+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin','year': 2012,'month': 10,'day': 1}))+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_calendar_anonymous(self):@@ -404,11 +408,13 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):'''log_hash = hash((1, 2012, 10))self.user_logout()+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.client.get(reverse('manager:workout:calendar', kwargs={'username': 'admin','year': 2012,'month': 10}))+ self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_calendar_day_anonymous(self):@@ -417,12 +423,14 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):'''log_hash = hash((1, 2012, 10, 1))self.user_logout()+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.client.get(reverse('manager:workout:calendar-day', kwargs={'username': 'admin','year': 2012,'month': 10,'day': 1}))+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_cache_update_log(self):@@ -442,6 +450,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):log.weight = 35log.save()+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))@@ -462,6 +471,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):log.weight = 35log.save()+ self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))@@ -481,6 +491,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):log = WorkoutLog.objects.get(pk=1)log.delete()+ self.assertFalse(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))@@ -500,6 +511,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):log = WorkoutLog.objects.get(pk=3)log.delete()+ self.assertTrue(cache.get(cache_mapper.get_workout_log(1, 2012, 10)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash_day)))diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex bebca8b67..13656aeef 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -141,6 +141,7 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):'''Test that the caches are cleared when updating a workout session'''+ log_hash = hash((1, 2012, 10))self.user_login('admin')self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))@@ -148,14 +149,14 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):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, True, 1, 2012, 10)))+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_cache_update_session_2(self):'''Test that the caches are only cleared for a the session's month'''+ log_hash = hash((1, 2012, 10))self.user_login('admin')self.client.get(reverse('manager:workout:calendar', kwargs={'year': 2012, 'month': 10}))@@ -164,37 +165,36 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):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, True, 1, 2012, 10)))+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_cache_delete_session(self):'''Test that the caches are cleared when deleting a workout session'''+ log_hash = hash((1, 2012, 10))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, 'True', 1, 2012, 10)))+ self.assertFalse(cache.get(cache_mapper.get_workout_log_list(log_hash)))def test_cache_delete_session_2(self):'''Test that the caches are only cleared for a the session's month'''+ log_hash = hash((1, 2012, 10))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, True, 1, 2012, 10)))+ self.assertTrue(cache.get(cache_mapper.get_workout_log_list(log_hash)))class WorkoutSessionApiTestCase(api_base_test.ApiBaseResourceTestCase):diff --git a/wger/utils/cache.py b/wger/utils/cache.pyindex 129359dd8..f90e7056b 100644--- a/wger/utils/cache.py+++ b/wger/utils/cache.py@@ -47,6 +47,8 @@ def reset_workout_log(user_pk, year, month, day=None):'''Resets the cached workout logs'''+ cache.delete(cache_mapper.get_workout_log(user_pk, year, month))+log_hash = hash((user_pk, year, month))cache.delete(cache_mapper.get_workout_log_list(log_hash))