From 1e9078079a4c32cff5c54bc134adf5e6bf3fb7ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Tue, 7 Dec 2021 15:55:11 +0500 Subject: [PATCH] remove useless argument TelemetryService.GetTransmittingTelemetriesAsync() --- AsbCloudApp/Services/ITelemetryService.cs | 14 ++++++++------ .../Services/TelemetryService.cs | 8 ++++---- AsbCloudInfrastructure/Services/WellService.cs | 2 +- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/AsbCloudApp/Services/ITelemetryService.cs b/AsbCloudApp/Services/ITelemetryService.cs index c61dedc9..3402e1ca 100644 --- a/AsbCloudApp/Services/ITelemetryService.cs +++ b/AsbCloudApp/Services/ITelemetryService.cs @@ -11,20 +11,22 @@ namespace AsbCloudApp.Services ITimeZoneService TimeZoneService { get; } ITelemetryTracker TelemetryTracker { get; } - int? GetidWellByTelemetryUid(string uid); - int GetOrCreateTemetryIdByUid(string uid); + int? GetIdWellByTelemetryUid(string uid); + int GetOrCreateTelemetryIdByUid(string uid); double GetTimezoneOffsetByTelemetryId(int idTelemetry); Task UpdateInfoAsync(string uid, TelemetryInfoDto info, CancellationToken token); Task GetTelemetryTimeZoneOffsetAsync(int idTelemetry, CancellationToken token); + Task FixDatesRangeByTimeZoneAsync(int telemetryId, DatesRangeDto result, - CancellationToken token); + CancellationToken token); + Task UpdateTimeZoneAsync(string uid, TelemetryTimeZoneDto telemetryTimeZoneInfo, CancellationToken token); int? GetIdTelemetryByIdWell(int idWell); int Merge(IEnumerable telemetryIds); - IEnumerable<(string Key, int[] Ids)> GetRedundentRemoteUids(); - IEnumerable GetTransmittingTelemetriesAsync(int idCompany); + IEnumerable<(string Key, int[] Ids)> GetRedundantRemoteUids(); + IEnumerable GetTransmittingTelemetries(); DateTime GetLastTelemetryDate(string telemetryUid); DateTime GetLastTelemetryDate(int telemetryId); void SaveRequestDate(string uid, DateTime remoteDate); } -} +} \ No newline at end of file diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index 26ba1f27..bf490b18 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -40,7 +40,7 @@ namespace AsbCloudInfrastructure.Services this.timeZoneService = timeZoneService; } - public IEnumerable GetTransmittingTelemetriesAsync(int idCompany) + public IEnumerable GetTransmittingTelemetries() { var telemetryDtos = new List(); IEnumerable activeTelemetriesUids = telemetryTracker.GetTransmittingTelemetriesUids(); @@ -74,10 +74,10 @@ namespace AsbCloudInfrastructure.Services return lastTelemetryDate; } - public int GetOrCreateTemetryIdByUid(string uid) + public int GetOrCreateTelemetryIdByUid(string uid) => GetOrCreateTelemetryByUid(uid).Id; - public int? GetidWellByTelemetryUid(string uid) + public int? GetIdWellByTelemetryUid(string uid) => GetWellByTelemetryUid(uid)?.Id; public double GetTimezoneOffsetByTelemetryId(int idTelemetry) => @@ -219,7 +219,7 @@ namespace AsbCloudInfrastructure.Services private Telemetry GetOrCreateTelemetryByUid(string uid) => cacheTelemetry.GetOrCreate(t => t.RemoteUid == uid, () => new Telemetry { RemoteUid = uid }); - public IEnumerable<(string Key, int[] Ids)> GetRedundentRemoteUids() + public IEnumerable<(string Key, int[] Ids)> GetRedundantRemoteUids() { return db.Telemetries .ToList() diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs index 0289915f..fce123ee 100644 --- a/AsbCloudInfrastructure/Services/WellService.cs +++ b/AsbCloudInfrastructure/Services/WellService.cs @@ -41,7 +41,7 @@ namespace AsbCloudInfrastructure.Services public async Task> GetTransmittingWellsAsync(int idCompany, CancellationToken token) { - var activeTelemetryIds = telemetryService.GetTransmittingTelemetriesAsync(idCompany) + var activeTelemetryIds = telemetryService.GetTransmittingTelemetries() .Select(t => t.Id); var wells = await (from w in db.GetWellsForCompany(idCompany)