Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add edit operations for nutrition logs
Roland Geider1f79fae3fb79
diff --git a/wger/core/api/views.py b/wger/core/api/views.pyindex 329372870..a88f5ee6a 100644--- a/wger/core/api/views.py+++ b/wger/core/api/views.py@@ -586,6 +586,14 @@ def upload_powersync_data(request):'details': 'NutritionPlan creation must go through the REST API',}+ case 'nutrition_logitem':+ if http_verb == 'PUT':+ result = ps_nutrition.handle_create_log(payload=payload, user_id=user_id)+ elif http_verb == 'PATCH':+ result = ps_nutrition.handle_update_log(payload=payload, user_id=user_id)+ elif http_verb == 'DELETE':+ result = ps_nutrition.handle_delete_log(payload=payload, user_id=user_id)+case _:logger.warning(f'Received unknown PowerSync table: {table}')return JsonResponse({'error': f'Unknown table: {table}'}, status=200)diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.pyindex c46fe0a29..7d4d31b30 100644--- a/wger/nutrition/api/serializers.py+++ b/wger/nutrition/api/serializers.py@@ -37,26 +37,12 @@ class IngredientWeightUnitSerializer(serializers.ModelSerializer):IngredientWeightUnit serializer"""- class Meta:- model = IngredientWeightUnit- fields = (- 'id',- 'gram',- 'ingredient',- 'name',- )---class IngredientWeightUnitInfoSerializer(serializers.ModelSerializer):- """- IngredientWeightUnit info serializer- """-class Meta:model = IngredientWeightUnitfields = ('id','uuid',+ 'ingredient','gram','name',)@@ -97,7 +83,7 @@ class IngredientSerializer(serializers.ModelSerializer):Ingredient serializer"""- weight_units = IngredientWeightUnitInfoSerializer(source='ingredientweightunit_set', many=True)+ weight_units = IngredientWeightUnitSerializer(source='ingredientweightunit_set', many=True)class Meta:model = Ingredient@@ -141,7 +127,7 @@ class IngredientInfoSerializer(serializers.ModelSerializer):Ingredient info serializer"""- weight_units = IngredientWeightUnitInfoSerializer(source='ingredientweightunit_set', many=True)+ weight_units = IngredientWeightUnitSerializer(source='ingredientweightunit_set', many=True)image = IngredientImageSerializer(read_only=True)thumbnails = serializers.SerializerMethodField()diff --git a/wger/nutrition/migrations/0035_add_uuids.py b/wger/nutrition/migrations/0035_add_uuids.pyindex 2fef843ae..d97d8f77f 100644--- a/wger/nutrition/migrations/0035_add_uuids.py+++ b/wger/nutrition/migrations/0035_add_uuids.py@@ -116,7 +116,7 @@ class Migration(migrations.Migration):name='uuid',field=models.UUIDField(default=uuid.uuid4,- editable=False,+ editable=True,null=False,unique=True,),diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.pyindex a477d2a1a..bee397cce 100644--- a/wger/nutrition/models/log.py+++ b/wger/nutrition/models/log.py@@ -49,7 +49,7 @@ class LogItem(BaseMealItem, models.Model):uuid = models.UUIDField(default=uuid.uuid4,- editable=False,+ editable=True,null=False,unique=True,)diff --git a/wger/nutrition/powersync.py b/wger/nutrition/powersync.pyindex 159ba78f0..d81f05b93 100644--- a/wger/nutrition/powersync.py+++ b/wger/nutrition/powersync.py@@ -18,9 +18,18 @@ import loggingfrom typing import Any# wger-from wger.nutrition.api.serializers import NutritionPlanSerializer-from wger.nutrition.api.views import NutritionPlanViewSet-from wger.nutrition.models import NutritionPlan+from wger.nutrition.api.serializers import (+ LogItemSerializer,+ NutritionPlanSerializer,+)+from wger.nutrition.api.views import (+ LogItemViewSet,+ NutritionPlanViewSet,+)+from wger.nutrition.models import (+ LogItem,+ NutritionPlan,+)from wger.utils.viewsets import check_fk_ownership@@ -77,3 +86,60 @@ def handle_delete_plan(payload: dict[str, Any], user_id: int) -> dict | None:entry.delete()logger.info(f'Deleted NutritionPlan {payload["id"]} for user {user_id}')return None++#+# Log items (nutrition diary)+#++def handle_create_log(payload: dict[str, Any], user_id: int) -> dict | None:+ """Handle a PowerSync PUT event for a diary log entry."""+ logger.debug(f'Received PowerSync payload for log create: {payload}')++ 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}')+ return None+ logger.warning(f'PowerSync log create validation failed: {serializer.errors}')+ return {'error': 'Validation failed', 'details': serializer.errors}+++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)+ 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'}++ if not check_fk_ownership(payload, LogItemViewSet.get_owner_objects(), user_id):+ return {'error': 'Forbidden', 'details': 'LogItem references an object you do not own'}++ # Drop 'id' from the patch, the row is already resolved by uuid above+ 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}')+ return None+ logger.warning(f'PowerSync log update validation failed: {serializer.errors}')+ return {'error': 'Validation failed', 'details': serializer.errors}+++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)+ 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'}+ entry.delete()+ logger.info(f'Deleted LogItem (uuid={payload["id"]}) for user {user_id}')+ return None