From 7dc80ec0066205fd545f2c7b1450744edd8a9dff Mon Sep 17 00:00:00 2001
From: "ashutosh.nehete" <ashutosh.nehete@marcoaiot.com>
Date: Wed, 28 May 2025 12:48:02 +0530
Subject: [PATCH] Included object consist of basic infromation of employee who
 created the bucket in View models

---
 Marco.Pms.Model/Mapper/DirectoryMapper.cs     |  6 ++++--
 Marco.Pms.Services/Helpers/DirectoryHelper.cs | 10 +++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/Marco.Pms.Model/Mapper/DirectoryMapper.cs b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
index 2aea3c0..4732542 100644
--- a/Marco.Pms.Model/Mapper/DirectoryMapper.cs
+++ b/Marco.Pms.Model/Mapper/DirectoryMapper.cs
@@ -199,7 +199,8 @@ namespace Marco.Pms.Model.Mapper
             {
                 Id = bucket.Id,
                 Name = bucket.Name,
-                Description = bucket.Description
+                Description = bucket.Description,
+                CreatedBy = bucket.CreatedBy != null ? bucket.CreatedBy.ToBasicEmployeeVMFromEmployee() : null
             };
         }
         public static AssignBucketVM ToAssignBucketVMFromBucket(this Bucket bucket)
@@ -208,7 +209,8 @@ namespace Marco.Pms.Model.Mapper
             {
                 Id = bucket.Id,
                 Name = bucket.Name,
-                Description = bucket.Description
+                Description = bucket.Description,
+                CreatedBy = bucket.CreatedBy != null ? bucket.CreatedBy.ToBasicEmployeeVMFromEmployee() : null
             };
         }
 
diff --git a/Marco.Pms.Services/Helpers/DirectoryHelper.cs b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
index 2529b96..458f576 100644
--- a/Marco.Pms.Services/Helpers/DirectoryHelper.cs
+++ b/Marco.Pms.Services/Helpers/DirectoryHelper.cs
@@ -2518,11 +2518,11 @@ namespace Marco.Pms.Services.Helpers
             List<Bucket> bucketList = new List<Bucket>();
             if (permissionIds.Contains(directoryAdmin))
             {
-                bucketList = await _context.Buckets.Where(b => b.TenantId == tenantId).ToListAsync();
+                bucketList = await _context.Buckets.Include(b => b.CreatedBy).Where(b => b.TenantId == tenantId).ToListAsync();
             }
             else if (permissionIds.Contains(directoryManager) || permissionIds.Contains(directoryUser))
             {
-                bucketList = await _context.Buckets.Where(b => bucketIds.Contains(b.Id) || b.CreatedByID == LoggedInEmployee.Id).ToListAsync();
+                bucketList = await _context.Buckets.Include(b => b.CreatedBy).Where(b => bucketIds.Contains(b.Id) || b.CreatedByID == LoggedInEmployee.Id).ToListAsync();
             }
             else
             {
@@ -2589,7 +2589,7 @@ namespace Marco.Pms.Services.Helpers
 
                 _context.EmployeeBucketMappings.Add(employeeBucket);
                 await _context.SaveChangesAsync();
-
+                bucket = await _context.Buckets.Include(b => b.CreatedBy).FirstOrDefaultAsync(b => b.Id == bucket.Id) ?? new Bucket();
                 BucketVM bucketVM = bucket.ToBucketVMFromBucket();
                 _logger.LogInfo("Employee Id {LoggedInEmployeeId} creayted new bucket {BucketId}", LoggedInEmployee.Id, bucket.Id);
                 return ApiResponse<object>.SuccessResponse(bucketVM, "Bucket Created SuccessFully", 200);
@@ -2607,7 +2607,7 @@ namespace Marco.Pms.Services.Helpers
                 var permissionIds = await _context.RolePermissionMappings.Where(rp => assignedRoleIds.Contains(rp.ApplicationRoleId)).Select(rp => rp.FeaturePermissionId).Distinct().ToListAsync();
                 var employeeBuckets = await _context.EmployeeBucketMappings.Where(eb => eb.BucketId == id).ToListAsync();
                 var bucketIds = employeeBuckets.Where(eb => eb.EmployeeId == LoggedInEmployee.Id).Select(eb => eb.BucketId).ToList();
-                Bucket? bucket = await _context.Buckets.FirstOrDefaultAsync(b => b.Id == bucketDto.Id && b.TenantId == tenantId);
+                Bucket? bucket = await _context.Buckets.Include(b => b.CreatedBy).FirstOrDefaultAsync(b => b.Id == bucketDto.Id && b.TenantId == tenantId);
 
                 if (bucket == null)
                 {
@@ -2671,7 +2671,7 @@ namespace Marco.Pms.Services.Helpers
                 var assignedRoleIds = await _context.EmployeeRoleMappings.Where(r => r.EmployeeId == LoggedInEmployee.Id).Select(r => r.RoleId).ToListAsync();
                 var permissionIds = await _context.RolePermissionMappings.Where(rp => assignedRoleIds.Contains(rp.ApplicationRoleId)).Select(rp => rp.FeaturePermissionId).Distinct().ToListAsync();
 
-                Bucket? bucket = await _context.Buckets.FirstOrDefaultAsync(b => b.Id == bucketId && b.TenantId == tenantId);
+                Bucket? bucket = await _context.Buckets.Include(b => b.CreatedBy).FirstOrDefaultAsync(b => b.Id == bucketId && b.TenantId == tenantId);
 
                 if (bucket == null)
                 {