ReiMerc/easyeat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: ReiMerc:15de778225a640b2c49b30ef4322193cc8230813
Branches Tags
ReiMerc:master
...
compare: ReiMerc:de8c9359cc180beb900fcf635ed1477d8ce7c7a4
Branches Tags
ReiMerc:master

2 Commits
15de778225 ... de8c9359cc

Author SHA1 Message Date
Jeas0001
de8c9359cc RemovedPreferedRecipes 2025-04-30 11:36:05 +02:00
Jeas0001
2596a9e408 Change element to name for ingredient 2025-04-30 11:04:56 +02:00
15 changed files with 788 additions and 374 deletions
Show Stats Expand all files Collapse all files

13
backend/API/BusinessLogic/RecipeLogic.cs
View File

@ -15,9 +15,8 @@ namespace API.BusinessLogic
public async Task<IActionResult> GetPrefereredRecipes(int userId)
{
PrefereredRecipes recipes = await _dbAccess.ReadPrefereredRecipes(userId);
if (recipes == null) { recipes = await _dbAccess.CreateMissingLists(userId); }
if (recipes == null || recipes.Id == 0) { return new ConflictObjectResult(new { message = "Could not find any recipes" }); }
var recipes = await _dbAccess.ReadRecipes(userId);
if (recipes == null || recipes.Count == 0) { return new ConflictObjectResult(new { message = "Could not find any recipes" }); }
return new OkObjectResult(recipes);
}
@ -52,7 +51,7 @@ namespace API.BusinessLogic
{
Ingredient ingredient = new Ingredient();
ingredient.Unit = item.Unit;
ingredient.Element = item.Element;
ingredient.Name = item.Name;
ingredient.Amount = item.Amount;
recipe1.Ingredients.Add(ingredient);
}
@ -62,10 +61,10 @@ namespace API.BusinessLogic
public async Task<IActionResult> EditRecipe(RecipeDTO recipe, int recipeId, int userId)
{
var prefereredRecipes = await _dbAccess.ReadPrefereredRecipes(userId);
var recipes = await _dbAccess.ReadRecipes(userId);
var dish = await _dbAccess.ReadRecipe(recipeId);
foreach (var item in prefereredRecipes.Recipes)
foreach (var item in recipes)
{
if (item.Name == recipe.Name)
{
@ -80,7 +79,7 @@ namespace API.BusinessLogic
{
Ingredient ingredient = new Ingredient();
ingredient.Unit = item.Unit;
ingredient.Element = item.Element;
ingredient.Name = item.Name;
ingredient.Amount = item.Amount;
dish.Ingredients.Add(ingredient);
}

6
backend/API/BusinessLogic/ShoppingListLogic.cs
View File

@ -146,9 +146,9 @@ namespace API.BusinessLogic
{
List<ShoppingList> shoppingList = user.ShoppingList;
if (shoppingList.Any(s => s.Name == ingredient.Element))
if (shoppingList.Any(s => s.Name == ingredient.Name))
{
ShoppingList item = shoppingList.Where(s => s.Name == ingredient.Element).FirstOrDefault();
ShoppingList item = shoppingList.Where(s => s.Name == ingredient.Name).FirstOrDefault();
shoppingList.Remove(item);
if (item.Unit == ingredient.Unit)
@ -194,7 +194,7 @@ namespace API.BusinessLogic
else
{
ShoppingList newItem = new ShoppingList();
newItem.Name = ingredient.Element;
newItem.Name = ingredient.Name;
newItem.Amount = ingredient.Amount;
newItem.Unit = ingredient.Unit;
newItem.Checked = false;

5
backend/API/BusinessLogic/UserLogic.cs
View File

@ -61,8 +61,7 @@ namespace API.BusinessLogic
string salt = Guid.NewGuid().ToString();
string hashedPassword = ComputeHash(userDTO.Password, SHA256.Create(), salt);
PrefereredRecipes recipes = new PrefereredRecipes();
recipes.Recipes = new List<Recipe>();
User user = new User
{
@ -70,7 +69,7 @@ namespace API.BusinessLogic
Email = userDTO.Email,
Password = hashedPassword,
Salt = salt,
PrefereredRecipes = recipes,
Recipes = new List<Recipe>(),
ShoppingList = new List<ShoppingList>(),
};

17
backend/API/DBAccess/RecipeDBaccess.cs
View File

@ -14,11 +14,11 @@ namespace API.DBAccess
_context = context;
}
public async Task<PrefereredRecipes> ReadPrefereredRecipes(int userId)
public async Task<List<Recipe>> ReadRecipes(int userId)
{
var recipes = await _context.Users.Include(u => u.PrefereredRecipes).ThenInclude(p => p.Recipes).FirstOrDefaultAsync(u => u.Id == userId);
var recipes = await _context.Users.Include(p => p.Recipes).FirstOrDefaultAsync(u => u.Id == userId);
return recipes.PrefereredRecipes;
return recipes.Recipes;
}
public async Task<PrefereredRecipes> ReadAllRecipe(int prefereredRecipesId)
@ -31,17 +31,6 @@ namespace API.DBAccess
return await _context.Recipes.Include(r => r.Ingredients).FirstOrDefaultAsync(r => r.Id == recipeId);
}
public async Task<PrefereredRecipes> CreateMissingLists(int userId)
{
var user = await _context.Users.FirstOrDefaultAsync(u => u.Id == userId);
user.PrefereredRecipes = new PrefereredRecipes();
user.PrefereredRecipes.Recipes = new List<Recipe>();
_context.SaveChangesAsync();
return await ReadPrefereredRecipes(userId);
}
public async Task<IActionResult> CreateRecipe(Recipe recipe, int prefereredRecipeId)
{
var recipes = await _context.PrefereredRecipes.Include(p => p.Recipes).FirstOrDefaultAsync(p => p.Id == prefereredRecipeId);

274
backend/API/Migrations/20250429115336_RecipeModelAdded.cs
View File

@ -1,274 +0,0 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace API.Migrations
{
/// <inheritdoc />
public partial class RecipeModelAdded : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AlterColumn<string>(
name: "UserName",
table: "Users",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext");
migrationBuilder.AlterColumn<string>(
name: "Salt",
table: "Users",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "RefreshTokenExpireAt",
table: "Users",
type: "TEXT",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "datetime(6)");
migrationBuilder.AlterColumn<string>(
name: "RefreshToken",
table: "Users",
type: "TEXT",
nullable: true,
oldClrType: typeof(string),
oldType: "longtext",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Password",
table: "Users",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext");
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Users",
type: "TEXT",
nullable: false,
oldClrType: typeof(string),
oldType: "longtext");
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "Users",
type: "INTEGER",
nullable: false,
oldClrType: typeof(int),
oldType: "int")
.Annotation("Sqlite:Autoincrement", true)
.OldAnnotation("Sqlite:Autoincrement", true);
migrationBuilder.AddColumn<int>(
name: "PrefereredRecipesId",
table: "Users",
type: "INTEGER",
nullable: false,
defaultValue: 0);
migrationBuilder.CreateTable(
name: "PrefereredRecipes",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true)
},
constraints: table =>
{
table.PrimaryKey("PK_PrefereredRecipes", x => x.Id);
});
migrationBuilder.CreateTable(
name: "ShoppingList",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
Amount = table.Column<double>(type: "REAL", nullable: false),
Unit = table.Column<string>(type: "TEXT", nullable: false),
Name = table.Column<string>(type: "TEXT", nullable: false),
Checked = table.Column<bool>(type: "INTEGER", nullable: false),
UserId = table.Column<int>(type: "INTEGER", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_ShoppingList", x => x.Id);
table.ForeignKey(
name: "FK_ShoppingList_Users_UserId",
column: x => x.UserId,
principalTable: "Users",
principalColumn: "Id");
});
migrationBuilder.CreateTable(
name: "Recipes",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
Name = table.Column<string>(type: "TEXT", nullable: false),
Description = table.Column<string>(type: "TEXT", nullable: false),
Directions = table.Column<string>(type: "TEXT", nullable: false),
PrefereredRecipesId = table.Column<int>(type: "INTEGER", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Recipes", x => x.Id);
table.ForeignKey(
name: "FK_Recipes_PrefereredRecipes_PrefereredRecipesId",
column: x => x.PrefereredRecipesId,
principalTable: "PrefereredRecipes",
principalColumn: "Id");
});
migrationBuilder.CreateTable(
name: "Ingredient",
columns: table => new
{
Id = table.Column<int>(type: "INTEGER", nullable: false)
.Annotation("Sqlite:Autoincrement", true),
Amount = table.Column<int>(type: "INTEGER", nullable: false),
Unit = table.Column<string>(type: "TEXT", nullable: false),
Element = table.Column<string>(type: "TEXT", nullable: false),
RecipeId = table.Column<int>(type: "INTEGER", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Ingredient", x => x.Id);
table.ForeignKey(
name: "FK_Ingredient_Recipes_RecipeId",
column: x => x.RecipeId,
principalTable: "Recipes",
principalColumn: "Id");
});
migrationBuilder.CreateIndex(
name: "IX_Users_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId");
migrationBuilder.CreateIndex(
name: "IX_Ingredient_RecipeId",
table: "Ingredient",
column: "RecipeId");
migrationBuilder.CreateIndex(
name: "IX_Recipes_PrefereredRecipesId",
table: "Recipes",
column: "PrefereredRecipesId");
migrationBuilder.CreateIndex(
name: "IX_ShoppingList_UserId",
table: "ShoppingList",
column: "UserId");
migrationBuilder.AddForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId",
principalTable: "PrefereredRecipes",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users");
migrationBuilder.DropTable(
name: "Ingredient");
migrationBuilder.DropTable(
name: "ShoppingList");
migrationBuilder.DropTable(
name: "Recipes");
migrationBuilder.DropTable(
name: "PrefereredRecipes");
migrationBuilder.DropIndex(
name: "IX_Users_PrefereredRecipesId",
table: "Users");
migrationBuilder.DropColumn(
name: "PrefereredRecipesId",
table: "Users");
migrationBuilder.AlterColumn<string>(
name: "UserName",
table: "Users",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "Salt",
table: "Users",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<DateTime>(
name: "RefreshTokenExpireAt",
table: "Users",
type: "datetime(6)",
nullable: false,
oldClrType: typeof(DateTime),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "RefreshToken",
table: "Users",
type: "longtext",
nullable: true,
oldClrType: typeof(string),
oldType: "TEXT",
oldNullable: true);
migrationBuilder.AlterColumn<string>(
name: "Password",
table: "Users",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<string>(
name: "Email",
table: "Users",
type: "longtext",
nullable: false,
oldClrType: typeof(string),
oldType: "TEXT");
migrationBuilder.AlterColumn<int>(
name: "Id",
table: "Users",
type: "int",
nullable: false,
oldClrType: typeof(int),
oldType: "INTEGER")
.Annotation("Sqlite:Autoincrement", true)
.OldAnnotation("Sqlite:Autoincrement", true);
}
}
}

58
backend/API/Migrations/20250429115336_RecipeModelAdded.Designer.cs → backend/API/Migrations/20250430091216_RecipeModelAdded.Designer.cs generated
View File

@ -11,34 +11,36 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
namespace API.Migrations
{
[DbContext(typeof(DBContext))]
[Migration("20250429115336_RecipeModelAdded")]
[Migration("20250430091216_RecipeModelAdded")]
partial class RecipeModelAdded
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
modelBuilder
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("API.Models.RecipeModels.Ingredient", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<int>("Amount")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Element")
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int?>("RecipeId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.HasKey("Id");
@ -51,7 +53,7 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.HasKey("Id");
@ -62,22 +64,22 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Description")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Directions")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int?>("PrefereredRecipesId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.HasKey("Id");
@ -90,24 +92,24 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<double>("Amount")
.HasColumnType("REAL");
.HasColumnType("double");
b.Property<bool>("Checked")
.HasColumnType("INTEGER");
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int?>("UserId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.HasKey("Id");
@ -120,31 +122,31 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int>("PrefereredRecipesId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("RefreshToken")
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<DateTime>("RefreshTokenExpireAt")
.HasColumnType("TEXT");
.HasColumnType("datetime(6)");
b.Property<string>("Salt")
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("UserName")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.HasKey("Id");

158
backend/API/Migrations/20250430091216_RecipeModelAdded.cs Normal file
View File

@ -0,0 +1,158 @@
using Microsoft.EntityFrameworkCore.Migrations;
using MySql.EntityFrameworkCore.Metadata;
#nullable disable
namespace API.Migrations
{
/// <inheritdoc />
public partial class RecipeModelAdded : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "PrefereredRecipesId",
table: "Users",
type: "int",
nullable: false,
defaultValue: 0);
migrationBuilder.CreateTable(
name: "PrefereredRecipes",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySQL:ValueGenerationStrategy", MySQLValueGenerationStrategy.IdentityColumn)
},
constraints: table =>
{
table.PrimaryKey("PK_PrefereredRecipes", x => x.Id);
})
.Annotation("MySQL:Charset", "utf8mb4");
migrationBuilder.CreateTable(
name: "ShoppingList",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySQL:ValueGenerationStrategy", MySQLValueGenerationStrategy.IdentityColumn),
Amount = table.Column<double>(type: "double", nullable: false),
Unit = table.Column<string>(type: "longtext", nullable: false),
Name = table.Column<string>(type: "longtext", nullable: false),
Checked = table.Column<bool>(type: "tinyint(1)", nullable: false),
UserId = table.Column<int>(type: "int", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_ShoppingList", x => x.Id);
table.ForeignKey(
name: "FK_ShoppingList_Users_UserId",
column: x => x.UserId,
principalTable: "Users",
principalColumn: "Id");
})
.Annotation("MySQL:Charset", "utf8mb4");
migrationBuilder.CreateTable(
name: "Recipes",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySQL:ValueGenerationStrategy", MySQLValueGenerationStrategy.IdentityColumn),
Name = table.Column<string>(type: "longtext", nullable: false),
Description = table.Column<string>(type: "longtext", nullable: false),
Directions = table.Column<string>(type: "longtext", nullable: false),
PrefereredRecipesId = table.Column<int>(type: "int", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Recipes", x => x.Id);
table.ForeignKey(
name: "FK_Recipes_PrefereredRecipes_PrefereredRecipesId",
column: x => x.PrefereredRecipesId,
principalTable: "PrefereredRecipes",
principalColumn: "Id");
})
.Annotation("MySQL:Charset", "utf8mb4");
migrationBuilder.CreateTable(
name: "Ingredient",
columns: table => new
{
Id = table.Column<int>(type: "int", nullable: false)
.Annotation("MySQL:ValueGenerationStrategy", MySQLValueGenerationStrategy.IdentityColumn),
Amount = table.Column<int>(type: "int", nullable: false),
Unit = table.Column<string>(type: "longtext", nullable: false),
Name = table.Column<string>(type: "longtext", nullable: false),
RecipeId = table.Column<int>(type: "int", nullable: true)
},
constraints: table =>
{
table.PrimaryKey("PK_Ingredient", x => x.Id);
table.ForeignKey(
name: "FK_Ingredient_Recipes_RecipeId",
column: x => x.RecipeId,
principalTable: "Recipes",
principalColumn: "Id");
})
.Annotation("MySQL:Charset", "utf8mb4");
migrationBuilder.CreateIndex(
name: "IX_Users_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId");
migrationBuilder.CreateIndex(
name: "IX_Ingredient_RecipeId",
table: "Ingredient",
column: "RecipeId");
migrationBuilder.CreateIndex(
name: "IX_Recipes_PrefereredRecipesId",
table: "Recipes",
column: "PrefereredRecipesId");
migrationBuilder.CreateIndex(
name: "IX_ShoppingList_UserId",
table: "ShoppingList",
column: "UserId");
migrationBuilder.AddForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId",
principalTable: "PrefereredRecipes",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users");
migrationBuilder.DropTable(
name: "Ingredient");
migrationBuilder.DropTable(
name: "ShoppingList");
migrationBuilder.DropTable(
name: "Recipes");
migrationBuilder.DropTable(
name: "PrefereredRecipes");
migrationBuilder.DropIndex(
name: "IX_Users_PrefereredRecipesId",
table: "Users");
migrationBuilder.DropColumn(
name: "PrefereredRecipesId",
table: "Users");
}
}
}

205
backend/API/Migrations/20250430092324_PreferedRecipesisnullable.Designer.cs generated Normal file
View File

@ -0,0 +1,205 @@
// <auto-generated />
using System;
using API.DBAccess;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace API.Migrations
{
[DbContext(typeof(DBContext))]
[Migration("20250430092324_PreferedRecipesisnullable")]
partial class PreferedRecipesisnullable
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("API.Models.RecipeModels.Ingredient", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Amount")
.HasColumnType("int");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("RecipeId")
.HasColumnType("int");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Id");
b.HasIndex("RecipeId");
b.ToTable("Ingredient");
});
modelBuilder.Entity("API.Models.RecipeModels.PrefereredRecipes", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.HasKey("Id");
b.ToTable("PrefereredRecipes");
});
modelBuilder.Entity("API.Models.RecipeModels.Recipe", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Description")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Directions")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("PrefereredRecipesId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("PrefereredRecipesId");
b.ToTable("Recipes");
});
modelBuilder.Entity("API.Models.ShoppingListModels.ShoppingList", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<double>("Amount")
.HasColumnType("double");
b.Property<bool>("Checked")
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("UserId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("ShoppingList");
});
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("PrefereredRecipesId")
.HasColumnType("int");
b.Property<string>("RefreshToken")
.HasColumnType("longtext");
b.Property<DateTime>("RefreshTokenExpireAt")
.HasColumnType("datetime(6)");
b.Property<string>("Salt")
.HasColumnType("longtext");
b.Property<string>("UserName")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Id");
b.HasIndex("PrefereredRecipesId");
b.ToTable("Users");
});
modelBuilder.Entity("API.Models.RecipeModels.Ingredient", b =>
{
b.HasOne("API.Models.RecipeModels.Recipe", null)
.WithMany("Ingredients")
.HasForeignKey("RecipeId");
});
modelBuilder.Entity("API.Models.RecipeModels.Recipe", b =>
{
b.HasOne("API.Models.RecipeModels.PrefereredRecipes", null)
.WithMany("Recipes")
.HasForeignKey("PrefereredRecipesId");
});
modelBuilder.Entity("API.Models.ShoppingListModels.ShoppingList", b =>
{
b.HasOne("API.Models.UserModels.User", null)
.WithMany("ShoppingList")
.HasForeignKey("UserId");
});
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.HasOne("API.Models.RecipeModels.PrefereredRecipes", "PrefereredRecipes")
.WithMany()
.HasForeignKey("PrefereredRecipesId");
b.Navigation("PrefereredRecipes");
});
modelBuilder.Entity("API.Models.RecipeModels.PrefereredRecipes", b =>
{
b.Navigation("Recipes");
});
modelBuilder.Entity("API.Models.RecipeModels.Recipe", b =>
{
b.Navigation("Ingredients");
});
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.Navigation("ShoppingList");
});
#pragma warning restore 612, 618
}
}
}

59
backend/API/Migrations/20250430092324_PreferedRecipesisnullable.cs Normal file
View File

@ -0,0 +1,59 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace API.Migrations
{
/// <inheritdoc />
public partial class PreferedRecipesisnullable : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users");
migrationBuilder.AlterColumn<int>(
name: "PrefereredRecipesId",
table: "Users",
type: "int",
nullable: true,
oldClrType: typeof(int),
oldType: "int");
migrationBuilder.AddForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId",
principalTable: "PrefereredRecipes",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users");
migrationBuilder.AlterColumn<int>(
name: "PrefereredRecipesId",
table: "Users",
type: "int",
nullable: false,
defaultValue: 0,
oldClrType: typeof(int),
oldType: "int",
oldNullable: true);
migrationBuilder.AddForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId",
principalTable: "PrefereredRecipes",
principalColumn: "Id",
onDelete: ReferentialAction.Cascade);
}
}
}

202
backend/API/Migrations/20250430093427_RemovedPreferedRecipes.Designer.cs generated Normal file
View File

@ -0,0 +1,202 @@
// <auto-generated />
using System;
using API.DBAccess;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
#nullable disable
namespace API.Migrations
{
[DbContext(typeof(DBContext))]
[Migration("20250430093427_RemovedPreferedRecipes")]
partial class RemovedPreferedRecipes
{
/// <inheritdoc />
protected override void BuildTargetModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("API.Models.RecipeModels.Ingredient", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<int>("Amount")
.HasColumnType("int");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("RecipeId")
.HasColumnType("int");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Id");
b.HasIndex("RecipeId");
b.ToTable("Ingredient");
});
modelBuilder.Entity("API.Models.RecipeModels.PrefereredRecipes", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.HasKey("Id");
b.ToTable("PrefereredRecipes");
});
modelBuilder.Entity("API.Models.RecipeModels.Recipe", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Description")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Directions")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("PrefereredRecipesId")
.HasColumnType("int");
b.Property<int?>("UserId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("PrefereredRecipesId");
b.HasIndex("UserId");
b.ToTable("Recipes");
});
modelBuilder.Entity("API.Models.ShoppingListModels.ShoppingList", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<double>("Amount")
.HasColumnType("double");
b.Property<bool>("Checked")
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("longtext");
b.Property<int?>("UserId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("UserId");
b.ToTable("ShoppingList");
});
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("int");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("longtext");
b.Property<string>("RefreshToken")
.HasColumnType("longtext");
b.Property<DateTime>("RefreshTokenExpireAt")
.HasColumnType("datetime(6)");
b.Property<string>("Salt")
.HasColumnType("longtext");
b.Property<string>("UserName")
.IsRequired()
.HasColumnType("longtext");
b.HasKey("Id");
b.ToTable("Users");
});
modelBuilder.Entity("API.Models.RecipeModels.Ingredient", b =>
{
b.HasOne("API.Models.RecipeModels.Recipe", null)
.WithMany("Ingredients")
.HasForeignKey("RecipeId");
});
modelBuilder.Entity("API.Models.RecipeModels.Recipe", b =>
{
b.HasOne("API.Models.RecipeModels.PrefereredRecipes", null)
.WithMany("Recipes")
.HasForeignKey("PrefereredRecipesId");
b.HasOne("API.Models.UserModels.User", null)
.WithMany("Recipes")
.HasForeignKey("UserId");
});
modelBuilder.Entity("API.Models.ShoppingListModels.ShoppingList", b =>
{
b.HasOne("API.Models.UserModels.User", null)
.WithMany("ShoppingList")
.HasForeignKey("UserId");
});
modelBuilder.Entity("API.Models.RecipeModels.PrefereredRecipes", b =>
{
b.Navigation("Recipes");
});
modelBuilder.Entity("API.Models.RecipeModels.Recipe", b =>
{
b.Navigation("Ingredients");
});
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.Navigation("Recipes");
b.Navigation("ShoppingList");
});
#pragma warning restore 612, 618
}
}
}

78
backend/API/Migrations/20250430093427_RemovedPreferedRecipes.cs Normal file
View File

@ -0,0 +1,78 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace API.Migrations
{
/// <inheritdoc />
public partial class RemovedPreferedRecipes : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users");
migrationBuilder.DropIndex(
name: "IX_Users_PrefereredRecipesId",
table: "Users");
migrationBuilder.DropColumn(
name: "PrefereredRecipesId",
table: "Users");
migrationBuilder.AddColumn<int>(
name: "UserId",
table: "Recipes",
type: "int",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_Recipes_UserId",
table: "Recipes",
column: "UserId");
migrationBuilder.AddForeignKey(
name: "FK_Recipes_Users_UserId",
table: "Recipes",
column: "UserId",
principalTable: "Users",
principalColumn: "Id");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_Recipes_Users_UserId",
table: "Recipes");
migrationBuilder.DropIndex(
name: "IX_Recipes_UserId",
table: "Recipes");
migrationBuilder.DropColumn(
name: "UserId",
table: "Recipes");
migrationBuilder.AddColumn<int>(
name: "PrefereredRecipesId",
table: "Users",
type: "int",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_Users_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId");
migrationBuilder.AddForeignKey(
name: "FK_Users_PrefereredRecipes_PrefereredRecipesId",
table: "Users",
column: "PrefereredRecipesId",
principalTable: "PrefereredRecipes",
principalColumn: "Id");
}
}
}

81
backend/API/Migrations/DBContextModelSnapshot.cs
View File

@ -15,27 +15,29 @@ namespace API.Migrations
protected override void BuildModel(ModelBuilder modelBuilder)
{
#pragma warning disable 612, 618
modelBuilder.HasAnnotation("ProductVersion", "8.0.10");
modelBuilder
.HasAnnotation("ProductVersion", "8.0.10")
.HasAnnotation("Relational:MaxIdentifierLength", 64);
modelBuilder.Entity("API.Models.RecipeModels.Ingredient", b =>
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<int>("Amount")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Element")
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int?>("RecipeId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.HasKey("Id");
@ -48,7 +50,7 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.HasKey("Id");
@ -59,27 +61,32 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Description")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Directions")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int?>("PrefereredRecipesId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<int?>("UserId")
.HasColumnType("int");
b.HasKey("Id");
b.HasIndex("PrefereredRecipesId");
b.HasIndex("UserId");
b.ToTable("Recipes");
});
@ -87,24 +94,24 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<double>("Amount")
.HasColumnType("REAL");
.HasColumnType("double");
b.Property<bool>("Checked")
.HasColumnType("INTEGER");
.HasColumnType("tinyint(1)");
b.Property<string>("Name")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Unit")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<int?>("UserId")
.HasColumnType("INTEGER");
.HasColumnType("int");
b.HasKey("Id");
@ -117,36 +124,31 @@ namespace API.Migrations
{
b.Property<int>("Id")
.ValueGeneratedOnAdd()
.HasColumnType("INTEGER");
.HasColumnType("int");
b.Property<string>("Email")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("Password")
.IsRequired()
.HasColumnType("TEXT");
b.Property<int>("PrefereredRecipesId")
.HasColumnType("INTEGER");
.HasColumnType("longtext");
b.Property<string>("RefreshToken")
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<DateTime>("RefreshTokenExpireAt")
.HasColumnType("TEXT");
.HasColumnType("datetime(6)");
b.Property<string>("Salt")
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.Property<string>("UserName")
.IsRequired()
.HasColumnType("TEXT");
.HasColumnType("longtext");
b.HasKey("Id");
b.HasIndex("PrefereredRecipesId");
b.ToTable("Users");
});
@ -162,6 +164,10 @@ namespace API.Migrations
b.HasOne("API.Models.RecipeModels.PrefereredRecipes", null)
.WithMany("Recipes")
.HasForeignKey("PrefereredRecipesId");
b.HasOne("API.Models.UserModels.User", null)
.WithMany("Recipes")
.HasForeignKey("UserId");
});
modelBuilder.Entity("API.Models.ShoppingListModels.ShoppingList", b =>
@ -171,17 +177,6 @@ namespace API.Migrations
.HasForeignKey("UserId");
});
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.HasOne("API.Models.RecipeModels.PrefereredRecipes", "PrefereredRecipes")
.WithMany()
.HasForeignKey("PrefereredRecipesId")
.OnDelete(DeleteBehavior.Cascade)
.IsRequired();
b.Navigation("PrefereredRecipes");
});
modelBuilder.Entity("API.Models.RecipeModels.PrefereredRecipes", b =>
{
b.Navigation("Recipes");
@ -194,6 +189,8 @@ namespace API.Migrations
modelBuilder.Entity("API.Models.UserModels.User", b =>
{
b.Navigation("Recipes");
b.Navigation("ShoppingList");
});
#pragma warning restore 612, 618

2
backend/API/Models/RecipeModels/Ingredient.cs
View File

@ -8,6 +8,6 @@
public string Unit { get; set; }
public string Element { get; set; }
public string Name { get; set; }
}
}

2
backend/API/Models/RecipeModels/IngredientDTO.cs
View File

@ -6,6 +6,6 @@
public string Unit { get; set; }
public string Element { get; set; }
public string Name { get; set; }
}
}

2
backend/API/Models/UserModels/User.cs
View File

@ -19,7 +19,7 @@ namespace API.Models.UserModels
public DateTime RefreshTokenExpireAt { get; set; }
public PrefereredRecipes PrefereredRecipes { get; set; }
public List<Recipe> Recipes { get; set; }
public List<ShoppingList> ShoppingList { get; set; }
}