working food property editor

cookbook/serializer.py

@@ -753,7 +753,10 @@ class FoodPropertyTypeSerializer(serializers.ModelSerializer):
 class FoodPropertySerializer(UniqueFieldsMixin, WritableNestedModelSerializer):
     property_type = FoodPropertyTypeSerializer()
     food = FoodSimpleSerializer()
-    unit = UnitSerializer()
+    food_unit = UnitSerializer()
+    food_amount = CustomDecimalField()
+    property_amount = CustomDecimalField()
+
     # TODO prevent updates
 
     def create(self, validated_data):

cookbook/urls.py

@@ -35,7 +35,8 @@ router.register(r'recipe', api.RecipeViewSet)
 router.register(r'recipe-book', api.RecipeBookViewSet)
 router.register(r'recipe-book-entry', api.RecipeBookEntryViewSet)
 router.register(r'unit-conversion', api.UnitConversionViewSet)
-router.register(r'nutrition-type', api.NutritionTypeViewSet)
+router.register(r'food-property-type', api.FoodPropertyTypeViewSet)
+router.register(r'food-property', api.FoodPropertyViewSet)
 router.register(r'shopping-list', api.ShoppingListViewSet)
 router.register(r'shopping-list-entry', api.ShoppingListEntryViewSet)
 router.register(r'shopping-list-recipe', api.ShoppingListRecipeViewSet)

cookbook/views/api.py

@@ -68,7 +68,7 @@ from cookbook.models import (Automation, BookmarkletImport, CookLog, CustomFilte
                              MealType, Recipe, RecipeBook, RecipeBookEntry, ShareLink, ShoppingList,
                              ShoppingListEntry, ShoppingListRecipe, Space, Step, Storage,
                              Supermarket, SupermarketCategory, SupermarketCategoryRelation, Sync,
-                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog, UnitConversion, FoodPropertyType)
+                             SyncLog, Unit, UserFile, UserPreference, UserSpace, ViewLog, UnitConversion, FoodPropertyType, FoodProperty)
 from cookbook.provider.dropbox import Dropbox
 from cookbook.provider.local import Local
 from cookbook.provider.nextcloud import Nextcloud
@@ -92,7 +92,7 @@ from cookbook.serializer import (AutomationSerializer, BookmarkletImportListSeri
                                  SyncLogSerializer, SyncSerializer, UnitSerializer,
                                  UserFileSerializer, UserSerializer, UserPreferenceSerializer,
                                  UserSpaceSerializer, ViewLogSerializer, AccessTokenSerializer, FoodSimpleSerializer,
-                                 RecipeExportSerializer, UnitConversionSerializer, FoodPropertyTypeSerializer)
+                                 RecipeExportSerializer, UnitConversionSerializer, FoodPropertyTypeSerializer, FoodPropertySerializer)
 from cookbook.views.import_export import get_integration
 from recipes import settings
 
@@ -969,7 +969,7 @@ class UnitConversionViewSet(viewsets.ModelViewSet):
         return self.queryset.filter(space=self.request.space)
 
 
-class NutritionTypeViewSet(viewsets.ModelViewSet):
+class FoodPropertyTypeViewSet(viewsets.ModelViewSet):
     queryset = FoodPropertyType.objects
     serializer_class = FoodPropertyTypeSerializer
     permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
@@ -978,6 +978,25 @@ class NutritionTypeViewSet(viewsets.ModelViewSet):
         return self.queryset.filter(space=self.request.space)
 
 
+class FoodPropertyViewSet(viewsets.ModelViewSet):
+    queryset = FoodProperty.objects
+    serializer_class = FoodPropertySerializer
+    permission_classes = [CustomIsUser & CustomTokenHasReadWriteScope]
+
+    query_params = [
+        QueryParam(name='food',
+                   description=_('ID of food to return properties for.'),
+                   qtype='int'),
+    ]
+    schema = QueryParamAutoSchema()
+
+    def get_queryset(self):
+        if food := self.request.query_params.get('food', None):
+            self.queryset = self.queryset.filter(food__id=food)
+
+        return self.queryset.filter(space=self.request.space)
+
+
 class ShoppingListRecipeViewSet(viewsets.ModelViewSet):
     queryset = ShoppingListRecipe.objects
     serializer_class = ShoppingListRecipeSerializer