Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add first draft for migrating workouts to routines

Roland Geiderf57c27d997be
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 0860065bc..2d2fd55c9 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -56,6 +56,7 @@ class RoutineSerializer(serializers.ModelSerializer):
'id',
'name',
'description',
+ 'first_day',
'created',
'start',
'end',
diff --git a/wger/manager/config_calculations/calculations.py b/wger/manager/config_calculations/calculations.py
index 499b99f2b..fc358a3a4 100644
--- a/wger/manager/config_calculations/calculations.py
+++ b/wger/manager/config_calculations/calculations.py
@@ -21,8 +21,8 @@ from abc import (
)
from decimal import Decimal
-from wger.manager.dataclasses import SetConfigData
# wger
+from wger.manager.dataclasses import SetConfigData
from wger.manager.models import (
AbstractChangeConfig,
WorkoutLog,
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 754cac9c8..25b0494ab 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -24,7 +24,8 @@ class Migration(migrations.Migration):
auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
- ('description', models.CharField(max_length=50, verbose_name='Description')),
+ ('name', models.CharField(max_length=20, verbose_name='Description')),
+ ('description', models.CharField(max_length=250, verbose_name='Description')),
('is_rest', models.BooleanField(default=False)),
('need_logs_to_advance', models.BooleanField(default=False)),
(
@@ -99,7 +100,7 @@ class Migration(migrations.Migration):
),
('order', models.PositiveIntegerField(blank=True)),
('comment', models.CharField(blank=True, max_length=100)),
- ('class_name', models.CharField(blank=True, max_length=100, null=True)),
+ ('class_name', models.CharField(blank=True, max_length=50, null=True)),
(
'exercise',
models.ForeignKey(
@@ -145,7 +146,7 @@ class Migration(migrations.Migration):
auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
),
),
- ('name', models.CharField(blank=True, max_length=50, verbose_name='Name')),
+ ('name', models.CharField(blank=True, max_length=100, verbose_name='Name')),
(
'description',
models.TextField(blank=True, max_length=1000, verbose_name='Description'),
@@ -173,9 +174,25 @@ class Migration(migrations.Migration):
verbose_name='User',
),
),
+ (
+ 'is_public',
+ models.BooleanField(
+ default=False,
+ help_text='A public template is available to other users',
+ verbose_name='Public template',
+ ),
+ ),
+ (
+ 'is_template',
+ models.BooleanField(
+ default=False,
+ help_text='Marking a workout as a template will freeze it and allow you to make copies of it',
+ verbose_name='Workout template',
+ ),
+ ),
],
options={
- 'ordering': ['-creation_date'],
+ 'ordering': ['-created'],
},
),
migrations.AddField(
@@ -194,11 +211,32 @@ class Migration(migrations.Migration):
null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.setconfig'
),
),
+ migrations.AddField(
+ model_name='workoutlog',
+ name='routine',
+ field=models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.routine',
+ verbose_name='Workout',
+ ),
+ ),
migrations.AddField(
model_name='workoutsession',
name='day',
field=models.ForeignKey(
- null=True, on_delete=django.db.models.deletion.CASCADE, to='manager.dayng'
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.dayng',
+ ),
+ ),
+ migrations.AddField(
+ model_name='workoutsession',
+ name='routine',
+ field=models.ForeignKey(
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.routine',
),
),
migrations.CreateModel(
diff --git a/wger/manager/migrations/0019_flexible_routines_migration.py b/wger/manager/migrations/0019_flexible_routines_migration.py
new file mode 100644
index 000000000..ded2fd169
--- /dev/null
+++ b/wger/manager/migrations/0019_flexible_routines_migration.py
@@ -0,0 +1,155 @@
+# Generated by Django 4.2.6 on 2024-04-14 11:22
+
+from django.db import migrations
+
+from datetime import timedelta
+
+
+def migrate_forward(apps, schema_editor):
+ workouts_to_routines = migrate_routines(apps)
+ migrate_logs(apps, workouts_to_routines)
+
+
+def migrate_routines(apps):
+ """
+ Migrates all workouts to routines and the new data model
+ """
+
+ Workout = apps.get_model('manager', 'Workout')
+ Routine = apps.get_model('manager', 'Routine')
+ DayNg = apps.get_model('manager', 'DayNg')
+ SetNg = apps.get_model('manager', 'SetNg')
+ SetConfig = apps.get_model('manager', 'SetConfig')
+ WeightConfig = apps.get_model('manager', 'WeightConfig')
+ RepsConfig = apps.get_model('manager', 'RepsConfig')
+ RiRConfig = apps.get_model('manager', 'RiRConfig')
+ RestConfig = apps.get_model('manager', 'RestConfig')
+
+ workouts_to_routines = {}
+
+ for workout in Workout.objects.all():
+ next_monday = workout.creation_date + timedelta(days=7 - workout.creation_date.weekday())
+
+ routine = Routine(
+ name=workout.name,
+ description=workout.description,
+ user=workout.user,
+ created=workout.creation_date,
+ start=next_monday,
+ end=next_monday + timedelta(weeks=4 * 6),
+ is_template=workout.is_template,
+ is_public=workout.is_public,
+ )
+ routine.save()
+
+ workouts_to_routines[workout.id] = routine
+
+ day_dict = {}
+
+ # To simulate a hard coded week, we will create exactly seven day entries (since
+ # we know the routine starts on a monday).
+ for i in range(1, 8):
+ day_ng = DayNg(routine=routine, next_day=day_dict.get(i, None), is_rest=True)
+ day_dict[i] = day_ng
+
+ if i == 7:
+ day_ng.next_day = day_dict[1]
+ elif i != 1:
+ day_dict[i - 1].next_day = day_dict[i]
+
+ day = workout.day_set.filter(day__id=i).first()
+ day_ng.save()
+ if day:
+ day_ng.description = day.description
+ day_ng.is_rest = False
+ day_ng.need_logs_to_advance = False
+ day_ng.save()
+
+ # Set the exercises and repetitions
+ # TODO: properly handle number of sets
+ for set in day.set_set.all():
+ set_ng = SetNg(day=day_ng, comment=set.comment, order=set.order)
+ set_ng.save()
+ for setting in set.setting_set.all():
+ set_config = SetConfig(
+ set=set_ng,
+ exercise=setting.exercise_base,
+ repetition_unit=setting.repetition_unit,
+ weight_unit=setting.weight_unit,
+ order=setting.order,
+ comment=setting.comment,
+ )
+ set_config.save()
+
+ if setting.weight:
+ WeightConfig(
+ set_config=set_config,
+ value=setting.weight,
+ iteration=1,
+ replace=True,
+ ).save()
+
+ if setting.reps:
+ RepsConfig(
+ set_config=set_config,
+ value=setting.reps,
+ iteration=1,
+ replace=True,
+ ).save()
+
+ if setting.rir:
+ RiRConfig(
+ set_config=set_config,
+ value=setting.rir,
+ iteration=1,
+ replace=True,
+ ).save()
+
+ RestConfig(
+ set_config=set_config,
+ value=120,
+ iteration=1,
+ replace=True,
+ ).save()
+
+ routine.first_day = day_dict[1]
+ routine.save()
+ return workouts_to_routines
+
+
+def migrate_logs(apps, workout_to_routine):
+ """
+ Migrates all logs to the new data model (basically setting the routine and session)
+ """
+
+ Log = apps.get_model('manager', 'WorkoutLog')
+ Session = apps.get_model('manager', 'WorkoutSession')
+
+ session_dict = {}
+
+ for log in Log.objects.all():
+ session = session_dict.get(log.date, None)
+ if not session:
+ session, created = Session.objects.get_or_create(
+ user=log.user,
+ date=log.date.date(),
+ defaults={
+ 'workout': log.workout,
+ 'routine': workout_to_routine[log.workout.id],
+ },
+ )
+ session_dict[log.date] = session
+
+ log.routine = workout_to_routine[log.workout.id]
+ log.session = session
+ log.save()
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('manager', '0018_flexible_routines'),
+ ]
+
+ operations = [
+ migrations.RunPython(migrate_forward, reverse_code=migrations.RunPython.noop),
+ ]
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index 873fe669f..3315cc686 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -45,8 +45,13 @@ class DayNg(models.Model):
on_delete=models.CASCADE,
)
+ name = models.CharField(
+ max_length=20,
+ verbose_name=_('Description'),
+ )
+
description = models.CharField(
- max_length=50,
+ max_length=250,
verbose_name=_('Description'),
)
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index 9a3b4cd35..b030081e2 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -43,6 +43,11 @@ class WorkoutLog(models.Model):
A log entry for an exercise
"""
+ date = models.DateTimeField(
+ verbose_name=_('Date'),
+ default=datetime.datetime.now,
+ )
+
user = models.ForeignKey(
User,
verbose_name=_('User'),
@@ -69,6 +74,13 @@ class WorkoutLog(models.Model):
on_delete=models.CASCADE,
)
+ routine = models.ForeignKey(
+ 'Routine',
+ verbose_name=_('Workout'),
+ on_delete=models.CASCADE,
+ null=True,
+ )
+
set_config = models.ForeignKey(
'SetConfig',
on_delete=models.CASCADE,
@@ -117,11 +129,6 @@ class WorkoutLog(models.Model):
The weight unit of the log. This can be e.g. kg, lb, km/h, etc.
"""
- date = models.DateTimeField(
- verbose_name=_('Date'),
- default=datetime.datetime.now,
- )
-
rir = models.CharField(
verbose_name=_('RiR'),
max_length=3,
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index 2275c303a..f979547a6 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -35,6 +35,10 @@ class Routine(models.Model):
Model for a routine
"""
+ # objects = WorkoutManager()
+ # templates = WorkoutTemplateManager()
+ # both = WorkoutAndTemplateManager()
+
class Meta:
ordering = [
'-created',
@@ -58,12 +62,15 @@ class Routine(models.Model):
max_length=50,
blank=True,
)
+
description = models.TextField(
verbose_name=_('Description'),
max_length=1000,
blank=True,
)
+ # TODO: remove the auto_now_add during migration so we can set this to a custom
+ # value and then set it back to auto_now_add
created = models.DateTimeField(
_('Creation date'),
auto_now_add=True,
@@ -77,6 +84,21 @@ class Routine(models.Model):
_('End date'),
)
+ is_template = models.BooleanField(
+ verbose_name=_('Workout template'),
+ help_text=_(
+ 'Marking a workout as a template will freeze it and allow you to ' 'make copies of it'
+ ),
+ default=False,
+ null=False,
+ )
+ is_public = models.BooleanField(
+ verbose_name=_('Public template'),
+ help_text=_('A public template is available to other users'),
+ default=False,
+ null=False,
+ )
+
def get_absolute_url(self):
"""
Returns the canonical URL to view a workout
diff --git a/wger/manager/models/session.py b/wger/manager/models/session.py
index 4afcd4c46..103961a8b 100644
--- a/wger/manager/models/session.py
+++ b/wger/manager/models/session.py
@@ -13,6 +13,7 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
# Standard Library
import datetime
@@ -62,6 +63,12 @@ class WorkoutSession(models.Model):
The workout the session belongs to
"""
+ routine = models.ForeignKey(
+ 'Routine',
+ on_delete=models.CASCADE,
+ null=True,
+ )
+
day = models.ForeignKey(
'DayNg',
on_delete=models.CASCADE,