on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

WellController. Объединил GetAsync и GetStatAsync в GetAsync.

Browse Source
This commit is contained in:
ngfrolov 2023-07-05 16:00:06 +05:00
parent 0230432c8c
commit 1fac8ef565
Signed by: ng.frolov
GPG Key ID: E99907A0357B29A7
2 changed files with 12 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
AsbCloudApp/Services/IWellService.cs
View File

@ -25,6 +25,14 @@ namespace AsbCloudApp.Services
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token); Task<IEnumerable<WellDto>> GetAsync(WellRequest request, CancellationToken token);
/// <summary>
/// Статистика по скважине
/// </summary>
/// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token);
/// <summary> /// <summary>
/// проверяет доступ к скважине для компании /// проверяет доступ к скважине для компании
/// </summary> /// </summary>
@ -34,6 +42,7 @@ namespace AsbCloudApp.Services
/// <returns></returns> /// <returns></returns>
Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token); Task<bool> IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token);
//TODO: remove that
/// <summary> /// <summary>
/// получить название скважины по id /// получить название скважины по id
/// </summary> /// </summary>
@ -102,13 +111,5 @@ namespace AsbCloudApp.Services
/// <param name="token"></param> /// <param name="token"></param>
/// <returns></returns> /// <returns></returns>
Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token); Task<IEnumerable<DepositBranchDto>> GetWellTreeAsync(int idCompany, CancellationToken token);
/// <summary>
/// Статистика по скважине
/// </summary>
/// <param name="idWell"></param>
/// <param name="token"></param>
/// <returns></returns>
Task<WellMapInfoWithTelemetryStat?> GetOrDefaultStatAsync(int idWell, CancellationToken token);
} }
} }

28
AsbCloudWebApi/Controllers/WellController.cs
View File

@ -74,7 +74,8 @@ namespace AsbCloudWebApi.Controllers
/// <returns>Информация о требуемой скважине </returns> /// <returns>Информация о требуемой скважине </returns>
[HttpGet("{idWell}")] [HttpGet("{idWell}")]
[Permission] [Permission]
[ProducesResponseType(typeof(WellDto), (int)System.Net.HttpStatusCode.OK)] [ProducesResponseType(typeof(WellMapInfoWithTelemetryStat), (int)System.Net.HttpStatusCode.OK)]
[ProducesResponseType((int)System.Net.HttpStatusCode.NoContent)]
public async Task<IActionResult> GetAsync(int idWell, CancellationToken token) public async Task<IActionResult> GetAsync(int idWell, CancellationToken token)
{ {
var idCompany = User.GetCompanyId(); var idCompany = User.GetCompanyId();
@ -82,30 +83,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false)) if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
return Forbid(); return Forbid();
var well = await wellService.GetOrDefaultAsync(idWell, var well = await wellService.GetOrDefaultStatAsync(idWell, token);
token).ConfigureAwait(false);
return Ok(well);
}
/// <summary>
/// Возвращает информацию о требуемой скважине
/// </summary>
/// <param name="idWell"> Id требуемой скважины </param>
/// <param name="token"> Токен отмены задачи </param>
/// <returns>Информация о требуемой скважине </returns>
[HttpGet("{idWell}/info")]
[Permission]
[ProducesResponseType(typeof(WellDto), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> GetStatAsync(int idWell, CancellationToken token)
{
var idCompany = User.GetCompanyId();
if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
return Forbid();
var well = await wellService.GetOrDefaultStatAsync(idWell,
token);
return Ok(well); return Ok(well);
} }