chore: remove BL mapper interfaces

nesfit · Feb 29, 2024 · f85ad10 · f85ad10
1 parent c72d5b7
commit f85ad10
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 45 deletions.
diff --git a/src/CookBook/CookBook.App/ViewModels/Recipe/RecipeIngredientsEditViewModel.cs b/src/CookBook/CookBook.App/ViewModels/Recipe/RecipeIngredientsEditViewModel.cs
@@ -13,7 +13,7 @@ namespace CookBook.App.ViewModels;
 public partial class RecipeIngredientsEditViewModel(
     IIngredientFacade ingredientFacade,
     IIngredientAmountFacade ingredientAmountFacade,
-    IIngredientAmountModelMapper ingredientAmountModelMapper,
+    IngredientAmountModelMapper ingredientAmountModelMapper,
     IMessengerService messengerService)
     : ViewModelBase(messengerService)
 {

diff --git a/src/CookBook/CookBook.BL.Tests/FacadeTestsBase.cs b/src/CookBook/CookBook.BL.Tests/FacadeTestsBase.cs
@@ -29,9 +29,9 @@ protected FacadeTestsBase(ITestOutputHelper output)
 
     protected IDbContextFactory<CookBookDbContext> DbContextFactory { get; }
 
-    protected IIngredientModelMapper IngredientModelMapper { get; }
+    protected IngredientModelMapper IngredientModelMapper { get; }
     protected IngredientAmountModelMapper IngredientAmountModelMapper { get; }
-    protected IRecipeModelMapper RecipeModelMapper { get; }
+    protected RecipeModelMapper RecipeModelMapper { get; }
     protected UnitOfWorkFactory UnitOfWorkFactory { get; }
 
     public async Task InitializeAsync()

diff --git a/src/CookBook/CookBook.BL/BLInstaller.cs b/src/CookBook/CookBook.BL/BLInstaller.cs
@@ -19,8 +19,8 @@ public static IServiceCollection AddBLServices(this IServiceCollection services)
 
         services.Scan(selector => selector
             .FromAssemblyOf<BusinessLogic>()
-            .AddClasses(filter => filter.AssignableTo(typeof(ModelMapperBase<,,>)))
-            .AsMatchingInterface()
+            .AddClasses(filter => filter.AssignableTo(typeof(IModelMapper<,,>)))
+            .AsSelfWithInterfaces()
             .WithSingletonLifetime());
 
         return services;

diff --git a/src/CookBook/CookBook.BL/Facades/IngredientAmountFacade.cs b/src/CookBook/CookBook.BL/Facades/IngredientAmountFacade.cs
@@ -9,7 +9,7 @@ namespace CookBook.BL.Facades;
 
 public class IngredientAmountFacade(
     IUnitOfWorkFactory unitOfWorkFactory,
-    IIngredientAmountModelMapper ingredientAmountModelMapper)
+    IngredientAmountModelMapper ingredientAmountModelMapper)
     :
         FacadeBase<IngredientAmountEntity, IngredientAmountListModel, IngredientAmountDetailModel,
             IngredientAmountEntityMapper>(unitOfWorkFactory, ingredientAmountModelMapper), IIngredientAmountFacade

diff --git a/src/CookBook/CookBook.BL/Facades/IngredientFacade.cs b/src/CookBook/CookBook.BL/Facades/IngredientFacade.cs
@@ -8,7 +8,7 @@ namespace CookBook.BL.Facades;
 
 public class IngredientFacade(
     IUnitOfWorkFactory unitOfWorkFactory,
-    IIngredientModelMapper modelMapper)
+    IngredientModelMapper modelMapper)
     :
         FacadeBase<IngredientEntity, IngredientListModel, IngredientDetailModel, IngredientEntityMapper>(
             unitOfWorkFactory, modelMapper), IIngredientFacade;
diff --git a/src/CookBook/CookBook.BL/Facades/RecipeFacade.cs b/src/CookBook/CookBook.BL/Facades/RecipeFacade.cs
@@ -8,7 +8,7 @@ namespace CookBook.BL.Facades;
 
 public class RecipeFacade(
     IUnitOfWorkFactory unitOfWorkFactory,
-    IRecipeModelMapper modelMapper)
+    RecipeModelMapper modelMapper)
     : FacadeBase<RecipeEntity, RecipeListModel, RecipeDetailModel, RecipeEntityMapper>(unitOfWorkFactory, modelMapper),
         IRecipeFacade
 {

diff --git a/src/CookBook/CookBook.BL/Mappers/IngredientAmountModelMapper.cs b/src/CookBook/CookBook.BL/Mappers/IngredientAmountModelMapper.cs
@@ -4,8 +4,7 @@
 namespace CookBook.BL.Mappers;
 
 public class IngredientAmountModelMapper :
-    ModelMapperBase<IngredientAmountEntity, IngredientAmountListModel, IngredientAmountDetailModel>,
-    IIngredientAmountModelMapper
+    ModelMapperBase<IngredientAmountEntity, IngredientAmountListModel, IngredientAmountDetailModel>
 {
     public override IngredientAmountListModel MapToListModel(IngredientAmountEntity? entity)
         => entity?.Ingredient is null

diff --git a/src/CookBook/CookBook.BL/Mappers/IngredientModelMapper.cs b/src/CookBook/CookBook.BL/Mappers/IngredientModelMapper.cs
@@ -3,8 +3,7 @@
 
 namespace CookBook.BL.Mappers;
 
-public class IngredientModelMapper : ModelMapperBase<IngredientEntity, IngredientListModel, IngredientDetailModel>,
-    IIngredientModelMapper
+public class IngredientModelMapper : ModelMapperBase<IngredientEntity, IngredientListModel, IngredientDetailModel>
 {
     public override IngredientListModel MapToListModel(IngredientEntity? entity)
         => entity is null

diff --git a/src/CookBook/CookBook.BL/Mappers/Interfaces/IIngredientAmountModelMapper.cs b/src/CookBook/CookBook.BL/Mappers/Interfaces/IIngredientAmountModelMapper.cs
diff --git a/src/CookBook/CookBook.BL/Mappers/Interfaces/IIngredientModelMapper.cs b/src/CookBook/CookBook.BL/Mappers/Interfaces/IIngredientModelMapper.cs
diff --git a/src/CookBook/CookBook.BL/Mappers/Interfaces/IRecipeModelMapper.cs b/src/CookBook/CookBook.BL/Mappers/Interfaces/IRecipeModelMapper.cs
diff --git a/src/CookBook/CookBook.BL/Mappers/ModelMapperBase.cs b/src/CookBook/CookBook.BL/Mappers/ModelMapperBase.cs
@@ -1,7 +1,6 @@
 namespace CookBook.BL.Mappers;
 
-public abstract class
-    ModelMapperBase<TEntity, TListModel, TDetailModel> : IModelMapper<TEntity, TListModel, TDetailModel>
+public abstract class ModelMapperBase<TEntity, TListModel, TDetailModel> : IModelMapper<TEntity, TListModel, TDetailModel>
 {
     public abstract TListModel MapToListModel(TEntity? entity);
 

diff --git a/src/CookBook/CookBook.BL/Mappers/RecipeModelMapper.cs b/src/CookBook/CookBook.BL/Mappers/RecipeModelMapper.cs
@@ -3,8 +3,8 @@
 
 namespace CookBook.BL.Mappers;
 
-public class RecipeModelMapper(IIngredientAmountModelMapper ingredientAmountModelMapper)
-    : ModelMapperBase<RecipeEntity, RecipeListModel, RecipeDetailModel>, IRecipeModelMapper
+public class RecipeModelMapper(IngredientAmountModelMapper ingredientAmountModelMapper)
+    : ModelMapperBase<RecipeEntity, RecipeListModel, RecipeDetailModel>
 {
     public override RecipeListModel MapToListModel(RecipeEntity? entity)
         => entity is null