Removed preferedrecipes from the entire project

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

View File

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

View File

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

View File

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

View File

@ -21,19 +21,14 @@ namespace API.DBAccess
return recipes.Recipes; 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) public async Task<Recipe> ReadRecipe(int recipeId)
{ {
return await _context.Recipes.Include(r => r.Ingredients).FirstOrDefaultAsync(r => r.Id == 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); recipes.Recipes.Add(recipe);

View File

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

View File

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