diff --git a/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs b/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs index b66e243b45edcf4a85d8e1ea42e14e6f2c768501..055dd47d43d109178955f608e694b4b9a06f6167 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/TenantController.cs @@ -36,6 +36,20 @@ namespace Tsi1.Api.Controllers return Ok(result.Data); } + [Authorize(Roles = UserTypes.UdelarAdmin)] + [HttpGet("GetById/{tenantId}")] + public async Task<IActionResult> GetById(int tenantId) + { + var result = await _tenantService.GetById(tenantId); + + if (result.HasError) + { + return BadRequest(result.Message); + } + + return Ok(result.Data); + } + [Authorize(Roles = UserTypes.UdelarAdmin)] [HttpPost("Create")] public async Task<IActionResult> Create(TenantCreateDto newTenant) diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs index 7e714c5ca1c8ab48c0a8adab2240f529521a0f8e..c68328b2d89c6b6acb62f531e7aae345802a1c74 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Interfaces/ITenantService.cs @@ -11,7 +11,7 @@ namespace Tsi1.BusinessLayer.Interfaces { Task<ServiceResult<TenantDetailDto>> GetByName(string tenantName); - Task<ServiceResult<int>> GetById(int tenantId); + Task<ServiceResult<TenantDetailDto>> GetById(int tenantId); Task<ServiceResult<List<TenantPreviewDto>>> GetAll(); diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs index cfd406e7d5951b142523e97aa2401e8846ced7bb..feb2f4a5738eae24dfd68155e4dd988ea3ca0a67 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/TenantService.cs @@ -188,9 +188,9 @@ namespace Tsi1.BusinessLayer.Services return result; } - public async Task<ServiceResult<int>> GetById(int tenantId) + public async Task<ServiceResult<TenantDetailDto>> GetById(int tenantId) { - var result = new ServiceResult<int>(); + var result = new ServiceResult<TenantDetailDto>(); var tenant = await _context.Tenants .FirstOrDefaultAsync(x => x.Id == tenantId); @@ -202,7 +202,7 @@ namespace Tsi1.BusinessLayer.Services return result; } - result.Data = tenant.Id; + result.Data = _mapper.Map<TenantDetailDto>(tenant); return result; }