forked from ddrilling/AsbCloudServer
fix TelemetryService.GetTimezone(). Well.Timezone has higher priority then telemetry.TimeZone.
This commit is contained in:
parent
28cbd75705
commit
bf9a1d50f4
@ -85,6 +85,15 @@ namespace AsbCloudInfrastructure.Services.SAUB
|
|||||||
if (telemetry is null)
|
if (telemetry is null)
|
||||||
throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
|
throw new Exception($"Telemetry id: {idTelemetry} does not exist.");
|
||||||
|
|
||||||
|
if (telemetry.Well?.Timezone is not null)
|
||||||
|
{
|
||||||
|
telemetry.TimeZone = telemetry.Well.Timezone;
|
||||||
|
db.Telemetries.Upsert(telemetry);
|
||||||
|
db.SaveChanges();
|
||||||
|
DropTelemetryCache();
|
||||||
|
return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
|
||||||
|
}
|
||||||
|
|
||||||
if (telemetry.TimeZone is not null)
|
if (telemetry.TimeZone is not null)
|
||||||
return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
|
return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
|
||||||
|
|
||||||
@ -102,14 +111,6 @@ namespace AsbCloudInfrastructure.Services.SAUB
|
|||||||
return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
|
return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (telemetry.Well?.Timezone is not null)
|
|
||||||
{
|
|
||||||
telemetry.TimeZone = telemetry.Well.Timezone;
|
|
||||||
db.Telemetries.Upsert(telemetry);
|
|
||||||
db.SaveChanges();
|
|
||||||
DropTelemetryCache();
|
|
||||||
return telemetry.TimeZone.Adapt<SimpleTimezoneDto>();
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new Exception($"Telemetry id: {idTelemetry} can't find timezone.");
|
throw new Exception($"Telemetry id: {idTelemetry} can't find timezone.");
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user