CS2-107: Added lost data after merge conflict resolve (with dev)

This commit is contained in:
KharchenkoVladimir 2021-11-23 11:41:27 +05:00
parent cb52f96069
commit e0a453a1f6

View File

@ -138,6 +138,20 @@ namespace AsbCloudInfrastructure.Services
_ => "Незвестно",
};
}
public async Task<IEnumerable<int>> GetClusterWellsIdsAsync(int idWell, CancellationToken token)
{
var well = await cacheWells.FirstOrDefaultAsync(w => w.Id == idWell)
.ConfigureAwait(false);
if (well is null)
return null;
var clusterWells = await cacheWells.WhereAsync(w => w.IdCluster == well.IdCluster)
.ConfigureAwait(false);
return clusterWells.Select(w => w.Id);
}
private WellDto Convert(Well well)
{
@ -145,6 +159,7 @@ namespace AsbCloudInfrastructure.Services
{
Id = well.Id,
Caption = well.Caption,
IdCluster = well.IdCluster,
Cluster = well.Cluster?.Caption,
Deposit = well.Cluster?.Deposit?.Caption,
LastTelemetryDate = GetLastTelemetryDate(well.Id),