Last files for merge
This commit is contained in:
@@ -4,7 +4,7 @@
|
||||
public class Category
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Name { get; set; } = string.Empty;
|
||||
public virtual ICollection<Recipe> Recipes { get; set; } = new List<Recipe>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@
|
||||
public class Ingredient
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Name { get; set; } = string.Empty;
|
||||
public virtual ICollection<RecipeIngredient> RecipeIngredients { get; set; } = new List<RecipeIngredient>();
|
||||
public virtual ICollection<IngredientsShoppingList> IngredientShoppingLists { get; set; } = new List<IngredientsShoppingList>();
|
||||
}
|
||||
|
||||
+2
-2
@@ -6,7 +6,7 @@
|
||||
public class IngredientsShoppingList
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public ShoppingList Shoppinglist { get; set; } = new();
|
||||
public Ingredient Ingredient { get; set; } = new();
|
||||
public ShoppingList Shoppinglist { get; set; } = new ();
|
||||
public Ingredient Ingredient { get; set; } = new ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5,9 +5,9 @@
|
||||
public class Instruction
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public string Description { get; set; }
|
||||
public string Number { get; set; }
|
||||
public virtual Recipe Recipe { get; set; } = new();
|
||||
public string Description { get; set; } = string.Empty;
|
||||
public int Number { get; set; }
|
||||
public virtual Recipe Recipe { get; set; } = new ();
|
||||
public virtual ICollection<MediaFile> MediaFiles { get; set; } = new List<MediaFile>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
public string? MimeType { get; set; }
|
||||
|
||||
public byte[]? Data { get; set; }
|
||||
public virtual Recipe? Recipe { get; set; } = new();
|
||||
public virtual Instruction Instruction { get; set; } = new();
|
||||
public virtual Recipe? Recipe { get; set; } = new ();
|
||||
public virtual Instruction Instruction { get; set; } = new ();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ using Francesco.Recipes.World.Models.BackendModels.RecipeIngredient;
|
||||
public class Recipe : ITimeStampedEntity
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Name { get; set; } = string.Empty;
|
||||
public string? Description { get; set; }
|
||||
public Difficulty Difficulty { get; set; }
|
||||
public int Servings { get; set; }
|
||||
@@ -20,5 +20,5 @@ public class Recipe : ITimeStampedEntity
|
||||
public virtual ICollection<RecipeIngredient> RecipeIngredients { get; set; } = new List<RecipeIngredient>();
|
||||
public virtual ICollection<Instruction> Instructions { get; set; } = new List<Instruction>();
|
||||
public virtual ICollection<MediaFile> MediaFiles { get; set; } = new List<MediaFile>();
|
||||
public virtual Favorit Favorit { get; set; } = new();
|
||||
public virtual Favorit Favorit { get; set; } = new ();
|
||||
}
|
||||
|
||||
@@ -6,9 +6,9 @@
|
||||
public class RecipeIngredient
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
public virtual Recipe Recipe { get; set; } = new();
|
||||
public virtual Ingredient Ingredient { get; set; } = new();
|
||||
public virtual Unit Unit { get; set; } = new();
|
||||
public virtual Recipe Recipe { get; set; } = new ();
|
||||
public virtual Ingredient Ingredient { get; set; } = new ();
|
||||
public virtual Unit Unit { get; set; } = new ();
|
||||
public int Quantity { get; set; }
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
using Francesco.Recipes.World.Models.BackendModels.IngredientShoppingList;
|
||||
|
||||
namespace Francesco.Recipes.World.Models.BackendModels.Shoppinglist
|
||||
namespace Francesco.Recipes.World.Models.BackendModels.Shoppinglist
|
||||
{
|
||||
using Francesco.Recipes.World.Models.BackendModels.IngredientShoppingList;
|
||||
|
||||
public class ShoppingList : ITimeStampedEntity
|
||||
{
|
||||
public Guid Id { get; set; }
|
||||
|
||||
@@ -1,14 +1,11 @@
|
||||
|
||||
namespace Francesco.Recipes.World.Models.BackendModels.Unit;
|
||||
|
||||
namespace Francesco.Recipes.World.Models.BackendModels.Unit
|
||||
{
|
||||
using Francesco.Recipes.World.Models.BackendModels.Ingredient;
|
||||
using Francesco.Recipes.World.Models.BackendModels.RecipeIngredient;
|
||||
|
||||
public class Unit
|
||||
{
|
||||
public Guid Id{ get; set; }
|
||||
public string Name { get; set; }
|
||||
public string Symbol { get; set; }
|
||||
public Guid Id { get; set; }
|
||||
public string Name { get; set; } = string.Empty;
|
||||
public string Symbol { get; set; } = string.Empty;
|
||||
public virtual ICollection<RecipeIngredient> RecipeIngredient { get; set; } = new List<RecipeIngredient>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user