From 109cb7af1bdd699a4d4fcf17ade7642c791e1dbf Mon Sep 17 00:00:00 2001 From: hay-kot Date: Tue, 27 Apr 2021 22:13:02 -0800 Subject: [PATCH] add carbs --- mealie/db/models/recipe/nutrition.py | 3 +++ mealie/schema/recipe.py | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/mealie/db/models/recipe/nutrition.py b/mealie/db/models/recipe/nutrition.py index 2ded5bdb2..38f181080 100644 --- a/mealie/db/models/recipe/nutrition.py +++ b/mealie/db/models/recipe/nutrition.py @@ -10,6 +10,7 @@ class Nutrition(SqlAlchemyBase): fatContent = sa.Column(sa.String) fiberContent = sa.Column(sa.String) proteinContent = sa.Column(sa.String) + carbohydrateContent = sa.Column(sa.String) sodiumContent = sa.Column(sa.String) sugarContent = sa.Column(sa.String) @@ -21,6 +22,7 @@ class Nutrition(SqlAlchemyBase): proteinContent=None, sodiumContent=None, sugarContent=None, + carbohydrateContent=None, ) -> None: self.calories = calories self.fatContent = fatContent @@ -28,3 +30,4 @@ class Nutrition(SqlAlchemyBase): self.proteinContent = proteinContent self.sodiumContent = sodiumContent self.sugarContent = sugarContent + self.carbohydrateContent = carbohydrateContent diff --git a/mealie/schema/recipe.py b/mealie/schema/recipe.py index fd42a4f2c..97db5e09f 100644 --- a/mealie/schema/recipe.py +++ b/mealie/schema/recipe.py @@ -22,12 +22,18 @@ class RecipeStep(BaseModel): class Config: orm_mode = True +class RecipeAsset(BaseModel): + name: str + icon: str + path: str + class Nutrition(BaseModel): calories: Optional[str] fatContent: Optional[str] - fiberContent: Optional[str] proteinContent: Optional[str] + carbohydrateContent: Optional[str] + fiberContent: Optional[str] sodiumContent: Optional[str] sugarContent: Optional[str]