Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove the current iteration endpoints

Roland Geiderd690799b5a2d
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index cad0bf745..5422a1669 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -156,33 +156,6 @@ class RoutineViewSet(viewsets.ModelViewSet):
"""
return Response(WorkoutDayDataGymModeSerializer(self.get_object().data_for_day()).data)
- @action(detail=True, url_path='current-iteration-display')
- def current_iteration_display_mode(self, request, pk):
- """
- Return current day of the routine
- """
- cache_key = CacheKeyMapper.get_routine_api_current_iteration_display_key(pk)
- cached_data = cache.get(cache_key)
- if cached_data is not None:
- return Response(cached_data)
-
- out = WorkoutDayDataDisplayModeSerializer(
- self.get_object().data_for_iteration(),
- many=True,
- ).data
-
- cache.set(cache_key, out, settings.WGER_SETTINGS['ROUTINE_CACHE_TTL'])
- return Response(out)
-
- @action(detail=True, url_path='current-iteration-gym')
- def current_iteration_gym_mode(self, request, pk):
- """
- Return current day of the routine
- """
- return Response(
- WorkoutDayDataGymModeSerializer(self.get_object().data_for_iteration(), many=True).data
- )
-
@action(detail=True)
def structure(self, request, pk):
"""
diff --git a/wger/manager/helpers.py b/wger/manager/helpers.py
index e2385e813..550920d22 100644
--- a/wger/manager/helpers.py
+++ b/wger/manager/helpers.py
@@ -187,7 +187,6 @@ def reset_routine_cache(instance: Routine):
cache.delete(CacheKeyMapper.get_routine_date_sequence_key(instance.id))
cache.delete(CacheKeyMapper.get_routine_api_date_sequence_key(instance.id))
- cache.delete(CacheKeyMapper.get_routine_api_current_iteration_display_key(instance.id))
cache.delete(CacheKeyMapper.get_routine_api_structure_key(instance.id))
cache.delete(CacheKeyMapper.get_routine_api_stats(instance.id))
diff --git a/wger/manager/tests/test_generator.py b/wger/manager/tests/test_generator.py
index 4af79890c..9a1826826 100644
--- a/wger/manager/tests/test_generator.py
+++ b/wger/manager/tests/test_generator.py
@@ -44,5 +44,5 @@ class RoutineGeneratorTestCase(WgerTestCase):
# Assert
# Things like nr of training days or exercises are random
- self.assertGreaterEqual(WorkoutLog.objects.filter(routine__user_id=1).count(), 400)
+ self.assertGreaterEqual(WorkoutLog.objects.filter(routine__user_id=1).count(), 150)
self.assertLessEqual(WorkoutLog.objects.filter(routine__user_id=1).count(), 800)
diff --git a/wger/utils/cache.py b/wger/utils/cache.py
index 98dfe829b..3783bcd21 100644
--- a/wger/utils/cache.py
+++ b/wger/utils/cache.py
@@ -19,7 +19,6 @@ import logging
from django.core.cache import cache
from django.core.cache.utils import make_template_fragment_key
-
logger = logging.getLogger(__name__)
@@ -59,7 +58,6 @@ class CacheKeyMapper:
EXERCISE_API_KEY = 'base-uuid-{0}'
ROUTINE_DATE_SEQUENCE_KEY = 'routine-date-sequence-{0}'
ROUTINE_API_DATE_SEQUENCE_DISPLAY_KEY = 'routine-api-date-sequence-display-{0}'
- ROUTINE_API_CURRENT_ITERATION_DISPLAY_KEY = 'routine-api-current-iteration-sequence-display-{0}'
ROUTINE_API_STATS_KEY = 'routine-api-stats-{0}'
ROUTINE_API_STRUCTURE_KEY = 'routine-api-structure-{0}'
SLOT_ENTRY_CONFIGS_KEY = 'slot-entry-configs-{0}'
@@ -110,10 +108,6 @@ class CacheKeyMapper:
def get_routine_api_date_sequence_key(cls, id: int):
return cls.ROUTINE_API_DATE_SEQUENCE_DISPLAY_KEY.format(id)
- @classmethod
- def get_routine_api_current_iteration_display_key(cls, id: int):
- return cls.ROUTINE_API_CURRENT_ITERATION_DISPLAY_KEY.format(id)
-
@classmethod
def get_routine_api_stats(cls, id: int):
return cls.ROUTINE_API_STATS_KEY.format(id)