added the TenantStatus and Industry in get tenant list API
This commit is contained in:
parent
f45ada2be2
commit
05bfa48115
@ -1162,13 +1162,19 @@ namespace MarcoBMS.Services.Controllers
|
|||||||
// Retrieve all TenantOrgMappings that match the organizationId and have a related Tenant
|
// Retrieve all TenantOrgMappings that match the organizationId and have a related Tenant
|
||||||
var tenantOrganizationMapping = await _context.TenantOrgMappings
|
var tenantOrganizationMapping = await _context.TenantOrgMappings
|
||||||
.Include(to => to.Tenant)
|
.Include(to => to.Tenant)
|
||||||
|
.ThenInclude(t => t!.TenantStatus)
|
||||||
|
.Include(to => to.Tenant)
|
||||||
|
.ThenInclude(t => t!.Industry)
|
||||||
.Where(to => to.OrganizationId == organizationId && to.Tenant != null)
|
.Where(to => to.OrganizationId == organizationId && to.Tenant != null)
|
||||||
.ToListAsync();
|
.ToListAsync();
|
||||||
|
|
||||||
var tenantList = tenantOrganizationMapping.Select(to => to.Tenant!).ToList();
|
var tenantList = tenantOrganizationMapping.Select(to => to.Tenant!).ToList();
|
||||||
|
|
||||||
// Additionally fetch the Tenant record associated directly with this OrganizationId if any
|
// Additionally fetch the Tenant record associated directly with this OrganizationId if any
|
||||||
var tenant = await _context.Tenants.FirstOrDefaultAsync(t => t.OrganizationId == organizationId);
|
var tenant = await _context.Tenants
|
||||||
|
.Include(t => t.Industry)
|
||||||
|
.Include(t => t.TenantStatus)
|
||||||
|
.FirstOrDefaultAsync(t => t.OrganizationId == organizationId);
|
||||||
if (tenant != null)
|
if (tenant != null)
|
||||||
{
|
{
|
||||||
tenantList.Add(tenant);
|
tenantList.Add(tenant);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user