Self hosted FLOSS fitness/workout, nutrition and weight tracker
We don't need to manually list every single field
Roland Geider49982a50d256
diff --git a/wger/nutrition/tests/test_plan.py b/wger/nutrition/tests/test_plan.pyindex 44ef866c2..e10e321ce 100644--- a/wger/nutrition/tests/test_plan.py+++ b/wger/nutrition/tests/test_plan.py@@ -14,10 +14,15 @@# along with Workout Manager. If not, see <http://www.gnu.org/licenses/>.# Django-from django.urls import reverse, resolve+from django.forms import model_to_dict+from django.urls import (+ resolve,+ reverse,+)# wgerfrom wger.core.tests import api_base_test+from wger.core.tests.base_testcase import WgerTestCasefrom wger.nutrition.models import NutritionPlan@@ -38,38 +43,33 @@ class PlanApiTestCase(api_base_test.ApiBaseResourceTestCase):class PlanCopyTestCase(WgerTestCase):-def test_copy_plan(self):"""Tests making a copy of a meal plan"""self.user_login()orig_plan = NutritionPlan.objects.get(pk=2)- response = self.client.get(reverse("nutrition:plan:copy", kwargs={"pk": 2}))- copied_plan_pk = int(resolve(response.url).kwargs["id"])+ response = self.client.get(reverse('nutrition:plan:copy', kwargs={'pk': 2}))+ copied_plan_pk = int(resolve(response.url).kwargs['id'])copied_plan = NutritionPlan.objects.get(pk=copied_plan_pk)- # fields for each object to test for equality- plan_fields = ("user", "language", "description", "has_goal_calories",)- meal_fields = ("name", "time", "order",)- meal_item_fields = ("ingredient", "weight_unit", "order", "amount",)-- # test each Plan's fields are equal- for field in plan_fields:- self.assertEqual(getattr(orig_plan, field), getattr(copied_plan, field))+ # Convert plans to dictionaries and compare+ orig_plan_dict = model_to_dict(orig_plan, exclude=['id'])+ copied_plan_dict = model_to_dict(copied_plan, exclude=['id'])+ self.assertEqual(orig_plan_dict, copied_plan_dict)orig_plan_meals = orig_plan.meal_set.all()copied_plan_meals = copied_plan.meal_set.all()- for meal_cnt, orig_meal in enumerate(orig_plan_meals):- # test that the fields are equal for each Meal for each Plan- for field in meal_fields:- self.assertEqual(getattr(orig_meal, field), getattr(copied_plan_meals[meal_cnt], field))+ for orig_meal, copied_meal in zip(orig_plan_meals, copied_plan_meals):+ orig_meal_dict = model_to_dict(orig_meal, exclude=['id', 'plan'])+ copied_meal_dict = model_to_dict(copied_meal, exclude=['id', 'plan'])+ self.assertEqual(orig_meal_dict, copied_meal_dict)- orig_plan_meal_items = orig_plan_meals[meal_cnt].mealitem_set.all()- copied_plan_meal_items = copied_plan_meals[meal_cnt].mealitem_set.all()+ orig_meal_items = orig_meal.mealitem_set.all()+ copied_meal_items = copied_meal.mealitem_set.all()- # test that the fields are equal for each MealItem for each Meal- for item_cnt, orig_meal_item in enumerate(orig_plan_meal_items):- for field in meal_item_fields:- self.assertEqual(getattr(orig_meal_item, field), getattr(copied_plan_meal_items[item_cnt], field))+ for orig_meal_item, copied_meal_item in zip(orig_meal_items, copied_meal_items):+ orig_meal_item_dict = model_to_dict(orig_meal_item, exclude=['id', 'meal'])+ copied_meal_item_dict = model_to_dict(copied_meal_item, exclude=['id', 'meal'])+ self.assertEqual(orig_meal_item_dict, copied_meal_item_dict)diff --git a/wger/nutrition/views/plan.py b/wger/nutrition/views/plan.pyindex e69a836e5..ad4f601b6 100644--- a/wger/nutrition/views/plan.py+++ b/wger/nutrition/views/plan.py@@ -19,6 +19,7 @@ import logging# Djangofrom django.contrib.auth.decorators import login_required+from django.forms import model_to_dictfrom django.http import (HttpResponse,HttpResponseForbidden,@@ -41,7 +42,11 @@ from reportlab.platypus import (# wgerfrom wger.nutrition.consts import MEALITEM_WEIGHT_GRAM-from wger.nutrition.models import NutritionPlan, Meal, MealItem+from wger.nutrition.models import (+ Meal,+ MealItem,+ NutritionPlan,+)from wger.utils.pdf import (get_logo,header_colour,@@ -64,37 +69,35 @@ def copy(request, pk):"""Copy the nutrition plan"""-orig_plan = get_object_or_404(NutritionPlan, pk=pk, user=request.user)- # make new Plan, Meal, and MealItem objects using the values for the fields from the original object- plan_copy = NutritionPlan(- user=orig_plan.user,- description=orig_plan.description,- has_goal_calories=orig_plan.has_goal_calories- )- plan_copy.save()+ # Convert the original plan to a dictionary and remove the primary key+ plan_data = model_to_dict(orig_plan)+ plan_data.pop('id')++ plan_copy = NutritionPlan.objects.create(user=request.user, **plan_data)+ # Copy meals and meal itemsorig_meals = orig_plan.meal_set.all()for orig_meal in orig_meals:- meal_copy = Meal(- plan=plan_copy,- name=orig_meal.name,- time=orig_meal.time,- order=orig_meal.order- )- meal_copy.save()+ meal_data = model_to_dict(orig_meal)+ meal_data.pop('id')+ meal_data['plan'] = plan_copy+ # setting manually due to "editable" False+ meal_data['order'] = orig_meal.order++ meal_copy = Meal.objects.create(**meal_data)orig_meal_items = orig_meal.mealitem_set.all()for orig_meal_item in orig_meal_items:- meal_item_copy = MealItem(- meal=meal_copy,- ingredient=orig_meal_item.ingredient,- weight_unit=orig_meal_item.weight_unit,- order=orig_meal_item.order,- amount=orig_meal_item.amount- )- meal_item_copy.save()+ meal_item_data = model_to_dict(orig_meal_item)+ meal_item_data.pop('id')+ meal_item_data.pop('ingredient')+ meal_item_data['meal'] = meal_copy+ meal_item_data['ingredient_id'] = orig_meal_item.ingredient_id+ # setting manually due to "editable" False+ meal_item_data['order'] = orig_meal_item.order+ MealItem.objects.create(**meal_item_data)# Redirectreturn HttpResponseRedirect(reverse('nutrition:plan:view', kwargs={'id': plan_copy.id}))