From 84c75098cf6ea29bac082473b903f001e934fc0c Mon Sep 17 00:00:00 2001 From: franc Date: Tue, 15 Apr 2025 16:20:08 +0200 Subject: [PATCH 1/7] Put one Method to Count all ShoppingListsRecipe --- .../Francesco.Recipes.World.csproj | 2 -- .../ShoppingList/IShoppingListService.cs | 7 ++++++ .../ShoppingList/ShoppingListService.cs | 22 +++++++++++++++++++ 3 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs create mode 100644 Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs diff --git a/Francesco.Recipes.World/Francesco.Recipes.World.csproj b/Francesco.Recipes.World/Francesco.Recipes.World.csproj index 7d430a2..84f6487 100644 --- a/Francesco.Recipes.World/Francesco.Recipes.World.csproj +++ b/Francesco.Recipes.World/Francesco.Recipes.World.csproj @@ -49,8 +49,6 @@ - - diff --git a/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs new file mode 100644 index 0000000..702c426 --- /dev/null +++ b/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs @@ -0,0 +1,7 @@ +namespace Francesco.Recipes.World.Services.ShoppingList +{ + public interface IShoppingListService + { + Task GetShoppingListRecipeCountAsync(Guid shoppingListId); + } +} diff --git a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs new file mode 100644 index 0000000..2428d90 --- /dev/null +++ b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs @@ -0,0 +1,22 @@ +using Francesco.Recipes.World.Data; +using Microsoft.EntityFrameworkCore; + +namespace Francesco.Recipes.World.Services.ShoppingList +{ + public class ShoppingListService + { + private readonly FrancescosRecipesWorldDbContext _context; + + public ShoppingListService(FrancescosRecipesWorldDbContext context) + { + _context = context; + } + + public async Task GetShoppingListRecipeCountAsync(Guid shoppingListId) + { + return await _context.RecipeShoppingLists + .Where(rsl => rsl.ShoppingList.Id == shoppingListId) + .CountAsync(); + } + } +} From c07cdf7eaecbd7d65c470e423bbe7847c1f1342d Mon Sep 17 00:00:00 2001 From: franc Date: Wed, 16 Apr 2025 17:37:11 +0200 Subject: [PATCH 2/7] Move Method Body on Repositroy and inject Repository on Service --- .../ShoppingList/IShoppingListRepository.cs | 3 +++ .../ShoppingList/ShoppingListRepository.cs | 7 +++++++ .../Services/ShoppingList/ShoppingListService.cs | 16 ++++++++-------- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs b/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs index 90c35c0..b9ef9d4 100644 --- a/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs +++ b/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs @@ -17,5 +17,8 @@ Task DeleteShoppingListAsync(Guid shoppingListId); Task GetRecipeByNameAndImageAsync(string recipeName, string imageFileName); + + Task GetShoppingListRecipeCountAsync(Guid shoppingListId); + } } diff --git a/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs b/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs index 16d8934..2b23dea 100644 --- a/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs +++ b/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs @@ -167,5 +167,12 @@ .Include(r => r.MediaFiles.Where(mf => mf.FileName == imageFileName)) .FirstOrDefaultAsync(); } + + public async Task GetShoppingListRecipeCountAsync(Guid shoppingListId) + { + return await _context.RecipeShoppingLists + .Where(rsl => rsl.ShoppingList.Id == shoppingListId) + .CountAsync(); + } } } diff --git a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs index 2428d90..ef4e37c 100644 --- a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs +++ b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs @@ -1,22 +1,22 @@ -using Francesco.Recipes.World.Data; -using Microsoft.EntityFrameworkCore; - -namespace Francesco.Recipes.World.Services.ShoppingList +namespace Francesco.Recipes.World.Services.ShoppingList { + using Francesco.Recipes.World.Data; + using Francesco.Recipes.World.Repositories.ShoppingList; + public class ShoppingListService { private readonly FrancescosRecipesWorldDbContext _context; + private readonly IShoppingListRepository _shoppingListRepository; - public ShoppingListService(FrancescosRecipesWorldDbContext context) + public ShoppingListService(FrancescosRecipesWorldDbContext context, IShoppingListRepository shoppingListRepository) { _context = context; + _shoppingListRepository = shoppingListRepository; } public async Task GetShoppingListRecipeCountAsync(Guid shoppingListId) { - return await _context.RecipeShoppingLists - .Where(rsl => rsl.ShoppingList.Id == shoppingListId) - .CountAsync(); + return await _shoppingListRepository.GetShoppingListRecipeCountAsync(shoppingListId); } } } From 556b22b8dfbc6f4f8d910ddd0267546dd6c09197 Mon Sep 17 00:00:00 2001 From: franc Date: Thu, 17 Apr 2025 10:24:08 +0200 Subject: [PATCH 3/7] Rename Refactoring --- .../Services/ShoppingList/ShoppingListService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs index ef4e37c..d650db7 100644 --- a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs +++ b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs @@ -14,7 +14,7 @@ _shoppingListRepository = shoppingListRepository; } - public async Task GetShoppingListRecipeCountAsync(Guid shoppingListId) + public async Task CountRecipeLinkedToShoppingListAsync(Guid shoppingListId) { return await _shoppingListRepository.GetShoppingListRecipeCountAsync(shoppingListId); } From e6a9e927484c4935ad8f436b7a5bd70fb6c328fd Mon Sep 17 00:00:00 2001 From: franc Date: Mon, 28 Apr 2025 13:36:40 +0200 Subject: [PATCH 4/7] Rename refactoring Method --- .../Services/ShoppingList/IShoppingListService.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs index 702c426..fe9d19a 100644 --- a/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs +++ b/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs @@ -2,6 +2,6 @@ { public interface IShoppingListService { - Task GetShoppingListRecipeCountAsync(Guid shoppingListId); + Task GetShoppingListRecipesCountAsync(Guid shoppingListId); } } From 3ca5b35cfe226a4127501d494c0b254734f556cf Mon Sep 17 00:00:00 2001 From: franc Date: Tue, 29 Apr 2025 09:04:18 +0200 Subject: [PATCH 5/7] Change some method logic --- .../Repositories/ShoppingList/IShoppingListRepository.cs | 2 +- .../Repositories/ShoppingList/ShoppingListRepository.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs b/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs index b9ef9d4..1677675 100644 --- a/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs +++ b/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs @@ -18,7 +18,7 @@ Task GetRecipeByNameAndImageAsync(string recipeName, string imageFileName); - Task GetShoppingListRecipeCountAsync(Guid shoppingListId); + Task GetShoppingListRecipeCountAsync(); } } diff --git a/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs b/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs index 2b23dea..22458ca 100644 --- a/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs +++ b/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs @@ -168,10 +168,9 @@ .FirstOrDefaultAsync(); } - public async Task GetShoppingListRecipeCountAsync(Guid shoppingListId) + public async Task GetShoppingListRecipeCountAsync() { return await _context.RecipeShoppingLists - .Where(rsl => rsl.ShoppingList.Id == shoppingListId) .CountAsync(); } } From 327ba7b1cc4b2e62fb6b72798275aabbe4617a13 Mon Sep 17 00:00:00 2001 From: franc Date: Tue, 29 Apr 2025 09:04:42 +0200 Subject: [PATCH 6/7] delete unnecessary service for shoppinglist --- .../ShoppingList/IShoppingListService.cs | 7 ------ .../ShoppingList/ShoppingListService.cs | 22 ------------------- 2 files changed, 29 deletions(-) delete mode 100644 Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs delete mode 100644 Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs diff --git a/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs deleted file mode 100644 index fe9d19a..0000000 --- a/Francesco.Recipes.World/Services/ShoppingList/IShoppingListService.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace Francesco.Recipes.World.Services.ShoppingList -{ - public interface IShoppingListService - { - Task GetShoppingListRecipesCountAsync(Guid shoppingListId); - } -} diff --git a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs b/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs deleted file mode 100644 index d650db7..0000000 --- a/Francesco.Recipes.World/Services/ShoppingList/ShoppingListService.cs +++ /dev/null @@ -1,22 +0,0 @@ -namespace Francesco.Recipes.World.Services.ShoppingList -{ - using Francesco.Recipes.World.Data; - using Francesco.Recipes.World.Repositories.ShoppingList; - - public class ShoppingListService - { - private readonly FrancescosRecipesWorldDbContext _context; - private readonly IShoppingListRepository _shoppingListRepository; - - public ShoppingListService(FrancescosRecipesWorldDbContext context, IShoppingListRepository shoppingListRepository) - { - _context = context; - _shoppingListRepository = shoppingListRepository; - } - - public async Task CountRecipeLinkedToShoppingListAsync(Guid shoppingListId) - { - return await _shoppingListRepository.GetShoppingListRecipeCountAsync(shoppingListId); - } - } -} From a8fdca4871da1c5cab91d0f1c52edfc819e7926a Mon Sep 17 00:00:00 2001 From: franc Date: Tue, 29 Apr 2025 09:16:18 +0200 Subject: [PATCH 7/7] Rename refactoring method --- .../Repositories/ShoppingList/IShoppingListRepository.cs | 3 +-- .../Repositories/ShoppingList/ShoppingListRepository.cs | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs b/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs index 1677675..c14f0aa 100644 --- a/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs +++ b/Francesco.Recipes.World/Repositories/ShoppingList/IShoppingListRepository.cs @@ -18,7 +18,6 @@ Task GetRecipeByNameAndImageAsync(string recipeName, string imageFileName); - Task GetShoppingListRecipeCountAsync(); - + Task CountAllRecipeShoppinglistsAsync(); } } diff --git a/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs b/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs index 22458ca..1e64469 100644 --- a/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs +++ b/Francesco.Recipes.World/Repositories/ShoppingList/ShoppingListRepository.cs @@ -168,7 +168,7 @@ .FirstOrDefaultAsync(); } - public async Task GetShoppingListRecipeCountAsync() + public async Task CountAllRecipeShoppinglistsAsync() { return await _context.RecipeShoppingLists .CountAsync();