Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Remove unneeded helper method

Roland Geider31277e49c029
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index 0a1d74098..df36e5d0d 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -162,18 +162,6 @@ class WorkoutLog(models.Model):
"""
return self
- def get_workout_session(self, date=None) -> WorkoutSession:
- """
- Returns the corresponding workout session
- """
- if not date:
- date = self.date
-
- try:
- return WorkoutSession.objects.filter(user=self.user).get(date=date)
- except WorkoutSession.DoesNotExist:
- return None
-
def save(self, *args, **kwargs):
"""
Plumbing
diff --git a/wger/manager/tests/test_weight_log.py b/wger/manager/tests/test_weight_log.py
index 16ab1eda6..827d71c8a 100644
--- a/wger/manager/tests/test_weight_log.py
+++ b/wger/manager/tests/test_weight_log.py
@@ -200,58 +200,6 @@ class WeightLogOverviewAddTestCase(WgerTestCase):
self.add_weight_log(fail=True)
-class WeightlogTestCase(WgerTestCase):
- """
- Tests other model methods
- """
-
- def test_get_workout_session(self):
- """
- Test the wgerGetWorkoutSession method
- """
-
- user1 = User.objects.get(pk=1)
- user2 = User.objects.get(pk=2)
- workout1 = Workout.objects.get(pk=2)
- workout2 = Workout.objects.get(pk=2)
-
- WorkoutLog.objects.all().delete()
- log = WorkoutLog()
- log.user = user1
- log.date = datetime.date(2014, 1, 5)
- log.exercise = ExerciseBase.objects.get(pk=1)
- log.workout = workout1
- log.weight = 10
- log.reps = 10
- log.save()
-
- session1 = WorkoutSession()
- session1.user = user1
- session1.workout = workout1
- session1.notes = 'Something here'
- session1.impression = '3'
- session1.date = datetime.date(2014, 1, 5)
- session1.save()
-
- session2 = WorkoutSession()
- session2.user = user1
- session2.workout = workout1
- session2.notes = 'Something else here'
- session2.impression = '1'
- session2.date = datetime.date(2014, 1, 1)
- session2.save()
-
- session3 = WorkoutSession()
- session3.user = user2
- session3.workout = workout2
- session3.notes = 'The notes here'
- session3.impression = '2'
- session3.date = datetime.date(2014, 1, 5)
- session3.save()
-
- self.assertEqual(log.get_workout_session(), session1)
-
-
class WeightLogDeleteTestCase(WgerDeleteTestCase):
"""
Tests deleting a WorkoutLog
diff --git a/wger/weight/helpers.py b/wger/weight/helpers.py
index 69871c04c..4a86c4a18 100644
--- a/wger/weight/helpers.py
+++ b/wger/weight/helpers.py
@@ -35,7 +35,6 @@ from wger.utils.cache import cache_mapper
from wger.utils.helpers import DecimalJsonEncoder
from wger.weight.models import WeightEntry
-
logger = logging.getLogger(__name__)
@@ -129,7 +128,7 @@ def group_log_entries(user, year, month, day=None):
out[entry.date] = {
'date': entry.date,
'workout': entry.workout,
- 'session': entry.get_workout_session(),
+ 'session': entry.session,
'logs': OrderedDict(),
}