Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Add UUIDs to measurement models

Roland Geider7eaa3ebdc115
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 137528bf3..82a25caaf 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -64,6 +64,7 @@ from rest_framework_simplejwt.tokens import AccessToken
# wger
import wger.manager.powersync as ps_manager
+import wger.measurements.powersync as ps_measurements
import wger.weight.powersync as ps_weight
from wger.core.api.serializers import (
LanguageCheckSerializer,
@@ -514,6 +515,23 @@ def upload_powersync_data(request):
elif http_verb == 'DELETE':
ps_weight.handle_delete(payload=data['data'], user_id=user_id)
+ # Measurements
+ case 'measuerement_category':
+ if http_verb == 'PUT':
+ ps_measurements.handle_create_category(payload=data['data'], user_id=user_id)
+ elif http_verb == 'PATCH':
+ ps_measurements.handle_update_category(payload=data['data'], user_id=user_id)
+ elif http_verb == 'DELETE':
+ ps_measurements.handle_delete_category(payload=data['data'], user_id=user_id)
+
+ case 'measurement_measurement':
+ if http_verb == 'PUT':
+ ps_measurements.handle_create_measurement(payload=data['data'], user_id=user_id)
+ elif http_verb == 'PATCH':
+ ps_measurements.handle_update_measurement(payload=data['data'], user_id=user_id)
+ elif http_verb == 'DELETE':
+ ps_measurements.handle_delete_measurement(payload=data['data'], user_id=user_id)
+
# Routines
case 'manager_workoutlog':
if http_verb == 'PUT':
diff --git a/wger/core/migrations/0022_create_publication.py b/wger/core/migrations/0022_create_publication.py
index 66c3e7cf8..8c8edc5b1 100644
--- a/wger/core/migrations/0022_create_publication.py
+++ b/wger/core/migrations/0022_create_publication.py
@@ -28,6 +28,7 @@ def add_publication(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
def remove_publication(apps: StateApps, schema_editor: BaseDatabaseSchemaEditor):
schema_editor.execute('DROP PUBLICATION IF EXISTS powersync;')
+
class Migration(migrations.Migration):
dependencies = [
('core', '0021_add_unit_type_to_repetitionunit'),
diff --git a/wger/manager/powersync.py b/wger/manager/powersync.py
index 4e7b604b2..7eefc2ff7 100644
--- a/wger/manager/powersync.py
+++ b/wger/manager/powersync.py
@@ -34,9 +34,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}',
- )
+ logger.debug(f'Received PowerSync payload for update: {payload}')
entry = WorkoutLog.objects.get(uuid=payload['id'], user_id=user_id)
if not entry:
@@ -67,9 +65,7 @@ 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}',
- )
+ logger.debug(f'Received PowerSync payload for delete: {payload}')
entry = WorkoutLog.objects.get(uuid=payload['id'], user_id=user_id)
if not entry:
logger.warning(f'WorkoutLog with UUID {payload["uuid"]} not found for delete.')
diff --git a/wger/measurements/api/serializers.py b/wger/measurements/api/serializers.py
index c965148d9..0f2a0b9cb 100644
--- a/wger/measurements/api/serializers.py
+++ b/wger/measurements/api/serializers.py
@@ -26,9 +26,9 @@ from wger.measurements.models import (
)
-class UnitSerializer(serializers.ModelSerializer):
+class CategorySerializer(serializers.ModelSerializer):
"""
- Measurement unit serializer
+ Measurement category serializer
"""
class Meta:
diff --git a/wger/measurements/api/views.py b/wger/measurements/api/views.py
index 2dd3fe340..f6e5f6b28 100644
--- a/wger/measurements/api/views.py
+++ b/wger/measurements/api/views.py
@@ -28,8 +28,8 @@ from rest_framework.permissions import IsAuthenticated
# wger
from wger.measurements.api.filtersets import MeasurementEntryFilterSet
from wger.measurements.api.serializers import (
+ CategorySerializer,
MeasurementSerializer,
- UnitSerializer,
)
from wger.measurements.models import (
Category,
@@ -47,7 +47,7 @@ class CategoryViewSet(WgerOwnerObjectModelViewSet):
"""
permission_classes = [IsAuthenticated]
- serializer_class = UnitSerializer
+ serializer_class = CategorySerializer
is_private = True
ordering_fields = '__all__'
filterset_fields = ('id', 'name', 'unit')
diff --git a/wger/measurements/migrations/0003_add_uuids.py b/wger/measurements/migrations/0003_add_uuids.py
new file mode 100644
index 000000000..322082695
--- /dev/null
+++ b/wger/measurements/migrations/0003_add_uuids.py
@@ -0,0 +1,72 @@
+# Generated by Django 5.2.12 on 2026-03-13 14:05
+
+import uuid
+from django.db import migrations, models
+from django.db.migrations.state import StateApps
+
+
+def gen_uuids(apps: StateApps, schema_editor):
+ Category = apps.get_model('measurements', 'Category')
+ Measurement = apps.get_model('measurements', 'Measurement')
+
+ for item in Category.objects.all():
+ item.uuid = uuid.uuid4()
+ item.save(update_fields=['uuid'])
+
+ for item in Measurement.objects.all():
+ item.uuid = uuid.uuid4()
+ item.save(update_fields=['uuid'])
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('measurements', '0002_auto_20210722_1042'),
+ ]
+
+ operations = [
+ # Don't force uniqueness
+ migrations.AddField(
+ model_name='category',
+ name='uuid',
+ field=models.UUIDField(
+ default=uuid.uuid4,
+ editable=False,
+ unique=False,
+ ),
+ ),
+ migrations.AddField(
+ model_name='measurement',
+ name='uuid',
+ field=models.UUIDField(
+ default=uuid.uuid4,
+ editable=False,
+ unique=False,
+ ),
+ ),
+ # Generate the UUIDs
+ migrations.RunPython(
+ gen_uuids,
+ reverse_code=migrations.RunPython.noop,
+ ),
+ # Close everything back up
+ migrations.AlterField(
+ model_name='category',
+ name='uuid',
+ field=models.UUIDField(
+ default=uuid.uuid4,
+ editable=False,
+ null=False,
+ unique=True,
+ ),
+ ),
+ migrations.AlterField(
+ model_name='measurement',
+ name='uuid',
+ field=models.UUIDField(
+ default=uuid.uuid4,
+ editable=False,
+ null=False,
+ unique=True,
+ ),
+ ),
+ ]
diff --git a/wger/measurements/models/category.py b/wger/measurements/models/category.py
index c20bab84f..1afea33ba 100644
--- a/wger/measurements/models/category.py
+++ b/wger/measurements/models/category.py
@@ -12,7 +12,9 @@
#
# You should have received a copy of the GNU Affero General Public License
# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
# Standard Library
+import uuid
# Django
from django.contrib.auth.models import User
@@ -31,6 +33,13 @@ class Category(models.Model):
on_delete=models.CASCADE,
)
+ uuid = models.UUIDField(
+ default=uuid.uuid4,
+ editable=False,
+ null=False,
+ unique=True,
+ )
+
name = models.CharField(
verbose_name='Name',
max_length=100,
diff --git a/wger/measurements/models/measurement.py b/wger/measurements/models/measurement.py
index 02f98ab39..29d00633e 100644
--- a/wger/measurements/models/measurement.py
+++ b/wger/measurements/models/measurement.py
@@ -16,6 +16,7 @@
# Standard Library
import datetime
+import uuid
# Django
from django.core.validators import (
@@ -41,6 +42,13 @@ class Measurement(models.Model):
on_delete=models.CASCADE,
)
+ uuid = models.UUIDField(
+ default=uuid.uuid4,
+ editable=False,
+ null=False,
+ unique=True,
+ )
+
date = models.DateField(
verbose_name='Date',
default=datetime.datetime.now,
diff --git a/wger/measurements/powersync.py b/wger/measurements/powersync.py
new file mode 100644
index 000000000..75b8ca8c1
--- /dev/null
+++ b/wger/measurements/powersync.py
@@ -0,0 +1,108 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.
+
+# Standard Library
+import logging
+
+# wger
+from wger.measurements.api.serializers import MeasurementSerializer
+from wger.measurements.api.views import CategorySerializer
+from wger.measurements.models import (
+ Category,
+ Measurement,
+)
+
+
+logger = logging.getLogger(__name__)
+
+
+def handle_update_category(payload: dict[str, any], user_id: int) -> None:
+ """Handle a push event from PowerSync"""
+ logger.debug(f'Received PowerSync payload for update: {payload}')
+ entry = Category.objects.get(uuid=payload['id'], user_id=user_id)
+
+ if not entry:
+ logger.warning(
+ f'Category with UUID {payload["id"]} and user {user_id} not found for update.'
+ )
+ return
+
+ serializer = CategorySerializer(entry, data=payload, partial=True)
+ if serializer.is_valid():
+ serializer.save()
+ logger.info(f'Updated Category {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ else:
+ logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+
+
+def handle_create_category(payload: dict[str, any], user_id: int) -> None:
+ """Handle a create event from PowerSync"""
+ logger.debug(
+ f'Received PowerSync payload for create: {payload}',
+ )
+ serializer = CategorySerializer(data=payload)
+ if serializer.is_valid():
+ serializer.save(user_id=user_id)
+ else:
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+
+
+def handle_delete_category(payload: dict[str, any], user_id: int) -> None:
+ """Handle a delete event from PowerSync"""
+ logger.debug(f'Received PowerSync payload for delete: {payload}')
+ entry = Category.objects.get(uuid=payload['id'], user_id=user_id)
+ if not entry:
+ logger.warning(f'Category with UUID {payload["id"]} not found for delete.')
+ return
+ entry.delete()
+
+
+def handle_update_measurement(payload: dict[str, any], user_id: int) -> None:
+ """Handle a push event from PowerSync"""
+ logger.debug(f'Received PowerSync payload for update: {payload}')
+ entry = Measurement.objects.get(uuid=payload['id'], user_id=user_id)
+
+ if not entry:
+ logger.warning(
+ f'Measurement with UUID {payload["id"]} and user {user_id} not found for update.'
+ )
+ return
+
+ serializer = MeasurementSerializer(entry, data=payload, partial=True)
+ if serializer.is_valid():
+ serializer.save()
+ logger.info(f'Updated Measurement {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ else:
+ logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+
+
+def handle_create_measurement(payload: dict[str, any], user_id: int) -> None:
+ """Handle a create event from PowerSync"""
+ logger.debug(f'Received PowerSync payload for create: {payload}')
+ serializer = MeasurementSerializer(data=payload)
+ if serializer.is_valid():
+ serializer.save(user_id=user_id)
+ else:
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+
+
+def handle_delete_measurement(payload: dict[str, any], user_id: int) -> None:
+ """Handle a delete event from PowerSync"""
+ logger.debug(f'Received PowerSync payload for delete: {payload}')
+ entry = Measurement.objects.get(uuid=payload['id'], user_id=user_id)
+ if not entry:
+ logger.warning(f'Measurement with UUID {payload["id"]} not found for delete.')
+ return
+ entry.delete()