Merge pull request #139 from SWD392-Domus/hotfix/create-quotation

Hotfix/create quotation

Domus.Service/Implementations/QuotationService.cs

@@ -206,15 +206,16 @@ public async Task<ServiceActionResult> CreateQuotation(CreateQuotationRequest re
 
 		quotation.QuotationRevisions.Add(quotationRevision);
 		await _quotationRepository.AddAsync(quotation);
-		var customerImage = (await _userRepository.GetAsync(x => !x.IsDeleted && x.Id == quotation.Customer.Id)).ProfileImage;
+		var customer = await _userRepository.GetAsync(x => !x.IsDeleted && x.Id == quotation.CustomerId) ??  throw new UserNotFoundException("Customer not found");
 		await _notificationRepository.AddAsync(new Notification()
 		{
 			RecipientId = NotificationHelper.ADMIN_ID,
-			Content = NotificationHelper.CreateNewQuotationMessage((quotation.Customer.FullName.Equals("N/A") ? quotation.Customer.Email : quotation.Customer.FullName),quotation.Id),
+			Content = NotificationHelper.CreateNewQuotationMessage((string.IsNullOrEmpty(customer.FullName) || customer.FullName.Equals("N/A") ? customer.Email! : customer.FullName), quotation.Id),
 			SentAt = DateTime.Now,
-			Image = customerImage,
+			Image = customer.ProfileImage ?? string.Empty,
 			RedirectString = $"staff/quotations/{quotation.Id}"
 		});
+
 		await _unitOfWork.CommitAsync();
 		return new ServiceActionResult(true);
     }

Domus.Service/Implementations/UserService.cs

@@ -97,12 +97,10 @@ public async Task<ServiceActionResult> GetAllUsers()
 	    // var clientUser = await _userRepository.GetAsync(x => x.Id.Equals(request.ClientId)&& !x.IsDeleted) ??
 	    //                  throw new Exception($"Not found Client: {request.ClientId}");
 	    // var clientRoles = await _userManager.GetRolesAsync(clientUser);
-	    var users = (await _userRepository.GetAllAsync())
-		    .Where(u => !u.IsDeleted).ToList();
+	    var users = await (await _userRepository.FindAsync(u => !u.IsDeleted)).ToListAsync();
 	    var dtoList = new List<DtoDomusUserWithRole>();
-		foreach (var dtoDomusUserWithRole in users)
+		foreach (var user in users)
 		{
-			var user = await _userRepository.GetAsync(x => x.Id.Equals(dtoDomusUserWithRole.Id) && !x.IsDeleted);
 			var userRole = await _userManager.GetRolesAsync(user);
 			var x = _mapper.Map<DtoDomusUserWithRole>(user);
 			x.Role = userRole;