Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Use a dataclass to handle the nutritional values calculations

Roland Geider68e9a539608b
diff --git a/wger/core/models/profile.py b/wger/core/models/profile.py
index 8edda7b73..ba7ca646f 100644
--- a/wger/core/models/profile.py
+++ b/wger/core/models/profile.py
@@ -523,8 +523,8 @@ by the US Department of Agriculture. It is extremely complete, with around
"""
if (
not WeightEntry.objects.filter(user=self.user).exists() or (
- datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date
- > datetime.timedelta(days=3)
+ datetime.date.today() - WeightEntry.objects.filter(user=self.user).latest().date >
+ datetime.timedelta(days=3)
)
):
entry = WeightEntry()
diff --git a/wger/exercises/models/base.py b/wger/exercises/models/base.py
index f7326e0d1..d55b7b41b 100644
--- a/wger/exercises/models/base.py
+++ b/wger/exercises/models/base.py
@@ -149,8 +149,8 @@ class ExerciseBase(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
Warning(
'exercises without translations',
hint=f'There are {no_translations} exercises without translations, this will '
- 'cause problems! You can output or delete them with "python manage.py '
- 'exercises-health-check --help"',
+ 'cause problems! You can output or delete them with "python manage.py '
+ 'exercises-health-check --help"',
id='wger.W002',
)
)
@@ -179,8 +179,7 @@ class ExerciseBase(AbstractLicenseModel, AbstractHistoryMixin, models.Model):
The latest update datetime of all exercises, videos and images.
"""
return max(
- self.last_update,
- *[image.last_update for image in self.exerciseimage_set.all()],
+ self.last_update, *[image.last_update for image in self.exerciseimage_set.all()],
*[video.last_update for video in self.exercisevideo_set.all()],
*[translation.last_update for translation in self.exercises.all()],
datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
diff --git a/wger/manager/urls.py b/wger/manager/urls.py
index 40dc8ad57..6268e1d18 100644
--- a/wger/manager/urls.py
+++ b/wger/manager/urls.py
@@ -37,6 +37,7 @@ from wger.manager.views import (
workout_session,
)
+
# sub patterns for workout logs
patterns_log = [
path(
diff --git a/wger/measurements/urls.py b/wger/measurements/urls.py
index cc7b3d908..8c08aff81 100644
--- a/wger/measurements/urls.py
+++ b/wger/measurements/urls.py
@@ -19,6 +19,7 @@ from django.urls import path
# wger
from wger.core.views.react import ReactView
+
urlpatterns = [
path(
'',
diff --git a/wger/nutrition/api/serializers.py b/wger/nutrition/api/serializers.py
index 35fb67710..ecb09dee0 100644
--- a/wger/nutrition/api/serializers.py
+++ b/wger/nutrition/api/serializers.py
@@ -298,7 +298,10 @@ class MealInfoSerializer(serializers.ModelSerializer):
meal_items = MealItemInfoSerializer(source='mealitem_set', many=True)
plan = serializers.PrimaryKeyRelatedField(read_only=True)
- get_nutritional_values = NutritionalValuesSerializer(read_only=True)
+ nutritional_values = NutritionalValuesSerializer(
+ source='get_nutritional_values',
+ read_only=True,
+ )
class Meta:
model = Meal
@@ -309,7 +312,7 @@ class MealInfoSerializer(serializers.ModelSerializer):
'time',
'name',
'meal_items',
- 'get_nutritional_values',
+ 'nutritional_values',
]
@@ -318,6 +321,8 @@ class NutritionPlanSerializer(serializers.ModelSerializer):
Nutritional plan serializer
"""
+ # nutritional_values = NutritionalValuesSerializer(source='get_nutritional_values.total')
+
class Meta:
model = NutritionPlan
fields = [
@@ -325,7 +330,7 @@ class NutritionPlanSerializer(serializers.ModelSerializer):
'creation_date',
'description',
'only_logging',
- 'get_nutritional_values',
+ # 'nutritional_values',
]
@@ -334,9 +339,6 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):
Nutritional plan info serializer
"""
meals = MealInfoSerializer(source='meal_set', many=True)
- get_nutritional_values = NutritionalValuesSerializer(
- source='get_nutritional_values.total', read_only=True
- )
class Meta:
model = NutritionPlan
@@ -345,6 +347,5 @@ class NutritionPlanInfoSerializer(serializers.ModelSerializer):
'id',
'creation_date',
'description',
- 'get_nutritional_values',
'meals',
]
diff --git a/wger/nutrition/api/views.py b/wger/nutrition/api/views.py
index 3d2cbd651..77895c487 100644
--- a/wger/nutrition/api/views.py
+++ b/wger/nutrition/api/views.py
@@ -17,6 +17,7 @@
# Standard Library
import logging
+from dataclasses import asdict
# Django
from django.conf import settings
@@ -56,6 +57,7 @@ from wger.nutrition.api.serializers import (
LogItemSerializer,
MealItemSerializer,
MealSerializer,
+ NutritionalValuesSerializer,
NutritionPlanInfoSerializer,
NutritionPlanSerializer,
WeightUnitSerializer,
@@ -75,6 +77,7 @@ from wger.utils.constants import ENGLISH_SHORT_NAME
from wger.utils.language import load_language
from wger.utils.viewsets import WgerOwnerObjectModelViewSet
+
logger = logging.getLogger(__name__)
@@ -145,10 +148,7 @@ class IngredientViewSet(viewsets.ReadOnlyModelViewSet):
item.weight_unit_id = unit_id
item.amount = form.cleaned_data['amount']
- result = item.get_nutritional_values()
-
- for i in result:
- result[i] = '{0:f}'.format(result[i])
+ result = item.get_nutritional_values().to_dict
else:
result['errors'] = form.errors
@@ -324,7 +324,10 @@ class NutritionPlanViewSet(viewsets.ModelViewSet):
"""
Return an overview of the nutritional plan's values
"""
- return Response(NutritionPlan.objects.get(pk=pk).get_nutritional_values())
+ serializer = NutritionalValuesSerializer(
+ NutritionPlan.objects.get(pk=pk).get_nutritional_values()['total'],
+ )
+ return Response(serializer.data)
class NutritionPlanInfoViewSet(NutritionPlanViewSet):
@@ -375,7 +378,8 @@ class MealViewSet(WgerOwnerObjectModelViewSet):
"""
Return an overview of the nutritional plan's values
"""
- return Response(Meal.objects.get(pk=pk).get_nutritional_values())
+ serializer = NutritionalValuesSerializer(Meal.objects.get(pk=pk).get_nutritional_values())
+ return Response(serializer.data)
class MealItemViewSet(WgerOwnerObjectModelViewSet):
diff --git a/wger/nutrition/helpers.py b/wger/nutrition/helpers.py
index 31dd1c9bc..c6b2e779b 100644
--- a/wger/nutrition/helpers.py
+++ b/wger/nutrition/helpers.py
@@ -15,6 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Standard Library
+from dataclasses import (
+ asdict,
+ dataclass,
+)
from decimal import Decimal
# wger
@@ -51,55 +55,86 @@ class BaseMealItem:
:param use_metric Flag that controls the units used
"""
- nutritional_info = {
- 'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0
- }
+ values = NutritionalValues()
+
# Calculate the base weight of the item
if self.get_unit_type() == MEALITEM_WEIGHT_GRAM:
item_weight = self.amount
else:
item_weight = (self.amount * self.weight_unit.amount * self.weight_unit.gram)
- nutritional_info['energy'] += self.ingredient.energy * item_weight / 100
- nutritional_info['protein'] += self.ingredient.protein * item_weight / 100
- nutritional_info['carbohydrates'] += self.ingredient.carbohydrates * item_weight / 100
- nutritional_info['fat'] += self.ingredient.fat * item_weight / 100
+ values.energy = self.ingredient.energy * item_weight / 100
+ values.protein = self.ingredient.protein * item_weight / 100
+ values.carbohydrates = self.ingredient.carbohydrates * item_weight / 100
+ values.fat = self.ingredient.fat * item_weight / 100
if self.ingredient.carbohydrates_sugar:
- nutritional_info['carbohydrates_sugar'] += \
- self.ingredient.carbohydrates_sugar * item_weight / 100
+ values.carbohydrates_sugar = self.ingredient.carbohydrates_sugar * item_weight / 100
if self.ingredient.fat_saturated:
- nutritional_info['fat_saturated'] += self.ingredient.fat_saturated * item_weight / 100
+ values.fat_saturated = self.ingredient.fat_saturated * item_weight / 100
if self.ingredient.fibres:
- nutritional_info['fibres'] += self.ingredient.fibres * item_weight / 100
+ values.fibres = self.ingredient.fibres * item_weight / 100
if self.ingredient.sodium:
- nutritional_info['sodium'] += self.ingredient.sodium * item_weight / 100
+ values.sodium = self.ingredient.sodium * item_weight / 100
+
+ # # If necessary, convert weight units
+ # if not use_metric:
+ # for key, value in nutritional_info.items():
+ #
+ # # Energy is not a weight!
+ # if key == 'energy':
+ # continue
+ #
+ # # Everything else, to ounces
+ # nutritional_info[key] = AbstractWeight(value, 'g').oz
+ #
+ # nutritional_info['energy_kilojoule'] = Decimal(nutritional_info['energy']) * Decimal(4.184)
- # If necessary, convert weight units
- if not use_metric:
- for key, value in nutritional_info.items():
+ # Only 2 decimal places, anything else doesn't make sense
+ # for i in nutritional_info:
+ # nutritional_info[i] = Decimal(nutritional_info[i]).quantize(TWOPLACES)
- # Energy is not a weight!
- if key == 'energy':
- continue
+ return values
- # Everything else, to ounces
- nutritional_info[key] = AbstractWeight(value, 'g').oz
- nutritional_info['energy_kilojoule'] = Decimal(nutritional_info['energy']) * Decimal(4.184)
+@dataclass
+class NutritionalValues:
+ energy: Decimal | int | float = 0
+ protein: Decimal | int | float = 0
+ carbohydrates: Decimal | int | float = 0
+ carbohydrates_sugar: Decimal | int | float | None = None
+ fat: Decimal | int | float = 0
+ fat_saturated: Decimal | int | float | None = None
+ fibres: Decimal | int | float | None = None
+ sodium: Decimal | int | float | None = None
- # Only 2 decimal places, anything else doesn't make sense
- for i in nutritional_info:
- nutritional_info[i] = Decimal(nutritional_info[i]).quantize(TWOPLACES)
+ @property
+ def energy_kilojoule(self):
+ return self.energy * 4.184
- return nutritional_info
+ def __add__(self, other: 'NutritionalValues'):
+ """
+ Allow adding nutritional values
+ """
+ return NutritionalValues(
+ energy=self.energy + other.energy,
+ protein=self.protein + other.protein,
+ carbohydrates=self.carbohydrates + other.carbohydrates,
+ carbohydrates_sugar=self.carbohydrates_sugar +
+ other.carbohydrates_sugar if self.carbohydrates_sugar and other.carbohydrates_sugar else
+ self.carbohydrates_sugar or other.carbohydrates_sugar,
+ fat=self.fat + other.fat,
+ fat_saturated=self.fat_saturated + other.fat_saturated if self.fat_saturated
+ and other.fat_saturated else self.fat_saturated or other.fat_saturated,
+ fibres=self.fibres +
+ other.fibres if self.fibres and other.fibres else self.fibres or other.fibres,
+ sodium=self.sodium +
+ other.sodium if self.sodium and other.sodium else self.sodium or other.sodium,
+ )
+
+ @property
+ def to_dict(self):
+ return asdict(self)
diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.py
index e7997c19b..cbda28edc 100644
--- a/wger/nutrition/models/meal.py
+++ b/wger/nutrition/models/meal.py
@@ -27,8 +27,10 @@ from wger.utils.constants import TWOPLACES
from wger.utils.fields import Html5TimeField
# Local
+from ..helpers import NutritionalValues
from .plan import NutritionPlan
+
logger = logging.getLogger(__name__)
@@ -86,29 +88,9 @@ class Meal(models.Model):
:param: use_metric Flag that controls the units used
"""
- nutritional_info = {
- 'energy': 0,
- 'energy_kilojoule': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0
- }
-
- # Get the calculated values from the meal item and add them
- for item in self.mealitem_set.select_related():
-
- values = item.get_nutritional_values(use_metric=use_metric)
- for key in nutritional_info.keys():
- nutritional_info[key] += values[key]
+ nutritional_values = NutritionalValues()
- nutritional_info['energy_kilojoule'] = Decimal(nutritional_info['energy']) * Decimal(4.184)
-
- # Only 2 decimal places, anything else doesn't make sense
- for i in nutritional_info:
- nutritional_info[i] = Decimal(nutritional_info[i]).quantize(TWOPLACES)
+ for item in self.mealitem_set.select_related():
+ nutritional_values += item.get_nutritional_values(use_metric=use_metric)
- return nutritional_info
+ return nutritional_values
diff --git a/wger/nutrition/models/plan.py b/wger/nutrition/models/plan.py
index dc8ce9e22..260191047 100644
--- a/wger/nutrition/models/plan.py
+++ b/wger/nutrition/models/plan.py
@@ -28,6 +28,7 @@ from django.utils.translation import gettext_lazy as _
# wger
from wger.nutrition.consts import ENERGY_FACTOR
+from wger.nutrition.helpers import NutritionalValues
from wger.utils.cache import cache_mapper
from wger.utils.constants import TWOPLACES
from wger.weight.models import WeightEntry
@@ -110,19 +111,11 @@ class NutritionPlan(models.Model):
"""
nutritional_representation = cache.get(cache_mapper.get_nutrition_cache_by_key(self.pk))
if not nutritional_representation:
+ nutritional_values = NutritionalValues()
use_metric = self.user.userprofile.use_metric
unit = 'kg' if use_metric else 'lb'
result = {
- 'total': {
- 'energy': 0,
- 'protein': 0,
- 'carbohydrates': 0,
- 'carbohydrates_sugar': 0,
- 'fat': 0,
- 'fat_saturated': 0,
- 'fibres': 0,
- 'sodium': 0
- },
+ 'total': NutritionalValues(),
'percent': {
'protein': 0,
'carbohydrates': 0,
@@ -137,29 +130,29 @@ class NutritionPlan(models.Model):
# Energy
for meal in self.meal_set.select_related():
- values = meal.get_nutritional_values(use_metric=use_metric)
- for key in result['total'].keys():
- result['total'][key] += values[key]
+ nutritional_values += meal.get_nutritional_values(use_metric=use_metric)
+ result['total'] = nutritional_values
- energy = result['total']['energy']
- result['total']['energy_kilojoule'] = result['total']['energy'] * Decimal(4.184)
+ energy = nutritional_values.energy
# In percent
if energy:
- for key in result['percent'].keys():
- result['percent'][key] = \
- result['total'][key] * ENERGY_FACTOR[key][unit] / energy * 100
+ result['percent']['protein'] = nutritional_values.protein * \
+ ENERGY_FACTOR['protein'][unit] / energy * 100
+ result['percent']['carbohydrates'] = nutritional_values.carbohydrates * \
+ ENERGY_FACTOR['carbohydrates'][
+ unit] / energy * 100
+ result['percent']['fat'] = nutritional_values.fat * \
+ ENERGY_FACTOR['fat'][unit] / energy * 100
# Per body weight
weight_entry = self.get_closest_weight_entry()
if weight_entry and weight_entry.weight:
- for key in result['per_kg'].keys():
- result['per_kg'][key] = result['total'][key] / weight_entry.weight
+ result['per_kg']['protein'] = nutritional_values.protein / weight_entry.weight
+ result['per_kg']['carbohydrates'
+ ] = nutritional_values.carbohydrates / weight_entry.weight
+ result['per_kg']['fat'] = nutritional_values.fat / weight_entry.weight
- # Only 2 decimal places, anything else doesn't make sense
- for key in result.keys():
- for i in result[key]:
- result[key][i] = Decimal(result[key][i]).quantize(TWOPLACES)
nutritional_representation = result
cache.set(cache_mapper.get_nutrition_cache_by_key(self.pk), nutritional_representation)
return nutritional_representation
diff --git a/wger/nutrition/tests/test_ingredient.py b/wger/nutrition/tests/test_ingredient.py
index 7eb0c21cf..5b087f990 100644
--- a/wger/nutrition/tests/test_ingredient.py
+++ b/wger/nutrition/tests/test_ingredient.py
@@ -316,18 +316,19 @@ class IngredientValuesTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
- self.assertEqual(len(result), 9)
+ self.assertEqual(len(result), 8)
self.assertEqual(
- result, {
- 'sodium': '0.01',
- 'energy': '1.76',
- 'energy_kilojoule': '7.36',
- 'fat': '0.08',
- 'carbohydrates_sugar': '0.00',
- 'fat_saturated': '0.03',
- 'fibres': '0.00',
- 'protein': '0.26',
- 'carbohydrates': '0.00'
+ result,
+ {
+ 'sodium': 0.00549,
+ 'energy': 1.76,
+ # 'energy_kilojoule': '7.36',
+ 'fat': 0.0819,
+ 'carbohydrates_sugar': None,
+ 'fat_saturated': 0.03244,
+ 'fibres': None,
+ 'protein': 0.2563,
+ 'carbohydrates': 0.00125
}
)
@@ -342,18 +343,19 @@ class IngredientValuesTestCase(WgerTestCase):
self.assertEqual(response.status_code, 200)
result = json.loads(response.content.decode('utf8'))
- self.assertEqual(len(result), 9)
+ self.assertEqual(len(result), 8)
self.assertEqual(
- result, {
- 'sodium': '0.61',
- 'energy': '196.24',
- 'energy_kilojoule': '821.07',
- 'fat': '9.13',
- 'carbohydrates_sugar': '0.00',
- 'fat_saturated': '3.62',
- 'fibres': '0.00',
- 'protein': '28.58',
- 'carbohydrates': '0.14'
+ result,
+ {
+ 'sodium': 0.612135,
+ 'energy': 196.24,
+ # 'energy_kilojoule': '821.07',
+ 'fat': 9.13185,
+ 'carbohydrates_sugar': None,
+ 'fat_saturated': 3.61706,
+ 'fibres': None,
+ 'protein': 28.57745,
+ 'carbohydrates': 0.139375
}
)
@@ -561,7 +563,6 @@ class IngredientModelTestCase(WgerTestCase):
class IngredientApiCodeSearch(BaseTestCase, ApiBaseTestCase):
-
url = '/api/v2/ingredient/'
@patch('wger.nutrition.models.Ingredient.fetch_ingredient_from_off')
diff --git a/wger/nutrition/tests/test_meal_item.py b/wger/nutrition/tests/test_meal_item.py
index a23bee4cd..2d7ff14f5 100644
--- a/wger/nutrition/tests/test_meal_item.py
+++ b/wger/nutrition/tests/test_meal_item.py
@@ -25,7 +25,6 @@ class MealItemApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 10
resource = MealItem
private_resource = True
- special_endpoints = ('nutritional_values', )
data = {
'meal': 2,
'amount': 100,
diff --git a/wger/nutrition/tests/test_nutritional_calculations.py b/wger/nutrition/tests/test_nutritional_calculations.py
index 1652efba8..c2244daf6 100644
--- a/wger/nutrition/tests/test_nutritional_calculations.py
+++ b/wger/nutrition/tests/test_nutritional_calculations.py
@@ -52,16 +52,21 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
item.order = 1
item.save()
- result_item = item.get_nutritional_values()
+ item_values = item.get_nutritional_values()
- for i in result_item:
- self.assertEqual(result_item[i], Decimal(getattr(ingredient, i)).quantize(TWOPLACES))
+ self.assertAlmostEqual(item_values.energy, ingredient.energy, 2)
+ self.assertAlmostEqual(item_values.carbohydrates, ingredient.carbohydrates, 2)
+ self.assertAlmostEqual(item_values.carbohydrates_sugar, None, 2)
+ self.assertAlmostEqual(item_values.fat, ingredient.fat, 2)
+ self.assertAlmostEqual(item_values.fat_saturated, ingredient.fat_saturated, 2)
+ self.assertAlmostEqual(item_values.sodium, ingredient.sodium, 2)
+ self.assertAlmostEqual(item_values.fibres, None, 2)
- result_meal = meal.get_nutritional_values()
- self.assertEqual(result_item, result_meal)
+ meal_nutritional_values = meal.get_nutritional_values()
+ self.assertEqual(item_values, meal_nutritional_values)
- result_plan = plan.get_nutritional_values()
- self.assertEqual(result_meal, result_plan['total'])
+ plan_nutritional_values = plan.get_nutritional_values()
+ self.assertEqual(meal_nutritional_values.energy, plan_nutritional_values['total'].energy)
# One ingredient, 1 x unit 3
item.delete()
@@ -73,19 +78,15 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
item.weight_unit_id = 3
item.save()
- result_item = item.get_nutritional_values()
+ item_values = item.get_nutritional_values()
- for i in result_item:
- self.assertEqual(
- result_item[i],
- (getattr(ingredient, i) * Decimal(12.0) / 100).quantize(TWOPLACES),
- )
+ self.assertAlmostEqual(item_values.energy, ingredient.energy * Decimal(12.0) / 100, 2)
- result_meal = meal.get_nutritional_values()
- self.assertEqual(result_item, result_meal)
+ meal_nutritional_values = meal.get_nutritional_values()
+ self.assertEqual(item_values, meal_nutritional_values)
- result_plan = plan.get_nutritional_values()
- self.assertEqual(result_meal, result_plan['total'])
+ plan_nutritional_values = plan.get_nutritional_values()
+ self.assertEqual(meal_nutritional_values, plan_nutritional_values['total'])
# Add another ingredient, 200 gr
item2 = models.MealItem()
@@ -96,18 +97,18 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
item2.order = 1
item2.save()
- result_item2 = item2.get_nutritional_values()
+ item2_values = item2.get_nutritional_values()
- result_total = {}
- for i in result_item2:
- self.assertEqual(result_item2[i], 2 * getattr(ingredient2, i))
- result_total[i] = result_item[i] + result_item2[i]
+ # result_total = {}
+ self.assertAlmostEqual(item2_values.energy, 2 * ingredient2.energy)
+ self.assertAlmostEqual(item2_values.carbohydrates, 2 * ingredient2.carbohydrates)
+ self.assertAlmostEqual(item2_values.fat, 2 * ingredient2.fat)
+ self.assertAlmostEqual(item2_values.protein, 2 * ingredient2.protein)
- result_meal = meal.get_nutritional_values()
- self.assertEqual(result_total, result_meal)
+ meal_nutritional_values = meal.get_nutritional_values()
- result_plan = plan.get_nutritional_values()
- self.assertEqual(result_meal, result_plan['total'])
+ plan_nutritional_values = plan.get_nutritional_values()
+ self.assertEqual(meal_nutritional_values, plan_nutritional_values['total'])
# Add another ingredient, 20 gr
item3 = models.MealItem()
@@ -118,20 +119,20 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
item3.order = 1
item3.save()
- result_item3 = item3.get_nutritional_values()
+ item3_values = item3.get_nutritional_values()
+ self.assertAlmostEqual(item3_values.energy, ingredient3.energy * Decimal(20.0) / 100, 2)
+ self.assertAlmostEqual(item3_values.protein, ingredient3.protein * Decimal(20.0) / 100, 2)
+ self.assertAlmostEqual(
+ item3_values.carbohydrates,
+ ingredient3.carbohydrates * Decimal(20.0) / 100,
+ 2,
+ )
+ self.assertAlmostEqual(item3_values.fat, ingredient3.fat * Decimal(20.0) / 100, 2)
- for i in result_item3:
- self.assertEqual(
- result_item3[i],
- (getattr(ingredient3, i) * Decimal(20.0) / 100).quantize(TWOPLACES),
- )
- result_total[i] = result_total[i] + result_item3[i]
+ meal_nutritional_values = meal.get_nutritional_values()
- result_meal = meal.get_nutritional_values()
- self.assertEqual(result_total, result_meal)
-
- result_plan = plan.get_nutritional_values()
- self.assertEqual(result_meal, result_plan['total'])
+ plan_nutritional_values = plan.get_nutritional_values()
+ self.assertEqual(meal_nutritional_values, plan_nutritional_values['total'])
def test_calculations_user(self):
"""
@@ -142,10 +143,10 @@ class NutritionalValuesCalculationsTestCase(WgerTestCase):
plan = models.NutritionPlan.objects.get(pk=4)
values = plan.get_nutritional_values()
- self.assertEqual(values['percent']['carbohydrates'], Decimal(29.79).quantize(TWOPLACES))
- self.assertEqual(values['percent']['fat'], Decimal(20.36).quantize(TWOPLACES))
- self.assertEqual(values['percent']['protein'], Decimal(26.06).quantize(TWOPLACES))
+ self.assertAlmostEqual(values['percent']['carbohydrates'], Decimal(29.79), 2)
+ self.assertAlmostEqual(values['percent']['fat'], Decimal(20.36), 2)
+ self.assertAlmostEqual(values['percent']['protein'], Decimal(26.06), 2)
- self.assertEqual(values['per_kg']['carbohydrates'], Decimal(4.96).quantize(TWOPLACES))
- self.assertEqual(values['per_kg']['fat'], Decimal(1.51).quantize(TWOPLACES))
- self.assertEqual(values['per_kg']['protein'], Decimal(4.33).quantize(TWOPLACES))
+ self.assertAlmostEqual(values['per_kg']['carbohydrates'], Decimal(4.96), 2)
+ self.assertAlmostEqual(values['per_kg']['fat'], Decimal(1.51), 2)
+ self.assertAlmostEqual(values['per_kg']['protein'], Decimal(4.33), 2)
diff --git a/wger/nutrition/tests/test_nutritional_values.py b/wger/nutrition/tests/test_nutritional_values.py
new file mode 100644
index 000000000..7476fb928
--- /dev/null
+++ b/wger/nutrition/tests/test_nutritional_values.py
@@ -0,0 +1,91 @@
+# This file is part of wger Workout Manager.
+#
+# wger Workout Manager is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# wger Workout Manager is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+
+# Django
+from django.test import SimpleTestCase
+
+# wger
+from wger.nutrition.helpers import NutritionalValues
+
+
+class NutritionalValuesTestCase(SimpleTestCase):
+ """
+ Tests the Nutritional Values dataclass methods
+ """
+
+ def test_kj_property(self):
+ """
+ Test that the KJ conversion is correct
+ """
+ values = NutritionalValues(energy=100)
+ self.assertAlmostEqual(values.energy_kilojoule, 418.4, places=3)
+
+ def test_addition(self):
+ """Test that the addition works correctly"""
+ values1 = NutritionalValues(
+ energy=100,
+ protein=90,
+ carbohydrates=80,
+ carbohydrates_sugar=70,
+ fat=60,
+ fat_saturated=50,
+ fibres=40,
+ sodium=30
+ )
+ values2 = NutritionalValues(
+ energy=10,
+ protein=9,
+ carbohydrates=8,
+ carbohydrates_sugar=7,
+ fat=6,
+ fat_saturated=5,
+ fibres=4,
+ sodium=3
+ )
+ values3 = values1 + values2
+
+ self.assertEqual(
+ values3,
+ NutritionalValues(
+ energy=110,
+ protein=99,
+ carbohydrates=88,
+ carbohydrates_sugar=77,
+ fat=66,
+ fat_saturated=55,
+ fibres=44,
+ sodium=33
+ ),
+ )
+
+ def test_addition_nullable_values(self):
+ """Test that the addition works correctly for the nullable values"""
+
+ values1 = NutritionalValues()
+ values2 = NutritionalValues(carbohydrates_sugar=10, fat_saturated=20, fibres=30, sodium=40)
+ values3 = values1 + values2
+
+ self.assertEqual(
+ values3,
+ NutritionalValues(
+ energy=0,
+ protein=0,
+ carbohydrates=0,
+ carbohydrates_sugar=10,
+ fat=0,
+ fat_saturated=20,
+ fibres=30,
+ sodium=40
+ ),
+ )
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.py
index a71664c45..202e45553 100644
--- a/wger/nutrition/tests/test_plan.py
+++ b/wger/nutrition/tests/test_plan.py
@@ -28,6 +28,6 @@ class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):
pk = 4
resource = NutritionPlan
private_resource = True
- overview_cached = True
+ overview_cached = False
special_endpoints = ('nutritional_values', )
data = {'description': 'The description'}
diff --git a/wger/nutrition/urls.py b/wger/nutrition/urls.py
index 1af3c2812..165a27e80 100644
--- a/wger/nutrition/urls.py
+++ b/wger/nutrition/urls.py
@@ -34,6 +34,7 @@ from wger.nutrition.views import (
unit_ingredient,
)
+
# sub patterns for nutritional plans
patterns_plan = [
path(
diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.py
index 225ec54d1..e5f613168 100644
--- a/wger/nutrition/views/plan.py
+++ b/wger/nutrition/views/plan.py
@@ -51,6 +51,7 @@ from wger.utils.pdf import (
styleSheet,
)
+
logger = logging.getLogger(__name__)
# ************************
@@ -207,7 +208,6 @@ def export_pdf(request, id, uidb64=None, token=None):
# Set the title (if available)
if plan.description:
-
p = Paragraph(
'<para align="center"><strong>%(description)s</strong></para>' %
{'description': plan.description}, styleSheet["HeaderBold"]
@@ -242,13 +242,13 @@ def export_pdf(request, id, uidb64=None, token=None):
data.append(
[
Paragraph(_('Energy'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['energy']), styleSheet["Normal"])
+ Paragraph(str(plan_data['total'].energy), styleSheet["Normal"])
]
)
data.append(
[
Paragraph(_('Protein'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['protein']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total'].protein), styleSheet["Normal"]),
Paragraph(str(plan_data['percent']['protein']), styleSheet["Normal"]),
Paragraph(str(plan_data['per_kg']['protein']), styleSheet["Normal"])
]
@@ -256,7 +256,7 @@ def export_pdf(request, id, uidb64=None, token=None):
data.append(
[
Paragraph(_('Carbohydrates'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['carbohydrates']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total'].carbohydrates), styleSheet["Normal"]),
Paragraph(str(plan_data['percent']['carbohydrates']), styleSheet["Normal"]),
Paragraph(str(plan_data['per_kg']['carbohydrates']), styleSheet["Normal"])
]
@@ -264,13 +264,13 @@ def export_pdf(request, id, uidb64=None, token=None):
data.append(
[
Paragraph(" " + _('Sugar content in carbohydrates'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['carbohydrates_sugar']), styleSheet["Normal"])
+ Paragraph(str(plan_data['total'].carbohydrates_sugar), styleSheet["Normal"])
]
)
data.append(
[
Paragraph(_('Fat'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['fat']), styleSheet["Normal"]),
+ Paragraph(str(plan_data['total'].fat), styleSheet["Normal"]),
Paragraph(str(plan_data['percent']['fat']), styleSheet["Normal"]),
Paragraph(str(plan_data['per_kg']['fat']), styleSheet["Normal"])
]
@@ -278,19 +278,19 @@ def export_pdf(request, id, uidb64=None, token=None):
data.append(
[
Paragraph(_('Saturated fat content in fats'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['fat_saturated']), styleSheet["Normal"])
+ Paragraph(str(plan_data['total'].fat_saturated), styleSheet["Normal"])
]
)
data.append(
[
Paragraph(_('Fibres'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['fibres']), styleSheet["Normal"])
+ Paragraph(str(plan_data['total'].fibres), styleSheet["Normal"])
]
)
data.append(
[
Paragraph(_('Sodium'), styleSheet["Normal"]),
- Paragraph(str(plan_data['total']['sodium']), styleSheet["Normal"])
+ Paragraph(str(plan_data['total'].sodium), styleSheet["Normal"])
]
)