Self hosted FLOSS fitness/workout, nutrition and weight tracker
Add tests to check if meals have been added to the logitem
Mohammed Ali Zubairba94384ae634
diff --git a/wger/nutrition/forms.py b/wger/nutrition/forms.pyindex ee656acb8..157b61028 100644--- a/wger/nutrition/forms.py+++ b/wger/nutrition/forms.py@@ -274,6 +274,11 @@ class MealLogItemForm(MealItemForm):'meals',]+ 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.py b/wger/nutrition/migrations/0010_meal_log_item.pysimilarity index 84%rename from wger/nutrition/migrations/0010_meal_log.pyrename to wger/nutrition/migrations/0010_meal_log_item.pyindex 010f39ae0..612d1fd73 100644--- a/wger/nutrition/migrations/0010_meal_log.py+++ b/wger/nutrition/migrations/0010_meal_log_item.py@@ -1,4 +1,4 @@-# Generated by Django 3.2.7 on 2021-10-03 17:27+# Generated by Django 3.2.7 on 2021-10-03 18:06from django.db import migrations, modelsimport django.db.models.deletion@@ -13,7 +13,7 @@ class Migration(migrations.Migration):operations = [migrations.AddField(model_name='meal',- name='log',+ name='log_item',field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='meals', to='nutrition.logitem'),),]diff --git a/wger/nutrition/models/meal.py b/wger/nutrition/models/meal.pyindex 0df6eff50..66497b681 100644--- a/wger/nutrition/models/meal.py+++ b/wger/nutrition/models/meal.py@@ -50,7 +50,7 @@ class Meal(models.Model):editable=False,on_delete=models.CASCADE,)- log = models.ForeignKey(+ log_item = models.ForeignKey(LogItem,blank=True,null=True,diff --git a/wger/nutrition/tests/test_nutrition_diary.py b/wger/nutrition/tests/test_nutrition_diary.pyindex 99bb3d8af..4829ea7b8 100644--- a/wger/nutrition/tests/test_nutrition_diary.py+++ b/wger/nutrition/tests/test_nutrition_diary.py@@ -241,6 +241,23 @@ class AddMealItemUnitTestCase(WgerAddTestCase):'weight_unit': 1,}+ def test_log_meals(self):+ plan = NutritionPlan.objects.get(pk=1)+ data = {+ "meals": [1],+ **self.data+ }+ plan.logitem_set.all().delete()+ self.assertFalse(plan.logitem_set.exists())+ self.user_login('test')+ response = self.client.post(self.url, data)+ self.assertEqual(response.status_code, 302)+ plan.refresh_from_db()+ log_item_queryset = plan.logitem_set.all()+ 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):"""