diff --git a/backend/API/BusinessLogic/RecipeLogic.cs b/backend/API/BusinessLogic/RecipeLogic.cs index 3ff9987..d50b02f 100644 --- a/backend/API/BusinessLogic/RecipeLogic.cs +++ b/backend/API/BusinessLogic/RecipeLogic.cs @@ -13,7 +13,7 @@ namespace API.BusinessLogic _dbAccess = dbAccess; } - public async Task GetPrefereredRecipes(int userId) + public async Task 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 CreateRecipe(RecipeDTO recipe, int prefereredRecipesId) + public async Task 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 EditRecipe(RecipeDTO recipe, int recipeId, int userId) diff --git a/backend/API/Controllers/RecipeController.cs b/backend/API/Controllers/RecipeController.cs index bb9c1eb..e36aaac 100644 --- a/backend/API/Controllers/RecipeController.cs +++ b/backend/API/Controllers/RecipeController.cs @@ -19,12 +19,12 @@ namespace API.Controllers [Authorize] [HttpGet("getall")] - public async Task ReadPrefereredRecipes() + public async Task 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 CreateRecipe([FromBody] RecipeDTO recipe, int prefereredRecipesId) + [HttpPost("create/{RecipesId}")] + public async Task CreateRecipe([FromBody] RecipeDTO recipe, int RecipesId) { - return await _recipeLogic.CreateRecipe(recipe, prefereredRecipesId); + return await _recipeLogic.CreateRecipe(recipe, RecipesId); } [Authorize] diff --git a/backend/API/DBAccess/DBContext.cs b/backend/API/DBAccess/DBContext.cs index f335651..b18f88e 100644 --- a/backend/API/DBAccess/DBContext.cs +++ b/backend/API/DBAccess/DBContext.cs @@ -9,8 +9,6 @@ namespace API.DBAccess { public DbSet Users { get; set; } - public DbSet PrefereredRecipes { get; set; } - public DbSet Recipes { get; set; } public DbSet ShoppingList { get; set; } diff --git a/backend/API/DBAccess/RecipeDBaccess.cs b/backend/API/DBAccess/RecipeDBaccess.cs index c17589b..ef1ee81 100644 --- a/backend/API/DBAccess/RecipeDBaccess.cs +++ b/backend/API/DBAccess/RecipeDBaccess.cs @@ -21,19 +21,14 @@ namespace API.DBAccess return recipes.Recipes; } - public async Task ReadAllRecipe(int prefereredRecipesId) - { - return await _context.PrefereredRecipes.Include(p => p.Recipes).FirstOrDefaultAsync(r => r.Id == prefereredRecipesId); - } - public async Task ReadRecipe(int recipeId) { return await _context.Recipes.Include(r => r.Ingredients).FirstOrDefaultAsync(r => r.Id == recipeId); } - public async Task CreateRecipe(Recipe recipe, int prefereredRecipeId) + public async Task 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); diff --git a/backend/API/Models/RecipeModels/PrefereredRecipes.cs b/backend/API/Models/RecipeModels/PrefereredRecipes.cs deleted file mode 100644 index 5a5872d..0000000 --- a/backend/API/Models/RecipeModels/PrefereredRecipes.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace API.Models.RecipeModels -{ - public class PrefereredRecipes - { - public int Id { get; set; } - - public List Recipes { get; set; } - } -} diff --git a/backend/API/Models/RecipeModels/PrefereredRecipesDTO.cs b/backend/API/Models/RecipeModels/PrefereredRecipesDTO.cs deleted file mode 100644 index 16ea538..0000000 --- a/backend/API/Models/RecipeModels/PrefereredRecipesDTO.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace API.Models.RecipeModels -{ - public class PrefereredRecipesDTO - { - public List Recipes { get; set; } - } -}