Merge pull request #142 from SWD392-Domus/hotfix/finalize-features

Hotfix/finalize features
SWD392-Domus · Mar 19, 2024 · 39d34b6 · 39d34b6
2 parents 6779edc + 5b7c77b
commit 39d34b6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 9 deletions.
diff --git a/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs b/Domus.Domain/Dtos/Quotations/DtoQuotationFullDetails.cs
@@ -16,6 +16,8 @@ public class DtoQuotationFullDetails
 
     public DateTime? ExpireAt { get; set; }
 
+    public DtoPackage? Package { get; set; }
+
 	[JsonPropertyName("products")]
 	public ICollection<DtoProductDetailQuotationRevision> ProductDetailQuotations { get; set; } = new List<DtoProductDetailQuotationRevision>();
 

diff --git a/Domus.Service/Implementations/AdminService.cs b/Domus.Service/Implementations/AdminService.cs
@@ -13,11 +13,13 @@ public class AdminService : IAdminService
 {
 	private readonly IContractRepository _contractRepository;
 	private readonly IQuotationRevisionRepository _quotationRevisionRepository;
+	private readonly IUserRepository _userRepository;
 
-	public AdminService(IContractRepository contractRepository, IQuotationRevisionRepository quotationRevisionRepository)
+	public AdminService(IContractRepository contractRepository, IQuotationRevisionRepository quotationRevisionRepository, IUserRepository userRepository)
 	{
 		_contractRepository = contractRepository;
 		_quotationRevisionRepository = quotationRevisionRepository;
+		_userRepository = userRepository;
 	}
 
     public async Task<ServiceActionResult> GetDashboardInfo(GetDashboardInfoRequest request)
@@ -47,6 +49,7 @@ public async Task<ServiceActionResult> GetDashboardInfo(GetDashboardInfoRequest
 			});
 		}
 
+		dashboardResponse.NewUsersCount = await (await _userRepository.FindAsync(u => !u.IsDeleted && u.EmailConfirmed)).CountAsync();
 		dashboardResponse.TotalRevenue = dashboardResponse.RevenueByMonths.Select(rbm => rbm.Revenue).Sum();
 
         return new ServiceActionResult(true) { Data = dashboardResponse };

diff --git a/Domus.Service/Implementations/UserService.cs b/Domus.Service/Implementations/UserService.cs
@@ -214,14 +214,16 @@ public async Task<ServiceActionResult> UpdatePassword(UpdateUserPasswordRequest
 
     public async Task<ServiceActionResult> GetAllStaff()
     {
-		var staffList = new List<DtoDomusUser>();
-		foreach (var user in _userManager.Users.ToList())
-		{
-			if (await _userManager.IsInRoleAsync(user, UserRoleConstants.STAFF) && !await _userManager.IsInRoleAsync(user, UserRoleConstants.ADMIN))
-				staffList.Add(_mapper.Map<DtoDomusUser>(user));
-		}
-
-		return new ServiceActionResult(true) { Data = staffList };
+	    var users = (await (await _userRepository.FindAsync(u => !u.IsDeleted && u.EmailConfirmed))
+		    .ToListAsync())
+		    .Where(u =>
+		    {
+			    var roles = _userManager.GetRolesAsync(u).Result;
+			    return roles.Contains(UserRoleConstants.STAFF) &&
+			           !roles.Contains(UserRoleConstants.ADMIN);
+		    });
+
+		return new ServiceActionResult(true) { Data = _mapper.Map<IEnumerable<DtoDomusUser>>(users) };
     }
 
     public async Task<ServiceActionResult> SearchUsersUsingGet(SearchUsingGetRequest request)