From aa2a370467a5fa651203ecadfc9809615ef13a55 Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Mon, 8 Sep 2025 15:07:30 +0530
Subject: [PATCH] getting the employee list filtered by tenant

---
 .../Controllers/EmployeeController.cs               |  4 ++--
 Marco.Pms.Services/Helpers/EmployeeHelper.cs        | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/Marco.Pms.Services/Controllers/EmployeeController.cs b/Marco.Pms.Services/Controllers/EmployeeController.cs
index 4052f32..2926db1 100644
--- a/Marco.Pms.Services/Controllers/EmployeeController.cs
+++ b/Marco.Pms.Services/Controllers/EmployeeController.cs
@@ -143,14 +143,14 @@ namespace MarcoBMS.Services.Controllers
             else if (hasViewTeamMembersPermission && !ShowInactive)
             {
                 var employeeIds = await _context.ProjectAllocations
-                    .Where(pa => projectIds.Contains(pa.ProjectId) && pa.IsActive)
+                    .Where(pa => projectIds.Contains(pa.ProjectId) && pa.IsActive && pa.TenantId == tenantId)
                     .Select(pa => pa.EmployeeId)
                     .Distinct()
                     .ToListAsync();
 
                 result = await _context.Employees
                     .Include(fp => fp.JobRole)
-                    .Where(e => employeeIds.Contains(e.Id) && e.IsActive)
+                    .Where(e => employeeIds.Contains(e.Id) && e.IsActive && e.TenantId == tenantId)
                     .Select(e => e.ToEmployeeVMFromEmployee())
                     .Distinct()
                     .ToListAsync();
diff --git a/Marco.Pms.Services/Helpers/EmployeeHelper.cs b/Marco.Pms.Services/Helpers/EmployeeHelper.cs
index d79e424..c359a93 100644
--- a/Marco.Pms.Services/Helpers/EmployeeHelper.cs
+++ b/Marco.Pms.Services/Helpers/EmployeeHelper.cs
@@ -71,31 +71,30 @@ namespace MarcoBMS.Services.Helpers
             }
         }
 
-        public async Task<List<EmployeeVM>> GetEmployeeByProjectId(Guid TenentId, Guid? ProjectId, bool ShowInActive)
+        public async Task<List<EmployeeVM>> GetEmployeeByProjectId(Guid tenantId, Guid? projectId, bool ShowInActive)
         {
             try
             {
                 List<EmployeeVM> result = new List<EmployeeVM>();
-                if (ProjectId.HasValue)
+                if (projectId.HasValue)
                 {
 
                     result = await _context.ProjectAllocations
                         .Include(pa => pa.Employee)
                             .ThenInclude(e => e!.JobRole)
-                        .Where(c => c.ProjectId == ProjectId.Value && c.IsActive && c.Employee != null)
+                        .Where(pa => pa.ProjectId == projectId.Value && pa.IsActive && pa.Employee != null && pa.TenantId == tenantId)
                         .Select(pa => pa.Employee!.ToEmployeeVMFromEmployee())
-                        .Distinct()
                         .ToListAsync();
 
                 }
                 else if (ShowInActive)
                 {
-                    result = await _context.Employees.Where(c => c.TenantId == TenentId && c.IsActive == false).Include(fp => fp.JobRole)
+                    result = await _context.Employees.Where(c => c.TenantId == tenantId && c.IsActive == false).Include(fp => fp.JobRole)
                             .Select(c => c.ToEmployeeVMFromEmployee()).ToListAsync();
                 }
                 else
                 {
-                    result = await _context.Employees.Where(c => c.TenantId == TenentId && c.IsActive == true).Include(fp => fp.JobRole)
+                    result = await _context.Employees.Where(c => c.TenantId == tenantId && c.IsActive == true).Include(fp => fp.JobRole)
                             .Select(c => c.ToEmployeeVMFromEmployee()).ToListAsync();
                 }
 
@@ -103,7 +102,7 @@ namespace MarcoBMS.Services.Helpers
             }
             catch (Exception ex)
             {
-                _logger.LogError(ex, "Error occured while featching list of employee by project ID {ProjectId}", ProjectId ?? Guid.Empty);
+                _logger.LogError(ex, "Error occured while featching list of employee by project ID {ProjectId}", projectId ?? Guid.Empty);
                 return new List<EmployeeVM>();
             }
         }