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

Removed preferedrecipes from the entire project

Browse Source
This commit is contained in:
Jeas0001 2025-04-30 12:49:58 +02:00
parent de8c9359cc
commit 4772daa666
6 changed files with 12 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -13,7 +13,7 @@ namespace API.BusinessLogic
_dbAccess = dbAccess;
}
public async Task<IActionResult> GetPrefereredRecipes(int userId)
public async Task<IActionResult> GetRecipes(int userId)
{
var recipes = await _dbAccess.ReadRecipes(userId);
if (recipes == null || recipes.Count == 0) { return new ConflictObjectResult(new { message = "Could not find any recipes" }); }
@ -30,11 +30,11 @@ namespace API.BusinessLogic
return new OkObjectResult(recipe);
}
public async Task<IActionResult> CreateRecipe(RecipeDTO recipe, int prefereredRecipesId)
public async Task<IActionResult> CreateRecipe(RecipeDTO recipe, int userId)
{
var prefereredRecipes = await _dbAccess.ReadAllRecipe(prefereredRecipesId);
var recipes = await _dbAccess.ReadRecipes(userId);
foreach (var item in prefereredRecipes.Recipes)
foreach (var item in recipes)
{
if (item.Name == recipe.Name)
{
@ -56,7 +56,7 @@ namespace API.BusinessLogic
recipe1.Ingredients.Add(ingredient);
}
return await _dbAccess.CreateRecipe(recipe1, prefereredRecipesId);
return await _dbAccess.CreateRecipe(recipe1, userId);
}
public async Task<IActionResult> EditRecipe(RecipeDTO recipe, int recipeId, int userId)

10
backend/API/Controllers/RecipeController.cs
View File

@ -19,12 +19,12 @@ namespace API.Controllers
[Authorize]
[HttpGet("getall")]
public async Task<IActionResult> ReadPrefereredRecipes()
public async Task<IActionResult> ReadRecipes()
{
var claims = HttpContext.User.Claims;
string userIdString = claims.FirstOrDefault(c => c.Type == ClaimTypes.NameIdentifier).Value;
int userId = Convert.ToInt32(userIdString);
return await _recipeLogic.GetPrefereredRecipes(userId);
return await _recipeLogic.GetRecipes(userId);
}
[Authorize]
@ -35,10 +35,10 @@ namespace API.Controllers
}
[Authorize]
[HttpPost("create/{prefereredRecipesId}")]
public async Task<IActionResult> CreateRecipe([FromBody] RecipeDTO recipe, int prefereredRecipesId)
[HttpPost("create/{RecipesId}")]
public async Task<IActionResult> CreateRecipe([FromBody] RecipeDTO recipe, int RecipesId)
{
return await _recipeLogic.CreateRecipe(recipe, prefereredRecipesId);
return await _recipeLogic.CreateRecipe(recipe, RecipesId);
}
[Authorize]

2
backend/API/DBAccess/DBContext.cs
View File

@ -9,8 +9,6 @@ namespace API.DBAccess
{
public DbSet<User> Users { get; set; }
public DbSet<PrefereredRecipes> PrefereredRecipes { get; set; }
public DbSet<Recipe> Recipes { get; set; }
public DbSet<ShoppingList> ShoppingList { get; set; }

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

@ -21,19 +21,14 @@ namespace API.DBAccess
return recipes.Recipes;
}
public async Task<PrefereredRecipes> ReadAllRecipe(int prefereredRecipesId)
{
return await _context.PrefereredRecipes.Include(p => p.Recipes).FirstOrDefaultAsync(r => r.Id == prefereredRecipesId);
}
public async Task<Recipe> ReadRecipe(int recipeId)
{
return await _context.Recipes.Include(r => r.Ingredients).FirstOrDefaultAsync(r => r.Id == recipeId);
}
public async Task<IActionResult> CreateRecipe(Recipe recipe, int prefereredRecipeId)
public async Task<IActionResult> CreateRecipe(Recipe recipe, int userId)
{
var recipes = await _context.PrefereredRecipes.Include(p => p.Recipes).FirstOrDefaultAsync(p => p.Id == prefereredRecipeId);
var recipes = await _context.Users.Include(p => p.Recipes).FirstOrDefaultAsync(u => u.Id == userId);
recipes.Recipes.Add(recipe);

9
backend/API/Models/RecipeModels/PrefereredRecipes.cs
View File

@ -1,9 +0,0 @@
namespace API.Models.RecipeModels
{
public class PrefereredRecipes
{
public int Id { get; set; }
public List<Recipe> Recipes { get; set; }
}
}

7
backend/API/Models/RecipeModels/PrefereredRecipesDTO.cs
View File

@ -1,7 +0,0 @@
namespace API.Models.RecipeModels
{
public class PrefereredRecipesDTO
{
public List<RecipeDTO> Recipes { get; set; }
}
}