Фикс версий прошивок

AsbCloudApp/Data/SAUB/TelemetryInfoDto.cs

@@ -67,3 +67,19 @@ public class TelemetryInfoDto
 	/// </summary>
 	public string? Comment { get; set; }
 }
+
+/// <summary>
+/// Информация о телеметрии скважины
+/// </summary>
+public class WellTelemetryInfoDto
+{
+    /// <summary>
+    /// Идентификатор скважины
+    /// </summary>
+    public int IdWell { get; set; }
+
+    /// <summary>
+    /// Информация о телеметрии
+    /// </summary>
+    public TelemetryInfoDto Info { get; set; } = null!;
+}

AsbCloudApp/Requests/TelemetryInfoRequest.cs

@@ -11,10 +11,10 @@ public class TelemetryInfoRequest
 	public int IdCompany { get; set; }
 
 	/// <summary>
-	/// Определяет состояние скважины
+	/// Необязательный параметр. Определяет состояние скважины
 	/// 0 - неизвестно,
 	/// 1 - в работе,
 	/// 2 - завершена
 	/// </summary>
-	public int IdWellState { get; set; }
+	public int? IdWellState { get; set; }
 }

AsbCloudApp/Services/ITelemetryService.cs

@@ -69,7 +69,7 @@ public interface ITelemetryService
     /// <param name="request"></param>
     /// <param name="token"></param>
     /// <returns></returns>
-    Task<IEnumerable<TelemetryInfoDto>> GetInfoAsync(TelemetryInfoRequest request, CancellationToken token);
+    Task<IEnumerable<WellTelemetryInfoDto>> GetInfoAsync(TelemetryInfoRequest request, CancellationToken token);
 
     /// <summary>
     /// Слить данные телеметрии в одну

AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs

@@ -78,15 +78,18 @@ public class TelemetryService : ITelemetryService
         DropTelemetryCache();
     }
 
-    public async Task<IEnumerable<TelemetryInfoDto>> GetInfoAsync(TelemetryInfoRequest request, CancellationToken token)
+    public async Task<IEnumerable<WellTelemetryInfoDto>> GetInfoAsync(TelemetryInfoRequest request, CancellationToken token)
     {
-	    var idTelemetries = await db.Set<Well>()
+	    var wells = db.Set<Well>()
 		    .Include(x => x.RelationCompaniesWells)
-		    .Where(x => x.RelationCompaniesWells.Any(y => y.IdCompany == request.IdCompany) &&
+		    .Where(x => x.RelationCompaniesWells.Any(y => y.IdCompany == request.IdCompany));
-		                x.IdState == request.IdWellState)
+
-		    .Where(x => x.IdTelemetry.HasValue)
+	    if (request.IdWellState.HasValue)
-		    .Select(x => x.IdTelemetry!.Value)
+		    wells = wells.Where(x => x.IdState == request.IdWellState);
-		    .ToArrayAsync(token);
+			    
+		var idTelemetries = await wells.Where(x => x.IdTelemetry.HasValue)
+			.Select(x => x.IdTelemetry!.Value)
+			.ToArrayAsync(token);
 
 	    var key = $"TelemetryInfo_{string.Join("", idTelemetries)}";
 
@@ -94,19 +97,25 @@ public class TelemetryService : ITelemetryService
 	    {
 		    entry.AbsoluteExpirationRelativeToNow = TimeSpan.FromMinutes(10);
 
-		    var query = db.Set<Telemetry>()
+		    var telemetries = await db.Set<Telemetry>()
+			    .Include(x => x.Well)
 			    .Where(x => idTelemetries.Contains(x.Id))
-			    .OrderBy(x => x.Info.DrillingStartDate);
+			    .OrderBy(x => x.Info.DrillingStartDate)
-
-		    var entities = await query
 			    .AsNoTracking()
 			    .ToArrayAsync(token);
 
-		    var dtos = entities.Select(x =>
+		    var dtos = telemetries.Select(x =>
 		    {
-			    var dto = x.Info.Adapt<TelemetryInfoDto>();
+			    var info = x.Info.Adapt<TelemetryInfoDto>();
-			    dto.DrillingStartDate = x.Info.DrillingStartDate.ToRemoteDateTime(dto.TimeZoneOffsetTotalHours);
+                info.DrillingStartDate = x.Info.DrillingStartDate.ToRemoteDateTime(info.TimeZoneOffsetTotalHours);
-			    return dto;
+
+                var dto = new WellTelemetryInfoDto
+                {
+                    IdWell = x.Well!.Id,
+	                Info = info
+                };
+                
+				return dto;
 		    });
 
 		    return dtos;

AsbCloudWebApi/Controllers/TelemetryInfoController.cs

@@ -28,7 +28,8 @@ public class TelemetryInfoController : ControllerBase
 	/// <summary>
 	/// Получить список версий прошивок
 	/// </summary>
-	/// <param name="idWellState">Определяет состояние скважины
+	/// <param name="idWellState">Необязательный параметр. Определяет состояние скважины
+	/// null - возвращаются все записи
 	/// 0 - неизвестно,
 	/// 1 - в работе,
 	/// 2 - завершена</param>
@@ -36,8 +37,8 @@ public class TelemetryInfoController : ControllerBase
 	/// <returns></returns>
 	[HttpGet]
 	[Permission]
-	[ProducesResponseType(typeof(IEnumerable<TelemetryInfoDto>), StatusCodes.Status200OK)]
+	[ProducesResponseType(typeof(IEnumerable<WellTelemetryInfoDto>), StatusCodes.Status200OK)]
-	public async Task<IActionResult> GetAsync([FromQuery] int idWellState, CancellationToken token)
+	public async Task<IActionResult> GetAsync([FromQuery] int? idWellState, CancellationToken token)
 	{
 		var idCompany = User.GetCompanyId();