diff --git a/AsbCloudApp/Services/IWellService.cs b/AsbCloudApp/Services/IWellService.cs
index 7c1cc8fd..a1df94f3 100644
--- a/AsbCloudApp/Services/IWellService.cs
+++ b/AsbCloudApp/Services/IWellService.cs
@@ -25,6 +25,14 @@ namespace AsbCloudApp.Services
///
Task> GetAsync(WellRequest request, CancellationToken token);
+ ///
+ /// Статистика по скважине
+ ///
+ ///
+ ///
+ ///
+ Task GetOrDefaultStatAsync(int idWell, CancellationToken token);
+
///
/// проверяет доступ к скважине для компании
///
@@ -34,6 +42,7 @@ namespace AsbCloudApp.Services
///
Task IsCompanyInvolvedInWellAsync(int idCompany, int idWell, CancellationToken token);
+ //TODO: remove that
///
/// получить название скважины по id
///
@@ -102,13 +111,5 @@ namespace AsbCloudApp.Services
///
///
Task> GetWellTreeAsync(int idCompany, CancellationToken token);
-
- ///
- /// Статистика по скважине
- ///
- ///
- ///
- ///
- Task GetOrDefaultStatAsync(int idWell, CancellationToken token);
}
}
diff --git a/AsbCloudWebApi/Controllers/WellController.cs b/AsbCloudWebApi/Controllers/WellController.cs
index 30b259c8..3ed37d65 100644
--- a/AsbCloudWebApi/Controllers/WellController.cs
+++ b/AsbCloudWebApi/Controllers/WellController.cs
@@ -74,7 +74,8 @@ namespace AsbCloudWebApi.Controllers
/// Информация о требуемой скважине
[HttpGet("{idWell}")]
[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 GetAsync(int idWell, CancellationToken token)
{
var idCompany = User.GetCompanyId();
@@ -82,30 +83,7 @@ namespace AsbCloudWebApi.Controllers
if (idCompany is null || !await wellService.IsCompanyInvolvedInWellAsync(idCompany ?? default, idWell, token).ConfigureAwait(false))
return Forbid();
- var well = await wellService.GetOrDefaultAsync(idWell,
- token).ConfigureAwait(false);
-
- return Ok(well);
- }
-
- ///
- /// Возвращает информацию о требуемой скважине
- ///
- /// Id требуемой скважины
- /// Токен отмены задачи
- /// Информация о требуемой скважине
- [HttpGet("{idWell}/info")]
- [Permission]
- [ProducesResponseType(typeof(WellDto), (int)System.Net.HttpStatusCode.OK)]
- public async Task 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);
+ var well = await wellService.GetOrDefaultStatAsync(idWell, token);
return Ok(well);
}