automapper removed and replaced by mapster completely

README.md

@@ -37,7 +37,7 @@ Join our Discord - [fullstackhero @ Discord](https://discord.gg/gdgHRt4mMw)
 - [x] Dapper Integration for Optimal Performance :heavy_check_mark:
 - [x] Serilog Integration :heavy_check_mark:
 - [x] Swagger Support :heavy_check_mark:
-- [x] Automapper :heavy_check_mark:
+- [x] Mapster :heavy_check_mark:
 - [x] API Versioning :heavy_check_mark:
 - [x] Response Caching - Distributed Caching :heavy_check_mark:
 - [x] Fluent Validations :heavy_check_mark:

src/Core/Application/Extensions/ServiceCollectionExtensions.cs

@@ -9,7 +9,6 @@ public static class ServiceCollectionExtensions
     {
         public static IServiceCollection AddApplication(this IServiceCollection services)
         {
-            // services.AddAutoMapper(Assembly.GetExecutingAssembly());
             services.AddValidatorsFromAssemblyContaining<IRequestValidator>();
             return services;
         }

src/Core/Application/Services/Catalog/ProductService.cs

@@ -1,4 +1,3 @@
-// using AutoMapper;
 using DN.WebApi.Application.Abstractions.Repositories;
 using DN.WebApi.Application.Abstractions.Services.Catalog;
 using DN.WebApi.Application.Abstractions.Services.General;
@@ -17,16 +16,12 @@ namespace DN.WebApi.Application.Services.Catalog
     public class ProductService : IProductService
     {
         private readonly IStringLocalizer<ProductService> _localizer;
-
-        // private readonly IMapper _mapper;
         private readonly IFileStorageService _file;
         private readonly IRepositoryAsync _repository;
 
-        public ProductService(IRepositoryAsync repository, /*IMapper mapper, */IStringLocalizer<ProductService> localizer, IFileStorageService file)
+        public ProductService(IRepositoryAsync repository, IStringLocalizer<ProductService> localizer, IFileStorageService file)
         {
             _repository = repository;
-
-            // _mapper = mapper;
             _localizer = localizer;
             _file = file;
         }
@@ -58,8 +53,6 @@ public async Task<Result<ProductDetailsDto>> GetByIdAsync(Guid id)
         public async Task<Result<ProductDetailsDto>> GetByIdUsingDapperAsync(Guid id)
         {
             var product = await _repository.QueryFirstOrDefaultAsync<Product>($"SELECT * FROM public.\"Products\" WHERE \"Id\"  = '{id}' AND \"TenantKey\"='@tenantKey'");
-
-            // var mappedProduct = _mapper.Map<ProductDetailsDto>(product);
             var mappedProduct = product.Adapt<ProductDetailsDto>();
             return await Result<ProductDetailsDto>.SuccessAsync(mappedProduct);
         }

src/Infrastructure/Extensions/MapperExtensions.cs

@@ -2,8 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-
-// using AutoMapper;
 using DN.WebApi.Application.Wrapper;
 using DN.WebApi.Shared.DTOs;
 using Mapster;
@@ -21,26 +19,6 @@ public static async Task<PaginatedResult<TDto>> ToMappedPaginatedResultAsync<T,
             return await converter.ConvertBackAsync(query);
         }
 
-        /*
-        public static async Task<PaginatedResult<TDto>> ToMappedPaginatedResultAsync<T, TDto>(/*this IMapper mapper,#1#this IQueryable<T> query, int pageNumber, int pageSize)
-        where T : class
-        {
-            if (query == null)
-            {
-                throw new ArgumentNullException(nameof(query));
-            }
-
-            pageNumber = pageNumber == 0 ? 1 : pageNumber;
-            pageSize = pageSize == 0 ? 10 : pageSize;
-            int count = await query.AsNoTracking().CountAsync();
-            pageNumber = pageNumber <= 0 ? 1 : pageNumber;
-            var items = await query.Skip((pageNumber - 1) * pageSize).Take(pageSize).ToListAsync();
-
-            // var mappedItems = mapper.Map<List<T>, List<TDto>>(items);
-            var mappedItems = items.Adapt<List<TDto>>();
-            return PaginatedResult<TDto>.Success(mappedItems, count, pageNumber, pageSize);
-        }
-    }*/
         public class MappedPaginatedResultConverter<T, TDto> : IMapsterConverterAsync<PaginatedResult<TDto>, IQueryable<T>>
             where T : class
         {
@@ -70,8 +48,6 @@ public async Task<PaginatedResult<TDto>> ConvertBackAsync(IQueryable<T> query)
                 int count = await query.AsNoTracking().CountAsync();
                 _pageNumber = _pageNumber <= 0 ? 1 : _pageNumber;
                 var items = await query.Skip((_pageNumber - 1) * _pageSize).Take(_pageSize).ToListAsync();
-
-                // var mappedItems = mapper.Map<List<T>, List<TDto>>(items);
                 var mappedItems = items.Adapt<List<TDto>>();
                 return await Task.FromResult(PaginatedResult<TDto>.Success(mappedItems, count, _pageNumber, _pageSize));
             }

src/Infrastructure/Extensions/ServiceCollectionExtensions.cs

@@ -17,8 +17,6 @@ public static class ServiceCollectionExtensions
         public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration config)
         {
             services.AddHealthCheckExtension();
-
-            // services.AddAutoMapper(Assembly.GetExecutingAssembly());
             services.AddLocalization();
             services.AddServices(config);
             services.AddDistributedMemoryCache();

src/Infrastructure/Identity/Services/PermissionService.cs

@@ -1,4 +1,3 @@
-// using AutoMapper;
 using DN.WebApi.Application.Abstractions.Services.General;
 using DN.WebApi.Application.Abstractions.Services.Identity;
 using DN.WebApi.Application.Constants;
@@ -17,18 +16,15 @@ namespace DN.WebApi.Infrastructure.Identity.Services
 {
     public class PermissionService : IPermissionService
     {
-        // private readonly IMapper _mapper;
         private readonly ApplicationDbContext _context;
         private readonly IDistributedCache _cache;
         private readonly ICurrentUser _currentUser;
         private readonly ISerializerService _serializer;
 
-        public PermissionService(ApplicationDbContext context, ICurrentUser currentUser, /* IMapper mapper,*/ IDistributedCache cache, ISerializerService serializer)
+        public PermissionService(ApplicationDbContext context, ICurrentUser currentUser, IDistributedCache cache, ISerializerService serializer)
         {
             _context = context;
             _currentUser = currentUser;
-
-            // _mapper = mapper;
             _cache = cache;
             _serializer = serializer;
         }
@@ -47,8 +43,6 @@ public async Task<bool> HasPermissionAsync(string userId, string permission)
             {
                 var userRoles = await _context.UserRoles.Where(a => a.UserId == userId).Select(a => a.RoleId).ToListAsync();
                 var applicationRoles = await _context.Roles.Where(a => userRoles.Contains(a.Id)).ToListAsync();
-
-                // roles = _mapper.Map<List<RoleDto>>(applicationRoles);
                 roles = applicationRoles.Adapt<List<RoleDto>>();
                 if (roles != null)
                 {

src/Infrastructure/Identity/Services/RoleService.cs

@@ -1,4 +1,3 @@
-// using AutoMapper;
 using DN.WebApi.Application.Abstractions.Services.Identity;
 using DN.WebApi.Application.Exceptions;
 using DN.WebApi.Application.Wrapper;
@@ -26,16 +25,12 @@ public class RoleService : IRoleService
         private readonly ApplicationDbContext _context;
         private readonly IStringLocalizer<RoleService> _localizer;
 
-        // private readonly IMapper _mapper;
-
-        public RoleService(RoleManager<ApplicationRole> roleManager, UserManager<ApplicationUser> userManager, ApplicationDbContext context, IStringLocalizer<RoleService> localizer, /* IMapper mapper,*/ ICurrentUser currentUser)
+        public RoleService(RoleManager<ApplicationRole> roleManager, UserManager<ApplicationUser> userManager, ApplicationDbContext context, IStringLocalizer<RoleService> localizer, ICurrentUser currentUser)
         {
             _roleManager = roleManager;
             _userManager = userManager;
             _context = context;
             _localizer = localizer;
-
-            // _mapper = mapper;
             _currentUser = currentUser;
         }
 
@@ -81,8 +76,6 @@ public async Task<Result<string>> DeleteAsync(string id)
         public async Task<Result<RoleDto>> GetByIdAsync(string id)
         {
             var roles = await _roleManager.Roles.SingleOrDefaultAsync(x => x.Id == id);
-
-            // var rolesResponse = _mapper.Map<RoleDto>(roles);
             var rolesResponse = roles.Adapt<RoleDto>();
             return await Result<RoleDto>.SuccessAsync(rolesResponse);
         }
@@ -95,8 +88,6 @@ public async Task<int> GetCountAsync()
         public async Task<Result<List<RoleDto>>> GetListAsync()
         {
             var roles = await _roleManager.Roles.ToListAsync();
-
-            // var rolesResponse = _mapper.Map<List<RoleDto>>(roles);
             var rolesResponse = roles.Adapt<List<RoleDto>>();
             return await Result<List<RoleDto>>.SuccessAsync(rolesResponse);
         }
@@ -105,8 +96,6 @@ public async Task<Result<List<RoleDto>>> GetUserRolesAsync(string userId)
         {
             var userRoles = await _context.UserRoles.Where(a => a.UserId == userId).Select(a => a.RoleId).ToListAsync();
             var roles = await _roleManager.Roles.Where(a => userRoles.Contains(a.Id)).ToListAsync();
-
-            // var rolesResponse = _mapper.Map<List<RoleDto>>(roles);
             var rolesResponse = roles.Adapt<List<RoleDto>>();
             return await Result<List<RoleDto>>.SuccessAsync(rolesResponse);
         }

src/Infrastructure/Persistence/Converters/OrderByConverter.cs

@@ -1,30 +1,8 @@
 using System;
 using System.Linq;
 using DN.WebApi.Shared.DTOs;
-
-/*using AutoMapper;*/
-
 namespace DN.WebApi.Infrastructure.Persistence.Converters
 {
-    /*public class OrderByConverter :
-        IValueConverter<string, string[]>,
-        IValueConverter<string[], string>
-    {
-        public string[] Convert(string orderBy, ResolutionContext context = null)
-        {
-            if (!string.IsNullOrWhiteSpace(orderBy))
-            {
-                return orderBy
-                    .Split(',')
-                    .Where(x => !string.IsNullOrWhiteSpace(x))
-                    .Select(x => x.Trim()).ToArray();
-            }
-
-            return Array.Empty<string>();
-        }
-
-        public string Convert(string[] orderBy, ResolutionContext context = null) => orderBy?.Any() == true ? string.Join(",", orderBy) : null;
-    }*/
     public class OrderByConverter : IMapsterConverter<string, string[]>
     {
         public string[] Convert(string item)

src/Infrastructure/Services/General/TenantManager.cs

@@ -1,4 +1,3 @@
-// using AutoMapper;
 using DN.WebApi.Application.Abstractions.Services.General;
 using DN.WebApi.Application.Abstractions.Services.Identity;
 using DN.WebApi.Application.Constants;
@@ -32,18 +31,14 @@ public class TenantManager : ITenantManager
         private readonly MultitenancySettings _options;
 
         private readonly TenantManagementDbContext _context;
-
-       // private readonly IMapper _mapper;
         private readonly ICurrentUser _user;
 
-        public TenantManager(ApplicationDbContext appContext, IStringLocalizer<TenantService> localizer, IOptions<MultitenancySettings> options, TenantManagementDbContext context, /*IMapper mapper,*/ UserManager<ApplicationUser> userManager, RoleManager<ApplicationRole> roleManager, ICurrentUser user)
+        public TenantManager(ApplicationDbContext appContext, IStringLocalizer<TenantService> localizer, IOptions<MultitenancySettings> options, TenantManagementDbContext context, UserManager<ApplicationUser> userManager, RoleManager<ApplicationRole> roleManager, ICurrentUser user)
         {
             _appContext = appContext;
             _localizer = localizer;
             _options = options.Value;
             _context = context;
-
-            // _mapper = mapper;
             _userManager = userManager;
             _roleManager = roleManager;
             _user = user;

src/Infrastructure/Services/General/TenantService.cs

@@ -1,4 +1,3 @@
-// using AutoMapper;
 using DN.WebApi.Application.Abstractions.Services.General;
 using DN.WebApi.Application.Abstractions.Services.Identity;
 using DN.WebApi.Application.Constants;
@@ -34,13 +33,11 @@ public class TenantService : ITenantService
 
         private readonly TenantManagementDbContext _context;
 
-       // private readonly IMapper _mapper;
-
         private HttpContext _httpContext;
 
         private TenantDto _currentTenant;
 
-        public TenantService(IOptions<MultitenancySettings> options, IHttpContextAccessor contextAccessor, ICurrentUser currentUser, IStringLocalizer<TenantService> localizer, TenantManagementDbContext context, /*IMapper mapper,*/ IDistributedCache cache, ISerializerService serializer)
+        public TenantService(IOptions<MultitenancySettings> options, IHttpContextAccessor contextAccessor, ICurrentUser currentUser, IStringLocalizer<TenantService> localizer, TenantManagementDbContext context, IDistributedCache cache, ISerializerService serializer)
         {
             _localizer = localizer;
             _options = options.Value;

src/Shared/Shared.DTOs/Shared.DTOs.csproj

@@ -20,7 +20,5 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <AdditionalFiles Include="..\..\..\stylecop.json" />
-        <PackageReference Include="AutoMapper" Version="10.1.1" />
-        <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.1" />
     </ItemGroup>
 </Project>