Self hosted FLOSS fitness/workout, nutrition and weight tracker
Simplify the powersync handlers by registering the individual ones
Roland Geider11ce67544dad
diff --git a/wger/core/tests/powersync_base_test.py b/wger/core/tests/powersync_base_test.pyindex 8ed02d60f..7d3916b42 100644--- a/wger/core/tests/powersync_base_test.py+++ b/wger/core/tests/powersync_base_test.py@@ -90,9 +90,7 @@ class PowerSyncCreateTestCase:"""Return the single object whose pk wasn't in ``pks_before``."""pks_after = set(self.resource.objects.values_list('pk', flat=True))new_pks = pks_after - pks_before- self.assertEqual(- len(new_pks), 1, f'Exactly one new {self.resource.__name__} row expected'- )+ self.assertEqual(len(new_pks), 1, f'Exactly one new {self.resource.__name__} row expected')return self.resource.objects.get(pk=new_pks.pop())def _client_supplied_id_field(self, obj):diff --git a/wger/manager/migrations/0026_change_pk_to_uuid_swap.py b/wger/manager/migrations/0026_change_pk_to_uuid_swap.pyindex e45c00730..fcfcba862 100644--- a/wger/manager/migrations/0026_change_pk_to_uuid_swap.py+++ b/wger/manager/migrations/0026_change_pk_to_uuid_swap.py@@ -42,9 +42,7 @@ class Migration(migrations.Migration):migrations.AlterField(model_name='workoutsession',name='id',- field=models.UUIDField(- default=uuid7, primary_key=True, serialize=False- ),+ field=models.UUIDField(default=uuid7, primary_key=True, serialize=False),),# WorkoutLogmigrations.RemoveField(@@ -59,9 +57,7 @@ class Migration(migrations.Migration):migrations.AlterField(model_name='workoutlog',name='id',- field=models.UUIDField(- default=uuid7, primary_key=True, serialize=False- ),+ field=models.UUIDField(default=uuid7, primary_key=True, serialize=False),),# --- Restore FKs ---# WorkoutLog.sessiondiff --git a/wger/manager/tests/test_powersync.py b/wger/manager/tests/test_powersync.pyindex 0a2098368..4ed35740e 100644--- a/wger/manager/tests/test_powersync.py+++ b/wger/manager/tests/test_powersync.py@@ -89,9 +89,7 @@ class WorkoutSessionPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestC'notes': 'edited via PowerSync',}- fk_ownership = (- ('routine', ROUTINE_OTHER),- )+ fk_ownership = (('routine', ROUTINE_OTHER),)class RoutinePowerSyncTestCase(diff --git a/wger/measurements/migrations/0004_add_uuids.py b/wger/measurements/migrations/0004_add_uuids.pyindex 6075362ab..51386a9ea 100644--- a/wger/measurements/migrations/0004_add_uuids.py+++ b/wger/measurements/migrations/0004_add_uuids.py@@ -81,7 +81,9 @@ class Migration(migrations.Migration):name='category_tmp',field=models.UUIDField(editable=False, null=True),),- migrations.RunPython(populate_measurement_category_tmp, reverse_code=migrations.RunPython.noop),+ migrations.RunPython(+ populate_measurement_category_tmp, reverse_code=migrations.RunPython.noop+ ),migrations.RemoveField(model_name='measurement', name='category'),# ------------------------------------------------------------------# 3. Promote uuid -> primary keydiff --git a/wger/measurements/tests/test_powersync.py b/wger/measurements/tests/test_powersync.pyindex 99c920541..e01211021 100644--- a/wger/measurements/tests/test_powersync.py+++ b/wger/measurements/tests/test_powersync.py@@ -69,6 +69,4 @@ class MeasurementPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase'value': 23.5,}- fk_ownership = (- ('category', CATEGORY_OTHER_UUID),- )+ fk_ownership = (('category', CATEGORY_OTHER_UUID),)diff --git a/wger/nutrition/migrations/0035_add_uuids.py b/wger/nutrition/migrations/0035_add_uuids.pyindex cbd289736..01ade3f6d 100644--- a/wger/nutrition/migrations/0035_add_uuids.py+++ b/wger/nutrition/migrations/0035_add_uuids.py@@ -145,7 +145,6 @@ class Migration(migrations.Migration):),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',@@ -153,7 +152,6 @@ class Migration(migrations.Migration):),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',@@ -168,7 +166,6 @@ class Migration(migrations.Migration):),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# ------------------------------------------------------------------diff --git a/wger/nutrition/tests/test_copy_plan.py b/wger/nutrition/tests/test_copy_plan.pyindex 21fe21532..3f20dd51b 100644--- a/wger/nutrition/tests/test_copy_plan.py+++ b/wger/nutrition/tests/test_copy_plan.py@@ -31,7 +31,9 @@ class CopyPlanTestCase(WgerTestCase):"""# Open the copy nutritional plan form- response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': '11111111-1111-1111-1111-000000000004'}))+ 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:diff --git a/wger/nutrition/tests/test_powersync.py b/wger/nutrition/tests/test_powersync.pyindex 64839df50..e0576e1ed 100644--- a/wger/nutrition/tests/test_powersync.py+++ b/wger/nutrition/tests/test_powersync.py@@ -84,9 +84,7 @@ class MealPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):'name': 'created via PowerSync',}- fk_ownership = (- ('plan', PLAN_OTHER_UUID),- )+ fk_ownership = (('plan', PLAN_OTHER_UUID),)class MealItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):@@ -109,9 +107,7 @@ class MealItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):'amount': '50',}- fk_ownership = (- ('meal', MEAL_OTHER_UUID),- )+ fk_ownership = (('meal', MEAL_OTHER_UUID),)class LogItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):@@ -137,6 +133,4 @@ class LogItemPowerSyncTestCase(powersync_base_test.PowerSyncResourceTestCase):'amount': '99',}- fk_ownership = (- ('plan', PLAN_OTHER_UUID),- )+ fk_ownership = (('plan', PLAN_OTHER_UUID),)diff --git a/wger/weight/api/serializers.py b/wger/weight/api/serializers.pyindex 39987377c..42e58ca22 100644--- a/wger/weight/api/serializers.py+++ b/wger/weight/api/serializers.py@@ -27,9 +27,7 @@ class WeightEntrySerializer(serializers.ModelSerializer):Weight serializer"""- user = serializers.PrimaryKeyRelatedField(- read_only=True, default=serializers.CurrentUserDefault()- )+ user = serializers.PrimaryKeyRelatedField(read_only=True)class Meta:model = WeightEntry