Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Fix foreign key relationships between meal and logitem

Mohammed Ali Zubair9eaedea2d933
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.py
index 157b61028..9dbb3f28c 100644
--- a/wger/nutrition/forms.py
+++ b/wger/nutrition/forms.py
@@ -263,7 +263,7 @@ class MealItemForm(forms.ModelForm):
class MealLogItemForm(MealItemForm):
- meals = forms.ModelMultipleChoiceField(queryset=Meal.objects.all(), required=False)
+ meal = forms.ModelChoiceField(queryset=Meal.objects.all(), required=False)
class Meta:
model = LogItem
@@ -271,14 +271,9 @@ class MealLogItemForm(MealItemForm):
'ingredient',
'weight_unit',
'amount',
- 'meals',
+ 'meal',
]
- def save(self, commit=True):
- super(MealLogItemForm, self).save(commit)
- self.instance.meals.set(self.cleaned_data.get("meals"))
- return self.instance
-
class IngredientForm(forms.ModelForm):
diff --git a/wger/nutrition/migrations/0010_meal_log_item.py b/wger/nutrition/migrations/0010_logitem_meal.py
similarity index 59%
rename from wger/nutrition/migrations/0010_meal_log_item.py
rename to wger/nutrition/migrations/0010_logitem_meal.py
index 612d1fd73..94a4fc67a 100644
--- a/wger/nutrition/migrations/0010_meal_log_item.py
+++ b/wger/nutrition/migrations/0010_logitem_meal.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.2.7 on 2021-10-03 18:06
+# Generated by Django 3.2.7 on 2021-10-03 19:00
from django.db import migrations, models
import django.db.models.deletion
@@ -12,8 +12,8 @@ class Migration(migrations.Migration):
operations = [
migrations.AddField(
- model_name='meal',
- name='log_item',
- field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='meals', to='nutrition.logitem'),
+ model_name='logitem',
+ name='meal',
+ field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='log_items', to='nutrition.meal', verbose_name='Meal'),
),
]
diff --git a/wger/nutrition/models/log.py b/wger/nutrition/models/log.py
index 48c55f719..8dc6c43a1 100644
--- a/wger/nutrition/models/log.py
+++ b/wger/nutrition/models/log.py
@@ -27,6 +27,7 @@ from django.utils.translation import gettext_lazy as _
from wger.nutrition.helpers import BaseMealItem
# Local
+from .meal import Meal
from .ingredient import Ingredient
from .ingredient_weight_unit import IngredientWeightUnit
from .plan import NutritionPlan
@@ -48,6 +49,14 @@ class LogItem(BaseMealItem, models.Model):
verbose_name=_('Nutrition plan'),
on_delete=models.CASCADE,
)
+ meal = models.ForeignKey(
+ Meal,
+ verbose_name=_('Meal'),
+ on_delete=models.CASCADE,
+ related_name="log_items",
+ blank=True,
+ null=True
+ )
"""
The plan this log belongs to
"""
diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.py
index 66497b681..81e17554a 100644
--- a/wger/nutrition/models/meal.py
+++ b/wger/nutrition/models/meal.py
@@ -27,7 +27,6 @@ from wger.utils.constants import TWOPLACES
from wger.utils.fields import Html5TimeField
# Local
-from . import LogItem
from .plan import NutritionPlan
logger = logging.getLogger(__name__)
@@ -50,13 +49,6 @@ class Meal(models.Model):
editable=False,
on_delete=models.CASCADE,
)
- log_item = models.ForeignKey(
- LogItem,
- blank=True,
- null=True,
- on_delete=models.SET_NULL,
- related_name="meals"
- )
order = models.IntegerField(
verbose_name=_('Order'),
blank=True,
diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.py
index 4829ea7b8..bc424f750 100644
--- a/wger/nutrition/tests/test_nutrition_diary.py
+++ b/wger/nutrition/tests/test_nutrition_diary.py
@@ -244,7 +244,7 @@ class AddMealItemUnitTestCase(WgerAddTestCase):
def test_log_meals(self):
plan = NutritionPlan.objects.get(pk=1)
data = {
- "meals": [1],
+ "meal": 1,
**self.data
}
plan.logitem_set.all().delete()
@@ -253,10 +253,8 @@ class AddMealItemUnitTestCase(WgerAddTestCase):
response = self.client.post(self.url, data)
self.assertEqual(response.status_code, 302)
plan.refresh_from_db()
- log_item_queryset = plan.logitem_set.all()
+ log_item_queryset = plan.logitem_set.filter(plan=plan, meal_id=1)
self.assertEqual(log_item_queryset.count(), 1)
- log_item = log_item_queryset.first()
- self.assertEqual(list(log_item.meals.values_list("id", flat=True)), [1])
class DeleteLogEntryTestCase(WgerDeleteTestCase):
diff --git a/wger/nutrition/views/log.py b/wger/nutrition/views/log.py
index 12bb9b378..a4180e752 100644
--- a/wger/nutrition/views/log.py
+++ b/wger/nutrition/views/log.py
@@ -174,12 +174,12 @@ def _logMealPlan(meals):
for item in meal.mealitem_set.select_related():
log_item = LogItem(
plan=item.meal.plan,
+ meal=meal,
ingredient=item.ingredient,
weight_unit=item.weight_unit,
amount=item.amount
)
log_item.save()
- log_item.meals.add(meal)
class LogCreateView(WgerFormMixin, CreateView):