frnix_06/Francescos.Recipes.World
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete unnecessary Methods and add some better Methods that improves the process

Browse Source
This commit is contained in:
Francesco Lorenzo D'Amico
2025-05-27 12:07:19 +02:00
parent 203b8db180
commit ba0e35e526
2 changed files with 68 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs
+4 -12
View File
@@ -1,27 +1,19 @@
namespace Francesco.Recipes.World.Repositories.ShoppingList
{
using Francesco.Recipes.World.Models.BackendModels.IngredientShoppingList;
using Francesco.Recipes.World.Models.BackendModels.Recipe;
using Francesco.Recipes.World.Models.BackendModels.Shoppinglist;
public interface IShoppingListRepository
{
Task<ShoppingList> AddIngredientsToShoppingListAsync(Guid recipeId, List<Guid> ingredientIds);
Task<IEnumerable<RecipeIngredientShoppingList>> GetIngredientsOfRecipeInListAsync(Guid shoppingListRecipeId);
Task UpdateIngredientCheckedAsync(Guid shoppingListRecipeId, Guid recipeIngredientId, bool isChecked);
Task RemoveRecipeIfEmptyAsync(Guid shoppingListRecipeId);
Task DeleteShoppingListAsync(Guid shoppingListId);
Task<Recipe?> GetRecipeByNameAndImageAsync(string recipeName, string imageFileName);
Task<ShoppingList?> GetByIdAsync(Guid shoppingListId);
Task<int> CountAllRecipeShoppinglistsAsync();
Task<IList<ShoppingList>> GetAllShoppingListsAsync();
Task RemoveIngredientsFromShoppingListAsync(List<Guid> recipeIngredientShoppngListIds);
Task RemoveRecipeFromShoppingListAsync(Guid recipeShoppingListId);
}
}
Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs
+64 -46
View File
@@ -109,12 +109,6 @@
return shoppingList;
}
public async Task<ShoppingList?> GetByIdAsync(Guid shoppingListId)
{
return await GetShoppingListQuery()
.FirstOrDefaultAsync(sl => sl.Id == shoppingListId);
}
public async Task<IList<ShoppingList>> GetAllShoppingListsAsync()
{
return await GetShoppingListQuery()
@@ -122,63 +116,57 @@
.ToListAsync();
}
public async Task<IEnumerable<RecipeIngredientShoppingList>> GetIngredientsOfRecipeInListAsync(Guid shoppingListRecipeId)
{
return await _context.RecipeIngredientsShoppingLists
.Include(i => i.RecipeIngredient)
.ThenInclude(ri => ri.Ingredient)
.Include(i => i.RecipeIngredient.Unit)
.Where(i => i.RecipeShoppingList.Id == shoppingListRecipeId)
.ToListAsync();
}
public async Task UpdateIngredientCheckedAsync(Guid shoppingListRecipeId, Guid recipeIngredientId, bool isChecked)
{
var item = await _context.RecipeIngredientsShoppingLists
.FirstOrDefaultAsync(i =>
i.RecipeShoppingList.Id == shoppingListRecipeId &&
i.RecipeIngredient.Id == recipeIngredientId);
if (item == null)
{
throw new Exception("Zutat nicht gefunden.");
}
item.IsChecked = isChecked;
await _context.SaveChangesAsync();
}
public async Task RemoveRecipeIfEmptyAsync(Guid shoppingListRecipeId)
{
var recipeEntry = await _context.RecipeShoppingLists
.Include(r => r.SelectedIngredients)
.Include(r => r.ShoppingList)
.ThenInclude(sl => sl.RecipeShoppingList)
.FirstOrDefaultAsync(r => r.Id == shoppingListRecipeId);
if (recipeEntry != null && !recipeEntry.SelectedIngredients.Any())
{
var shoppingList = recipeEntry.ShoppingList;
_context.RecipeShoppingLists.Remove(recipeEntry);
await _context.SaveChangesAsync();
}
}
public async Task DeleteShoppingListAsync(Guid shoppingListId)
if (shoppingList != null && (shoppingList.RecipeShoppingList == null || !shoppingList.RecipeShoppingList.Any()))
{
var list = await _context.ShoppingLists
.FirstOrDefaultAsync(sl => sl.Id == shoppingListId);
if (list != null)
{
_context.ShoppingLists.Remove(list);
_context.ShoppingLists.Remove(shoppingList);
await _context.SaveChangesAsync();
}
}
}
public async Task<Recipe?> GetRecipeByNameAndImageAsync(string recipeName, string imageFileName)
public async Task RemoveRecipeFromShoppingListAsync(Guid recipeShoppingListId)
{
return await _context.Recipes
.Where(r => r.Name == recipeName && r.MediaFiles.Any(mf => mf.FileName == imageFileName))
.Include(r => r.MediaFiles.Where(mf => mf.FileName == imageFileName))
.FirstOrDefaultAsync();
var recipeEntry = await _context.RecipeShoppingLists
.Include(r => r.SelectedIngredients)
.Include(r => r.ShoppingList)
.ThenInclude(sl => sl.RecipeShoppingList)
.FirstOrDefaultAsync(r => r.Id == recipeShoppingListId);
if (recipeEntry != null)
{
var shoppingList = recipeEntry.ShoppingList;
_context.RecipeIngredientsShoppingLists.RemoveRange(recipeEntry.SelectedIngredients);
_context.RecipeShoppingLists.Remove(recipeEntry);
await _context.SaveChangesAsync();
if (shoppingList != null)
{
await _context.Entry(shoppingList).Collection(sl => sl.RecipeShoppingList).LoadAsync();
if (!shoppingList.RecipeShoppingList.Any())
{
_context.ShoppingLists.Remove(shoppingList);
await _context.SaveChangesAsync();
}
}
}
}
public async Task<int> CountAllRecipeShoppinglistsAsync()
@@ -187,6 +175,36 @@
.CountAsync();
}
public async Task RemoveIngredientsFromShoppingListAsync(List<Guid> recipeIngredientShoppingListIds)
{
if (recipeIngredientShoppingListIds == null || !recipeIngredientShoppingListIds.Any())
{
throw new ArgumentNullException(nameof(recipeIngredientShoppingListIds));
}
var affectedRecipeShoppingListIds = await _context.RecipeIngredientsShoppingLists
.Where(risl => recipeIngredientShoppingListIds.Contains(risl.Id))
.Select(risl => risl.RecipeShoppingList.Id)
.Distinct()
.ToListAsync();
foreach (var id in recipeIngredientShoppingListIds)
{
var entry = await _context.RecipeIngredientsShoppingLists.FindAsync(id);
if (entry != null)
{
_context.RecipeIngredientsShoppingLists.Remove(entry);
}
}
await _context.SaveChangesAsync();
foreach (var recipeShoppingListId in affectedRecipeShoppingListIds)
{
await RemoveRecipeIfEmptyAsync(recipeShoppingListId);
}
}
private IQueryable<ShoppingList> GetShoppingListQuery()
{
return _context.ShoppingLists