Self hosted FLOSS fitness/workout, nutrition and weight tracker
Format code with ruff and isort
Apple3b72d633d95a
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.pyindex 8dd66a797..37662cd87 100644--- a/wger/manager/api/serializers.py+++ b/wger/manager/api/serializers.py@@ -440,7 +440,9 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):def get_date(self, obj):if obj.datetime_start:+ # Djangofrom django.utils import timezone+return timezone.localtime(obj.datetime_start).date()return Nonediff --git a/wger/manager/management/commands/dummy-generator-workout-diary.py b/wger/manager/management/commands/dummy-generator-workout-diary.pyindex cef7d16ac..b8c1e65d4 100644--- a/wger/manager/management/commands/dummy-generator-workout-diary.py+++ b/wger/manager/management/commands/dummy-generator-workout-diary.py@@ -95,14 +95,16 @@ class Command(BaseCommand):)hour_start = random.randint(8, 20)- datetime_start = make_aware(datetime.datetime.combine(- day_data.date,- datetime.time(- hour_start,- random.randint(0, 59),- random.randint(0, 59),+ datetime_start = make_aware(+ datetime.datetime.combine(+ day_data.date,+ datetime.time(+ hour_start,+ random.randint(0, 59),+ random.randint(0, 59),+ ),)- ))+ )datetime_end = datetime_start + datetime.timedelta(hours=random.randint(1, 3),minutes=random.randint(0, 59),@@ -114,7 +116,7 @@ class Command(BaseCommand):routine=routine,datetime_start__date=day_data.date,).first()-+if not session:session = WorkoutSession.objects.create(user=user,diff --git a/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py b/wger/manager/migrations/0028_alter_workoutsession_options_and_more.pyindex a406c43e0..6ffc93920 100644--- a/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py+++ b/wger/manager/migrations/0028_alter_workoutsession_options_and_more.py@@ -15,7 +15,7 @@ def forward_func(apps, schema_editor):# Handle cases where date might be None, though default is today, just in casedate = session.date if session.date else datetime.date.today()session.datetime_start = make_aware(datetime.datetime.combine(date, start_time))-+if session.time_end:session.datetime_end = make_aware(datetime.datetime.combine(date, session.time_end))if session.time_end < start_time:@@ -24,7 +24,6 @@ def forward_func(apps, schema_editor):class Migration(migrations.Migration):-dependencies = [('manager', '0027_cleanup_fields'),migrations.swappable_dependency(settings.AUTH_USER_MODEL),@@ -51,9 +50,10 @@ class Migration(migrations.Migration):migrations.AddField(model_name='workoutsession',name='datetime_start',- field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Start date and time'),+ field=models.DateTimeField(+ default=django.utils.timezone.now, verbose_name='Start date and time'+ ),),-migrations.AlterField(model_name='workoutlog',name='date',@@ -61,7 +61,9 @@ class Migration(migrations.Migration):),migrations.AddIndex(model_name='workoutsession',- index=models.Index(fields=['routine', 'datetime_start'], name='manager_wor_routine_46e75a_idx'),+ index=models.Index(+ fields=['routine', 'datetime_start'], name='manager_wor_routine_46e75a_idx'+ ),),migrations.RunPython(forward_func),migrations.RemoveField(diff --git a/wger/manager/models/log.py b/wger/manager/models/log.pyindex 8f4f11efd..3e6306be1 100644--- a/wger/manager/models/log.py+++ b/wger/manager/models/log.py@@ -271,9 +271,12 @@ class WorkoutLog(models.Model):# Auto-create a session only if the client didn't provide one.if not self.session_id:+ # Standard Libraryimport datetime++ # Djangofrom django.utils import timezone-+# Ensure self.date is a timezone-aware datetime for comparisonslog_date = self.dateif isinstance(log_date, datetime.date) and not isinstance(log_date, datetime.datetime):@@ -293,14 +296,18 @@ class WorkoutLog(models.Model):if not matching_session:max_duration = datetime.timedelta(hours=WorkoutSession.MAX_SESSION_LENGTH_HOURS)time_threshold = log_date - max_duration-- matching_session = WorkoutSession.objects.filter(- user=self.user,- routine=self.routine,- datetime_end__isnull=True,- datetime_start__gte=time_threshold,- datetime_start__lte=log_date,- ).order_by('-datetime_start').first()++ matching_session = (+ WorkoutSession.objects.filter(+ user=self.user,+ routine=self.routine,+ datetime_end__isnull=True,+ datetime_start__gte=time_threshold,+ datetime_start__lte=log_date,+ )+ .order_by('-datetime_start')+ .first()+ )if matching_session:self.session = matching_sessiondiff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.pyindex fcc0737b3..15e975b14 100644--- a/wger/manager/models/routine.py+++ b/wger/manager/models/routine.py@@ -235,7 +235,11 @@ class Routine(models.Model):workout_session_map = defaultdict(set)for day in days:for session in day.workoutsession_set.all():- workout_session_map[day.id].add(timezone.localtime(session.datetime_start).date() if session.datetime_start else None)+ workout_session_map[day.id].add(+ timezone.localtime(session.datetime_start).date()+ if session.datetime_start+ else None+ )# Main sequence generation logiclabels = self.label_dictdiff --git a/wger/manager/models/session.py b/wger/manager/models/session.pyindex 4bbca4255..c34b84dab 100644--- a/wger/manager/models/session.py+++ b/wger/manager/models/session.py@@ -22,8 +22,8 @@ from uuid import uuid4from django.contrib.auth.models import Userfrom django.core.exceptions import ValidationErrorfrom django.db import models-from django.utils.translation import gettext_lazy as _from django.utils import timezone+from django.utils.translation import gettext_lazy as _# wgerfrom wger.utils.uuid import uuid7@@ -145,7 +145,9 @@ class WorkoutSession(models.Model):if self.datetime_end and self.datetime_start:duration = self.datetime_end - self.datetime_startif duration > datetime.timedelta(hours=self.MAX_SESSION_LENGTH_HOURS):- raise ValidationError(_(f'A session cannot be longer than {self.MAX_SESSION_LENGTH_HOURS} hours.'))+ raise ValidationError(+ _(f'A session cannot be longer than {self.MAX_SESSION_LENGTH_HOURS} hours.')+ )def get_owner_object(self):"""diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.pyindex 1b1502105..f75251393 100644--- a/wger/manager/tests/test_routine.py+++ b/wger/manager/tests/test_routine.py@@ -18,8 +18,8 @@ from unittest import mock# Djangofrom django.conf import settings-from django.utils import timezonefrom django.urls import reverse+from django.utils import timezone# wgerfrom wger.core.tests.api_base_test import ApiBaseResourceTestCase@@ -302,7 +302,9 @@ class RoutineTestCase(WgerTestCase):WorkoutSession.objects.create(day=self.day1,routine=self.routine,- datetime_start=timezone.make_aware(datetime.datetime.combine(start + datetime.timedelta(days=2), datetime.time())),+ datetime_start=timezone.make_aware(+ datetime.datetime.combine(start + datetime.timedelta(days=2), datetime.time())+ ),user=self.routine.user,)diff --git a/wger/manager/tests/test_workout_session.py b/wger/manager/tests/test_workout_session.pyindex 28cb2dbfd..44280dbf8 100644--- a/wger/manager/tests/test_workout_session.py+++ b/wger/manager/tests/test_workout_session.py@@ -15,6 +15,7 @@# Standard Libraryimport datetime+# Djangofrom django.utils import timezone# wgerdiff --git a/wger/trophies/services/statistics.py b/wger/trophies/services/statistics.pyindex 91f3c7109..afd97a0d6 100644--- a/wger/trophies/services/statistics.py+++ b/wger/trophies/services/statistics.py@@ -91,7 +91,11 @@ class UserStatisticsService:stats.total_workouts = sessions.count()# Calculate streaks and other date-based stats- workout_dates = list(sessions.values_list('datetime_start__date', flat=True).distinct().order_by('datetime_start__date'))+ workout_dates = list(+ sessions.values_list('datetime_start__date', flat=True)+ .distinct()+ .order_by('datetime_start__date')+ )current_streak, longest_streak = cls._calculate_streaks(workout_dates)stats.current_streak = current_streakstats.longest_streak = longest_streak@@ -200,10 +204,7 @@ class UserStatisticsService:# Update workout times if session has time infoif session and session.datetime_start:session_time = session.datetime_start.time()- if (- stats.earliest_workout_time is None- or session_time < stats.earliest_workout_time- ):+ if stats.earliest_workout_time is None or session_time < stats.earliest_workout_time:stats.earliest_workout_time = session_timeif stats.latest_workout_time is None or session_time > stats.latest_workout_time:stats.latest_workout_time = session_time@@ -417,12 +418,10 @@ class UserStatisticsService:# Check if both days have workoutshas_saturday = WorkoutSession.objects.filter(- user=stats.user,- datetime_start__date=saturday+ user=stats.user, datetime_start__date=saturday).exists()has_sunday = WorkoutSession.objects.filter(- user=stats.user,- datetime_start__date=sunday+ user=stats.user, datetime_start__date=sunday).exists()if has_saturday and has_sunday: