Removing the conflictes between Tenantmanagement and Ashutosh_Task#16_UpdateTenant branches
This commit is contained in:
parent
6ee508645a
commit
c69226c83e
@ -19,6 +19,19 @@ namespace Marco.Pms.Model.Mapper
|
|||||||
OnBoardingDate = createTenant.OnBoardingDate,
|
OnBoardingDate = createTenant.OnBoardingDate,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
public static TenantVM ToTenantVMFromTenant(this Tenant tenant)
|
||||||
|
{
|
||||||
|
return new TenantVM
|
||||||
|
{
|
||||||
|
OrganizationName = tenant.Name,
|
||||||
|
About = tenant.Description,
|
||||||
|
Website = tenant.DomainName,
|
||||||
|
Name = tenant.ContactName,
|
||||||
|
//OragnizationSize = OragnizationSize,
|
||||||
|
ContactNumber = tenant.ContactNumber,
|
||||||
|
OnBoardingDate = tenant.OnBoardingDate,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
15
Marco.Pms.Model/ViewModels/Tenant/TenantVM.cs
Normal file
15
Marco.Pms.Model/ViewModels/Tenant/TenantVM.cs
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
namespace Marco.Pms.Model.ViewModels.Tenant
|
||||||
|
{
|
||||||
|
public class TenantVM
|
||||||
|
{
|
||||||
|
public string OrganizationName { get; set; }
|
||||||
|
public string About { get; set; }
|
||||||
|
public string Website { get; set; }
|
||||||
|
public string Name { get; set; }
|
||||||
|
public string ContactNumber { get; set; }
|
||||||
|
|
||||||
|
//public string? OragnizationSize { get; set; }
|
||||||
|
//public int IndustryId { get; set; }
|
||||||
|
public DateTime OnBoardingDate { get; set; }
|
||||||
|
}
|
||||||
|
}
|
@ -5,6 +5,7 @@ using Marco.Pms.Model.Employees;
|
|||||||
using Marco.Pms.Model.Entitlements;
|
using Marco.Pms.Model.Entitlements;
|
||||||
using Marco.Pms.Model.Mapper;
|
using Marco.Pms.Model.Mapper;
|
||||||
using Marco.Pms.Model.Utilities;
|
using Marco.Pms.Model.Utilities;
|
||||||
|
using Marco.Pms.Model.ViewModels.Tenant;
|
||||||
using MarcoBMS.Services.Service;
|
using MarcoBMS.Services.Service;
|
||||||
using Microsoft.AspNetCore.Identity;
|
using Microsoft.AspNetCore.Identity;
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
@ -67,6 +68,7 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
_context.ApplicationRoles.Add(role);
|
_context.ApplicationRoles.Add(role);
|
||||||
await _context.SaveChangesAsync();
|
await _context.SaveChangesAsync();
|
||||||
|
|
||||||
|
|
||||||
List<FeaturePermission> permissions = await _context.FeaturePermissions.AsNoTracking().ToListAsync();
|
List<FeaturePermission> permissions = await _context.FeaturePermissions.AsNoTracking().ToListAsync();
|
||||||
List<RolePermissionMappings> rolePermissionMappings = new List<RolePermissionMappings>();
|
List<RolePermissionMappings> rolePermissionMappings = new List<RolePermissionMappings>();
|
||||||
|
|
||||||
@ -106,7 +108,7 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
};
|
};
|
||||||
_context.EmployeeRoleMappings.Add(employeeRoleMapping);
|
_context.EmployeeRoleMappings.Add(employeeRoleMapping);
|
||||||
await _context.SaveChangesAsync();
|
await _context.SaveChangesAsync();
|
||||||
return Ok(newEmployee);
|
return Ok(ApiResponse<object>.SuccessResponse(result.Succeeded, "Tenant created successfully.", 200));
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -122,6 +124,22 @@ namespace Marco.Pms.Services.Controllers
|
|||||||
return BadRequest("Falied to create Tenant");
|
return BadRequest("Falied to create Tenant");
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[HttpGet("profile/{tenantId}")]
|
||||||
|
public async Task<IActionResult> GetTenantProfile(int tenantId)
|
||||||
|
{
|
||||||
|
if (tenantId <= 0)
|
||||||
|
{
|
||||||
|
return BadRequest("Tenant Id is required and must be greater than zero.");
|
||||||
|
}
|
||||||
|
var tenant = await _context.Tenants.FirstOrDefaultAsync(t => t.Id == tenantId);
|
||||||
|
if (tenant == null)
|
||||||
|
{
|
||||||
|
return NotFound("Tenant Not Found");
|
||||||
|
}
|
||||||
|
TenantVM tenantVM = tenant.ToTenantVMFromTenant();
|
||||||
|
return Ok(ApiResponse<object>.SuccessResponse(tenantVM, "Tenant Profile.", 200));
|
||||||
|
}
|
||||||
[HttpPost("edit/{tenantId}")]
|
[HttpPost("edit/{tenantId}")]
|
||||||
public async Task<IActionResult> SuspendTenant(int tenantId,UpdateTenantDto model)
|
public async Task<IActionResult> SuspendTenant(int tenantId,UpdateTenantDto model)
|
||||||
{
|
{
|
||||||
|
Loading…
x
Reference in New Issue
Block a user