Self hosted FLOSS fitness/workout, nutrition and weight tracker
Remove 'workout_log' cache
Roland Geider2438ad7d6214
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.pyindex e81b06d6b..d63dcf7d7 100644--- a/wger/manager/tests/test_weight_log.py+++ b/wger/manager/tests/test_weight_log.py@@ -379,11 +379,9 @@ 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):@@ -392,14 +390,12 @@ 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):@@ -408,13 +404,11 @@ 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):@@ -423,14 +417,12 @@ 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):@@ -450,7 +442,6 @@ 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)))@@ -471,7 +462,6 @@ 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)))@@ -491,7 +481,6 @@ 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)))@@ -511,7 +500,6 @@ 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 13656aeef..60788ed02 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -149,7 +149,6 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):session.notes = 'Lorem ipsum'session.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)))def test_cache_update_session_2(self):@@ -165,7 +164,6 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):session.notes = 'Lorem ipsum'session.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)))def test_cache_delete_session(self):@@ -179,7 +177,6 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):session = WorkoutSession.objects.get(pk=1)session.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)))def test_cache_delete_session_2(self):@@ -193,7 +190,6 @@ class WorkoutLogCacheTestCase(WorkoutManagerTestCase):session = WorkoutSession.objects.get(pk=2)session.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)))diff --git a/wger/manager/views/log.py b/wger/manager/views/log.pyindex bc70c616e..b6e616658 100644--- a/wger/manager/views/log.py+++ b/wger/manager/views/log.py@@ -326,33 +326,43 @@ class WorkoutCalendar(HTMLCalendar):self.workout_logs = workout_logsdef formatday(self, day, weekday):- if day != 0:- cssclass = self.cssclasses[weekday]- date_obj = datetime.date(self.year, self.month, day)- if datetime.date.today() == date_obj:- cssclass += ' today'- if day in self.workout_logs:- current_log = self.workout_logs.get(day)- if current_log['impression'] == WorkoutSession.IMPRESSION_BAD:- background_css = 'btn-danger'- elif current_log['impression'] == WorkoutSession.IMPRESSION_GOOD:- background_css = 'btn-success'- else:- background_css = 'btn-warning'-- url = reverse('manager:log:log', kwargs={'pk': current_log['log'].workout_id})- formatted_date = date_obj.strftime('%Y-%m-%d')- body = []- body.append('<a href="{0}" '- 'data-log="log-{1}" '- 'class="btn btn-block {2} calendar-link">'.format(url,- formatted_date,- background_css))- body.append(repr(day))- body.append('</a>')- return self.day_cell(cssclass, '{0}'.format(''.join(body)))++ # days belonging to last or next month are rendered empty+ if day == 0:+ return self.day_cell('noday', ' ')++ date_obj = datetime.date(self.year, self.month, day)+ cssclass = self.cssclasses[weekday]+ if datetime.date.today() == date_obj:+ cssclass += ' today'++ # There are no logs for this day, doesn't need special attention+ if date_obj not in self.workout_logs:return self.day_cell(cssclass, day)- return self.day_cell('noday', ' ')++ # Day with a log, set background and link+ entry = self.workout_logs.get(date_obj)+ if entry['session']:+ if entry['session'].impression == WorkoutSession.IMPRESSION_BAD:+ background_css = 'btn-danger'+ elif entry['session'].impression == WorkoutSession.IMPRESSION_GOOD:+ background_css = 'btn-success'+ else:+ background_css = 'btn-warning'+ else:+ background_css = 'btn-warning'++ url = reverse('manager:log:log', kwargs={'pk': entry['workout'].id})+ formatted_date = date_obj.strftime('%Y-%m-%d')+ body = []+ body.append('<a href="{0}" '+ 'data-log="log-{1}" '+ 'class="btn btn-block {2} calendar-link">'.format(url,+ formatted_date,+ background_css))+ body.append(repr(day))+ body.append('</a>')+ return self.day_cell(cssclass, '{0}'.format(''.join(body)))def formatmonth(self, year, month):'''@@ -393,29 +403,12 @@ def calendar(request, username=None, year=None, month=None):logs = WorkoutLog.objects.filter(user=user,date__year=year,date__month=month).order_by('exercise')- logs_filtered = cache.get(cache_mapper.get_workout_log(user.pk, year, month))- if not logs_filtered:- logs_filtered = {}-- # Process the logs. Group by date and check for impressions- for log in logs:- if log.date not in logs_filtered:- session = log.get_workout_session()-- if session:- impression = session.impression- else:- # Default is 'neutral'- impression = WorkoutSession.IMPRESSION_NEUTRAL-- logs_filtered[log.date.day] = {'impression': impression,- 'log': log}- cache.set(cache_mapper.get_workout_log(user.pk, year, month), logs_filtered)(current_workout, schedule) = Schedule.objects.get_current_workout(user)+ grouped_log_entries = group_log_entries(logs, (user.pk, year, month))- context['calendar'] = WorkoutCalendar(logs_filtered).formatmonth(year, month)- context['logs'] = group_log_entries(logs, (user.pk, year, month))+ context['calendar'] = WorkoutCalendar(grouped_log_entries).formatmonth(year, month)+ context['logs'] = grouped_log_entriescontext['current_year'] = yearcontext['current_month'] = monthcontext['current_workout'] = current_workout@@ -438,8 +431,7 @@ def day(request, username, year, month, day):except ValueError as e:logger.error("Error on date: {0}".format(e))return HttpResponseForbidden()- logs = WorkoutLog.objects.filter(user=user,- date=date).order_by('id', 'exercise')+ logs = WorkoutLog.objects.filter(user=user, date=date).order_by('id', 'exercise')context = {}context['logs'] = group_log_entries(logs, (user.pk, date.year, date.month, date.day))context['date'] = datediff --git a/wger/utils/cache.py b/wger/utils/cache.pyindex f90e7056b..585805e07 100644--- a/wger/utils/cache.py+++ b/wger/utils/cache.py@@ -47,7 +47,6 @@ 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))@@ -68,7 +67,6 @@ class CacheKeyMapper(object):EXERCISE_CACHE_KEY_MUSCLE_BG = 'exercise-muscle-bg-{0}'INGREDIENT_CACHE_KEY = 'ingredient-{0}'WORKOUT_CANONICAL_REPRESENTATION = 'workout-canonical-representation-{0}'- WORKOUT_LOG = 'workout-log-user{0}-year{1}-month{2}'WORKOUT_LOG_LIST = 'workout-log-hash-{0}'def get_exercise_key(self, param):@@ -137,12 +135,6 @@ class CacheKeyMapper(object):return self.WORKOUT_CANONICAL_REPRESENTATION.format(pk)- def get_workout_log(self, user_pk, year, month):- '''- Return the workout canonical representation- '''- return self.WORKOUT_LOG.format(user_pk, year, month)-def get_workout_log_list(self, hash_value):'''Return the workout canonical representation