Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Change primary key type for WorkoutLog and Session models to UUID

Roland Geider1165c56d2c8e
diff --git a/wger/manager/api/serializers.py b/wger/manager/api/serializers.py
index 6cc4d9e59..4873edeea 100644
--- a/wger/manager/api/serializers.py
+++ b/wger/manager/api/serializers.py
@@ -410,7 +410,6 @@ class WorkoutSessionSerializer(serializers.ModelSerializer):
model = WorkoutSession
fields = (
'id',
- 'uuid',
'routine',
'day',
'date',
@@ -430,7 +429,6 @@ class WorkoutLogSerializer(serializers.ModelSerializer):
model = WorkoutLog
fields = (
'id',
- 'uuid',
'date',
'session',
'routine',
diff --git a/wger/manager/migrations/0025_change_pk_to_uuid.py b/wger/manager/migrations/0025_change_pk_to_uuid.py
new file mode 100644
index 000000000..96b3a82cf
--- /dev/null
+++ b/wger/manager/migrations/0025_change_pk_to_uuid.py
@@ -0,0 +1,142 @@
+# Generated by Django 5.2.12 on 2026-03-15 14:39
+
+from django.db import migrations, models
+from django.db.migrations.state import StateApps
+
+from wger.utils.uuid import uuid7
+from django.db.models import Subquery, OuterRef
+
+
+def populate_tmp_fields(apps: StateApps, schema_editor):
+ WorkoutLog = apps.get_model('manager', 'WorkoutLog')
+ WorkoutSession = apps.get_model('manager', 'WorkoutSession')
+
+ # session_tmp
+ WorkoutLog.objects.update(
+ session_tmp=Subquery(
+ WorkoutSession.objects.filter(id=OuterRef('session')).values('uuid')[:1]
+ )
+ )
+
+ # next_log_tmp
+ WorkoutLog.objects.update(
+ next_log_tmp=Subquery(
+ WorkoutLog.objects.filter(id=OuterRef('next_log')).values('uuid')[:1],
+ )
+ )
+
+
+def reverse_populate_tmp_fields(apps: StateApps, schema_editor):
+ WorkoutLog = apps.get_model('manager', 'WorkoutLog')
+ WorkoutLog.objects.update(session_tmp=None, next_log_tmp=None)
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('manager', '0024_log_and_session_uuid'),
+ ]
+
+ operations = [
+ # --- Add tmp fields ---
+ migrations.AddField(
+ model_name='workoutlog',
+ name='session_tmp',
+ field=models.UUIDField(null=True, editable=False),
+ ),
+ migrations.AddField(
+ model_name='workoutlog',
+ name='next_log_tmp',
+ field=models.UUIDField(null=True, editable=False),
+ ),
+ # Populate tmp fields
+ migrations.RunPython(populate_tmp_fields, reverse_populate_tmp_fields),
+ # --- Remove FKs ---
+ migrations.RemoveField(
+ model_name='workoutlog',
+ name='session',
+ ),
+ migrations.RemoveField(
+ model_name='workoutlog',
+ name='next_log',
+ ),
+ # --- Change PKs ---
+ # WorkoutSession
+ migrations.RemoveField(
+ model_name='workoutsession',
+ name='id',
+ ),
+ migrations.RenameField(
+ model_name='workoutsession',
+ old_name='uuid',
+ new_name='id',
+ ),
+ migrations.AlterField(
+ model_name='workoutsession',
+ name='id',
+ field=models.UUIDField(
+ default=uuid7, editable=False, primary_key=True, serialize=False
+ ),
+ ),
+ # WorkoutLog
+ migrations.RemoveField(
+ model_name='workoutlog',
+ name='id',
+ ),
+ migrations.RenameField(
+ model_name='workoutlog',
+ old_name='uuid',
+ new_name='id',
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='id',
+ field=models.UUIDField(
+ default=uuid7, editable=False, primary_key=True, serialize=False
+ ),
+ ),
+ # --- Restore FKs ---
+ # WorkoutLog.session
+ migrations.RenameField(
+ model_name='workoutlog',
+ old_name='session_tmp',
+ new_name='session',
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='session',
+ field=models.UUIDField(db_column='session_id', null=True, editable=False),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='session',
+ field=models.ForeignKey(
+ to='manager.WorkoutSession',
+ verbose_name='Session',
+ on_delete=models.CASCADE,
+ null=True,
+ related_name='logs',
+ ),
+ ),
+ # WorkoutLog.next_log
+ migrations.RenameField(
+ model_name='workoutlog',
+ old_name='next_log_tmp',
+ new_name='next_log',
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='next_log',
+ field=models.UUIDField(db_column='next_log_id', null=True, editable=False),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='next_log',
+ field=models.ForeignKey(
+ to='manager.WorkoutLog',
+ editable=True,
+ on_delete=models.CASCADE,
+ null=True,
+ default=None,
+ ),
+ ),
+ ]
diff --git a/wger/manager/migrations/0026_cleanup_fields.py b/wger/manager/migrations/0026_cleanup_fields.py
new file mode 100644
index 000000000..03c8d3b2b
--- /dev/null
+++ b/wger/manager/migrations/0026_cleanup_fields.py
@@ -0,0 +1,82 @@
+# Generated by Django 5.2.12 on 2026-03-15 14:45
+
+import django.db.models.deletion
+import wger.manager.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('core', '0022_create_publication'),
+ ('manager', '0025_change_pk_to_uuid'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='slotentry',
+ name='type',
+ field=models.CharField(
+ choices=[
+ ('normal', 'Normal'),
+ ('warmup', 'Warmup'),
+ ('dropset', 'Dropset'),
+ ('myo', 'Myo'),
+ ('partial', 'Partial'),
+ ('forced', 'Forced'),
+ ('tut', 'Tut'),
+ ('iso', 'Iso Hold'),
+ ('jump', 'Jump'),
+ ],
+ default='normal',
+ max_length=10,
+ ),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='repetitions_target',
+ field=models.DecimalField(
+ blank=True,
+ decimal_places=2,
+ max_digits=6,
+ null=True,
+ validators=[wger.manager.validators.NullMinValueValidator(0)],
+ verbose_name='Repetitions target',
+ ),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='repetitions_unit',
+ field=models.ForeignKey(
+ blank=True,
+ default=1,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='core.repetitionunit',
+ verbose_name='Repetitions unit',
+ ),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='weight_target',
+ field=models.DecimalField(
+ blank=True,
+ decimal_places=2,
+ max_digits=6,
+ null=True,
+ validators=[wger.manager.validators.NullMinValueValidator(0)],
+ verbose_name='Weight target',
+ ),
+ ),
+ migrations.AlterField(
+ model_name='workoutlog',
+ name='weight_unit',
+ field=models.ForeignKey(
+ blank=True,
+ default=1,
+ null=True,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='core.weightunit',
+ verbose_name='Weight unit',
+ ),
+ ),
+ ]
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index 580d21921..f2646420e 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -40,6 +40,7 @@ from wger.manager.validators import (
validate_rir,
)
from wger.utils.cache import reset_workout_log_cache
+from wger.utils.uuid import uuid7
class WorkoutLog(models.Model):
@@ -49,10 +50,11 @@ class WorkoutLog(models.Model):
objects = WorkoutLogManager()
- uuid = models.UUIDField(
- default=uuid4,
- editable=True,
+ id = models.UUIDField(
+ default=uuid7,
+ editable=False,
null=False,
+ primary_key=True,
)
date = models.DateTimeField(
diff --git a/wger/manager/models/session.py b/wger/manager/models/session.py
index 131d28d6c..85dbb6688 100644
--- a/wger/manager/models/session.py
+++ b/wger/manager/models/session.py
@@ -26,6 +26,7 @@ from django.utils.translation import gettext_lazy as _
# wger
from wger.utils.cache import reset_workout_log_cache
+from wger.utils.uuid import uuid7
class WorkoutSession(models.Model):
@@ -54,10 +55,11 @@ class WorkoutSession(models.Model):
See note in weight.models.WeightEntry about why this is not editable=False
"""
- uuid = models.UUIDField(
- default=uuid4,
- editable=True,
+ id = models.UUIDField(
+ default=uuid7,
+ editable=False,
null=False,
+ primary_key=True,
)
routine = models.ForeignKey(
diff --git a/wger/manager/powersync.py b/wger/manager/powersync.py
index 7eefc2ff7..94078ad6f 100644
--- a/wger/manager/powersync.py
+++ b/wger/manager/powersync.py
@@ -35,7 +35,7 @@ logger = logging.getLogger(__name__)
def handle_update_log(payload: dict[str, any], user_id: int) -> None:
"""Handle a push event from PowerSync"""
logger.debug(f'Received PowerSync payload for update: {payload}')
- entry = WorkoutLog.objects.get(uuid=payload['id'], user_id=user_id)
+ entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)
if not entry:
logger.warning(
@@ -46,7 +46,7 @@ def handle_update_log(payload: dict[str, any], user_id: int) -> None:
serializer = WorkoutLogSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated WorkoutLog {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ logger.info(f'Updated WorkoutLog {entry.pk} for user {user_id}')
else:
logger.warning(f'PowerSync update validation failed: {serializer.errors}')
@@ -66,9 +66,9 @@ def handle_create_log(payload: dict[str, any], user_id: int) -> None:
def handle_delete_log(payload: dict[str, any], user_id: int) -> None:
"""Handle a delete event from PowerSync"""
logger.debug(f'Received PowerSync payload for delete: {payload}')
- entry = WorkoutLog.objects.get(uuid=payload['id'], user_id=user_id)
+ entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)
if not entry:
- logger.warning(f'WorkoutLog with UUID {payload["uuid"]} not found for delete.')
+ logger.warning(f'WorkoutLog with UUID {payload["id"]} not found for delete.')
return
entry.delete()
@@ -78,7 +78,7 @@ def handle_update_session(payload: dict[str, any], user_id: int) -> None:
logger.debug(
f'Received PowerSync payload for update: {payload}',
)
- entry = WorkoutSession.objects.get(uuid=payload['id'], user_id=user_id)
+ entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)
if not entry:
logger.warning(
@@ -89,7 +89,7 @@ def handle_update_session(payload: dict[str, any], user_id: int) -> None:
serializer = WorkoutSessionSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated WorkoutSession {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ logger.info(f'Updated WorkoutSession {entry.pk} for user {user_id}')
else:
logger.warning(f'PowerSync update validation failed: {serializer.errors}')
@@ -108,11 +108,9 @@ def handle_create_session(payload: dict[str, any], user_id: int) -> None:
def handle_delete_session(payload: dict[str, any], user_id: int) -> None:
"""Handle a delete event from PowerSync"""
- logger.debug(
- f'Received PowerSync payload for delete: {payload}',
- )
- entry = WorkoutSession.objects.get(uuid=payload['id'], user_id=user_id)
+ logger.debug(f'Received PowerSync payload for delete: {payload}')
+ entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)
if not entry:
- logger.warning(f'WorkoutSession with UUID {payload["uuid"]} not found for delete.')
+ logger.warning(f'WorkoutSession with UUID {payload["id"]} not found for delete.')
return
entry.delete()