Last files for merge
This commit is contained in:
@@ -1,12 +1,12 @@
|
|||||||
using System;
|
#nullable disable
|
||||||
using Microsoft.EntityFrameworkCore.Migrations;
|
|
||||||
|
|
||||||
#nullable disable
|
|
||||||
|
|
||||||
#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
|
#pragma warning disable CA1814 // Prefer jagged arrays over multidimensional
|
||||||
|
|
||||||
namespace Francesco.Recipes.World.Migrations
|
namespace Francesco.Recipes.World.Migrations
|
||||||
{
|
{
|
||||||
|
using System;
|
||||||
|
using Microsoft.EntityFrameworkCore.Migrations;
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public partial class InitialMIgration : Migration
|
public partial class InitialMIgration : Migration
|
||||||
{
|
{
|
||||||
@@ -17,12 +17,13 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{
|
{
|
||||||
throw new ArgumentNullException(nameof(migrationBuilder));
|
throw new ArgumentNullException(nameof(migrationBuilder));
|
||||||
}
|
}
|
||||||
|
|
||||||
migrationBuilder.CreateTable(
|
migrationBuilder.CreateTable(
|
||||||
name: "Categories",
|
name: "Categories",
|
||||||
columns: table => new
|
columns: table => new
|
||||||
{
|
{
|
||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
Name = table.Column<string>(type: "nvarchar(max)", nullable: false)
|
Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -34,7 +35,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
columns: table => new
|
columns: table => new
|
||||||
{
|
{
|
||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false)
|
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -46,7 +47,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
columns: table => new
|
columns: table => new
|
||||||
{
|
{
|
||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
Name = table.Column<string>(type: "nvarchar(max)", nullable: false)
|
Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -59,7 +60,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{
|
{
|
||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
|
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
|
||||||
ModifiedAt = table.Column<DateTime>(type: "datetime2", nullable: true)
|
ModifiedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -72,7 +73,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{
|
{
|
||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
Name = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||||
Symbol = table.Column<string>(type: "nvarchar(max)", nullable: false)
|
Symbol = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -94,7 +95,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
|
CreatedAt = table.Column<DateTime>(type: "datetime2", nullable: false),
|
||||||
ModifiedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
|
ModifiedAt = table.Column<DateTime>(type: "datetime2", nullable: true),
|
||||||
FavoritId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
FavoritId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
CategoryId = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
|
CategoryId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -118,7 +119,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{
|
{
|
||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
ShoppinglistId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
ShoppinglistId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
IngredientId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
|
IngredientId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -144,7 +145,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
Description = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
Description = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||||
Number = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
Number = table.Column<string>(type: "nvarchar(max)", nullable: false),
|
||||||
RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
|
RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -165,7 +166,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
IngredientId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
IngredientId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
UnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
UnitId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
Quantity = table.Column<int>(type: "int", nullable: false)
|
Quantity = table.Column<int>(type: "int", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -199,7 +200,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
MimeType = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
MimeType = table.Column<string>(type: "nvarchar(max)", nullable: true),
|
||||||
Data = table.Column<byte[]>(type: "varbinary(max)", nullable: true),
|
Data = table.Column<byte[]>(type: "varbinary(max)", nullable: true),
|
||||||
RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
|
RecipeId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
|
||||||
InstructionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false)
|
InstructionId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
|
||||||
},
|
},
|
||||||
constraints: table =>
|
constraints: table =>
|
||||||
{
|
{
|
||||||
@@ -231,7 +232,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{ new Guid("abbc6bb0-97ea-49f5-b31e-6507eb784fd1"), "Hauptgerichte" },
|
{ new Guid("abbc6bb0-97ea-49f5-b31e-6507eb784fd1"), "Hauptgerichte" },
|
||||||
{ new Guid("adfb75ce-3ef3-428b-a5ca-b0c4c619d5ec"), "Hefegebäck & Brot" },
|
{ new Guid("adfb75ce-3ef3-428b-a5ca-b0c4c619d5ec"), "Hefegebäck & Brot" },
|
||||||
{ new Guid("b248244f-f21c-4555-a14d-5dd49a2717cf"), "Vorspeisen & Snacks" },
|
{ 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(
|
migrationBuilder.InsertData(
|
||||||
@@ -249,7 +250,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{ new Guid("7ea2f51d-7493-4f19-a663-1f309186d3ae"), "bund", "bund" },
|
{ new Guid("7ea2f51d-7493-4f19-a663-1f309186d3ae"), "bund", "bund" },
|
||||||
{ new Guid("d82f4abd-e4e4-4104-a9c0-1acdeaa701f5"), "blatt", "blatt" },
|
{ new Guid("d82f4abd-e4e4-4104-a9c0-1acdeaa701f5"), "blatt", "blatt" },
|
||||||
{ new Guid("df5cb4c3-4de6-4c6f-be8c-da41b2986408"), "messerspitze", "msp" },
|
{ 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(
|
migrationBuilder.CreateIndex(
|
||||||
@@ -310,6 +311,7 @@ namespace Francesco.Recipes.World.Migrations
|
|||||||
{
|
{
|
||||||
throw new ArgumentNullException(nameof(migrationBuilder));
|
throw new ArgumentNullException(nameof(migrationBuilder));
|
||||||
}
|
}
|
||||||
|
|
||||||
migrationBuilder.DropTable(
|
migrationBuilder.DropTable(
|
||||||
name: "IngredientsShoppingLists");
|
name: "IngredientsShoppingLists");
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
public class Category
|
public class Category
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
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>();
|
public virtual ICollection<Recipe> Recipes { get; set; } = new List<Recipe>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
public class Ingredient
|
public class Ingredient
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
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<RecipeIngredient> RecipeIngredients { get; set; } = new List<RecipeIngredient>();
|
||||||
public virtual ICollection<IngredientsShoppingList> IngredientShoppingLists { get; set; } = new List<IngredientsShoppingList>();
|
public virtual ICollection<IngredientsShoppingList> IngredientShoppingLists { get; set; } = new List<IngredientsShoppingList>();
|
||||||
}
|
}
|
||||||
|
|||||||
+2
-2
@@ -6,7 +6,7 @@
|
|||||||
public class IngredientsShoppingList
|
public class IngredientsShoppingList
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public ShoppingList Shoppinglist { get; set; } = new();
|
public ShoppingList Shoppinglist { get; set; } = new ();
|
||||||
public Ingredient Ingredient { get; set; } = new();
|
public Ingredient Ingredient { get; set; } = new ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,9 +5,9 @@
|
|||||||
public class Instruction
|
public class Instruction
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public string Description { get; set; }
|
public string Description { get; set; } = string.Empty;
|
||||||
public string Number { get; set; }
|
public int Number { get; set; }
|
||||||
public virtual Recipe Recipe { get; set; } = new();
|
public virtual Recipe Recipe { get; set; } = new ();
|
||||||
public virtual ICollection<MediaFile> MediaFiles { get; set; } = new List<MediaFile>();
|
public virtual ICollection<MediaFile> MediaFiles { get; set; } = new List<MediaFile>();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
public string? MimeType { get; set; }
|
public string? MimeType { get; set; }
|
||||||
|
|
||||||
public byte[]? Data { get; set; }
|
public byte[]? Data { get; set; }
|
||||||
public virtual Recipe? Recipe { get; set; } = new();
|
public virtual Recipe? Recipe { get; set; } = new ();
|
||||||
public virtual Instruction Instruction { 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 class Recipe : ITimeStampedEntity
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; } = string.Empty;
|
||||||
public string? Description { get; set; }
|
public string? Description { get; set; }
|
||||||
public Difficulty Difficulty { get; set; }
|
public Difficulty Difficulty { get; set; }
|
||||||
public int Servings { 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<RecipeIngredient> RecipeIngredients { get; set; } = new List<RecipeIngredient>();
|
||||||
public virtual ICollection<Instruction> Instructions { get; set; } = new List<Instruction>();
|
public virtual ICollection<Instruction> Instructions { get; set; } = new List<Instruction>();
|
||||||
public virtual ICollection<MediaFile> MediaFiles { get; set; } = new List<MediaFile>();
|
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 class RecipeIngredient
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
public Guid Id { get; set; }
|
||||||
public virtual Recipe Recipe { get; set; } = new();
|
public virtual Recipe Recipe { get; set; } = new ();
|
||||||
public virtual Ingredient Ingredient { get; set; } = new();
|
public virtual Ingredient Ingredient { get; set; } = new ();
|
||||||
public virtual Unit Unit { get; set; } = new();
|
public virtual Unit Unit { get; set; } = new ();
|
||||||
public int Quantity { get; set; }
|
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 class ShoppingList : ITimeStampedEntity
|
||||||
{
|
{
|
||||||
public Guid Id { get; set; }
|
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;
|
using Francesco.Recipes.World.Models.BackendModels.RecipeIngredient;
|
||||||
|
|
||||||
public class Unit
|
public class Unit
|
||||||
{
|
{
|
||||||
public Guid Id{ get; set; }
|
public Guid Id { get; set; }
|
||||||
public string Name { get; set; }
|
public string Name { get; set; } = string.Empty;
|
||||||
public string Symbol { get; set; }
|
public string Symbol { get; set; } = string.Empty;
|
||||||
public virtual ICollection<RecipeIngredient> RecipeIngredient { get; set; } = new List<RecipeIngredient>();
|
public virtual ICollection<RecipeIngredient> RecipeIngredient { get; set; } = new List<RecipeIngredient>();
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|||||||
Reference in New Issue
Block a user