corrected the distinct by error

revert Optmized the work status master APIs

Marco.Pms.Helpers/CacheHelper/EmployeeCache.cs

@@ -212,6 +212,27 @@ namespace Marco.Pms.Helpers.CacheHelper
 
             return true;
         }
+        public async Task<bool> ClearAllEmployeesFromCacheByOnlyEmployeeId(Guid employeeId)
+        {
+            var employeeIdString = employeeId.ToString();
+
+            try
+            {
+                var filter = Builders<EmployeePermissionMongoDB>.Filter.Eq(e => e.Id, employeeIdString);
+
+                var result = await _collection.DeleteManyAsync(filter);
+
+                if (result.DeletedCount == 0)
+                    return false;
+
+                return true;
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error occured while deleting employee profile");
+                return false;
+            }
+        }
         public async Task<bool> ClearAllEmployeesFromCacheByTenantId(Guid tenantId)
         {
             var tenantIdString = tenantId.ToString();

Marco.Pms.Model/Dtos/Activities/CreateWorkStatusMasterDto.cs

@@ -2,7 +2,7 @@
 {
     public class CreateWorkStatusMasterDto
     {
-        public string? Name { get; set; }
-        public string? Description { get; set; }
+        public required string Name { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Activities/UpdateWorkStatusMasterDto.cs

@@ -3,7 +3,7 @@
     public class UpdateWorkStatusMasterDto
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
-        public string? Description { get; set; }
+        public required string Name { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Master/CreateContactCategoryDto.cs

@@ -2,7 +2,7 @@
 {
     public class CreateContactCategoryDto
     {
-        public string? Name { get; set; }
-        public string? Description { get; set; }
+        public required string Name { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Master/CreateContactTagDto.cs

@@ -2,7 +2,7 @@
 {
     public class CreateContactTagDto
     {
-        public string? Name { get; set; }
-        public string? Description { get; set; }
+        public required string Name { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Master/UpdateContactCategoryDto.cs

@@ -2,8 +2,8 @@
 {
     public class UpdateContactCategoryDto
     {
-        public Guid Id { get; set; }
-        public string? Name { get; set; }
-        public string? Description { get; set; }
+        public required Guid Id { get; set; }
+        public required string Name { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Model/Dtos/Master/UpdateContactTagDto.cs

@@ -3,7 +3,7 @@
     public class UpdateContactTagDto
     {
         public Guid Id { get; set; }
-        public string? Name { get; set; }
-        public string? Description { get; set; }
+        public required string Name { get; set; }
+        public required string Description { get; set; }
     }
 }

Marco.Pms.Services/Controllers/AuthController.cs

@@ -7,6 +7,7 @@ using Marco.Pms.Model.Employees;
 using Marco.Pms.Model.Entitlements;
 using Marco.Pms.Model.Utilities;
 using Marco.Pms.Model.ViewModels.Tenant;
+using Marco.Pms.Services.Helpers;
 using MarcoBMS.Services.Helpers;
 using MarcoBMS.Services.Service;
 using Microsoft.AspNetCore.Authorization;
@@ -1469,6 +1470,9 @@ namespace MarcoBMS.Services.Controllers
             // Generate and store refresh token
             var refreshToken = await _refreshTokenService.CreateRefreshToken(loggedInEmployee.ApplicationUserId, tenantId.ToString(), loggedInEmployee.OrganizationId, _jwtSettings);
 
+            var _cache = scope.ServiceProvider.GetRequiredService<CacheUpdateHelper>();
+            await _cache.ClearAllEmployeesFromCacheByOnlyEmployeeId(loggedInEmployee.Id);
+
             _logger.LogInfo("Tenant selected and tokens generated for TenantId: {TenantId} and Employee: {EmployeeEmail}", tenantId, loggedInEmployee.Email ?? string.Empty);
 
             // Return success response including tokens

Marco.Pms.Services/Controllers/ProjectController.cs

@@ -560,6 +560,13 @@ namespace MarcoBMS.Services.Controllers
             var response = await _projectServices.GetAssignedOrganizationsToProjectAsync(projectId, tenantId, loggedInEmployee);
             return StatusCode(response.StatusCode, response);
         }
+        [HttpGet("get/assigned/organization/dropdown/{projectId}")]
+        public async Task<IActionResult> GetAssignedOrganizationsToProjectForDropdownAsync(Guid projectId)
+        {
+            Employee loggedInEmployee = await _userHelper.GetCurrentEmployeeAsync();
+            var response = await _projectServices.GetAssignedOrganizationsToProjectForDropdownAsync(projectId, tenantId, loggedInEmployee);
+            return StatusCode(response.StatusCode, response);
+        }
 
         #endregion
     }

Marco.Pms.Services/Helpers/CacheUpdateHelper.cs

@@ -956,6 +956,17 @@ namespace Marco.Pms.Services.Helpers
                 _logger.LogError(ex, "Error occured while deleting all employees from Cache");
             }
         }
+        public async Task ClearAllEmployeesFromCacheByOnlyEmployeeId(Guid employeeId)
+        {
+            try
+            {
+                var response = await _employeeCache.ClearAllEmployeesFromCacheByOnlyEmployeeId(employeeId);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Error occured while deleting all employees from Cache");
+            }
+        }
         public async Task ClearAllEmployeesFromCacheByTenantId(Guid tenantId)
         {
             try

Marco.Pms.Services/MappingProfiles/MappingProfile.cs

@@ -379,6 +379,27 @@ namespace Marco.Pms.Services.MappingProfiles
 
             #endregion
 
+            #region ======================================================= Contact Category Master =======================================================
+            CreateMap<CreateContactCategoryDto, ContactCategoryMaster>();
+            CreateMap<UpdateContactCategoryDto, ContactCategoryMaster>();
+            CreateMap<ContactCategoryMaster, ContactCategoryVM>();
+            #endregion
+            #region ======================================================= Contact Tag Master =======================================================
+            CreateMap<CreateContactTagDto, ContactTagMaster>();
+            CreateMap<UpdateContactTagDto, ContactTagMaster>();
+            CreateMap<ContactTagMaster, ContactTagVM>();
+            #endregion
+            #region ======================================================= Expenses Status Master =======================================================
+            #endregion
+            #region ======================================================= Expenses Status Master =======================================================
+            #endregion
+            #region ======================================================= Expenses Status Master =======================================================
+            #endregion
+            #region ======================================================= Expenses Status Master =======================================================
+            #endregion
+            #region ======================================================= Expenses Status Master =======================================================
+            #endregion
+
             #endregion
 
             #region ======================================================= Document =======================================================

Marco.Pms.Services/Service/ProjectServices.cs

@@ -2805,6 +2805,128 @@ namespace Marco.Pms.Services.Service
                 return ApiResponse<object>.ErrorResponse("Internal error", "An internal exception occurred", 500);
             }
         }
+        public async Task<ApiResponse<object>> GetAssignedOrganizationsToProjectForDropdownAsync(Guid projectId, Guid tenantId, Employee loggedInEmployee)
+        {
+            _logger.LogDebug("Started fetching assigned organizations for ProjectId: {ProjectId} and TenantId: {TenantId} by user {UserId}",
+                projectId, tenantId, loggedInEmployee.Id);
+
+            try
+            {
+                // Create a scoped PermissionServices instance for permission checks
+                using var scope = _serviceScopeFactory.CreateScope();
+                var permissionService = scope.ServiceProvider.GetRequiredService<PermissionServices>();
+
+                // Retrieve the project by projectId and tenantId
+                var projectTask = Task.Run(async () =>
+                {
+                    await using var context = await _dbContextFactory.CreateDbContextAsync();
+                    return await context.Projects.AsNoTracking().Include(p => p.Promoter).Include(p => p.PMC).FirstOrDefaultAsync(p => p.Id == projectId && p.TenantId == tenantId);
+                });
+
+                var tenantTask = Task.Run(async () =>
+                {
+                    await using var context = await _dbContextFactory.CreateDbContextAsync();
+                    return await context.Tenants.AsNoTracking().Include(t => t.Organization).FirstOrDefaultAsync(t => t.Id == tenantId);
+                });
+                var projectServiceTask = Task.Run(async () =>
+                {
+                    await using var context = await _dbContextFactory.CreateDbContextAsync();
+                    return await context.ProjectServiceMappings
+                    .AsNoTracking()
+                    .Include(ps => ps!.Service)
+                    .Where(ps => ps.ProjectId == projectId && ps.TenantId == tenantId).ToListAsync();
+                });
+
+                await Task.WhenAll(projectTask, tenantTask, projectServiceTask);
+
+                var project = projectTask.Result;
+                var tenant = tenantTask.Result;
+                var projectService = projectServiceTask.Result;
+
+                if (project == null || tenant == null)
+                {
+                    _logger.LogWarning("Project {ProjectId} not found in database for tenant {TenantId}", projectId, tenantId);
+                    return ApiResponse<object>.ErrorResponse("Project not found", "Project not found", 404);
+                }
+
+                // Check if the logged in employee has permission to access the project
+                var hasPermission = await permissionService.HasProjectPermission(loggedInEmployee, projectId);
+                if (!hasPermission)
+                {
+                    _logger.LogWarning("Access denied for user {UserId} on project {ProjectId}", loggedInEmployee.Id, projectId);
+                    return ApiResponse<object>.ErrorResponse("Access Denied", "You do not have permission to access this project.", 403);
+                }
+
+                // Fetch all project-organization mappings with related service and organization data
+                var projectOrgMappingsQuery = _context.ProjectOrgMappings
+                    .AsNoTracking()
+                    .Include(po => po.ProjectService)
+                        .ThenInclude(ps => ps!.Service)
+                    .Include(po => po.AssignedBy)
+                    .Include(po => po.OrganizationType)
+                    .Include(po => po.Organization)
+                    .Where(po => po.ProjectService != null
+                              && po.ProjectService.ProjectId == projectId
+                              && po.TenantId == tenantId);
+
+                if (loggedInEmployee.OrganizationId != project.PMCId && loggedInEmployee.OrganizationId != project.PromoterId && loggedInEmployee.OrganizationId != tenant.OrganizationId)
+                {
+                    projectOrgMappingsQuery = projectOrgMappingsQuery.Where(po => po.ParentOrganizationId == loggedInEmployee.OrganizationId || po.OrganizationId == loggedInEmployee.OrganizationId);
+                }
+
+                var projectOrgMappings = await projectOrgMappingsQuery
+                    .Distinct()
+                    .ToListAsync();
+                var organizations = projectOrgMappings.Select(po => po.Organization!).ToList();
+
+                if (loggedInEmployee.OrganizationId == project.PMCId || loggedInEmployee.OrganizationId == project.PromoterId || loggedInEmployee.OrganizationId == tenant.OrganizationId)
+                {
+                    var pmc = project.PMC;
+                    var promoter = project.Promoter;
+                    var organization = tenant.Organization;
+
+                    if (!organizations.Any(r => r.Id == project.PMCId) && pmc != null)
+                    {
+                        organizations.Add(pmc);
+                    }
+                    if (!organizations.Any(r => r.Id == project.PromoterId) && promoter != null)
+                    {
+                        organizations.Add(promoter);
+                    }
+                    if (!organizations.Any(r => r.Id == tenant.OrganizationId) && organization != null)
+                    {
+                        organizations.Add(organization);
+                    }
+                }
+
+                organizations = organizations.DistinctBy(o => o.Id).ToList();
+
+                // Filter and map the data to the desired view model
+                var response = organizations
+                    .Select(o => new ProjectOrganizationVM
+                    {
+                        Id = o.Id,
+                        Name = o.Name,
+                        SPRID = 0
+                    })
+                    .ToList();
+
+                _logger.LogInfo("Fetched {Count} assigned organizations for ProjectId: {ProjectId}", response.Count, projectId);
+
+                return ApiResponse<object>.SuccessResponse(response, "Successfully fetched the list of organizations assigned to the project", 200);
+            }
+            catch (DbUpdateException dbEx)
+            {
+                _logger.LogError(dbEx, "Database exception while fetching assigned organizations for ProjectId: {ProjectId}", projectId);
+                return ApiResponse<object>.ErrorResponse("Internal error", "A database exception occurred", 500);
+            }
+            catch (Exception ex)
+            {
+                _logger.LogError(ex, "Unhandled exception while fetching assigned organizations for ProjectId: {ProjectId}", projectId);
+                return ApiResponse<object>.ErrorResponse("Internal error", "An internal exception occurred", 500);
+            }
+        }
+
 
         #endregion
 

Marco.Pms.Services/Service/ServiceInterfaces/IProjectServices.cs

@@ -49,6 +49,7 @@ namespace Marco.Pms.Services.Service.ServiceInterfaces
         Task<ApiResponse<object>> DeassignServiceToProjectAsync(DeassignServiceDto model, Guid tenantId, Employee loggedInEmployee);
 
         Task<ApiResponse<object>> GetAssignedOrganizationsToProjectAsync(Guid projectId, Guid tenantId, Employee loggedInEmployee);
+        Task<ApiResponse<object>> GetAssignedOrganizationsToProjectForDropdownAsync(Guid projectId, Guid tenantId, Employee loggedInEmployee);
 
     }
 }