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

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

Browse Source
This commit is contained in:
KharchenkoVladimir 2021-11-23 11:41:27 +05:00
parent cb52f96069
commit e0a453a1f6
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
AsbCloudInfrastructure/Services/WellService.cs
View File

@ -139,12 +139,27 @@ 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) private WellDto Convert(Well well)
{ {
return new WellDto return new WellDto
{ {
Id = well.Id, Id = well.Id,
Caption = well.Caption, Caption = well.Caption,
IdCluster = well.IdCluster,
Cluster = well.Cluster?.Caption, Cluster = well.Cluster?.Caption,
Deposit = well.Cluster?.Deposit?.Caption, Deposit = well.Cluster?.Deposit?.Caption,
LastTelemetryDate = GetLastTelemetryDate(well.Id), LastTelemetryDate = GetLastTelemetryDate(well.Id),