Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Return error codes to the client

Roland Geiderc806a58f1324
diff --git a/wger/core/api/views.py b/wger/core/api/views.py
index 0361ddbc2..6bef31119 100644
--- a/wger/core/api/views.py
+++ b/wger/core/api/views.py
@@ -490,50 +490,75 @@ def upload_powersync_data(request):
logger.info(f'Received PowerSync data for table {table} via {http_verb} for user {user_id}')
+ # Each handler returns either `None` (operation processed successfully) or
+ # an error dict which we propagate back to the client. The HTTP status stays
+ # at 200 even on logical errors since powersync treats non-2xx statuses as
+ # "retry forever".
+ result: dict | None = None
try:
match table:
# Body weight
case 'weight_weightentry':
if http_verb == 'PUT':
- ps_weight.handle_create(payload=payload, user_id=user_id, request=request)
+ result = ps_weight.handle_create(
+ payload=payload,
+ user_id=user_id,
+ request=request,
+ )
elif http_verb == 'PATCH':
- ps_weight.handle_update(payload=payload, user_id=user_id, request=request)
+ result = ps_weight.handle_update(
+ payload=payload,
+ user_id=user_id,
+ request=request,
+ )
elif http_verb == 'DELETE':
- ps_weight.handle_delete(payload=payload, user_id=user_id)
+ result = ps_weight.handle_delete(payload=payload, user_id=user_id)
# Measurements
case 'measurements_category':
if http_verb == 'PUT':
- ps_measurements.handle_create_category(payload=payload, user_id=user_id)
+ result = ps_measurements.handle_create_category(
+ payload=payload, user_id=user_id
+ )
elif http_verb == 'PATCH':
- ps_measurements.handle_update_category(payload=payload, user_id=user_id)
+ result = ps_measurements.handle_update_category(
+ payload=payload, user_id=user_id
+ )
elif http_verb == 'DELETE':
- ps_measurements.handle_delete_category(payload=payload, user_id=user_id)
+ result = ps_measurements.handle_delete_category(
+ payload=payload, user_id=user_id
+ )
case 'measurements_measurement':
if http_verb == 'PUT':
- ps_measurements.handle_create_measurement(payload=payload, user_id=user_id)
+ result = ps_measurements.handle_create_measurement(
+ payload=payload, user_id=user_id
+ )
elif http_verb == 'PATCH':
- ps_measurements.handle_update_measurement(payload=payload, user_id=user_id)
+ result = ps_measurements.handle_update_measurement(
+ payload=payload, user_id=user_id
+ )
elif http_verb == 'DELETE':
- ps_measurements.handle_delete_measurement(payload=payload, user_id=user_id)
+ result = ps_measurements.handle_delete_measurement(
+ payload=payload, user_id=user_id
+ )
# Routines
case 'manager_workoutlog':
if http_verb == 'PUT':
- ps_manager.handle_create_log(payload=payload, user_id=user_id)
+ result = ps_manager.handle_create_log(payload=payload, user_id=user_id)
elif http_verb == 'PATCH':
- ps_manager.handle_update_log(payload=payload, user_id=user_id)
+ result = ps_manager.handle_update_log(payload=payload, user_id=user_id)
elif http_verb == 'DELETE':
- ps_manager.handle_delete_log(payload=payload, user_id=user_id)
+ result = ps_manager.handle_delete_log(payload=payload, user_id=user_id)
case 'manager_workoutsession':
if http_verb == 'PUT':
- ps_manager.handle_create_session(payload=payload, user_id=user_id)
+ result = ps_manager.handle_create_session(payload=payload, user_id=user_id)
elif http_verb == 'PATCH':
- ps_manager.handle_update_session(payload=payload, user_id=user_id)
+ result = ps_manager.handle_update_session(payload=payload, user_id=user_id)
elif http_verb == 'DELETE':
- ps_manager.handle_delete_session(payload=payload, user_id=user_id)
+ result = ps_manager.handle_delete_session(payload=payload, user_id=user_id)
case _:
logger.warning(f'Received unknown PowerSync table: {table}')
@@ -542,4 +567,6 @@ def upload_powersync_data(request):
logger.exception(f'Error processing PowerSync data for table {table}')
return JsonResponse({'error': str(e)}, status=200)
+ if result is not None:
+ return JsonResponse(result, status=200)
return JsonResponse({'status': 'ok!'}, status=200)
diff --git a/wger/core/management/commands/setup-powersync-storage.py b/wger/core/management/commands/setup-powersync-storage.py
index c72dab8f5..8f787783e 100644
--- a/wger/core/management/commands/setup-powersync-storage.py
+++ b/wger/core/management/commands/setup-powersync-storage.py
@@ -59,7 +59,7 @@ class Command(BaseCommand):
def handle(self, *args, **options):
# Extract storage connection details
- uri = getattr(settings, 'PS_STORAGE_PG_URI', '').strip()
+ uri = getattr(settings, 'PS_STORAGE_PG_URI', '').strip()
if not uri:
self.stdout.write('PS_STORAGE_PG_URI not set — skipping PowerSync storage setup.')
return
diff --git a/wger/manager/powersync.py b/wger/manager/powersync.py
index d1cb56d64..fee19ab5f 100644
--- a/wger/manager/powersync.py
+++ b/wger/manager/powersync.py
@@ -36,7 +36,7 @@ from wger.utils.viewsets import check_fk_ownership
logger = logging.getLogger(__name__)
-def handle_update_log(payload: dict[str, Any], user_id: int) -> None:
+def handle_update_log(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:
@@ -45,45 +45,48 @@ def handle_update_log(payload: dict[str, Any], user_id: int) -> None:
logger.warning(
f'WorkoutLog with UUID {payload["id"]} and user {user_id} not found for update.'
)
- return
+ return {'error': 'Not found', 'details': f'WorkoutLog with UUID {payload["id"]} not found'}
if not check_fk_ownership(payload, WorkoutLogViewSet.get_owner_objects(), user_id):
- return
+ return {'error': 'Forbidden', 'details': 'WorkoutLog references an object you do not own'}
serializer = WorkoutLogSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
logger.info(f'Updated WorkoutLog {entry.pk} for user {user_id}')
- else:
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_create_log(payload: dict[str, Any], user_id: int) -> None:
+def handle_create_log(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a create event from PowerSync"""
logger.debug(f'Received PowerSync payload for create: {payload}')
if not check_fk_ownership(payload, WorkoutLogViewSet.get_owner_objects(), user_id):
- return
+ return {'error': 'Forbidden', 'details': 'WorkoutLog references an object you do not own'}
serializer = WorkoutLogSerializer(data=payload)
if serializer.is_valid():
serializer.save(user_id=user_id)
- else:
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_delete_log(payload: dict[str, Any], user_id: int) -> None:
+def handle_delete_log(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a delete event from PowerSync"""
logger.debug(f'Received PowerSync payload for delete: {payload}')
try:
entry = WorkoutLog.objects.get(pk=payload['id'], user_id=user_id)
except WorkoutLog.DoesNotExist:
logger.warning(f'WorkoutLog with UUID {payload["id"]} not found for delete.')
- return
+ return {'error': 'Not found', 'details': f'WorkoutLog with UUID {payload["id"]} not found'}
entry.delete()
+ return None
-def handle_update_session(payload: dict[str, Any], user_id: int) -> None:
+def handle_update_session(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:
@@ -92,39 +95,54 @@ def handle_update_session(payload: dict[str, Any], user_id: int) -> None:
logger.warning(
f'WorkoutSession with UUID {payload["id"]} and user {user_id} not found for update.'
)
- return
+ return {
+ 'error': 'Not found',
+ 'details': f'WorkoutSession with UUID {payload["id"]} not found',
+ }
if not check_fk_ownership(payload, WorkoutSessionViewSet.get_owner_objects(), user_id):
- return
+ return {
+ 'error': 'Forbidden',
+ 'details': 'WorkoutSession references an object you do not own',
+ }
serializer = WorkoutSessionSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
logger.info(f'Updated WorkoutSession {entry.pk} for user {user_id}')
- else:
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_create_session(payload: dict[str, Any], user_id: int) -> None:
+def handle_create_session(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a create event from PowerSync"""
logger.debug(f'Received PowerSync payload for create: {payload}')
if not check_fk_ownership(payload, WorkoutSessionViewSet.get_owner_objects(), user_id):
- return
+ return {
+ 'error': 'Forbidden',
+ 'details': 'WorkoutSession references an object you do not own',
+ }
serializer = WorkoutSessionSerializer(data=payload)
if serializer.is_valid():
serializer.save(user_id=user_id)
- else:
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_delete_session(payload: dict[str, Any], user_id: int) -> None:
+def handle_delete_session(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a delete event from PowerSync"""
logger.debug(f'Received PowerSync payload for delete: {payload}')
try:
entry = WorkoutSession.objects.get(pk=payload['id'], user_id=user_id)
except WorkoutSession.DoesNotExist:
logger.warning(f'WorkoutSession with UUID {payload["id"]} not found for delete.')
- return
+ return {
+ 'error': 'Not found',
+ 'details': f'WorkoutSession with UUID {payload["id"]} not found',
+ }
entry.delete()
+ return None
diff --git a/wger/measurements/powersync.py b/wger/measurements/powersync.py
index 3e10725ed..0604a52ee 100644
--- a/wger/measurements/powersync.py
+++ b/wger/measurements/powersync.py
@@ -33,7 +33,7 @@ from wger.utils.viewsets import check_fk_ownership
logger = logging.getLogger(__name__)
-def handle_update_category(payload: dict[str, Any], user_id: int) -> None:
+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}')
try:
@@ -42,38 +42,41 @@ def handle_update_category(payload: dict[str, Any], user_id: int) -> None:
logger.warning(
f'Category with UUID {payload["id"]} and user {user_id} not found for update.'
)
- return
+ return {'error': 'Not found', 'details': f'Category with UUID {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}')
- else:
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ 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) -> None:
+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)
- else:
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_delete_category(payload: dict[str, Any], user_id: int) -> None:
+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}')
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
+ return {'error': 'Not found', 'details': f'Category with UUID {payload["id"]} not found'}
entry.delete()
+ return None
-def handle_update_measurement(payload: dict[str, Any], user_id: int) -> 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:
@@ -82,39 +85,48 @@ def handle_update_measurement(payload: dict[str, Any], user_id: int) -> None:
logger.warning(
f'Measurement with UUID {payload["id"]} and user {user_id} not found for update.'
)
- return
+ return {
+ 'error': 'Not found',
+ 'details': f'Measurement with UUID {payload["id"]} not found',
+ }
if not check_fk_ownership(payload, MeasurementViewSet.get_owner_objects(), user_id):
- return
+ return {'error': 'Forbidden', 'details': 'Measurement references a category you do not own'}
serializer = MeasurementSerializer(entry, data=payload, partial=True)
if serializer.is_valid():
serializer.save()
logger.info(f'Updated Measurement {entry.pk} for user {user_id}')
- else:
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_create_measurement(payload: dict[str, Any], user_id: int) -> None:
+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}')
if not check_fk_ownership(payload, MeasurementViewSet.get_owner_objects(), user_id):
- return
+ return {'error': 'Forbidden', 'details': 'Measurement references a category you do not own'}
serializer = MeasurementSerializer(data=payload)
if serializer.is_valid():
serializer.save()
- else:
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_delete_measurement(payload: dict[str, Any], user_id: int) -> None:
+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}')
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
+ return {
+ 'error': 'Not found',
+ 'details': f'Measurement with UUID {payload["id"]} not found',
+ }
entry.delete()
+ return None
diff --git a/wger/weight/powersync.py b/wger/weight/powersync.py
index f516f8832..c9e73f03e 100644
--- a/wger/weight/powersync.py
+++ b/wger/weight/powersync.py
@@ -28,7 +28,7 @@ from wger.weight.models import WeightEntry
logger = logging.getLogger(__name__)
-def handle_update(payload: dict[str, Any], user_id: int, request: HttpRequest) -> None:
+def handle_update(payload: dict[str, Any], user_id: int, request: HttpRequest) -> dict | None:
"""Handle a push event from PowerSync"""
logger.debug(f'Received PowerSync payload for update: {payload}')
try:
@@ -37,7 +37,10 @@ def handle_update(payload: dict[str, Any], user_id: int, request: HttpRequest) -
logger.warning(
f'WeightEntry with UUID {payload["id"]} and user {user_id} not found for update.'
)
- return
+ return {
+ 'error': 'Not found',
+ 'details': f'WeightEntry with UUID {payload["id"]} not found',
+ }
serializer = WeightEntrySerializer(
entry,
@@ -48,26 +51,32 @@ def handle_update(payload: dict[str, Any], user_id: int, request: HttpRequest) -
if serializer.is_valid():
serializer.save()
logger.info(f'Updated WeightEntry {entry.pk} (uuid={entry.uuid}) for user {user_id}')
- else:
- logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync update validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_create(payload: dict[str, Any], user_id: int, request: HttpRequest) -> None:
+def handle_create(payload: dict[str, Any], user_id: int, request: HttpRequest) -> dict | None:
"""Handle a create event from PowerSync"""
logger.debug(f'Received PowerSync payload for create: {payload}')
serializer = WeightEntrySerializer(data=payload, context={'request': request})
if serializer.is_valid():
serializer.save(user_id=user_id)
- else:
- logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return None
+ logger.warning(f'PowerSync create validation failed: {serializer.errors}')
+ return {'error': 'Validation failed', 'details': serializer.errors}
-def handle_delete(payload: dict[str, Any], user_id: int) -> None:
+def handle_delete(payload: dict[str, Any], user_id: int) -> dict | None:
"""Handle a delete event from PowerSync"""
logger.debug(f'Received PowerSync payload for delete: {payload}')
try:
entry = WeightEntry.objects.get(uuid=payload['id'], user_id=user_id)
except WeightEntry.DoesNotExist:
logger.warning(f'WeightEntry with UUID {payload["id"]} not found for delete.')
- return
+ return {
+ 'error': 'Not found',
+ 'details': f'WeightEntry with UUID {payload["id"]} not found',
+ }
entry.delete()
+ return None