Self hosted FLOSS fitness/workout, nutrition and weight tracker
feat(core): add timezone field to UserProfile
pankaj-basnetff78fdb9bdcb
diff --git a/settings/settings_global.py b/settings/settings_global.pyindex 9daeec1af..2836e0730 100644--- a/settings/settings_global.py+++ b/settings/settings_global.py@@ -148,6 +148,9 @@ MIDDLEWARE = [# Django Admin'django.contrib.auth.middleware.AuthenticationMiddleware',+ # Time zone middleware+ 'wger.core.middleware.TimezoneMiddleware',+# Auth proxy middleware'wger.core.middleware.AuthProxyHeaderMiddleware',diff --git a/wger/core/api/serializers.py b/wger/core/api/serializers.pyindex 5e43edf0c..cd1b35e88 100644--- a/wger/core/api/serializers.py+++ b/wger/core/api/serializers.py@@ -77,6 +77,7 @@ class UserprofileSerializer(serializers.ModelSerializer):'calories','weight_unit','num_days_weight_reminder',+ 'time_zone',)diff --git a/wger/core/middleware.py b/wger/core/middleware.pyindex a6f2c44c2..18b231d13 100644--- a/wger/core/middleware.py+++ b/wger/core/middleware.py@@ -26,6 +26,7 @@ from django.contrib.auth import ()from django.shortcuts import redirectfrom django.urls import reverse+from django.utils import timezonefrom django.utils.deprecation import MiddlewareMixinfrom django.utils.http import url_has_allowed_host_and_scheme@@ -161,3 +162,26 @@ class AuthProxyHeaderMiddleware(MiddlewareMixin):request.user = Nonereturn None+++class TimezoneMiddleware:+ """+ Activates the current user's stored time_zone for the duration of the+ request, default is server's global TIME_ZONE+ """++ def __init__(self, get_response):+ self.get_response = get_response++ def __call__(self, request):+ user = getattr(request, 'user', None)+ if user is not None and user.is_authenticated:+ try:+ timezone.activate(user.userprofile.zone_info)+ except Exception:+ # Falls back to Django's default (settings.TIME_ZONE)+ timezone.deactivate()+ else:+ timezone.deactivate()++ return self.get_response(request)diff --git a/wger/core/migrations/0027_userprofile_timezone.py b/wger/core/migrations/0027_userprofile_timezone.pynew file mode 100644index 000000000..8938cdad3--- /dev/null+++ b/wger/core/migrations/0027_userprofile_timezone.py@@ -0,0 +1,25 @@+# Django+from django.conf import settings+from django.db import migrations, models++# wger+from wger.core.models.profile import validate_timezone+++class Migration(migrations.Migration):+ dependencies = [+ ('core', '0026_alter_userprofile_birthdate_alter_userprofile_height'),+ ]++ operations = [+ migrations.AddField(+ model_name='userprofile',+ name='time_zone',+ field=models.CharField(+ default=settings.TIME_ZONE,+ max_length=50,+ validators=[validate_timezone],+ verbose_name='Timezone',+ ),+ ),+ ]diff --git a/wger/core/models/profile.py b/wger/core/models/profile.pyindex 7863231a6..cd6af693c 100644--- a/wger/core/models/profile.py+++ b/wger/core/models/profile.py@@ -17,6 +17,10 @@# Standard Libraryimport datetimeimport decimal+from zoneinfo import (+ ZoneInfo,+ available_timezones,+)# Djangofrom django.conf import settings@@ -62,6 +66,14 @@ def birthdate_validator(birthdate):)+def validate_timezone(value: str) -> None:+ """+ Validates that the given string is a real IANA timezone name.+ """+ if value not in available_timezones():+ raise ValidationError(f'"{value} is not a valid IANA timezone name')++class UserProfile(models.Model):GENDER_MALE = '1'GENDER_FEMALE = '2'@@ -323,6 +335,17 @@ class UserProfile(models.Model):)"""Number of Days for email weight reminder"""+ time_zone = models.CharField(+ verbose_name='Timezone',+ max_length=50,+ default=settings.TIME_ZONE,+ validators=[validate_timezone],+ )+ """+ IANA timezone name (e.g. "Europe/Berlin") used to compute what calendar day+ a workout session, log, or other "local" event counts for.+ """+## API#@@ -437,6 +460,16 @@ class UserProfile(models.Model):"""return self.weight_unit == 'kg'+ @property+ def zone_info(self) -> ZoneInfo:+ """+ Returns the parsed ZoneInfo object for this user's timezone+ """+ try:+ return ZoneInfo(self.time_zone)+ except Exception:+ return ZoneInfo(settings.TIME_ZONE)+def calculate_bmi(self):"""Calculates the user's BMIdiff --git a/wger/manager/models/session.py b/wger/manager/models/session.pyindex b9da2f5b9..27879a556 100644--- a/wger/manager/models/session.py+++ b/wger/manager/models/session.py@@ -134,7 +134,9 @@ class WorkoutSession(models.Model):if not self.datetime_start:return None- return timezone.localtime(self.datetime_start).date()+ return timezone.localtime(+ self.datetime_start, timezone=self.user.userprofile.zone_info+ ).date()class Meta:"""