From 02533e9bfb10acf7e88230a104132e158a1965c8 Mon Sep 17 00:00:00 2001 From: Francesco D'Amico Date: Wed, 19 Mar 2025 16:33:40 +0100 Subject: [PATCH] Last files for merge --- .../20250318150949_InitialMIgration.cs | 34 ++++++++++--------- .../Models/BackendModels/Category/Category.cs | 2 +- .../BackendModels/Ingredient/Ingredient.cs | 2 +- .../IngredientsShoppingList.cs | 4 +-- .../BackendModels/Instruction/Instruction.cs | 6 ++-- .../BackendModels/MediaFile/MediaFile.cs | 4 +-- .../Models/BackendModels/Recipe/Recipe.cs | 4 +-- .../RecipeIngredient/RecipeIngredient.cs | 6 ++-- .../Shoppinglist/ShoppingList.cs | 6 ++-- .../Models/BackendModels/Unit/Unit.cs | 15 ++++---- 10 files changed, 41 insertions(+), 42 deletions(-) diff --git a/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs b/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs index 2b14663..18ff0ed 100644 --- a/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs +++ b/Francesco.Recipes.World/Migrations/20250318150949_InitialMIgration.cs @@ -1,12 +1,12 @@ -using System; -using Microsoft.EntityFrameworkCore.Migrations; - -#nullable disable +#nullable disable #pragma warning disable CA1814 // Prefer jagged arrays over multidimensional namespace Francesco.Recipes.World.Migrations { + using System; + using Microsoft.EntityFrameworkCore.Migrations; + /// public partial class InitialMIgration : Migration { @@ -17,12 +17,13 @@ namespace Francesco.Recipes.World.Migrations { throw new ArgumentNullException(nameof(migrationBuilder)); } + migrationBuilder.CreateTable( name: "Categories", columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), - Name = table.Column(type: "nvarchar(max)", nullable: false) + Name = table.Column(type: "nvarchar(max)", nullable: false), }, constraints: table => { @@ -34,7 +35,7 @@ namespace Francesco.Recipes.World.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), - CreatedAt = table.Column(type: "datetime2", nullable: false) + CreatedAt = table.Column(type: "datetime2", nullable: false), }, constraints: table => { @@ -46,7 +47,7 @@ namespace Francesco.Recipes.World.Migrations columns: table => new { Id = table.Column(type: "uniqueidentifier", nullable: false), - Name = table.Column(type: "nvarchar(max)", nullable: false) + Name = table.Column(type: "nvarchar(max)", nullable: false), }, constraints: table => { @@ -59,7 +60,7 @@ namespace Francesco.Recipes.World.Migrations { Id = table.Column(type: "uniqueidentifier", nullable: false), CreatedAt = table.Column(type: "datetime2", nullable: false), - ModifiedAt = table.Column(type: "datetime2", nullable: true) + ModifiedAt = table.Column(type: "datetime2", nullable: true), }, constraints: table => { @@ -72,7 +73,7 @@ namespace Francesco.Recipes.World.Migrations { Id = table.Column(type: "uniqueidentifier", nullable: false), Name = table.Column(type: "nvarchar(max)", nullable: false), - Symbol = table.Column(type: "nvarchar(max)", nullable: false) + Symbol = table.Column(type: "nvarchar(max)", nullable: false), }, constraints: table => { @@ -94,7 +95,7 @@ namespace Francesco.Recipes.World.Migrations CreatedAt = table.Column(type: "datetime2", nullable: false), ModifiedAt = table.Column(type: "datetime2", nullable: true), FavoritId = table.Column(type: "uniqueidentifier", nullable: false), - CategoryId = table.Column(type: "uniqueidentifier", nullable: true) + CategoryId = table.Column(type: "uniqueidentifier", nullable: true), }, constraints: table => { @@ -118,7 +119,7 @@ namespace Francesco.Recipes.World.Migrations { Id = table.Column(type: "uniqueidentifier", nullable: false), ShoppinglistId = table.Column(type: "uniqueidentifier", nullable: false), - IngredientId = table.Column(type: "uniqueidentifier", nullable: false) + IngredientId = table.Column(type: "uniqueidentifier", nullable: false), }, constraints: table => { @@ -144,7 +145,7 @@ namespace Francesco.Recipes.World.Migrations Id = table.Column(type: "uniqueidentifier", nullable: false), Description = table.Column(type: "nvarchar(max)", nullable: false), Number = table.Column(type: "nvarchar(max)", nullable: false), - RecipeId = table.Column(type: "uniqueidentifier", nullable: false) + RecipeId = table.Column(type: "uniqueidentifier", nullable: false), }, constraints: table => { @@ -165,7 +166,7 @@ namespace Francesco.Recipes.World.Migrations RecipeId = table.Column(type: "uniqueidentifier", nullable: false), IngredientId = table.Column(type: "uniqueidentifier", nullable: false), UnitId = table.Column(type: "uniqueidentifier", nullable: false), - Quantity = table.Column(type: "int", nullable: false) + Quantity = table.Column(type: "int", nullable: false), }, constraints: table => { @@ -199,7 +200,7 @@ namespace Francesco.Recipes.World.Migrations MimeType = table.Column(type: "nvarchar(max)", nullable: true), Data = table.Column(type: "varbinary(max)", nullable: true), RecipeId = table.Column(type: "uniqueidentifier", nullable: true), - InstructionId = table.Column(type: "uniqueidentifier", nullable: false) + InstructionId = table.Column(type: "uniqueidentifier", nullable: false), }, constraints: table => { @@ -231,7 +232,7 @@ namespace Francesco.Recipes.World.Migrations { new Guid("abbc6bb0-97ea-49f5-b31e-6507eb784fd1"), "Hauptgerichte" }, { new Guid("adfb75ce-3ef3-428b-a5ca-b0c4c619d5ec"), "Hefegebäck & Brot" }, { new Guid("b248244f-f21c-4555-a14d-5dd49a2717cf"), "Vorspeisen & Snacks" }, - { new Guid("d332f88d-d241-48c5-a2f2-bfd124eada7e"), "Soßen & Saucen" } + { new Guid("d332f88d-d241-48c5-a2f2-bfd124eada7e"), "Soßen & Saucen" }, }); migrationBuilder.InsertData( @@ -249,7 +250,7 @@ namespace Francesco.Recipes.World.Migrations { new Guid("7ea2f51d-7493-4f19-a663-1f309186d3ae"), "bund", "bund" }, { new Guid("d82f4abd-e4e4-4104-a9c0-1acdeaa701f5"), "blatt", "blatt" }, { new Guid("df5cb4c3-4de6-4c6f-be8c-da41b2986408"), "messerspitze", "msp" }, - { new Guid("e45a3af2-2ed6-4ac4-b06f-b4175663a7be"), "stange", "stange" } + { new Guid("e45a3af2-2ed6-4ac4-b06f-b4175663a7be"), "stange", "stange" }, }); migrationBuilder.CreateIndex( @@ -310,6 +311,7 @@ namespace Francesco.Recipes.World.Migrations { throw new ArgumentNullException(nameof(migrationBuilder)); } + migrationBuilder.DropTable( name: "IngredientsShoppingLists"); diff --git a/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs b/Francesco.Recipes.World/Models/BackendModels/Category/Category.cs index 5fa42d4..23f13b6 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; } = string.Empty; public virtual ICollection Recipes { get; set; } = new List(); } } diff --git a/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs b/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs index 2a3e4d4..87797d2 100644 --- a/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs +++ b/Francesco.Recipes.World/Models/BackendModels/Ingredient/Ingredient.cs @@ -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 RecipeIngredients { get; set; } = new List(); public virtual ICollection IngredientShoppingLists { get; set; } = new List(); } diff --git a/Francesco.Recipes.World/Models/BackendModels/IngredientShoppingList/IngredientsShoppingList.cs b/Francesco.Recipes.World/Models/BackendModels/IngredientShoppingList/IngredientsShoppingList.cs index c527693..9e0fb38 100644 --- a/Francesco.Recipes.World/Models/BackendModels/IngredientShoppingList/IngredientsShoppingList.cs +++ b/Francesco.Recipes.World/Models/BackendModels/IngredientShoppingList/IngredientsShoppingList.cs @@ -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 (); } } diff --git a/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs b/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs index 6f0919c..0c2e855 100644 --- a/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs +++ b/Francesco.Recipes.World/Models/BackendModels/Instruction/Instruction.cs @@ -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 MediaFiles { get; set; } = new List(); } } diff --git a/Francesco.Recipes.World/Models/BackendModels/MediaFile/MediaFile.cs b/Francesco.Recipes.World/Models/BackendModels/MediaFile/MediaFile.cs index 56c083a..bafcd48 100644 --- a/Francesco.Recipes.World/Models/BackendModels/MediaFile/MediaFile.cs +++ b/Francesco.Recipes.World/Models/BackendModels/MediaFile/MediaFile.cs @@ -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 (); } } diff --git a/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs b/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs index 7d4e01e..0e46f85 100644 --- a/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs +++ b/Francesco.Recipes.World/Models/BackendModels/Recipe/Recipe.cs @@ -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 RecipeIngredients { get; set; } = new List(); public virtual ICollection Instructions { get; set; } = new List(); public virtual ICollection MediaFiles { get; set; } = new List(); - public virtual Favorit Favorit { get; set; } = new(); + public virtual Favorit Favorit { get; set; } = new (); } diff --git a/Francesco.Recipes.World/Models/BackendModels/RecipeIngredient/RecipeIngredient.cs b/Francesco.Recipes.World/Models/BackendModels/RecipeIngredient/RecipeIngredient.cs index 30456ad..876da46 100644 --- a/Francesco.Recipes.World/Models/BackendModels/RecipeIngredient/RecipeIngredient.cs +++ b/Francesco.Recipes.World/Models/BackendModels/RecipeIngredient/RecipeIngredient.cs @@ -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; } } } diff --git a/Francesco.Recipes.World/Models/BackendModels/Shoppinglist/ShoppingList.cs b/Francesco.Recipes.World/Models/BackendModels/Shoppinglist/ShoppingList.cs index a6f764e..95ffcb7 100644 --- a/Francesco.Recipes.World/Models/BackendModels/Shoppinglist/ShoppingList.cs +++ b/Francesco.Recipes.World/Models/BackendModels/Shoppinglist/ShoppingList.cs @@ -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; } diff --git a/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs b/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs index e11bce3..94ab6a8 100644 --- a/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs +++ b/Francesco.Recipes.World/Models/BackendModels/Unit/Unit.cs @@ -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 { get; set; } = new List(); - } -} + }