Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Expose the calculate date sequence over the API

Roland Geider5511e1aa8034
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 0c1ec483f..0d361a0d1 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -28,11 +28,16 @@ from wger.exercises.api.serializers import (
from wger.manager.models import (
Day,
DayNg,
+ RepsConfig,
+ RestConfig,
+ RiRConfig,
Routine,
Schedule,
ScheduleStep,
Set,
+ SetConfig,
Setting,
+ WeightConfig,
Workout,
WorkoutLog,
WorkoutSession,
@@ -58,7 +63,7 @@ class RoutineSerializer(serializers.ModelSerializer):
class DayNgSerializer(serializers.ModelSerializer):
"""
- Routine serializer
+ Day serializer
"""
class Meta:
@@ -72,6 +77,110 @@ class DayNgSerializer(serializers.ModelSerializer):
)
+class SetConfigSerializer(serializers.ModelSerializer):
+ """
+ Day serializer
+ """
+
+ class Meta:
+ model = SetConfig
+ fields = (
+ 'set',
+ 'exercise',
+ 'repetition_unit',
+ 'weight_unit',
+ 'order',
+ 'comment',
+ 'class_name',
+ )
+
+
+class WeightConfigSerializer(serializers.ModelSerializer):
+ """
+ Weight Config serializer
+ """
+
+ class Meta:
+ model = WeightConfig
+ fields = (
+ 'set_config',
+ 'iteration',
+ 'trigger',
+ 'value',
+ 'operation',
+ 'step',
+ 'replace',
+ 'need_log_to_apply',
+ )
+
+
+class RepetitionConfigSerializer(serializers.ModelSerializer):
+ """
+ Repetition Config serializer
+ """
+
+ class Meta:
+ model = RepsConfig
+ fields = (
+ 'set_config',
+ 'iteration',
+ 'trigger',
+ 'value',
+ 'operation',
+ 'step',
+ 'replace',
+ 'need_log_to_apply',
+ )
+
+
+class RiRConfigSerializer(serializers.ModelSerializer):
+ """
+ RiR Config serializer
+ """
+
+ class Meta:
+ model = RiRConfig
+ fields = (
+ 'set_config',
+ 'iteration',
+ 'trigger',
+ 'value',
+ 'operation',
+ 'step',
+ 'replace',
+ 'need_log_to_apply',
+ )
+
+
+class RestConfigSerializer(serializers.ModelSerializer):
+ """
+ Rest Config serializer
+ """
+
+ class Meta:
+ model = RestConfig
+ fields = (
+ 'set_config',
+ 'iteration',
+ 'trigger',
+ 'value',
+ 'operation',
+ 'step',
+ 'replace',
+ 'need_log_to_apply',
+ )
+
+
+class WorkoutDayDataSerializer(serializers.Serializer):
+ """
+ WorkoutDayData serializer
+ """
+
+ iteration = serializers.IntegerField()
+ date = serializers.DateField()
+ day = DayNgSerializer()
+
+
class WorkoutSerializer(serializers.ModelSerializer):
"""
Workout serializer
diff --git a/wger/manager/api/views.py b/wger/manager/api/views.py
index e802cb7ba..9a4b8fcfd 100644
--- a/wger/manager/api/views.py
+++ b/wger/manager/api/views.py
@@ -37,6 +37,7 @@ from wger.manager.api.serializers import (
SetSerializer,
SettingSerializer,
WorkoutCanonicalFormSerializer,
+ WorkoutDayDataSerializer,
WorkoutLogSerializer,
WorkoutSerializer,
WorkoutSessionSerializer,
@@ -89,13 +90,20 @@ class RoutineViewSet(viewsets.ModelViewSet):
"""
serializer.save(user=self.request.user)
- @action(detail=True)
+ @action(detail=True, url_path='day-sequence')
def day_sequence(self, request, pk):
"""
Return the day sequence of the routine
"""
return Response(DayNgSerializer(self.get_object().day_sequence, many=True).data)
+ @action(detail=True, url_path='date-sequence')
+ def date_sequence(self, request, pk):
+ """
+ Return the day sequence of the routine
+ """
+ return Response(WorkoutDayDataSerializer(self.get_object().date_sequence, many=True).data)
+
class WorkoutViewSet(viewsets.ModelViewSet):
"""
diff --git a/wger/manager/dataclasses.py b/wger/manager/dataclasses.py
index 30ef62e34..2e2fa5362 100644
--- a/wger/manager/dataclasses.py
+++ b/wger/manager/dataclasses.py
@@ -1,4 +1,5 @@
# Standard Library
+import datetime
from dataclasses import dataclass
from decimal import Decimal
@@ -9,6 +10,7 @@ from wger.manager.models import DayNg
@dataclass
class WorkoutDayData:
day: DayNg
+ date: datetime.date
iteration: int
diff --git a/wger/manager/migrations/0018_flexible_routines.py b/wger/manager/migrations/0018_flexible_routines.py
index 2e7345453..754cac9c8 100644
--- a/wger/manager/migrations/0018_flexible_routines.py
+++ b/wger/manager/migrations/0018_flexible_routines.py
@@ -38,54 +38,6 @@ class Migration(migrations.Migration):
),
],
),
- migrations.CreateModel(
- name='SetConfig',
- fields=[
- (
- 'id',
- models.AutoField(
- auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
- ),
- ),
- ('order', models.PositiveIntegerField(blank=True)),
- ('comment', models.CharField(blank=True, max_length=100)),
- ('class_name', models.CharField(blank=True, max_length=100, null=True)),
- (
- 'exercise',
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE, to='exercises.exercisebase'
- ),
- ),
- (
- 'repetition_unit',
- models.ForeignKey(
- default=1,
- on_delete=django.db.models.deletion.CASCADE,
- to='core.repetitionunit',
- ),
- ),
- (
- 'set',
- models.ForeignKey(
- on_delete=django.db.models.deletion.CASCADE,
- to='manager.set',
- verbose_name='Sets',
- ),
- ),
- (
- 'weight_unit',
- models.ForeignKey(
- default=1,
- on_delete=django.db.models.deletion.CASCADE,
- to='core.weightunit',
- verbose_name='Unit',
- ),
- ),
- ],
- options={
- 'ordering': ['order', 'id'],
- },
- ),
migrations.AddField(
model_name='workoutlog',
name='iteration',
@@ -127,7 +79,7 @@ class Migration(migrations.Migration):
'day',
models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
- to='manager.day',
+ to='manager.dayng',
verbose_name='Exercise day',
),
),
@@ -136,6 +88,54 @@ class Migration(migrations.Migration):
'ordering': ['order'],
},
),
+ migrations.CreateModel(
+ name='SetConfig',
+ fields=[
+ (
+ 'id',
+ models.AutoField(
+ auto_created=True, primary_key=True, serialize=False, verbose_name='ID'
+ ),
+ ),
+ ('order', models.PositiveIntegerField(blank=True)),
+ ('comment', models.CharField(blank=True, max_length=100)),
+ ('class_name', models.CharField(blank=True, max_length=100, null=True)),
+ (
+ 'exercise',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE, to='exercises.exercisebase'
+ ),
+ ),
+ (
+ 'repetition_unit',
+ models.ForeignKey(
+ default=1,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='core.repetitionunit',
+ ),
+ ),
+ (
+ 'set',
+ models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='manager.setNg',
+ verbose_name='Sets',
+ ),
+ ),
+ (
+ 'weight_unit',
+ models.ForeignKey(
+ default=1,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='core.weightunit',
+ verbose_name='Unit',
+ ),
+ ),
+ ],
+ options={
+ 'ordering': ['order', 'id'],
+ },
+ ),
migrations.CreateModel(
name='Routine',
fields=[
diff --git a/wger/manager/models/day.py b/wger/manager/models/day.py
index 1e4364479..9dacc0275 100644
--- a/wger/manager/models/day.py
+++ b/wger/manager/models/day.py
@@ -77,7 +77,7 @@ class DayNg(models.Model):
"""
return self.routine
- def can_proceed(self, date: datetime.date):
+ def can_proceed(self, date: datetime.date) -> bool:
if not self.need_logs_to_advance:
return True
elif self.workoutsession_set.filter(date=date).exists():
@@ -85,6 +85,12 @@ class DayNg(models.Model):
return False
+ def get_sets(self, iteration: int):
+ """
+ Return the sets for this day
+ """
+ ...
+
class Day(models.Model):
"""
diff --git a/wger/manager/models/routine.py b/wger/manager/models/routine.py
index b6758aed9..5bd2dc7cb 100644
--- a/wger/manager/models/routine.py
+++ b/wger/manager/models/routine.py
@@ -92,7 +92,7 @@ class Routine(models.Model):
if self.name:
return self.name
else:
- return f'Routine {self.id} - created on {self.creation_date}'
+ return f'Routine {self.id} - {self.created}'
def get_owner_object(self):
"""
@@ -136,11 +136,13 @@ class Routine(models.Model):
current_day = self.first_day
counter = Counter()
- out = {}
+ out = []
while current_date <= self.end:
counter[current_day] += 1
- out[current_date] = WorkoutDayData(day=current_day, iteration=counter[current_day])
+ out.append(
+ WorkoutDayData(day=current_day, iteration=counter[current_day], date=current_date)
+ )
if current_day.can_proceed(current_date):
current_day = current_day.next_day
diff --git a/wger/manager/models/set.py b/wger/manager/models/set.py
index 001d81d70..13cfa3aa2 100644
--- a/wger/manager/models/set.py
+++ b/wger/manager/models/set.py
@@ -31,7 +31,10 @@ from wger.utils.cache import reset_workout_canonical_form
from wger.utils.helpers import normalize_decimal
# Local
-from .day import Day
+from .day import (
+ Day,
+ DayNg,
+)
class SetNg(models.Model):
@@ -43,7 +46,7 @@ class SetNg(models.Model):
MAX_SETS = 10
day = models.ForeignKey(
- Day,
+ DayNg,
verbose_name=_('Exercise day'),
on_delete=models.CASCADE,
)
@@ -74,29 +77,13 @@ class SetNg(models.Model):
"""
Return a more human-readable representation
"""
- return f'Set-ID {self.id}'
+ return f'Set {self.id}'
def get_owner_object(self):
"""
Returns the object that has owner information
"""
- return self.day.training
-
- def save(self, *args, **kwargs):
- """
- Reset all cached infos
- """
-
- reset_workout_canonical_form(self.exerciseday.training_id)
- super(Set, self).save(*args, **kwargs)
-
- def delete(self, *args, **kwargs):
- """
- Reset all cached infos
- """
-
- reset_workout_canonical_form(self.exerciseday.training_id)
- super(Set, self).delete(*args, **kwargs)
+ return self.day.routine
class Set(models.Model):
diff --git a/wger/manager/models/set_config.py b/wger/manager/models/set_config.py
index f6c2ac2e6..58c0bdbe4 100644
--- a/wger/manager/models/set_config.py
+++ b/wger/manager/models/set_config.py
@@ -41,7 +41,7 @@ class SetConfig(models.Model):
"""
set = models.ForeignKey(
- 'Set',
+ 'SetNg',
verbose_name=_('Sets'),
on_delete=models.CASCADE,
)
@@ -80,7 +80,7 @@ class SetConfig(models.Model):
)
class_name = models.CharField(
- max_length=100,
+ max_length=50,
null=True,
blank=True,
)
@@ -101,7 +101,7 @@ class SetConfig(models.Model):
"""
Returns the object that has owner information
"""
- return self.set.exerciseday.training
+ return self.set.day.routine
@staticmethod
def calculate_config_value(configs: list[AbstractChangeConfig]):
@@ -140,6 +140,7 @@ class SetConfig(models.Model):
return custom_logic.calculate()
+ # Calculate the weights normally
max_iter_weight = 1
max_iter_reps = 1
diff --git a/wger/manager/tests/test_routine.py b/wger/manager/tests/test_routine.py
index 390effbd2..fad556cf6 100644
--- a/wger/manager/tests/test_routine.py
+++ b/wger/manager/tests/test_routine.py
@@ -85,18 +85,18 @@ class RoutineTestCase(WgerTestCase):
self.assertEqual(
self.routine.date_sequence,
- {
- datetime.date(2024, 1, 1): WorkoutDayData(day=self.day1, iteration=1),
- datetime.date(2024, 1, 2): WorkoutDayData(day=self.day2, iteration=1),
- datetime.date(2024, 1, 3): WorkoutDayData(day=self.day3, iteration=1),
- datetime.date(2024, 1, 4): WorkoutDayData(day=self.day1, iteration=2),
- datetime.date(2024, 1, 5): WorkoutDayData(day=self.day2, iteration=2),
- datetime.date(2024, 1, 6): WorkoutDayData(day=self.day3, iteration=2),
- datetime.date(2024, 1, 7): WorkoutDayData(day=self.day1, iteration=3),
- datetime.date(2024, 1, 8): WorkoutDayData(day=self.day2, iteration=3),
- datetime.date(2024, 1, 9): WorkoutDayData(day=self.day3, iteration=3),
- datetime.date(2024, 1, 10): WorkoutDayData(day=self.day1, iteration=4),
- },
+ [
+ WorkoutDayData(day=self.day1, iteration=1, date=datetime.date(2024, 1, 1)),
+ WorkoutDayData(day=self.day2, iteration=1, date=datetime.date(2024, 1, 2)),
+ WorkoutDayData(day=self.day3, iteration=1, date=datetime.date(2024, 1, 3)),
+ WorkoutDayData(day=self.day1, iteration=2, date=datetime.date(2024, 1, 4)),
+ WorkoutDayData(day=self.day2, iteration=2, date=datetime.date(2024, 1, 5)),
+ WorkoutDayData(day=self.day3, iteration=2, date=datetime.date(2024, 1, 6)),
+ WorkoutDayData(day=self.day1, iteration=3, date=datetime.date(2024, 1, 7)),
+ WorkoutDayData(day=self.day2, iteration=3, date=datetime.date(2024, 1, 8)),
+ WorkoutDayData(day=self.day3, iteration=3, date=datetime.date(2024, 1, 9)),
+ WorkoutDayData(day=self.day1, iteration=4, date=datetime.date(2024, 1, 10)),
+ ],
)
def test_date_sequences_logs(self):
@@ -127,18 +127,18 @@ class RoutineTestCase(WgerTestCase):
# Assert
self.assertEqual(
self.routine.date_sequence,
- {
- datetime.date(2024, 1, 1): WorkoutDayData(day=self.day1, iteration=1),
- datetime.date(2024, 1, 2): WorkoutDayData(day=self.day1, iteration=2),
- datetime.date(2024, 1, 3): WorkoutDayData(day=self.day1, iteration=3),
- datetime.date(2024, 1, 4): WorkoutDayData(day=self.day1, iteration=4),
- datetime.date(2024, 1, 5): WorkoutDayData(day=self.day2, iteration=1),
- datetime.date(2024, 1, 6): WorkoutDayData(day=self.day3, iteration=1),
- datetime.date(2024, 1, 7): WorkoutDayData(day=self.day1, iteration=5),
- datetime.date(2024, 1, 8): WorkoutDayData(day=self.day2, iteration=2),
- datetime.date(2024, 1, 9): WorkoutDayData(day=self.day3, iteration=2),
- datetime.date(2024, 1, 10): WorkoutDayData(day=self.day1, iteration=6),
- },
+ [
+ WorkoutDayData(day=self.day1, iteration=1, date=datetime.date(2024, 1, 1)),
+ WorkoutDayData(day=self.day1, iteration=2, date=datetime.date(2024, 1, 2)),
+ WorkoutDayData(day=self.day1, iteration=3, date=datetime.date(2024, 1, 3)),
+ WorkoutDayData(day=self.day1, iteration=4, date=datetime.date(2024, 1, 4)),
+ WorkoutDayData(day=self.day2, iteration=1, date=datetime.date(2024, 1, 5)),
+ WorkoutDayData(day=self.day3, iteration=1, date=datetime.date(2024, 1, 6)),
+ WorkoutDayData(day=self.day1, iteration=5, date=datetime.date(2024, 1, 7)),
+ WorkoutDayData(day=self.day2, iteration=2, date=datetime.date(2024, 1, 8)),
+ WorkoutDayData(day=self.day3, iteration=2, date=datetime.date(2024, 1, 9)),
+ WorkoutDayData(day=self.day1, iteration=6, date=datetime.date(2024, 1, 10)),
+ ],
)
@@ -150,6 +150,7 @@ class RoutineApiTestCase(ApiBaseResourceTestCase):
pk = 1
resource = Routine
private_resource = True
+ special_endpoints = ('day-sequence',)
data = {
'name': 'A new comment',
'start': '2024-03-11',