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

Added the PMC, Promotor and Primary organization of the tenant in list of assigned organization to project

Browse Source
This commit is contained in:
ashutosh.nehete 2025-09-29 14:33:57 +05:30
parent 5df66b79ca
commit 1cd8203d27
1 changed files with 97 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

106
Marco.Pms.Services/Service/ProjectServices.cs
View File

@ -2634,14 +2634,36 @@ namespace Marco.Pms.Services.Service
var permissionService = scope.ServiceProvider.GetRequiredService<PermissionServices>(); var permissionService = scope.ServiceProvider.GetRequiredService<PermissionServices>();
// Retrieve the project by projectId and tenantId // Retrieve the project by projectId and tenantId
var project = await _context.Projects var projectTask = Task.Run(async () =>
.AsNoTracking()
.FirstOrDefaultAsync(p => p.Id == projectId && p.TenantId == tenantId);
if (project == null)
{ {
_logger.LogWarning("Project not found. ProjectId: {ProjectId}, TenantId: {TenantId}", projectId, tenantId); await using var context = await _dbContextFactory.CreateDbContextAsync();
return ApiResponse<object>.ErrorResponse("Project not found", "Project not found in database", 404); 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 // Check if the logged in employee has permission to access the project
@ -2653,14 +2675,21 @@ namespace Marco.Pms.Services.Service
} }
// Fetch all project-organization mappings with related service and organization data // Fetch all project-organization mappings with related service and organization data
var projectOrgMappings = await _context.ProjectOrgMappings var projectOrgMappingsQuery = _context.ProjectOrgMappings
.AsNoTracking() .AsNoTracking()
.Include(po => po.ProjectService) .Include(po => po.ProjectService)
.ThenInclude(ps => ps!.Service) .ThenInclude(ps => ps!.Service)
.Include(po => po.Organization) .Include(po => po.Organization)
.Where(po => po.ProjectService != null .Where(po => po.ProjectService != null
&& po.ProjectService.ProjectId == projectId && po.ProjectService.ProjectId == projectId
&& po.TenantId == tenantId) && 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() .Distinct()
.ToListAsync(); .ToListAsync();
@ -2682,6 +2711,65 @@ namespace Marco.Pms.Services.Service
}) })
.ToList(); .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;
var employee = await _context.Employees.AsNoTracking().Include(e => e.JobRole).FirstOrDefaultAsync(e => e.OrganizationId == loggedInEmployee.OrganizationId && e.IsPrimary);
var assignedBy = _mapper.Map<BasicEmployeeVM>(employee);
var assignedDate = project.StartDate.HasValue ? project.StartDate.Value : DateTime.UtcNow;
var completionDate = project.EndDate;
if (!response.Any(r => r.Id == project.PMCId) && pmc != null)
{
response.Add(new ProjectOrganizationVM
{
Id = pmc.Id,
Name = pmc.Name,
Email = pmc.Email,
ContactPerson = pmc.ContactPerson,
SPRID = pmc.SPRID,
logoImage = pmc.logoImage,
AssignedBy = assignedBy,
AssignedDate = assignedDate,
CompletionDate = completionDate
});
}
if (!response.Any(r => r.Id == project.PromoterId) && promoter != null)
{
response.Add(new ProjectOrganizationVM
{
Id = promoter.Id,
Name = promoter.Name,
Email = promoter.Email,
ContactPerson = promoter.ContactPerson,
SPRID = promoter.SPRID,
logoImage = promoter.logoImage,
AssignedBy = assignedBy,
AssignedDate = assignedDate,
CompletionDate = completionDate
});
}
if (!response.Any(r => r.Id == tenant.OrganizationId) && organization != null)
{
response.Add(new ProjectOrganizationVM
{
Id = organization.Id,
Name = organization.Name,
Email = organization.Email,
ContactPerson = organization.ContactPerson,
SPRID = organization.SPRID,
logoImage = organization.logoImage,
AssignedBy = assignedBy,
AssignedDate = assignedDate,
CompletionDate = completionDate
});
}
}
_logger.LogInfo("Fetched {Count} assigned organizations for ProjectId: {ProjectId}", response.Count, projectId); _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); return ApiResponse<object>.SuccessResponse(response, "Successfully fetched the list of organizations assigned to the project", 200);