admin/marco.pms.api
1
0
Fork 0
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

Ashutosh_Refactor #107

Merged
ashutosh.nehete merged 52 commits from Ashutosh_Refactor into main 2025-07-18 13:01:29 +00:00
Conversation 0 Commits 52 Files Changed 50 +4 -1
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2a3c75b0c8 - Show all commits

5
Marco.Pms.Services/Helpers/DirectoryHelper.cs
View File

@ -1157,11 +1157,12 @@ namespace Marco.Pms.Services.Helpers
List<EmployeeBucketMapping> employeeBuckets = await _context.EmployeeBucketMappings.Where(b => b.EmployeeId == LoggedInEmployee.Id).ToListAsync();
var bucketIds = employeeBuckets.Select(b => b.BucketId).ToList();
List<EmployeeBucketMapping> employeeBucketVM = await _context.EmployeeBucketMappings.Where(b => bucketIds.Contains(b.BucketId)).ToListAsync();
List<Bucket> bucketList = new List<Bucket>();
if (permissionIds.Contains(PermissionsMaster.DirectoryAdmin))
{
bucketList = await _context.Buckets.Include(b => b.CreatedBy).Where(b => b.TenantId == tenantId).ToListAsync();
bucketIds = bucketList.Select(b => b.Id).ToList();
}
else if (permissionIds.Contains(PermissionsMaster.DirectoryAdmin) || permissionIds.Contains(PermissionsMaster.DirectoryUser))
{
@ -1173,6 +1174,8 @@ namespace Marco.Pms.Services.Helpers
return ApiResponse<object>.ErrorResponse("You don't have permission", "You don't have permission", 401);
}
List<EmployeeBucketMapping> employeeBucketVM = await _context.EmployeeBucketMappings.Where(b => bucketIds.Contains(b.BucketId)).ToListAsync();
List<AssignBucketVM> bucketVMs = new List<AssignBucketVM>();
if (bucketList.Any())
{