Feature/ddd

Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/HR.LeaveManagement.Application.UnitTests.csproj

@@ -8,7 +8,6 @@
   </PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="AutoMapper" Version="16.0.0" />
 		<PackageReference Include="Bogus" Version="35.6.5" />
 		<PackageReference Include="FluentAssertions" Version="8.8.0" />
 		<PackageReference Include="Microsoft.Extensions.Configuration" Version="10.0.2" />

Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/LeaveTypes/Commands/CreateLeaveTypeCommandHandlerTests.cs

@@ -1,11 +1,9 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs.LeaveType;
 using HR.LeaveManagement.Application.Exceptions;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Handlers.Commands;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Handlers.Queries;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Commands;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Queries;
-using HR.LeaveManagement.Application.Profiles;
 using HR.LeaveManagement.Application.Responses;
 using HR.LeaveManagement.Domain;
 using Moq;
@@ -26,21 +24,11 @@ namespace HR.LeaveManagement.Application.UnitTests.LeaveTypes.Commands
     [TestFixture()]
     public class CreateLeaveTypeCommandHandlerTests
     {
-        private readonly IMapper _mapper;
-
         private readonly CreateLeaveTypeDto _leaveTypeDto;
         private readonly CreateLeaveTypeCommandHandler _handler;
 
         public CreateLeaveTypeCommandHandlerTests()
         {
-
-            var mapperConfig = new MapperConfiguration(c =>
-            {
-                c.AddProfile<MappingProfile>();
-            }, null);
-
-            _mapper = mapperConfig.CreateMapper();
-
             var testData = new List<LeaveType>();
             var mock = new Mock<IGraphRepository<LeaveType>>();
             var validationMock = new Mock<IValidationService>();
@@ -56,7 +44,7 @@ public CreateLeaveTypeCommandHandlerTests()
 
             validationMock.Setup(x => x.ValidateAsync(_leaveTypeDto, false, CancellationToken.None))
                 .Returns(() => Task.FromResult(new ValidationOutcome()));
-            _handler = new CreateLeaveTypeCommandHandler(_mapper, mock.Object, validationMock.Object);
+            _handler = new CreateLeaveTypeCommandHandler(mock.Object, validationMock.Object);
         }
 
         [Test]
@@ -77,7 +65,7 @@ public async Task InValid_LeaveType_Added()
             //leaveTypes.Count.ShouldBe(3);
 
             result.ShouldBeOfType<BaseCommandResponse>();
-            
+
         }
     }
 }

Examples/CleanWithCQRS/HR.LeaveManagement.Application.UnitTests/LeaveTypes/Queries/GetLeaveTypeListRequestHandlerTests.cs

@@ -1,8 +1,6 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs.LeaveType;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Handlers.Queries;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Queries;
-using HR.LeaveManagement.Application.Profiles;
 using HR.LeaveManagement.Domain;
 using Moq;
 using NUnit.Framework;
@@ -22,19 +20,6 @@ namespace HR.LeaveManagement.Application.UnitTests.LeaveTypes.Queries
     [TestFixture()]
     public class GetLeaveTypeListRequestHandlerTests
     {
-        private readonly IMapper _mapper;
-        public GetLeaveTypeListRequestHandlerTests()
-        {
-            //_mockRepo = MockLeaveTypeRepository.GetLeaveTypeRepository();
-
-            var mapperConfig = new MapperConfiguration(c => 
-            {
-                c.AddProfile<MappingProfile>();
-            }, null);
-
-            _mapper = mapperConfig.CreateMapper();
-        }
-
         [Test]
         public async Task GetLeaveTypeListTest()
         {
@@ -46,8 +31,8 @@ public async Task GetLeaveTypeListTest()
             var mock = new Mock<IGraphRepository<LeaveType>>();
             mock.Setup(x => x.FindAsync(x=>true, CancellationToken.None))
                 .Returns(() => Task.FromResult(testData as ICollection<LeaveType>));
-            
-            var handler = new GetLeaveTypeListRequestHandler(mock.Object, _mapper);
+
+            var handler = new GetLeaveTypeListRequestHandler(mock.Object);
             var result = await handler.HandleAsync(new GetLeaveTypeListRequest(), CancellationToken.None);
 
             result.ShouldBeOfType<List<LeaveTypeDto>>();

Examples/CleanWithCQRS/HR.LeaveManagement.Application/ApplicationServicesRegistration.cs

@@ -1,4 +1,3 @@
-using HR.LeaveManagement.Application.Profiles;
 using Microsoft.Extensions.DependencyInjection;
 using System;
 using System.Collections.Generic;
@@ -11,8 +10,6 @@ public static class ApplicationServicesRegistration
     {
         public static IServiceCollection ConfigureApplicationServices(this IServiceCollection services)
         {
-            services.AddAutoMapper(x => x.AddProfile(new MappingProfile()));
-
             return services;
         }
     }

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveAllocations/Handlers/Commands/CreateLeaveAllocationCommandHandler.cs

@@ -1,4 +1,3 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs.LeaveAllocation.Validators;
 using HR.LeaveManagement.Application.Exceptions;
 using HR.LeaveManagement.Application.Features.LeaveAllocations.Requests.Commands;
@@ -25,21 +24,18 @@ public class CreateLeaveAllocationCommandHandler : IAppRequestHandler<CreateLeav
         private readonly IGraphRepository<LeaveType> _leaveTypeRepository;
         private readonly IGraphRepository<LeaveAllocation> _leaveAllocationRepository;
         private readonly IUserService _userService;
-        private readonly IMapper _mapper;
         private readonly IValidationService _validationService;
 
         public CreateLeaveAllocationCommandHandler(IGraphRepository<LeaveType> leaveTypeRepository,
             IGraphRepository<LeaveAllocation> leaveAllocationRepository,
             IUserService userService,
-            IMapper mapper, 
             IValidationService validationService)
         {
             this._leaveTypeRepository = leaveTypeRepository;
             this._leaveAllocationRepository = leaveAllocationRepository;
             this._leaveAllocationRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
             this._leaveTypeRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
             this._userService = userService;
-            _mapper = mapper;
             _validationService = validationService;
         }
 
@@ -77,12 +73,11 @@ public async Task<BaseCommandResponse> HandleAsync(CreateLeaveAllocationCommand
                 {
                     await _leaveAllocationRepository.AddAsync(item);
                 }
-                
+
                 response.Success = true;
                 response.Message = "Allocations Successful";
             }
 
-
             return response;
         }
     }

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveAllocations/Handlers/Commands/DeleteLeaveAllocationCommandHandler.cs

@@ -1,4 +1,3 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.Exceptions;
 using HR.LeaveManagement.Application.Features.LeaveAllocations.Requests.Commands;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Commands;
@@ -17,13 +16,11 @@ namespace HR.LeaveManagement.Application.Features.LeaveAllocations.Handlers.Comm
     public class DeleteLeaveAllocationCommandHandler : IAppRequestHandler<DeleteLeaveAllocationCommand>
     {
         private readonly IGraphRepository<LeaveAllocation> _leaveAllocationRepository;
-        private readonly IMapper _mapper;
 
-        public DeleteLeaveAllocationCommandHandler(IGraphRepository<LeaveAllocation> leaveAllocationRepository, IMapper mapper)
+        public DeleteLeaveAllocationCommandHandler(IGraphRepository<LeaveAllocation> leaveAllocationRepository)
         {
             this._leaveAllocationRepository = leaveAllocationRepository;
             this._leaveAllocationRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
-            _mapper = mapper;
         }
 
         public async Task HandleAsync(DeleteLeaveAllocationCommand request, CancellationToken cancellationToken)

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveAllocations/Handlers/Commands/UpdateLeaveAllocationCommandHandler.cs

@@ -1,8 +1,8 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs.LeaveAllocation.Validators;
 using HR.LeaveManagement.Application.Exceptions;
 using HR.LeaveManagement.Application.Features.LeaveAllocations.Requests.Commands;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Commands;
+using HR.LeaveManagement.Application.Mappings;
 using HR.LeaveManagement.Domain;
 using RCommon.Mediator.Subscribers;
 using System;
@@ -20,19 +20,16 @@ public class UpdateLeaveAllocationCommandHandler : IAppRequestHandler<UpdateLeav
     {
         private readonly IGraphRepository<LeaveAllocation> _leaveAllocationRepository;
         private readonly IReadOnlyRepository<LeaveType> _leaveTypeRepository;
-        private readonly IMapper _mapper;
         private readonly IValidationService _validationService;
 
         public UpdateLeaveAllocationCommandHandler(IGraphRepository<LeaveAllocation> leaveAllocationRepository,
             IReadOnlyRepository<LeaveType> leaveTypeRepository,
-            IMapper mapper,
             IValidationService validationService)
         {
             this._leaveAllocationRepository = leaveAllocationRepository;
             this._leaveTypeRepository = leaveTypeRepository;
             this._leaveAllocationRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
             this._leaveTypeRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
-            _mapper = mapper;
             _validationService = validationService;
         }
 
@@ -48,10 +45,9 @@ public async Task HandleAsync(UpdateLeaveAllocationCommand request, Cancellation
             if (leaveAllocation is null)
                 throw new NotFoundException(nameof(leaveAllocation), request.LeaveAllocationDto.Id);
 
-            _mapper.Map(request.LeaveAllocationDto, leaveAllocation);
+            request.LeaveAllocationDto.ApplyTo(leaveAllocation);
 
             await _leaveAllocationRepository.UpdateAsync(leaveAllocation);
-
         }
     }
 }

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveAllocations/Handlers/Queries/GetLeaveAllocationDetailRequestHandler.cs

@@ -1,7 +1,7 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs;
 using HR.LeaveManagement.Application.DTOs.LeaveAllocation;
 using HR.LeaveManagement.Application.Features.LeaveAllocations.Requests.Queries;
+using HR.LeaveManagement.Application.Mappings;
 using HR.LeaveManagement.Domain;
 using RCommon.Mediator.Subscribers;
 using RCommon.Persistence;
@@ -14,19 +14,18 @@ namespace HR.LeaveManagement.Application.Features.LeaveAllocations.Handlers.Quer
     public class GetLeaveAllocationDetailRequestHandler : IAppRequestHandler<GetLeaveAllocationDetailRequest, LeaveAllocationDto>
     {
         private readonly IGraphRepository<LeaveAllocation> _leaveAllocationRepository;
-        private readonly IMapper _mapper;
 
-        public GetLeaveAllocationDetailRequestHandler(IGraphRepository<LeaveAllocation> leaveAllocationRepository, IMapper mapper)
+        public GetLeaveAllocationDetailRequestHandler(IGraphRepository<LeaveAllocation> leaveAllocationRepository)
         {
             _leaveAllocationRepository = leaveAllocationRepository;
             this._leaveAllocationRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
-            _mapper = mapper;
         }
+
         public async Task<LeaveAllocationDto> HandleAsync(GetLeaveAllocationDetailRequest request, CancellationToken cancellationToken)
         {
             _leaveAllocationRepository.Include(x => x.LeaveType);
             var leaveAllocation = await _leaveAllocationRepository.FindAsync(request.Id);
-            return _mapper.Map<LeaveAllocationDto>(leaveAllocation);
+            return leaveAllocation.ToLeaveAllocationDto();
         }
     }
 }

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveAllocations/Handlers/Queries/GetLeaveAllocationListRequestHandler.cs

@@ -1,9 +1,10 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs;
 using HR.LeaveManagement.Application.DTOs.LeaveAllocation;
 using HR.LeaveManagement.Application.Features.LeaveAllocations.Requests.Queries;
+using HR.LeaveManagement.Application.Mappings;
 using RCommon.Mediator.Subscribers;
 using System.Collections.Generic;
+using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
 using HR.LeaveManagement.Application.Contracts.Identity;
@@ -19,18 +20,15 @@ namespace HR.LeaveManagement.Application.Features.LeaveAllocations.Handlers.Quer
     public class GetLeaveAllocationListRequestHandler : IAppRequestHandler<GetLeaveAllocationListRequest, List<LeaveAllocationDto>>
     {
         private readonly IGraphRepository<LeaveAllocation> _leaveAllocationRepository;
-        private readonly IMapper _mapper;
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly IUserService _userService;
 
         public GetLeaveAllocationListRequestHandler(IGraphRepository<LeaveAllocation> leaveAllocationRepository,
-             IMapper mapper,
              IHttpContextAccessor httpContextAccessor,
             IUserService userService)
         {
             _leaveAllocationRepository = leaveAllocationRepository;
             this._leaveAllocationRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
-            _mapper = mapper;
             this._httpContextAccessor = httpContextAccessor;
             this._userService = userService;
         }
@@ -44,19 +42,19 @@ public async Task<List<LeaveAllocationDto>> HandleAsync(GetLeaveAllocationListRe
             {
                 var userId = _httpContextAccessor.HttpContext.User.FindFirst(
                     q => q.Type == CustomClaimTypes.Uid)?.Value;
-                leaveAllocations = await _leaveAllocationRepository.FindAsync(x=>x.EmployeeId == userId) as List<LeaveAllocation>;
+                leaveAllocations = await _leaveAllocationRepository.FindAsync(x => x.EmployeeId == userId) as List<LeaveAllocation>;
 
                 var employee = await _userService.GetEmployee(userId);
-                allocations = _mapper.Map<List<LeaveAllocationDto>>(leaveAllocations);
+                allocations = leaveAllocations.Select(x => x.ToLeaveAllocationDto()).ToList();
                 foreach (var alloc in allocations)
                 {
                     alloc.Employee = employee;
                 }
             }
             else
             {
-                leaveAllocations = await _leaveAllocationRepository.FindAsync(x=>true) as List<LeaveAllocation>;
-                allocations = _mapper.Map<List<LeaveAllocationDto>>(leaveAllocations);
+                leaveAllocations = await _leaveAllocationRepository.FindAsync(x => true) as List<LeaveAllocation>;
+                allocations = leaveAllocations.Select(x => x.ToLeaveAllocationDto()).ToList();
                 foreach (var req in allocations)
                 {
                     req.Employee = await _userService.GetEmployee(req.EmployeeId);

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveRequests/Handlers/Commands/CreateLeaveRequestCommandHandler.cs

@@ -1,8 +1,8 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.DTOs.LeaveRequest.Validators;
 using HR.LeaveManagement.Application.Exceptions;
 using HR.LeaveManagement.Application.Features.LeaveRequests.Requests.Commands;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Commands;
+using HR.LeaveManagement.Application.Mappings;
 using HR.LeaveManagement.Application.Responses;
 using HR.LeaveManagement.Domain;
 using RCommon.Mediator.Subscribers;
@@ -32,7 +32,6 @@ public class CreateLeaveRequestCommandHandler : IAppRequestHandler<CreateLeaveRe
         private readonly IEmailService _emailSender;
         private readonly ICurrentUser _currentUser;
         private readonly IOptions<SendGridEmailSettings> _emailSettings;
-        private readonly IMapper _mapper;
         private readonly IValidationService _validationService;
         private readonly IReadOnlyRepository<LeaveType> _leaveTypeRepository;
         private readonly IGraphRepository<LeaveAllocation> _leaveAllocationRepository;
@@ -45,7 +44,6 @@ public CreateLeaveRequestCommandHandler(
             IEmailService emailSender,
             ICurrentUser currentUser,
             IOptions<SendGridEmailSettings> emailSettings,
-            IMapper mapper,
             IValidationService validationService)
         {
             _leaveTypeRepository = leaveTypeRepository;
@@ -56,8 +54,7 @@ public CreateLeaveRequestCommandHandler(
             this._leaveRequestRepository.DataStoreName = DataStoreNamesConst.LeaveManagement;
             _emailSender = emailSender;
             this._currentUser = currentUser;
-            _emailSettings=emailSettings;
-            _mapper = mapper;
+            _emailSettings = emailSettings;
             _validationService = validationService;
         }
 
@@ -67,8 +64,8 @@ public async Task<BaseCommandResponse> HandleAsync(CreateLeaveRequestCommand req
             var validationResult = await _validationService.ValidateAsync(request.LeaveRequestDto);
             var userId = _currentUser.FindClaimValue(CustomClaimTypes.Uid);
 
-            var allocation = _leaveAllocationRepository.FirstOrDefault(x=>x.EmployeeId == userId && x.LeaveTypeId == request.LeaveRequestDto.LeaveTypeId);
-            if(allocation is null)
+            var allocation = _leaveAllocationRepository.FirstOrDefault(x => x.EmployeeId == userId && x.LeaveTypeId == request.LeaveRequestDto.LeaveTypeId);
+            if (allocation is null)
             {
                 validationResult.Errors.Add(new ValidationFault(nameof(request.LeaveRequestDto.LeaveTypeId),
                     "You do not have any allocations for this leave type."));
@@ -82,7 +79,7 @@ public async Task<BaseCommandResponse> HandleAsync(CreateLeaveRequestCommand req
                         nameof(request.LeaveRequestDto.EndDate), "You do not have enough days for this request"));
                 }
             }
-            
+
             if (validationResult.IsValid == false)
             {
                 response.Success = false;
@@ -91,7 +88,7 @@ public async Task<BaseCommandResponse> HandleAsync(CreateLeaveRequestCommand req
             }
             else
             {
-                var leaveRequest = _mapper.Map<LeaveRequest>(request.LeaveRequestDto);
+                var leaveRequest = request.LeaveRequestDto.ToLeaveRequest();
                 leaveRequest.RequestingEmployeeId = userId;
                 await _leaveRequestRepository.AddAsync(leaveRequest);
                 //TODO: May need to get Id out
@@ -104,7 +101,7 @@ public async Task<BaseCommandResponse> HandleAsync(CreateLeaveRequestCommand req
                 {
                     var emailAddress = _currentUser.FindClaimValue(ClaimTypes.Email);
 
-                    var email = new MailMessage(new MailAddress(this._emailSettings.Value.FromEmailDefault, this._emailSettings.Value.FromNameDefault), 
+                    var email = new MailMessage(new MailAddress(this._emailSettings.Value.FromEmailDefault, this._emailSettings.Value.FromNameDefault),
                         new MailAddress(emailAddress))
                     {
                         Body = $"Your leave request for {request.LeaveRequestDto.StartDate:D} to {request.LeaveRequestDto.EndDate:D} " +
@@ -119,7 +116,7 @@ public async Task<BaseCommandResponse> HandleAsync(CreateLeaveRequestCommand req
                     //// Log or handle error, but don't throw...
                 }
             }
-            
+
             return response;
         }
     }

Examples/CleanWithCQRS/HR.LeaveManagement.Application/Features/LeaveRequests/Handlers/Commands/DeleteLeaveRequestCommandHandler.cs

@@ -1,4 +1,3 @@
-using AutoMapper;
 using HR.LeaveManagement.Application.Exceptions;
 using HR.LeaveManagement.Application.Features.LeaveRequests.Requests.Commands;
 using HR.LeaveManagement.Application.Features.LeaveTypes.Requests.Commands;