From 1f2344eabf1574e1932560305231cb7016f73787 Mon Sep 17 00:00:00 2001
From: Francesco D'Amico <fda145977@stud.gibb.ch>
Date: Wed, 8 Jan 2025 11:27:07 +0100
Subject: [PATCH] Add new Model Unit and changed some Logik to some Properties

---
 .../Models/BackendModels/Category/Category.cs         |  2 +-
 .../Models/BackendModels/ITimeStampedEntity.cs        |  9 ---------
 .../Models/BackendModels/Ingredient/Ingredient.cs     |  6 ++++--
 .../Models/BackendModels/Instruction/Instruction.cs   |  4 ++--
 .../Models/BackendModels/Rating/Rating.cs             |  7 -------
 .../Models/BackendModels/Recipe/Recipe.cs             |  7 +++----
 .../Models/BackendModels/Unit/Unit.cs                 | 11 +++++++++++
 7 files changed, 21 insertions(+), 25 deletions(-)
 delete mode 100644 Francesco.Recipes.World/Models/BackendModels/ITimeStampedEntity.cs
 delete mode 100644 Francesco.Recipes.World/Models/BackendModels/Rating/Rating.cs
 create mode 100644 Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs

diff --git a/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs b/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs
index 64934a2..5fa42d4 100644
--- a/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs
+++ b/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs
@@ -4,7 +4,7 @@
     public class Category
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
+        public string Name { get; set; }
         public virtual ICollection<Recipe> Recipes { get; set; } = new List<Recipe>();
     }
 }
diff --git a/Francesco.Recipes.World/Models/BackendModels/ITimeStampedEntity.cs b/Francesco.Recipes.World/Models/BackendModels/ITimeStampedEntity.cs
deleted file mode 100644
index baa9f35..0000000
--- a/Francesco.Recipes.World/Models/BackendModels/ITimeStampedEntity.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-namespace Francesco.Recipes.World.Models.BackendModels
-{
-    public interface ITimeStampedEntity
-    {
-        DateTime CreatedAt { get; set; }
-
-        DateTime? ModifiedAt { get; set; }
-    }
-}
diff --git a/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs b/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs
index 5a3dfc9..96f377f 100644
--- a/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs
+++ b/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs
@@ -1,9 +1,11 @@
 namespace Francesco.Recipes.World.Models.BackendModels.Ingredient
 {
+    using Francesco.Recipes.World.Models.BackendModels.Unit;
     public class Ingredient
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
-        public string? Unit { get; set; }
+        public string Name { get; set; }
+        public virtual Unit Unit { get; set; } = new();
+        public int Quantity { get; set; }
     }
 }
diff --git a/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs b/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs
index 62ba576..36a2bd1 100644
--- a/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs
+++ b/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs
@@ -4,8 +4,8 @@
     public class Instruction
     {
         public Guid Id { get; set; }
-        public string? StepDescription { get; set; } 
-        public string? StepNumber { get; set; }
+        public string Description { get; set; }
+        public string Number { get; set; }
         public virtual Recipe Recipe { get; set; } = new();
     }
 }
diff --git a/Francesco.Recipes.World/Models/BackendModels/Rating/Rating.cs b/Francesco.Recipes.World/Models/BackendModels/Rating/Rating.cs
deleted file mode 100644
index 8d483be..0000000
--- a/Francesco.Recipes.World/Models/BackendModels/Rating/Rating.cs
+++ /dev/null
@@ -1,7 +0,0 @@
-namespace Francesco.Recipes.World.Models.BackendModels.Rating
-{
-    public class Rating
-    {
-
-    }
-}
diff --git a/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs b/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs
index 3bd978c..1712072 100644
--- a/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs
+++ b/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs
@@ -6,14 +6,13 @@
     public class Recipe
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
-        public string? Description { get; set; }
-        public string? Difficulty { get; set; }
+        public string Name { get; set; }
+        public string Description { get; set; }
+        public string Difficulty { get; set; }
         public int Servings { get; set; }
         public TimeSpan PreparationTime { get; set; }
         public TimeSpan CookingTime { get; set; }
         public virtual ICollection <RecipeIngredient> RecipeIngredients { get; set; } = new List<RecipeIngredient>();
         public virtual ICollection <Instruction> Instructions { get; set; } = new List<Instruction>();
-        
     }
 }
diff --git a/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs b/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs
new file mode 100644
index 0000000..19ba712
--- /dev/null
+++ b/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs
@@ -0,0 +1,11 @@
+namespace Francesco.Recipes.World.Models.BackendModels.Unit
+{
+    using Francesco.Recipes.World.Models.BackendModels.Ingredient;
+
+    public class Unit
+    {
+        public Guid Id { get; set; }
+        public string Name { get; set; }
+        public virtual ICollection<Ingredient> Recipes { get; set; } = new List<Ingredient>();
+    }
+}