Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Make the nutrition tables IDs to UUIDs

Roland Geiderea5590125864
diff --git a/wger/core/tests/powersync_base_test.py b/wger/core/tests/powersync_base_test.py
index c6f613359..205b9b7ef 100644
--- a/wger/core/tests/powersync_base_test.py
+++ b/wger/core/tests/powersync_base_test.py
@@ -115,6 +115,28 @@ class PowerSyncCreateTestCase:
new_obj = self._diff_new_object(pks_before)
self.assertEqual(self.get_owner_username(new_obj), self.user_access)
+ def test_create_preserves_client_supplied_id(self):
+ """
+ For tables where the client generates the row's primary key (UUID PK
+ models), the server must store exactly that id rather than generate a
+ new one — otherwise PowerSync's local copy and the server diverge.
+ """
+ if self.resource is None or self.create_payload is None:
+ return
+ if 'id' not in self.create_payload:
+ return
+ self.authenticate()
+ pks_before = set(self.resource.objects.values_list('pk', flat=True))
+ response = self.push('PUT', self.create_payload)
+ self.assertEqual(response.status_code, status.HTTP_200_OK, response.content)
+
+ new_obj = self._diff_new_object(pks_before)
+ self.assertEqual(
+ str(new_obj.pk),
+ str(self.create_payload['id']),
+ 'Server replaced the client-supplied id with a fresh one',
+ )
+
def test_create_ignores_user_in_payload(self):
"""A user/user_id smuggled in the payload must not change the owner."""
if self.resource is None or self.create_payload is None:
diff --git a/wger/manager/migrations/0026_change_pk_to_uuid_swap.py b/wger/manager/migrations/0026_change_pk_to_uuid_swap.py
index 3d49a930c..e45c00730 100644
--- a/wger/manager/migrations/0026_change_pk_to_uuid_swap.py
+++ b/wger/manager/migrations/0026_change_pk_to_uuid_swap.py
@@ -43,7 +43,7 @@ class Migration(migrations.Migration):
model_name='workoutsession',
name='id',
field=models.UUIDField(
- default=uuid7, editable=False, primary_key=True, serialize=False
+ default=uuid7, primary_key=True, serialize=False
),
),
# WorkoutLog
@@ -60,7 +60,7 @@ class Migration(migrations.Migration):
model_name='workoutlog',
name='id',
field=models.UUIDField(
- default=uuid7, editable=False, primary_key=True, serialize=False
+ default=uuid7, primary_key=True, serialize=False
),
),
# --- Restore FKs ---
diff --git a/wger/manager/models/log.py b/wger/manager/models/log.py
index 64acbc4bc..4d71be4c7 100644
--- a/wger/manager/models/log.py
+++ b/wger/manager/models/log.py
@@ -53,7 +53,6 @@ class WorkoutLog(models.Model):
id = models.UUIDField(
default=uuid7,
- editable=False,
null=False,
primary_key=True,
)
diff --git a/wger/manager/models/session.py b/wger/manager/models/session.py
index 85dbb6688..ce7b44317 100644
--- a/wger/manager/models/session.py
+++ b/wger/manager/models/session.py
@@ -57,7 +57,6 @@ class WorkoutSession(models.Model):
id = models.UUIDField(
default=uuid7,
- editable=False,
null=False,
primary_key=True,
)
diff --git a/wger/manager/tests/test_generator.py b/wger/manager/tests/test_generator.py
index 42b8da813..8d74a6537 100644
--- a/wger/manager/tests/test_generator.py
+++ b/wger/manager/tests/test_generator.py
@@ -24,19 +24,22 @@ from wger.manager.models import (
class RoutineGeneratorTestCase(WgerTestCase):
- def test_generator_routines(self):
- # Arrange
+ def setUp(self):
+ super().setUp()
+
Routine.objects.all().delete()
+ def test_generator_routines(self):
+
# Act
- call_command('dummy-generator-routines', '--routines', 10)
+ call_command('dummy-generator-routines', '--routines', 3, '--user-id', 1)
# Assert
- self.assertEqual(Routine.objects.filter(user_id=1).count(), 10)
+ self.assertEqual(Routine.objects.filter(user_id=1).count(), 3)
+ self.assertEqual(Routine.objects.filter(user_id=2).count(), 0)
+ self.assertEqual(Routine.objects.filter(user_id=3).count(), 0)
def test_generator_diary_entries(self):
- # Arrange
- Routine.objects.all().delete()
# Act
call_command('dummy-generator-routines', '--routines', 1, '--user-id', 1)
diff --git a/wger/measurements/migrations/0004_add_uuids.py b/wger/measurements/migrations/0004_add_uuids.py
index 26be188bd..6075362ab 100644
--- a/wger/measurements/migrations/0004_add_uuids.py
+++ b/wger/measurements/migrations/0004_add_uuids.py
@@ -1,8 +1,23 @@
# Generated by Django 5.2.12 on 2026-03-13 14:05
+"""
+Convert Category and Measurement to use UUID primary keys.
-import uuid
+Pattern matches the four-step transition we use for nutrition:
+
+1. Add `uuid` columns to both tables and backfill them.
+2. Repoint Measurement.category through a temporary `category_tmp` UUID column
+ copied from the parent's uuid.
+3. Promote each table's `uuid` to the primary key (drop the integer `id`,
+ rename `uuid` -> `id`).
+4. Restore Measurement.category as a ForeignKey to the new UUID PK.
+"""
+
+import django.db.models.deletion
from django.db import migrations, models
from django.db.migrations.state import StateApps
+from django.db.models import OuterRef, Subquery
+
+from wger.utils.uuid import uuid7
def gen_uuids(apps: StateApps, schema_editor):
@@ -10,63 +25,107 @@ def gen_uuids(apps: StateApps, schema_editor):
Measurement = apps.get_model('measurements', 'Measurement')
for item in Category.objects.all():
- item.uuid = uuid.uuid4()
+ item.uuid = uuid7()
item.save(update_fields=['uuid'])
for item in Measurement.objects.all():
- item.uuid = uuid.uuid4()
+ item.uuid = uuid7()
item.save(update_fields=['uuid'])
+def populate_measurement_category_tmp(apps: StateApps, schema_editor):
+ Measurement = apps.get_model('measurements', 'Measurement')
+ Category = apps.get_model('measurements', 'Category')
+ Measurement.objects.update(
+ category_tmp=Subquery(
+ Category.objects.filter(id=OuterRef('category')).values('uuid')[:1],
+ )
+ )
+
+
class Migration(migrations.Migration):
dependencies = [
('measurements', '0003_alter_measurement_unique_together_and_more'),
]
operations = [
- # Don't force uniqueness
+ # ------------------------------------------------------------------
+ # 1. Add uuid columns and backfill
+ # ------------------------------------------------------------------
migrations.AddField(
model_name='category',
name='uuid',
- field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- unique=False,
- ),
+ field=models.UUIDField(default=uuid7, null=True, unique=False),
),
migrations.AddField(
model_name='measurement',
name='uuid',
- field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- unique=False,
- ),
+ field=models.UUIDField(default=uuid7, null=True, unique=False),
),
- # Generate the UUIDs
- migrations.RunPython(
- gen_uuids,
- reverse_code=migrations.RunPython.noop,
+ migrations.RunPython(gen_uuids, reverse_code=migrations.RunPython.noop),
+ migrations.AlterField(
+ model_name='category',
+ name='uuid',
+ field=models.UUIDField(default=uuid7, null=False, unique=True),
),
- # Close everything back up
+ migrations.AlterField(
+ model_name='measurement',
+ name='uuid',
+ field=models.UUIDField(default=uuid7, null=False, unique=True),
+ ),
+ # ------------------------------------------------------------------
+ # 2. Repoint Measurement.category through tmp uuid column
+ # ------------------------------------------------------------------
+ migrations.AddField(
+ model_name='measurement',
+ name='category_tmp',
+ field=models.UUIDField(editable=False, null=True),
+ ),
+ migrations.RunPython(populate_measurement_category_tmp, reverse_code=migrations.RunPython.noop),
+ migrations.RemoveField(model_name='measurement', name='category'),
+ # ------------------------------------------------------------------
+ # 3. Promote uuid -> primary key
+ # ------------------------------------------------------------------
+ migrations.RemoveField(model_name='category', name='id'),
migrations.AlterField(
model_name='category',
name='uuid',
field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- null=False,
- unique=True,
+ default=uuid7,
+ primary_key=True,
+ serialize=False,
),
),
+ migrations.RemoveField(model_name='measurement', name='id'),
migrations.AlterField(
model_name='measurement',
name='uuid',
field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- null=False,
- unique=True,
+ default=uuid7,
+ primary_key=True,
+ serialize=False,
+ ),
+ ),
+ # ------------------------------------------------------------------
+ # 4. Restore Measurement.category FK to the new UUID PK
+ # ------------------------------------------------------------------
+ migrations.RenameField(
+ model_name='measurement',
+ old_name='category_tmp',
+ new_name='category',
+ ),
+ migrations.AlterField(
+ model_name='measurement',
+ name='category',
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='measurements.category',
+ verbose_name='Category',
),
),
+ # ------------------------------------------------------------------
+ # 5. Rename uuid -> id on both tables
+ # ------------------------------------------------------------------
+ migrations.RenameField(model_name='category', old_name='uuid', new_name='id'),
+ migrations.RenameField(model_name='measurement', old_name='uuid', new_name='id'),
]
diff --git a/wger/measurements/migrations/0007_alter_measurement_date.py b/wger/measurements/migrations/0005_alter_measurement_date.py
similarity index 86%
rename from wger/measurements/migrations/0007_alter_measurement_date.py
rename to wger/measurements/migrations/0005_alter_measurement_date.py
index 81e335caa..c4fc54bc6 100644
--- a/wger/measurements/migrations/0007_alter_measurement_date.py
+++ b/wger/measurements/migrations/0005_alter_measurement_date.py
@@ -6,7 +6,7 @@ class Migration(migrations.Migration):
"""This only changes de default"""
dependencies = [
- ('measurements', '0006_change_measurement_pk_to_uuid'),
+ ('measurements', '0004_add_uuids'),
]
operations = [
diff --git a/wger/measurements/migrations/0005_change_category_pk_type_to_uuid.py b/wger/measurements/migrations/0005_change_category_pk_type_to_uuid.py
deleted file mode 100644
index 7c217372f..000000000
--- a/wger/measurements/migrations/0005_change_category_pk_type_to_uuid.py
+++ /dev/null
@@ -1,108 +0,0 @@
-# Generated by Django 5.2.12 on 2026-03-15 11:29
-
-"""
-This migration replaces the integer Primary Key of the Category model with a UUID.
-
-Since this is not directly possible, the following steps are taken:
-
-1. Add a temporary UUID field (`category_tmp`) to Measurement and populate it with
- existing related category UUIDs.
-2. Remove the old integer `category` ForeignKey.
-3. Switch the Category model's Primary Key from `id` to `uuid`.
-4. Restore `Measurement.category` as a ForeignKey (pointing to the new UUID PK).
-5. Rename `Category.uuid` to `id` (while keeping the UUID type).
-"""
-
-from wger.utils.uuid import uuid7
-from django.db import migrations, models
-from django.db.migrations.state import StateApps
-from django.db.models import Subquery, OuterRef
-
-
-def populate_category_tmp(apps: StateApps, schema_editor):
- Measurement = apps.get_model('measurements', 'Measurement')
- Category = apps.get_model('measurements', 'Category')
-
- Measurement.objects.update(
- category_tmp=Subquery(
- Category.objects.filter(id=OuterRef('category')).values('uuid')[:1],
- )
- )
-
-
-def reverse_populate_category_tmp(apps: StateApps, schema_editor):
- Measurement = apps.get_model('measurements', 'Measurement')
- for m in Measurement.objects.all():
- m.category_tmp = None
- m.save(update_fields=['category_tmp'])
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('measurements', '0004_add_uuids'),
- ]
-
- operations = [
- # Add tmp UUID field and copy the category UUIDs into it.
- migrations.AddField(
- model_name='measurement',
- name='category_tmp',
- field=models.UUIDField(editable=False, null=True),
- ),
- migrations.RunPython(populate_category_tmp, reverse_populate_category_tmp),
- # Remove old FK
- migrations.AlterUniqueTogether(
- name='measurement',
- unique_together=set(),
- ),
- migrations.RemoveField(
- model_name='measurement',
- name='category',
- ),
- # Change category PK
- migrations.RemoveField(
- model_name='category',
- name='id',
- ),
- migrations.AlterField(
- model_name='category',
- name='uuid',
- field=models.UUIDField(
- default=uuid7,
- editable=False,
- primary_key=True,
- serialize=False,
- ),
- ),
- # Rename "category_tmp" back to "category"
- migrations.RenameField(
- model_name='measurement',
- old_name='category_tmp',
- new_name='category',
- ),
- migrations.AlterUniqueTogether(
- name='measurement',
- unique_together={('date', 'category')},
- ),
- # Make category
- migrations.AlterField(
- model_name='measurement',
- name='category',
- field=models.UUIDField(db_column='category_id', editable=False, null=True),
- ),
- # Change the FK and rename
- migrations.AlterField(
- model_name='measurement',
- name='category',
- field=models.ForeignKey(
- on_delete=models.deletion.CASCADE,
- to='measurements.category',
- verbose_name='Category',
- ),
- ),
- migrations.RenameField(
- model_name='category',
- old_name='uuid',
- new_name='id',
- ),
- ]
diff --git a/wger/measurements/migrations/0006_change_measurement_pk_to_uuid.py b/wger/measurements/migrations/0006_change_measurement_pk_to_uuid.py
deleted file mode 100644
index dd4c93bf2..000000000
--- a/wger/measurements/migrations/0006_change_measurement_pk_to_uuid.py
+++ /dev/null
@@ -1,33 +0,0 @@
-# Generated by Django 5.2.12 on 2026-03-15 12:21
-
-from django.db import migrations, models
-from wger.utils.uuid import uuid7
-
-
-class Migration(migrations.Migration):
- dependencies = [
- ('measurements', '0005_change_category_pk_type_to_uuid'),
- ]
-
- operations = [
- migrations.RemoveField(
- model_name='measurement',
- name='id',
- ),
- migrations.RenameField(
- model_name='measurement',
- old_name='uuid',
- new_name='id',
- ),
- migrations.AlterField(
- model_name='measurement',
- name='id',
- field=models.UUIDField(
- default=uuid7,
- editable=False,
- primary_key=True,
- serialize=False,
- unique=True,
- ),
- ),
- ]
diff --git a/wger/measurements/models/category.py b/wger/measurements/models/category.py
index dda144f72..b089387ab 100644
--- a/wger/measurements/models/category.py
+++ b/wger/measurements/models/category.py
@@ -13,9 +13,6 @@
# 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
from django.db import models
@@ -32,8 +29,6 @@ class Category(models.Model):
id = models.UUIDField(
default=uuid7,
- editable=False,
- null=False,
primary_key=True,
)
diff --git a/wger/measurements/models/measurement.py b/wger/measurements/models/measurement.py
index 43d14c01c..94b29b78e 100644
--- a/wger/measurements/models/measurement.py
+++ b/wger/measurements/models/measurement.py
@@ -34,9 +34,6 @@ class Measurement(models.Model):
id = models.UUIDField(
default=uuid7,
- editable=False,
- null=False,
- unique=True,
primary_key=True,
)
diff --git a/wger/measurements/powersync.py b/wger/measurements/powersync.py
index 0604a52ee..83a611047 100644
--- a/wger/measurements/powersync.py
+++ b/wger/measurements/powersync.py
@@ -33,100 +33,110 @@ from wger.utils.viewsets import check_fk_ownership
logger = logging.getLogger(__name__)
+#
+# Categories
+#
+
+
+def handle_create_category(payload: dict[str, Any], user_id: int) -> dict | None:
+ """Handle a PowerSync PUT event for a measurement category."""
+ logger.debug(f'Received PowerSync payload for category create: {payload}')
+ serializer = CategorySerializer(data=payload)
+ if serializer.is_valid():
+ serializer.save(user_id=user_id)
+ logger.info(f'Created Category {payload["id"]} for user {user_id}')
+ return None
+ logger.warning(f'PowerSync category create validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
+
+
def handle_update_category(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a push event from PowerSync"""
- logger.debug(f'Received PowerSync payload for update: {payload}')
+ """Handle a PowerSync PATCH event for a measurement category."""
+ logger.debug(f'Received PowerSync payload for category update: {payload}')
try:
entry = Category.objects.get(pk=payload['id'], user_id=user_id)
except Category.DoesNotExist:
- logger.warning(
- f'Category with UUID {payload["id"]} and user {user_id} not found for update.'
- )
- return {'error': 'Not found', 'details': f'Category with UUID {payload["id"]} not found'}
+ logger.warning(f'Category {payload["id"]} for user {user_id} not found for update.')
+ return {'error': 'Not found', 'details': f'Category {payload["id"]} not found'}
serializer = CategorySerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
logger.info(f'Updated Category {entry.pk} for user {user_id}')
return None
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
- return {'error': 'Validation failed', 'details': serializer.errors}
-
-
-def handle_create_category(payload: dict[str, Any], user_id: int) -> dict | 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)
- return None
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ logger.warning(f'PowerSync category update validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
def handle_delete_category(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a delete event from PowerSync"""
- logger.debug(f'Received PowerSync payload for delete: {payload}')
+ """Handle a PowerSync DELETE event for a measurement category.
+
+ Django's FK CASCADE removes any dependent measurements in the same
+ transaction.
+ """
+ logger.debug(f'Received PowerSync payload for category delete: {payload}')
try:
entry = Category.objects.get(pk=payload['id'], user_id=user_id)
except Category.DoesNotExist:
- logger.warning(f'Category with UUID {payload["id"]} not found for delete.')
- return {'error': 'Not found', 'details': f'Category with UUID {payload["id"]} not found'}
+ logger.warning(f'Category {payload["id"]} not found for delete.')
+ return {'error': 'Not found', 'details': f'Category {payload["id"]} not found'}
entry.delete()
+ logger.info(f'Deleted Category {payload["id"]} for user {user_id}')
return None
-def handle_update_measurement(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a push event from PowerSync"""
- logger.debug(f'Received PowerSync payload for update: {payload}')
- try:
- entry = Measurement.objects.get(pk=payload['id'], category__user_id=user_id)
- except Measurement.DoesNotExist:
- logger.warning(
- f'Measurement with UUID {payload["id"]} and user {user_id} not found for update.'
- )
- return {
- 'error': 'Not found',
- 'details': f'Measurement with UUID {payload["id"]} not found',
- }
+#
+# Measurements
+#
+
+
+def handle_create_measurement(payload: dict[str, Any], user_id: int) -> dict | None:
+ """Handle a PowerSync PUT event for a measurement."""
+ logger.debug(f'Received PowerSync payload for measurement create: {payload}')
if not check_fk_ownership(payload, MeasurementViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'Measurement references a category you do not own'}
- serializer = MeasurementSerializer(entry, data=payload, partial=True)
+ serializer = MeasurementSerializer(data=payload)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated Measurement {entry.pk} for user {user_id}')
+ logger.info(f'Created Measurement {payload["id"]} for user {user_id}')
return None
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ logger.warning(f'PowerSync measurement create validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_create_measurement(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a create event from PowerSync"""
- logger.debug(f'Received PowerSync payload for create: {payload}')
+def handle_update_measurement(payload: dict[str, Any], user_id: int) -> dict | None:
+ """Handle a PowerSync PATCH event for a measurement."""
+ logger.debug(f'Received PowerSync payload for measurement update: {payload}')
+ try:
+ entry = Measurement.objects.get(pk=payload['id'], category__user_id=user_id)
+ except Measurement.DoesNotExist:
+ logger.warning(
+ f'Measurement {payload["id"]} for user {user_id} not found for update.'
+ )
+ return {'error': 'Not found', 'details': f'Measurement {payload["id"]} not found'}
if not check_fk_ownership(payload, MeasurementViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'Measurement references a category you do not own'}
- serializer = MeasurementSerializer(data=payload)
+ serializer = MeasurementSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
+ logger.info(f'Updated Measurement {entry.pk} for user {user_id}')
return None
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ logger.warning(f'PowerSync measurement update validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
def handle_delete_measurement(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a delete event from PowerSync"""
- logger.debug(f'Received PowerSync payload for delete: {payload}')
+ """Handle a PowerSync DELETE event for a measurement."""
+ logger.debug(f'Received PowerSync payload for measurement delete: {payload}')
try:
entry = Measurement.objects.get(pk=payload['id'], category__user_id=user_id)
except Measurement.DoesNotExist:
- logger.warning(f'Measurement with UUID {payload["id"]} not found for delete.')
- return {
- 'error': 'Not found',
- 'details': f'Measurement with UUID {payload["id"]} not found',
- }
+ logger.warning(f'Measurement {payload["id"]} not found for delete.')
+ return {'error': 'Not found', 'details': f'Measurement {payload["id"]} not found'}
entry.delete()
+ logger.info(f'Deleted Measurement {payload["id"]} for user {user_id}')
return None
diff --git a/wger/measurements/tests/test_powersync.py b/wger/measurements/tests/test_powersync.py
index c81c60ab2..99c920541 100644
--- a/wger/measurements/tests/test_powersync.py
+++ b/wger/measurements/tests/test_powersync.py
@@ -20,24 +20,21 @@ from wger.measurements.models import (
)
-# Pinned in test-measurement-categories.json
-CATEGORY_OWNED = 'cccccccc-cccc-cccc-cccc-000000000001' # user 'test'
-CATEGORY_OTHER = 'cccccccc-cccc-cccc-cccc-0000000000aa' # user 'admin'
+# Pinned in test-measurement-categories.json (uuid field on the matching pk)
+CATEGORY_OWNED_UUID = 'cccccccc-cccc-cccc-cccc-000000000001' # user 'test'
+CATEGORY_OTHER_UUID = 'cccccccc-cccc-cccc-cccc-0000000000aa' # user 'admin'
-# Pinned in test-measurements.json (owned via CATEGORY_OWNED)
-MEASUREMENT_OWNED = 'dddddddd-dddd-dddd-dddd-000000000001'
+# Pinned in test-measurements.json (owned via CATEGORY_OWNED_UUID)
+MEASUREMENT_OWNED_UUID = 'dddddddd-dddd-dddd-dddd-000000000001'
class CategoryPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
- """
- PowerSync handlers for measurements.Category. No check_fk_ownership step
- in the handler because Category only has a User FK.
- """
+ """PowerSync handlers for measurements.Category."""
table = 'measurements_category'
resource = Category
- pk_owned = CATEGORY_OWNED
+ pk_owned = CATEGORY_OWNED_UUID
create_payload = {
'id': 'cccccccc-cccc-cccc-cccc-000000000099',
@@ -52,19 +49,18 @@ class CategoryPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
class MeasurementPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
"""
- PowerSync handlers for measurements.Measurement. The handler runs
- check_fk_ownership against the `category` FK so payloads pointing at
- another user's category must be rejected.
+ PowerSync handlers for measurements.Measurement. ``check_fk_ownership``
+ rejects payloads pointing at another user's category.
"""
table = 'measurements_measurement'
resource = Measurement
- pk_owned = MEASUREMENT_OWNED
+ pk_owned = MEASUREMENT_OWNED_UUID
create_payload = {
'id': 'dddddddd-dddd-dddd-dddd-000000000099',
- 'category': CATEGORY_OWNED,
+ 'category': CATEGORY_OWNED_UUID,
'date': '2030-01-15T10:00:00Z',
'value': 22.5,
}
@@ -74,5 +70,5 @@ class MeasurementPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase
}
fk_ownership = (
- ('category', CATEGORY_OTHER),
+ ('category', CATEGORY_OTHER_UUID),
)
diff --git a/wger/measurements/urls.py b/wger/measurements/urls.py
index 8c08aff81..6db7a805d 100644
--- a/wger/measurements/urls.py
+++ b/wger/measurements/urls.py
@@ -27,7 +27,7 @@ urlpatterns = [
name='overview',
),
path(
- 'category/<int:pk>',
+ 'category/<uuid:pk>',
ReactView.as_view(login_required=True),
name='detail',
),
diff --git a/wger/nutrition/fixtures/test-nutrition-data.json b/wger/nutrition/fixtures/test-nutrition-data.json
index 0339abff4..34f44a3b1 100644
--- a/wger/nutrition/fixtures/test-nutrition-data.json
+++ b/wger/nutrition/fixtures/test-nutrition-data.json
@@ -1,30 +1,28 @@
[
{
- "pk": 1,
+ "pk": "cc000000-0000-0000-0000-000000000001",
"model": "nutrition.nutritionplan",
"fields": {
"description": "",
"user": 2,
"creation_date": "2012-09-22",
"start": "2012-09-22",
- "end": null,
- "uuid": "cc000000-0000-0000-0000-000000000001"
+ "end": null
}
},
{
- "pk": 2,
+ "pk": "cc000000-0000-0000-0000-000000000002",
"model": "nutrition.nutritionplan",
"fields": {
"description": "",
"user": 1,
"creation_date": "2012-10-29",
"start": "2012-11-01",
- "end": "2012-11-30",
- "uuid": "cc000000-0000-0000-0000-000000000002"
+ "end": "2012-11-30"
}
},
{
- "pk": 3,
+ "pk": "11111111-1111-1111-1111-000000000003",
"model": "nutrition.nutritionplan",
"fields": {
"description": "",
@@ -35,7 +33,7 @@
}
},
{
- "pk": 4,
+ "pk": "11111111-1111-1111-1111-000000000004",
"model": "nutrition.nutritionplan",
"fields": {
"description": "My plan to do xyz",
@@ -46,7 +44,7 @@
}
},
{
- "pk": 5,
+ "pk": "11111111-1111-1111-1111-000000000005",
"model": "nutrition.nutritionplan",
"fields": {
"description": "Description 1",
@@ -57,316 +55,312 @@
}
},
{
- "pk": 1,
+ "pk": "aa000000-0000-0000-0000-000000000001",
"model": "nutrition.meal",
"fields": {
"time": null,
- "plan": 1,
- "order": 1,
- "uuid": "aa000000-0000-0000-0000-000000000001"
+ "plan": "cc000000-0000-0000-0000-000000000001",
+ "order": 1
}
},
{
- "pk": 2,
+ "pk": "22222222-2222-2222-2222-000000000002",
"model": "nutrition.meal",
"fields": {
"time": "07:00:00",
- "plan": 4,
+ "plan": "11111111-1111-1111-1111-000000000004",
"order": 1
}
},
{
- "pk": 3,
+ "pk": "aa000000-0000-0000-0000-000000000003",
"model": "nutrition.meal",
"fields": {
"time": "08:00:00",
- "plan": 2,
- "order": 1,
- "uuid": "aa000000-0000-0000-0000-000000000003"
+ "plan": "cc000000-0000-0000-0000-000000000002",
+ "order": 1
}
},
{
- "pk": 4,
+ "pk": "22222222-2222-2222-2222-000000000004",
"model": "nutrition.meal",
"fields": {
"time": "08:00:00",
- "plan": 3,
+ "plan": "11111111-1111-1111-1111-000000000003",
"order": 1
}
},
{
- "pk": 5,
+ "pk": "22222222-2222-2222-2222-000000000005",
"model": "nutrition.meal",
"fields": {
"time": "08:00:00",
- "plan": 2,
+ "plan": "cc000000-0000-0000-0000-000000000002",
"order": 1
}
},
{
- "pk": 6,
+ "pk": "22222222-2222-2222-2222-000000000006",
"model": "nutrition.meal",
"fields": {
"time": "08:00:00",
- "plan": 5,
+ "plan": "11111111-1111-1111-1111-000000000005",
"order": 1
}
},
{
- "pk": 7,
+ "pk": "22222222-2222-2222-2222-000000000007",
"model": "nutrition.meal",
"fields": {
"time": "08:02:00",
- "plan": 4,
+ "plan": "11111111-1111-1111-1111-000000000004",
"order": 1
}
},
{
- "pk": 8,
+ "pk": "22222222-2222-2222-2222-000000000008",
"model": "nutrition.meal",
"fields": {
"time": "10:00:00",
- "plan": 2,
+ "plan": "cc000000-0000-0000-0000-000000000002",
"order": 1
}
},
{
- "pk": 9,
+ "pk": "22222222-2222-2222-2222-000000000009",
"model": "nutrition.meal",
"fields": {
"time": "10:00:00",
- "plan": 4,
+ "plan": "11111111-1111-1111-1111-000000000004",
"order": 1
}
},
{
- "pk": 10,
+ "pk": "22222222-2222-2222-2222-000000000010",
"model": "nutrition.meal",
"fields": {
"time": "19:02:00",
- "plan": 4,
+ "plan": "11111111-1111-1111-1111-000000000004",
"order": 1
}
},
{
- "pk": 11,
+ "pk": "22222222-2222-2222-2222-000000000011",
"model": "nutrition.meal",
"fields": {
"time": "22:00:00",
- "plan": 4,
+ "plan": "11111111-1111-1111-1111-000000000004",
"order": 1
}
},
{
- "pk": 1,
+ "pk": "bb000000-0000-0000-0000-000000000001",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 1,
"amount": 200,
- "meal": 1,
- "order": 1,
- "uuid": "bb000000-0000-0000-0000-000000000001"
+ "meal": "aa000000-0000-0000-0000-000000000001",
+ "order": 1
}
},
{
- "pk": 2,
+ "pk": "33333333-3333-3333-3333-000000000002",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 1,
"amount": 200,
- "meal": 1,
+ "meal": "aa000000-0000-0000-0000-000000000001",
"order": 1
}
},
{
- "pk": 3,
+ "pk": "33333333-3333-3333-3333-000000000003",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 1,
"amount": 200,
- "meal": 1,
+ "meal": "aa000000-0000-0000-0000-000000000001",
"order": 1
}
},
{
- "pk": 4,
+ "pk": "bb000000-0000-0000-0000-000000000004",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 4,
"amount": 300,
- "meal": 3,
- "order": 1,
- "uuid": "bb000000-0000-0000-0000-000000000004"
+ "meal": "aa000000-0000-0000-0000-000000000003",
+ "order": 1
}
},
{
- "pk": 5,
+ "pk": "33333333-3333-3333-3333-000000000005",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 2,
"amount": 100,
- "meal": 8,
+ "meal": "22222222-2222-2222-2222-000000000008",
"order": 1
}
},
{
- "pk": 6,
+ "pk": "33333333-3333-3333-3333-000000000006",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 5,
"amount": 100,
- "meal": 8,
+ "meal": "22222222-2222-2222-2222-000000000008",
"order": 1
}
},
{
- "pk": 7,
+ "pk": "33333333-3333-3333-3333-000000000007",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 3,
"amount": 300,
- "meal": 7,
+ "meal": "22222222-2222-2222-2222-000000000007",
"order": 1
}
},
{
- "pk": 8,
+ "pk": "33333333-3333-3333-3333-000000000008",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 1,
"amount": 101,
- "meal": 9,
+ "meal": "22222222-2222-2222-2222-000000000009",
"order": 1
}
},
{
- "pk": 9,
+ "pk": "33333333-3333-3333-3333-000000000009",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 2,
"amount": 100,
- "meal": 9,
+ "meal": "22222222-2222-2222-2222-000000000009",
"order": 1
}
},
{
- "pk": 10,
+ "pk": "33333333-3333-3333-3333-000000000010",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 3,
"amount": 100,
- "meal": 2,
+ "meal": "22222222-2222-2222-2222-000000000002",
"order": 1
}
},
{
- "pk": 11,
+ "pk": "33333333-3333-3333-3333-000000000011",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 4,
"amount": 200,
- "meal": 10,
+ "meal": "22222222-2222-2222-2222-000000000010",
"order": 1
}
},
{
- "pk": 12,
+ "pk": "33333333-3333-3333-3333-000000000012",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 4,
"amount": 200,
- "meal": 10,
+ "meal": "22222222-2222-2222-2222-000000000010",
"order": 1
}
},
{
- "pk": 13,
+ "pk": "33333333-3333-3333-3333-000000000013",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 3,
"amount": 100,
- "meal": 7,
+ "meal": "22222222-2222-2222-2222-000000000007",
"order": 1
}
},
{
- "pk": 14,
+ "pk": "33333333-3333-3333-3333-000000000014",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 6,
"amount": 30,
- "meal": 7,
+ "meal": "22222222-2222-2222-2222-000000000007",
"order": 1
}
},
{
- "pk": 15,
+ "pk": "33333333-3333-3333-3333-000000000015",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 3,
"amount": 150,
- "meal": 10,
+ "meal": "22222222-2222-2222-2222-000000000010",
"order": 1
}
},
{
- "pk": 16,
+ "pk": "33333333-3333-3333-3333-000000000016",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 1,
"amount": 500,
- "meal": 11,
+ "meal": "22222222-2222-2222-2222-000000000011",
"order": 1
}
},
{
- "pk": 17,
+ "pk": "33333333-3333-3333-3333-000000000017",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 6,
"amount": 100,
- "meal": 6,
+ "meal": "22222222-2222-2222-2222-000000000006",
"order": 1
}
},
{
- "pk": 18,
+ "pk": "33333333-3333-3333-3333-000000000018",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 4,
"amount": 100,
- "meal": 6,
+ "meal": "22222222-2222-2222-2222-000000000006",
"order": 1
}
},
{
- "pk": 19,
+ "pk": "33333333-3333-3333-3333-000000000019",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 3,
"amount": 100,
- "meal": 6,
+ "meal": "22222222-2222-2222-2222-000000000006",
"order": 1
}
},
{
- "pk": 20,
+ "pk": "33333333-3333-3333-3333-000000000020",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 2,
"amount": 100,
- "meal": 6,
+ "meal": "22222222-2222-2222-2222-000000000006",
"order": 1
}
},
{
- "pk": 21,
+ "pk": "33333333-3333-3333-3333-000000000021",
"model": "nutrition.mealitem",
"fields": {
"ingredient": 1,
"amount": 100,
- "meal": 6,
+ "meal": "22222222-2222-2222-2222-000000000006",
"order": 1
}
}
-]
\ No newline at end of file
+]
diff --git a/wger/nutrition/fixtures/test-nutrition-diary.json b/wger/nutrition/fixtures/test-nutrition-diary.json
index d07e5fe40..fe76a46c1 100644
--- a/wger/nutrition/fixtures/test-nutrition-diary.json
+++ b/wger/nutrition/fixtures/test-nutrition-diary.json
@@ -1,63 +1,62 @@
[
{
"fields": {
- "plan": 1,
+ "plan": "cc000000-0000-0000-0000-000000000001",
"datetime": "2016-05-15T12:01:00Z",
"ingredient": 5,
"comment": "",
"amount": "2",
- "weight_unit": 1,
- "uuid": "ee000000-0000-0000-0000-000000000001"
+ "weight_unit": 1
},
- "pk": 1,
+ "pk": "ee000000-0000-0000-0000-000000000001",
"model": "nutrition.logitem"
},
{
"fields": {
- "plan": 1,
+ "plan": "cc000000-0000-0000-0000-000000000001",
"datetime": "2016-05-15T12:01:15Z",
"ingredient": 4,
"comment": "",
"amount": "100",
"weight_unit": null
},
- "pk": 2,
+ "pk": "44444444-4444-4444-4444-000000000002",
"model": "nutrition.logitem"
},
{
"fields": {
- "plan": 1,
+ "plan": "cc000000-0000-0000-0000-000000000001",
"datetime": "2016-05-15T12:01:00Z",
"ingredient": 1,
"comment": "",
"amount": "75",
"weight_unit": null
},
- "pk": 3,
+ "pk": "44444444-4444-4444-4444-000000000003",
"model": "nutrition.logitem"
},
{
"fields": {
- "plan": 1,
+ "plan": "cc000000-0000-0000-0000-000000000001",
"datetime": "2016-05-14T17:11:33Z",
"ingredient": 1,
"comment": "",
"amount": "75",
"weight_unit": null
},
- "pk": 4,
+ "pk": "44444444-4444-4444-4444-000000000004",
"model": "nutrition.logitem"
},
{
"fields": {
- "plan": 2,
+ "plan": "cc000000-0000-0000-0000-000000000002",
"datetime": "2016-05-14T17:11:33Z",
"ingredient": 1,
"comment": "",
"amount": "75",
"weight_unit": null
},
- "pk": 4,
+ "pk": "44444444-4444-4444-4444-000000000004",
"model": "nutrition.logitem"
}
-]
\ No newline at end of file
+]
diff --git a/wger/nutrition/migrations/0035_add_uuids.py b/wger/nutrition/migrations/0035_add_uuids.py
index aed5a8e82..cbd289736 100644
--- a/wger/nutrition/migrations/0035_add_uuids.py
+++ b/wger/nutrition/migrations/0035_add_uuids.py
@@ -1,9 +1,25 @@
# Generated by Django 4.2.16 on 2024-10-19 21:04
+"""
+Convert NutritionPlan, Meal, MealItem and LogItem to use UUID primary keys.
-from django.db import migrations, models
-import uuid
+The migration runs in three logical phases:
+
+1. Add a `uuid` field to all four tables and backfill it for existing rows.
+2. Repoint each FK that targets one of these tables to a temporary `<name>_tmp`
+ UUID column copied from the parent's uuid.
+3. Promote each table's `uuid` to the primary key (drop the integer `id`,
+ rename `uuid` -> `id`) and restore the FKs as ForeignKeys to the new PK.
+Order matters: parents must be repointed before their children's `_tmp` columns
+become FK columns, otherwise Django can't construct the FK.
+"""
+
+import django.db.models.deletion
+from django.db import migrations, models
from django.db.migrations.state import StateApps
+from django.db.models import OuterRef, Subquery
+
+from wger.utils.uuid import uuid7
def gen_uuids(apps: StateApps, schema_editor):
@@ -12,21 +28,61 @@ def gen_uuids(apps: StateApps, schema_editor):
MealItem = apps.get_model('nutrition', 'MealItem')
LogItem = apps.get_model('nutrition', 'LogItem')
- for item in LogItem.objects.all():
- item.uuid = uuid.uuid4()
- item.save(update_fields=['uuid'])
+ for plan in NutritionPlan.objects.all():
+ plan.uuid = uuid7()
+ plan.save(update_fields=['uuid'])
+
+ for meal in Meal.objects.all():
+ meal.uuid = uuid7()
+ meal.save(update_fields=['uuid'])
for item in MealItem.objects.all():
- item.uuid = uuid.uuid4()
+ item.uuid = uuid7()
item.save(update_fields=['uuid'])
- for meal in Meal.objects.all():
- meal.uuid = uuid.uuid4()
- meal.save(update_fields=['uuid'])
+ for item in LogItem.objects.all():
+ item.uuid = uuid7()
+ item.save(update_fields=['uuid'])
- for plan in NutritionPlan.objects.all():
- plan.uuid = uuid.uuid4()
- plan.save(update_fields=['uuid'])
+
+def populate_meal_plan_tmp(apps: StateApps, schema_editor):
+ Meal = apps.get_model('nutrition', 'Meal')
+ NutritionPlan = apps.get_model('nutrition', 'NutritionPlan')
+ Meal.objects.update(
+ plan_tmp=Subquery(
+ NutritionPlan.objects.filter(id=OuterRef('plan')).values('uuid')[:1],
+ )
+ )
+
+
+def populate_mealitem_meal_tmp(apps: StateApps, schema_editor):
+ MealItem = apps.get_model('nutrition', 'MealItem')
+ Meal = apps.get_model('nutrition', 'Meal')
+ MealItem.objects.update(
+ meal_tmp=Subquery(
+ Meal.objects.filter(id=OuterRef('meal')).values('uuid')[:1],
+ )
+ )
+
+
+def populate_logitem_plan_tmp(apps: StateApps, schema_editor):
+ LogItem = apps.get_model('nutrition', 'LogItem')
+ NutritionPlan = apps.get_model('nutrition', 'NutritionPlan')
+ LogItem.objects.update(
+ plan_tmp=Subquery(
+ NutritionPlan.objects.filter(id=OuterRef('plan')).values('uuid')[:1],
+ )
+ )
+
+
+def populate_logitem_meal_tmp(apps: StateApps, schema_editor):
+ LogItem = apps.get_model('nutrition', 'LogItem')
+ Meal = apps.get_model('nutrition', 'Meal')
+ LogItem.objects.exclude(meal__isnull=True).update(
+ meal_tmp=Subquery(
+ Meal.objects.filter(id=OuterRef('meal')).values('uuid')[:1],
+ )
+ )
class Migration(migrations.Migration):
@@ -35,90 +91,180 @@ class Migration(migrations.Migration):
]
operations = [
+ # ------------------------------------------------------------------
+ # 1. Add uuid columns and backfill them
+ # ------------------------------------------------------------------
migrations.AddField(
model_name='nutritionplan',
name='uuid',
- field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- null=True,
- unique=False,
- ),
+ field=models.UUIDField(default=uuid7, null=True, unique=False),
),
migrations.AddField(
model_name='meal',
name='uuid',
- field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- null=True,
- unique=False,
- ),
+ field=models.UUIDField(default=uuid7, null=True, unique=False),
),
migrations.AddField(
model_name='mealitem',
name='uuid',
- field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- null=True,
- unique=False,
- ),
+ field=models.UUIDField(default=uuid7, null=True, unique=False),
),
migrations.AddField(
model_name='logitem',
name='uuid',
- field=models.UUIDField(
- default=uuid.uuid4,
- editable=False,
- null=True,
- unique=False,
- ),
+ field=models.UUIDField(default=uuid7, null=True, unique=False),
),
- # Generate UUIDs
- migrations.RunPython(
- gen_uuids,
- reverse_code=migrations.RunPython.noop,
+ migrations.RunPython(gen_uuids, reverse_code=migrations.RunPython.noop),
+ migrations.AlterField(
+ model_name='nutritionplan',
+ name='uuid',
+ field=models.UUIDField(default=uuid7, null=False, unique=True),
+ ),
+ migrations.AlterField(
+ model_name='meal',
+ name='uuid',
+ field=models.UUIDField(default=uuid7, null=False, unique=True),
),
- # Set uuid fields to non-nullable
+ migrations.AlterField(
+ model_name='mealitem',
+ name='uuid',
+ field=models.UUIDField(default=uuid7, null=False, unique=True),
+ ),
+ migrations.AlterField(
+ model_name='logitem',
+ name='uuid',
+ field=models.UUIDField(default=uuid7, null=False, unique=True),
+ ),
+ # ------------------------------------------------------------------
+ # 2. Repoint via a tmp column
+ # ------------------------------------------------------------------
+ migrations.AddField(
+ model_name='meal',
+ name='plan_tmp',
+ field=models.UUIDField(editable=False, null=True),
+ ),
+ migrations.RunPython(populate_meal_plan_tmp, reverse_code=migrations.RunPython.noop),
+ migrations.RemoveField(model_name='meal', name='plan'),
+
+ migrations.AddField(
+ model_name='mealitem',
+ name='meal_tmp',
+ field=models.UUIDField(editable=False, null=True),
+ ),
+ migrations.RunPython(populate_mealitem_meal_tmp, reverse_code=migrations.RunPython.noop),
+ migrations.RemoveField(model_name='mealitem', name='meal'),
+
+ migrations.AddField(
+ model_name='logitem',
+ name='plan_tmp',
+ field=models.UUIDField(editable=False, null=True),
+ ),
+ migrations.RunPython(populate_logitem_plan_tmp, reverse_code=migrations.RunPython.noop),
+ migrations.RemoveField(model_name='logitem', name='plan'),
+ migrations.AddField(
+ model_name='logitem',
+ name='meal_tmp',
+ field=models.UUIDField(editable=False, null=True, blank=True),
+ ),
+ migrations.RunPython(populate_logitem_meal_tmp, reverse_code=migrations.RunPython.noop),
+ migrations.RemoveField(model_name='logitem', name='meal'),
+
+ # ------------------------------------------------------------------
+ # 3. Promote uuid to primary key on every table
+ # ------------------------------------------------------------------
+ migrations.RemoveField(model_name='nutritionplan', name='id'),
migrations.AlterField(
model_name='nutritionplan',
name='uuid',
field=models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ default=uuid7,
+ primary_key=True,
+ serialize=False,
),
),
+ migrations.RemoveField(model_name='meal', name='id'),
migrations.AlterField(
model_name='meal',
name='uuid',
field=models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ default=uuid7,
+ primary_key=True,
+ serialize=False,
),
),
+ migrations.RemoveField(model_name='mealitem', name='id'),
migrations.AlterField(
model_name='mealitem',
name='uuid',
field=models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ default=uuid7,
+ primary_key=True,
+ serialize=False,
),
),
+ migrations.RemoveField(model_name='logitem', name='id'),
migrations.AlterField(
model_name='logitem',
name='uuid',
field=models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ default=uuid7,
+ primary_key=True,
+ serialize=False,
+ ),
+ ),
+ # ------------------------------------------------------------------
+ # 4. Restore the FKs as ForeignKeys to the new UUID PKs
+ # ------------------------------------------------------------------
+ migrations.RenameField(model_name='meal', old_name='plan_tmp', new_name='plan'),
+ migrations.AlterField(
+ model_name='meal',
+ name='plan',
+ field=models.ForeignKey(
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.nutritionplan',
+ verbose_name='Nutrition plan',
+ ),
+ ),
+ migrations.RenameField(model_name='mealitem', old_name='meal_tmp', new_name='meal'),
+ migrations.AlterField(
+ model_name='mealitem',
+ name='meal',
+ field=models.ForeignKey(
+ editable=False,
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.meal',
+ verbose_name='Nutrition plan',
+ ),
+ ),
+ migrations.RenameField(model_name='logitem', old_name='plan_tmp', new_name='plan'),
+ migrations.AlterField(
+ model_name='logitem',
+ name='plan',
+ field=models.ForeignKey(
+ on_delete=django.db.models.deletion.CASCADE,
+ to='nutrition.nutritionplan',
+ verbose_name='Nutrition plan',
+ ),
+ ),
+ migrations.RenameField(model_name='logitem', old_name='meal_tmp', new_name='meal'),
+ migrations.AlterField(
+ model_name='logitem',
+ name='meal',
+ field=models.ForeignKey(
+ blank=True,
+ null=True,
+ on_delete=django.db.models.deletion.SET_NULL,
+ related_name='log_items',
+ to='nutrition.meal',
+ verbose_name='Meal',
),
),
+ # ------------------------------------------------------------------
+ # 5. Rename uuid -> id on every table for canonical access
+ # ------------------------------------------------------------------
+ migrations.RenameField(model_name='nutritionplan', old_name='uuid', new_name='id'),
+ migrations.RenameField(model_name='meal', old_name='uuid', new_name='id'),
+ migrations.RenameField(model_name='mealitem', old_name='uuid', new_name='id'),
+ migrations.RenameField(model_name='logitem', old_name='uuid', new_name='id'),
]
diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.py
index bee397cce..d58657a0c 100644
--- a/wger/nutrition/models/log.py
+++ b/wger/nutrition/models/log.py
@@ -15,7 +15,6 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Standard Library
-import uuid
from decimal import Decimal
# Django
@@ -28,6 +27,7 @@ from django.utils import timezone
# wger
from wger.nutrition.helpers import BaseMealItem
+from wger.utils.uuid import uuid7
# Local
from .ingredient import Ingredient
@@ -47,11 +47,9 @@ class LogItem(BaseMealItem, models.Model):
'-datetime',
]
- uuid = models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ id = models.UUIDField(
+ default=uuid7,
+ primary_key=True,
)
plan = models.ForeignKey(
diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.py
index 31080a03b..e90012a95 100644
--- a/wger/nutrition/models/meal.py
+++ b/wger/nutrition/models/meal.py
@@ -16,13 +16,13 @@
# Standard Library
import logging
-import uuid
# Django
from django.db import models
# wger
from wger.utils.fields import Html5TimeField
+from wger.utils.uuid import uuid7
# Local
from ..helpers import NutritionalValues
@@ -43,11 +43,9 @@ class Meal(models.Model):
'time',
]
- uuid = models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ id = models.UUIDField(
+ default=uuid7,
+ primary_key=True,
)
plan = models.ForeignKey(
diff --git a/wger/nutrition/models/meal_item.py b/wger/nutrition/models/meal_item.py
index 7477ff123..47b850a31 100644
--- a/wger/nutrition/models/meal_item.py
+++ b/wger/nutrition/models/meal_item.py
@@ -16,7 +16,6 @@
# Standard Library
import logging
-import uuid
from decimal import Decimal
# Django
@@ -28,6 +27,7 @@ from django.db import models
# wger
from wger.nutrition.helpers import BaseMealItem
+from wger.utils.uuid import uuid7
# Local
from .ingredient import Ingredient
@@ -43,11 +43,9 @@ class MealItem(BaseMealItem, models.Model):
An item (component) of a meal
"""
- uuid = models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ id = models.UUIDField(
+ default=uuid7,
+ primary_key=True,
)
meal = models.ForeignKey(
diff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.py
index bda97eb14..9c20524f4 100644
--- a/wger/nutrition/models/plan.py
+++ b/wger/nutrition/models/plan.py
@@ -17,7 +17,6 @@
# Standard Library
import datetime
import logging
-import uuid
# Django
from django.contrib.auth.models import User
@@ -30,6 +29,7 @@ from django.utils.timezone import make_aware
from wger.nutrition.consts import ENERGY_FACTOR
from wger.nutrition.helpers import NutritionalValues
from wger.utils.cache import cache_mapper
+from wger.utils.uuid import uuid7
from wger.weight.models import WeightEntry
@@ -47,11 +47,9 @@ class NutritionPlan(models.Model):
'-start',
]
- uuid = models.UUIDField(
- default=uuid.uuid4,
- editable=True,
- null=False,
- unique=True,
+ id = models.UUIDField(
+ default=uuid7,
+ primary_key=True,
)
user = models.ForeignKey(
diff --git a/wger/nutrition/powersync.py b/wger/nutrition/powersync.py
index fe13d6047..daf5d0b50 100644
--- a/wger/nutrition/powersync.py
+++ b/wger/nutrition/powersync.py
@@ -36,7 +36,6 @@ from wger.nutrition.models import (
MealItem,
NutritionPlan,
)
-from wger.utils.powersync import resolve_uuid_fk
from wger.utils.viewsets import check_fk_ownership
@@ -49,18 +48,12 @@ logger = logging.getLogger(__name__)
def handle_create_plan(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a PowerSync PUT event for a nutritional plan.
-
- The client generates the row's UUID; the backend honours it via
- `serializer.save(uuid=...)`. The owning user is forced to the
- authenticated one regardless of payload contents.
- """
+ """Handle a PowerSync PUT event for a nutritional plan."""
logger.debug(f'Received PowerSync payload for nutritional plan create: {payload}')
-
serializer = NutritionPlanSerializer(data=payload)
if serializer.is_valid():
- serializer.save(user_id=user_id, uuid=payload['id'])
- logger.info(f'Created NutritionPlan (uuid={payload["id"]}) for user {user_id}')
+ serializer.save(user_id=user_id)
+ logger.info(f'Created NutritionPlan {payload["id"]} for user {user_id}')
return None
logger.warning(f'PowerSync nutritional plan create validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -70,24 +63,23 @@ def handle_update_plan(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a PowerSync PATCH event for a nutritional plan."""
logger.debug(f'Received PowerSync payload for nutritional plan update: {payload}')
try:
- entry = NutritionPlan.objects.get(uuid=payload['id'], user_id=user_id)
+ entry = NutritionPlan.objects.get(pk=payload['id'], user_id=user_id)
except NutritionPlan.DoesNotExist:
logger.warning(
- f'NutritionPlan with uuid {payload["id"]} and user {user_id} not found for update.'
+ f'NutritionPlan {payload["id"]} for user {user_id} not found for update.'
)
return {
'error': 'Not found',
- 'details': f'NutritionPlan with uuid {payload["id"]} not found',
+ 'details': f'NutritionPlan {payload["id"]} not found',
}
if not check_fk_ownership(payload, NutritionPlanViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'NutritionPlan references an object you do not own'}
- payload.pop('id', None)
serializer = NutritionPlanSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated NutritionPlan {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ logger.info(f'Updated NutritionPlan {entry.pk} for user {user_id}')
return None
logger.warning(f'PowerSync nutritional plan update validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -101,15 +93,15 @@ def handle_delete_plan(payload: dict[str, Any], user_id: int) -> dict | None:
"""
logger.debug(f'Received PowerSync payload for nutritional plan delete: {payload}')
try:
- entry = NutritionPlan.objects.get(uuid=payload['id'], user_id=user_id)
+ entry = NutritionPlan.objects.get(pk=payload['id'], user_id=user_id)
except NutritionPlan.DoesNotExist:
- logger.warning(f'NutritionPlan with uuid {payload["id"]} not found for delete.')
+ logger.warning(f'NutritionPlan {payload["id"]} not found for delete.')
return {
'error': 'Not found',
- 'details': f'NutritionPlan with uuid {payload["id"]} not found',
+ 'details': f'NutritionPlan {payload["id"]} not found',
}
entry.delete()
- logger.info(f'Deleted NutritionPlan (uuid={payload["id"]}) for user {user_id}')
+ logger.info(f'Deleted NutritionPlan {payload["id"]} for user {user_id}')
return None
@@ -121,23 +113,18 @@ def handle_delete_plan(payload: dict[str, Any], user_id: int) -> dict | None:
def handle_create_meal(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a PowerSync PUT event for a meal.
- The client generates the row's UUID; the parent plan is referenced by UUID
- too and resolved here. The `order` field is set to whatever the client
- computed (or 1 by default, matching the existing REST `perform_create`).
+ The `order` field is set to whatever the client computed (or 1 by default,
+ matching the existing REST `perform_create`).
"""
logger.debug(f'Received PowerSync payload for meal create: {payload}')
- error = resolve_uuid_fk(payload, 'plan', NutritionPlan)
- if error:
- return error
-
if not check_fk_ownership(payload, MealViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'Meal references an object you do not own'}
serializer = MealSerializer(data=payload)
if serializer.is_valid():
- serializer.save(uuid=payload['id'], order=payload.get('order', 1))
- logger.info(f'Created Meal (uuid={payload["id"]}) for user {user_id}')
+ serializer.save(order=payload.get('order', 1))
+ logger.info(f'Created Meal {payload["id"]} for user {user_id}')
return None
logger.warning(f'PowerSync meal create validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -147,25 +134,18 @@ def handle_update_meal(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a PowerSync PATCH event for a meal."""
logger.debug(f'Received PowerSync payload for meal update: {payload}')
try:
- entry = Meal.objects.get(uuid=payload['id'], plan__user_id=user_id)
+ entry = Meal.objects.get(pk=payload['id'], plan__user_id=user_id)
except Meal.DoesNotExist:
- logger.warning(
- f'Meal with uuid {payload["id"]} and user {user_id} not found for update.'
- )
- return {'error': 'Not found', 'details': f'Meal with uuid {payload["id"]} not found'}
-
- error = resolve_uuid_fk(payload, 'plan', NutritionPlan)
- if error:
- return error
+ logger.warning(f'Meal {payload["id"]} for user {user_id} not found for update.')
+ return {'error': 'Not found', 'details': f'Meal {payload["id"]} not found'}
if not check_fk_ownership(payload, MealViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'Meal references an object you do not own'}
- payload.pop('id', None)
serializer = MealSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated Meal {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ logger.info(f'Updated Meal {entry.pk} for user {user_id}')
return None
logger.warning(f'PowerSync meal update validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -178,12 +158,12 @@ def handle_delete_meal(payload: dict[str, Any], user_id: int) -> dict | None:
"""
logger.debug(f'Received PowerSync payload for meal delete: {payload}')
try:
- entry = Meal.objects.get(uuid=payload['id'], plan__user_id=user_id)
+ entry = Meal.objects.get(pk=payload['id'], plan__user_id=user_id)
except Meal.DoesNotExist:
- logger.warning(f'Meal with uuid {payload["id"]} not found for delete.')
- return {'error': 'Not found', 'details': f'Meal with uuid {payload["id"]} not found'}
+ logger.warning(f'Meal {payload["id"]} not found for delete.')
+ return {'error': 'Not found', 'details': f'Meal {payload["id"]} not found'}
entry.delete()
- logger.info(f'Deleted Meal (uuid={payload["id"]}) for user {user_id}')
+ logger.info(f'Deleted Meal {payload["id"]} for user {user_id}')
return None
@@ -193,24 +173,16 @@ def handle_delete_meal(payload: dict[str, Any], user_id: int) -> dict | None:
def handle_create_mealitem(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a PowerSync PUT event for a meal item.
-
- The client generates the UUID and references its parent meal by UUID; the
- helper resolves that UUID to the integer FK before the serializer runs.
- """
+ """Handle a PowerSync PUT event for a meal item."""
logger.debug(f'Received PowerSync payload for meal item create: {payload}')
- error = resolve_uuid_fk(payload, 'meal', Meal)
- if error:
- return error
-
if not check_fk_ownership(payload, MealItemViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'MealItem references an object you do not own'}
serializer = MealItemSerializer(data=payload)
if serializer.is_valid():
- serializer.save(uuid=payload['id'], order=payload.get('order', 1))
- logger.info(f'Created MealItem (uuid={payload["id"]}) for user {user_id}')
+ serializer.save(order=payload.get('order', 1))
+ logger.info(f'Created MealItem {payload["id"]} for user {user_id}')
return None
logger.warning(f'PowerSync meal item create validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -220,25 +192,18 @@ def handle_update_mealitem(payload: dict[str, Any], user_id: int) -> dict | None
"""Handle a PowerSync PATCH event for a meal item."""
logger.debug(f'Received PowerSync payload for meal item update: {payload}')
try:
- entry = MealItem.objects.get(uuid=payload['id'], meal__plan__user_id=user_id)
+ entry = MealItem.objects.get(pk=payload['id'], meal__plan__user_id=user_id)
except MealItem.DoesNotExist:
- logger.warning(
- f'MealItem with uuid {payload["id"]} and user {user_id} not found for update.'
- )
- return {'error': 'Not found', 'details': f'MealItem with uuid {payload["id"]} not found'}
-
- error = resolve_uuid_fk(payload, 'meal', Meal)
- if error:
- return error
+ logger.warning(f'MealItem {payload["id"]} for user {user_id} not found for update.')
+ return {'error': 'Not found', 'details': f'MealItem {payload["id"]} not found'}
if not check_fk_ownership(payload, MealItemViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'MealItem references an object you do not own'}
- payload.pop('id', None)
serializer = MealItemSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated MealItem {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ logger.info(f'Updated MealItem {entry.pk} for user {user_id}')
return None
logger.warning(f'PowerSync meal item update validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -248,12 +213,12 @@ def handle_delete_mealitem(payload: dict[str, Any], user_id: int) -> dict | None
"""Handle a PowerSync DELETE event for a meal item."""
logger.debug(f'Received PowerSync payload for meal item delete: {payload}')
try:
- entry = MealItem.objects.get(uuid=payload['id'], meal__plan__user_id=user_id)
+ entry = MealItem.objects.get(pk=payload['id'], meal__plan__user_id=user_id)
except MealItem.DoesNotExist:
- logger.warning(f'MealItem with uuid {payload["id"]} not found for delete.')
- return {'error': 'Not found', 'details': f'MealItem with uuid {payload["id"]} not found'}
+ logger.warning(f'MealItem {payload["id"]} not found for delete.')
+ return {'error': 'Not found', 'details': f'MealItem {payload["id"]} not found'}
entry.delete()
- logger.info(f'Deleted MealItem (uuid={payload["id"]}) for user {user_id}')
+ logger.info(f'Deleted MealItem {payload["id"]} for user {user_id}')
return None
@@ -263,27 +228,16 @@ def handle_delete_mealitem(payload: dict[str, Any], user_id: int) -> dict | None
def handle_create_log(payload: dict[str, Any], user_id: int) -> dict | None:
- """Handle a PowerSync PUT event for a diary log entry.
-
- Plan and meal FKs both arrive as UUID strings and are resolved to integer
- PKs before validation.
- """
+ """Handle a PowerSync PUT event for a diary log entry."""
logger.debug(f'Received PowerSync payload for log create: {payload}')
- error = resolve_uuid_fk(payload, 'plan', NutritionPlan)
- if error:
- return error
- error = resolve_uuid_fk(payload, 'meal', Meal)
- if error:
- return error
-
if not check_fk_ownership(payload, LogItemViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'LogItem references an object you do not own'}
serializer = LogItemSerializer(data=payload)
if serializer.is_valid():
- serializer.save(uuid=payload['id'])
- logger.info(f'Created LogItem (uuid={payload["id"]}) for user {user_id}')
+ serializer.save()
+ logger.info(f'Created LogItem {payload["id"]} for user {user_id}')
return None
logger.warning(f'PowerSync log create validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -293,28 +247,18 @@ def handle_update_log(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a PowerSync PATCH event for a diary log entry."""
logger.debug(f'Received PowerSync payload for log update: {payload}')
try:
- entry = LogItem.objects.get(uuid=payload['id'], plan__user_id=user_id)
+ entry = LogItem.objects.get(pk=payload['id'], plan__user_id=user_id)
except LogItem.DoesNotExist:
- logger.warning(
- f'LogItem with uuid {payload["id"]} and user {user_id} not found for update.'
- )
- return {'error': 'Not found', 'details': f'LogItem with uuid {payload["id"]} not found'}
-
- error = resolve_uuid_fk(payload, 'plan', NutritionPlan)
- if error:
- return error
- error = resolve_uuid_fk(payload, 'meal', Meal)
- if error:
- return error
+ logger.warning(f'LogItem {payload["id"]} for user {user_id} not found for update.')
+ return {'error': 'Not found', 'details': f'LogItem {payload["id"]} not found'}
if not check_fk_ownership(payload, LogItemViewSet.get_owner_objects(), user_id):
return {'error': 'Forbidden', 'details': 'LogItem references an object you do not own'}
- payload.pop('id', None)
serializer = LogItemSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
- logger.info(f'Updated LogItem {entry.pk} (uuid={entry.uuid}) for user {user_id}')
+ logger.info(f'Updated LogItem {entry.pk} for user {user_id}')
return None
logger.warning(f'PowerSync log update validation failed: {serializer.errors}')
return {'error': 'Validation failed', 'details': serializer.errors}
@@ -324,10 +268,10 @@ def handle_delete_log(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a PowerSync DELETE event for a diary log entry."""
logger.debug(f'Received PowerSync payload for log delete: {payload}')
try:
- entry = LogItem.objects.get(uuid=payload['id'], plan__user_id=user_id)
+ entry = LogItem.objects.get(pk=payload['id'], plan__user_id=user_id)
except LogItem.DoesNotExist:
- logger.warning(f'LogItem with uuid {payload["id"]} not found for delete.')
- return {'error': 'Not found', 'details': f'LogItem with uuid {payload["id"]} not found'}
+ logger.warning(f'LogItem {payload["id"]} not found for delete.')
+ return {'error': 'Not found', 'details': f'LogItem {payload["id"]} not found'}
entry.delete()
- logger.info(f'Deleted LogItem (uuid={payload["id"]}) for user {user_id}')
+ logger.info(f'Deleted LogItem {payload["id"]} for user {user_id}')
return None
diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.py
index 0453fd0f7..21fe21532 100644
--- a/wger/nutrition/tests/test_copy_plan.py
+++ b/wger/nutrition/tests/test_copy_plan.py
@@ -31,7 +31,7 @@ class CopyPlanTestCase(WgerTestCase):
"""
# Open the copy nutritional plan form
- response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': 4}))
+ response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': '11111111-1111-1111-1111-000000000004'}))
if fail:
self.assertIn(response.status_code, (302, 403, 404))
else:
@@ -40,7 +40,7 @@ class CopyPlanTestCase(WgerTestCase):
# Copy the plan
count_before = NutritionPlan.objects.count()
response = self.client.post(
- reverse('nutrition:plan:copy', kwargs={'pk': 4}),
+ reverse('nutrition:plan:copy', kwargs={'pk': '11111111-1111-1111-1111-000000000004'}),
{'comment': 'A copied plan'},
)
count_after = NutritionPlan.objects.count()
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index b02e3e206..ddcf985ff 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -445,7 +445,7 @@ class IngredientTestCase(WgerTestCase):
ingredient2.protein = 30
self.assertEqual(ingredient1, ingredient2)
- meal = Meal.objects.get(pk=1)
+ meal = Meal.objects.get(pk='aa000000-0000-0000-0000-000000000001')
self.assertFalse(ingredient1 == meal)
diff --git a/wger/nutrition/tests/test_meal.py b/wger/nutrition/tests/test_meal.py
index 766193845..5a8c354eb 100644
--- a/wger/nutrition/tests/test_meal.py
+++ b/wger/nutrition/tests/test_meal.py
@@ -26,12 +26,12 @@ class MealApiTestCase(api_base_test.ApiBaseResourceTestCase):
Tests the meal overview resource
"""
- pk = 2
+ pk = '22222222-2222-2222-2222-000000000002'
resource = Meal
private_resource = True
special_endpoints = ('nutritional_values',)
data = {
'time': datetime.time(9, 2),
- 'plan': 4,
+ 'plan': '11111111-1111-1111-1111-000000000004',
'order': 1,
}
diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.py
index 10ddd4d3d..9876247ed 100644
--- a/wger/nutrition/tests/test_meal_item.py
+++ b/wger/nutrition/tests/test_meal_item.py
@@ -28,11 +28,11 @@ class MealItemApiTestCase(api_base_test.ApiBaseResourceTestCase):
Tests the meal overview resource
"""
- pk = 10
+ pk = '33333333-3333-3333-3333-000000000010'
resource = MealItem
private_resource = True
data = {
- 'meal': 2,
+ 'meal': '22222222-2222-2222-2222-000000000002',
'amount': 100,
'ingredient': 1,
}
diff --git a/wger/nutrition/tests/test_nutritional_calculations.py b/wger/nutrition/tests/test_nutritional_calculations.py
index 4db8fc4c1..4f086cbfa 100644
--- a/wger/nutrition/tests/test_nutritional_calculations.py
+++ b/wger/nutrition/tests/test_nutritional_calculations.py
@@ -221,7 +221,7 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
:return:
"""
self.user_login('test')
- plan = models.NutritionPlan.objects.get(pk=4)
+ plan = models.NutritionPlan.objects.get(pk='11111111-1111-1111-1111-000000000004')
values = plan.get_nutritional_values()
self.assertAlmostEqual(values['percent']['carbohydrates'], Decimal(29.79), 2)
diff --git a/wger/nutrition/tests/test_pdf.py b/wger/nutrition/tests/test_pdf.py
index 60a958179..f35677bb0 100644
--- a/wger/nutrition/tests/test_pdf.py
+++ b/wger/nutrition/tests/test_pdf.py
@@ -33,7 +33,12 @@ class NutritionalPlanPdfExportTestCase(WgerTestCase):
"""
# Get a plan
- response = self.client.get(reverse('nutrition:plan:export-pdf', kwargs={'id': 4}))
+ response = self.client.get(
+ reverse(
+ 'nutrition:plan:export-pdf',
+ kwargs={'id': '11111111-1111-1111-1111-000000000004'},
+ ),
+ )
if fail:
self.assertIn(response.status_code, (404, 403))
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index 88708ff5f..8c69dacb6 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -34,7 +34,7 @@ class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):
cached, but we don't really use it. This should be removed
"""
- pk = 4
+ pk = '11111111-1111-1111-1111-000000000004'
resource = NutritionPlan
private_resource = True
overview_cached = False
@@ -42,37 +42,43 @@ class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):
data = {'description': 'The description'}
+PLAN_OWNED_BY_TEST_USER = 'cc000000-0000-0000-0000-000000000002'
+
+
class PlanCopyTestCase(WgerTestCase):
def test_copy_plan(self):
"""
Tests making a copy of a meal plan
"""
self.user_login()
- orig_plan = NutritionPlan.objects.get(pk=2)
- response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': 2}))
- copied_plan_pk = int(resolve(response.url).kwargs['id'])
+ orig_plan = NutritionPlan.objects.get(pk=PLAN_OWNED_BY_TEST_USER)
+ response = self.client.get(
+ reverse('nutrition:plan:copy', kwargs={'pk': PLAN_OWNED_BY_TEST_USER}),
+ )
+ copied_plan_pk = resolve(response.url).kwargs['id']
copied_plan = NutritionPlan.objects.get(pk=copied_plan_pk)
# Convert plans to dictionaries and compare. The copy gets a fresh
- # uuid (PowerSync row identity), so we exclude it alongside the pk.
- orig_plan_dict = model_to_dict(orig_plan, exclude=['id', 'uuid'])
- copied_plan_dict = model_to_dict(copied_plan, exclude=['id', 'uuid'])
+ # UUID primary key, so we exclude `id` from the comparison.
+ orig_plan_dict = model_to_dict(orig_plan, exclude=['id'])
+ copied_plan_dict = model_to_dict(copied_plan, exclude=['id'])
self.assertEqual(orig_plan_dict, copied_plan_dict)
+ self.assertNotEqual(orig_plan.id, copied_plan.id)
orig_plan_meals = orig_plan.meal_set.all()
copied_plan_meals = copied_plan.meal_set.all()
for orig_meal, copied_meal in zip(orig_plan_meals, copied_plan_meals):
- orig_meal_dict = model_to_dict(orig_meal, exclude=['id', 'uuid', 'plan'])
- copied_meal_dict = model_to_dict(copied_meal, exclude=['id', 'uuid', 'plan'])
+ orig_meal_dict = model_to_dict(orig_meal, exclude=['id', 'plan'])
+ copied_meal_dict = model_to_dict(copied_meal, exclude=['id', 'plan'])
self.assertEqual(orig_meal_dict, copied_meal_dict)
- self.assertNotEqual(orig_meal.uuid, copied_meal.uuid)
+ self.assertNotEqual(orig_meal.id, copied_meal.id)
orig_meal_items = orig_meal.mealitem_set.all()
copied_meal_items = copied_meal.mealitem_set.all()
for orig_meal_item, copied_meal_item in zip(orig_meal_items, copied_meal_items):
- orig_dict = model_to_dict(orig_meal_item, exclude=['id', 'uuid', 'meal'])
- copied_dict = model_to_dict(copied_meal_item, exclude=['id', 'uuid', 'meal'])
+ orig_dict = model_to_dict(orig_meal_item, exclude=['id', 'meal'])
+ copied_dict = model_to_dict(copied_meal_item, exclude=['id', 'meal'])
self.assertEqual(orig_dict, copied_dict)
- self.assertNotEqual(orig_meal_item.uuid, copied_meal_item.uuid)
+ self.assertNotEqual(orig_meal_item.id, copied_meal_item.id)
diff --git a/wger/nutrition/tests/test_powersync.py b/wger/nutrition/tests/test_powersync.py
index 1e03b576b..64839df50 100644
--- a/wger/nutrition/tests/test_powersync.py
+++ b/wger/nutrition/tests/test_powersync.py
@@ -37,10 +37,7 @@ INGREDIENT_PUBLIC = 1
class NutritionPlanPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
- """
- PowerSync handlers for nutrition.NutritionPlan. Full CRUD via PowerSync —
- the handler keys rows by uuid (Pattern A).
- """
+ """PowerSync handlers for nutrition.NutritionPlan."""
table = 'nutrition_nutritionplan'
resource = NutritionPlan
@@ -67,16 +64,9 @@ class NutritionPlanPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCa
'goal_fiber': None,
}
- def _get_entry_for_update(self):
- return NutritionPlan.objects.get(uuid=self.update_payload['id'])
-
class MealPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
- """
- PowerSync handlers for nutrition.Meal. Full CRUD via PowerSync — the
- handler keys rows by uuid; the `plan` FK in the payload is a uuid string
- that the handler resolves to the integer PK before saving.
- """
+ """PowerSync handlers for nutrition.Meal."""
table = 'nutrition_meal'
resource = Meal
@@ -98,16 +88,9 @@ class MealPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
('plan', PLAN_OTHER_UUID),
)
- def _get_entry_for_update(self):
- return Meal.objects.get(uuid=self.update_payload['id'])
-
class MealItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
- """
- PowerSync handlers for nutrition.MealItem. Full CRUD via PowerSync — the
- handler keys rows by uuid; the `meal` FK in the payload is a uuid string
- that the handler resolves to the integer PK before saving.
- """
+ """PowerSync handlers for nutrition.MealItem."""
table = 'nutrition_mealitem'
resource = MealItem
@@ -130,16 +113,11 @@ class MealItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
('meal', MEAL_OTHER_UUID),
)
- def _get_entry_for_update(self):
- return MealItem.objects.get(uuid=self.update_payload['id'])
-
class LogItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
"""
PowerSync handlers for nutrition.LogItem. The handler runs
check_fk_ownership against (NutritionPlan, 'plan') and (Meal, 'meal').
- Lookup uses the uuid field; the `plan` and `meal` FKs in the payload are
- uuid strings that the handler resolves to the integer PKs before saving.
"""
table = 'nutrition_logitem'
@@ -162,7 +140,3 @@ class LogItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):
fk_ownership = (
('plan', PLAN_OTHER_UUID),
)
-
- def _get_entry_for_update(self):
- # LogItem's PowerSync handler looks up by uuid, not pk
- return LogItem.objects.get(uuid=self.update_payload['id'])
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 8e87637bb..016dfc29e 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -38,17 +38,17 @@ patterns_plan = [
name='overview',
),
path(
- '<int:id>/view/',
+ '<uuid:id>/view/',
ReactView.as_view(login_required=True),
name='view',
),
path(
- '<int:pk>/copy',
+ '<uuid:pk>/copy',
plan.copy,
name='copy',
),
path(
- '<int:id>/pdf',
+ '<uuid:id>/pdf',
plan.export_pdf,
name='export-pdf',
),
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 755abaef6..2b45fae53 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -70,12 +70,10 @@ def copy(request, pk):
"""
orig_plan = get_object_or_404(NutritionPlan, pk=pk, user=request.user)
- # Convert the original plan to a dictionary and remove the primary key.
- # uuid is editable so the copy gets a fresh one (otherwise we'd collide
- # with the original plan's uuid).
+ # Convert the original plan to a dictionary and remove the primary key
+ # so the copy gets a fresh UUID.
plan_data = model_to_dict(orig_plan)
- plan_data.pop('id')
- plan_data.pop('uuid', None)
+ plan_data.pop('id', None)
plan_copy = NutritionPlan.objects.create(user=request.user, **plan_data)
@@ -83,10 +81,7 @@ def copy(request, pk):
orig_meals = orig_plan.meal_set.all()
for orig_meal in orig_meals:
meal_data = model_to_dict(orig_meal)
- meal_data.pop('id')
- # uuid is editable so the copy gets a fresh one (otherwise we'd
- # collide with the original meal's uuid)
- meal_data.pop('uuid', None)
+ meal_data.pop('id', None)
meal_data['plan'] = plan_copy
# setting manually due to "editable" False
meal_data['order'] = orig_meal.order
@@ -96,8 +91,7 @@ def copy(request, pk):
orig_meal_items = orig_meal.mealitem_set.all()
for orig_meal_item in orig_meal_items:
meal_item_data = model_to_dict(orig_meal_item)
- meal_item_data.pop('id')
- meal_item_data.pop('uuid', None)
+ meal_item_data.pop('id', None)
meal_item_data.pop('ingredient')
meal_item_data['meal'] = meal_copy
meal_item_data['ingredient_id'] = orig_meal_item.ingredient_id