diff --git a/AsbCloudDb/Readme.md b/AsbCloudDb/Readme.md index 5685a59e..e04daa96 100644 --- a/AsbCloudDb/Readme.md +++ b/AsbCloudDb/Readme.md @@ -55,6 +55,7 @@ SELECT timescaledb_pre_restore(); Terminal: ``` sudo -u postgres psql -p 5499 -U postgres postgres -W < dump_2021-11-26.bak +sudo pg_restore -Fc -d postgres dump_2021-11-26.bak ``` OR psql: ``` diff --git a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj index 47a5fc8b..b83c926e 100644 --- a/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj +++ b/AsbCloudInfrastructure/AsbCloudInfrastructure.csproj @@ -5,7 +5,7 @@ - 1701;1702;IDE0090;IDE0063;IDE0066 + 1701;1702;IDE0090;IDE0063;IDE0066;IDE0054 diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index 5de1ba70..6445d67c 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -40,7 +40,6 @@ namespace AsbCloudInfrastructure.Services if (dtos == default || !dtos.Any()) return 0; - var idTelemetry = telemetryService.GetOrCreateTelemetryIdByUid(uid); var dtosList = dtos.OrderBy(d => d.Date).ToList(); var dtoMinDate = dtosList.First().Date; @@ -55,8 +54,9 @@ namespace AsbCloudInfrastructure.Services foreach (var duplicate in duplicates) dtosList.Remove(duplicate); } - - var timezone = telemetryService.GetTimezone(idTelemetry); + + var idTelemetry = telemetryService.GetOrCreateTelemetryIdByUid(uid); + var timezone = telemetryService.GetTimezone(idTelemetry); var entities = dtosList.Select(dto => { var entity = Convert(dto, timezone.Hours); @@ -171,5 +171,23 @@ namespace AsbCloudInfrastructure.Services public abstract TDto Convert(TModel src, double timezoneOffset); public abstract TModel Convert(TDto src, double timezoneOffset); + + private static double AssumeTimezoneOffset(DateTime nearToCurrentDate) + { + var offset = 5d; + if (nearToCurrentDate.Kind == DateTimeKind.Unspecified) + { + var now = DateTime.UtcNow; + var minutes = 60 * (now.Hour - nearToCurrentDate.Hour) + now.Minute - nearToCurrentDate.Minute; + var minutesPositive = (1440_0000 + minutes) % 1440; //60*24 + var halfsHours = Math.Round(1d * minutesPositive / 30d); // quarters are ignored + var hours = halfsHours / 2; + offset = hours < 12 ? hours : 24 - hours; + } + if (nearToCurrentDate.Kind == DateTimeKind.Local) + offset = TimeZoneInfo.Local.BaseUtcOffset.TotalHours; + + return offset; + } } } diff --git a/AsbCloudInfrastructure/Services/TelemetryService.cs b/AsbCloudInfrastructure/Services/TelemetryService.cs index fd745d4b..90144464 100644 --- a/AsbCloudInfrastructure/Services/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryService.cs @@ -178,7 +178,16 @@ namespace AsbCloudInfrastructure.Services } private Telemetry GetOrCreateTelemetryByUid(string uid) - => cacheTelemetry.GetOrCreate(t => t.RemoteUid == uid, () => new Telemetry { RemoteUid = uid }); + => cacheTelemetry.GetOrCreate(t => t.RemoteUid == uid, () => new Telemetry + { + RemoteUid = uid, + TimeZone = new SimpleTimezone + { + Hours = 5, + IsOverride = false, + TimeZoneId = "default", + } + }); public async Task MergeAsync(int from, int to, CancellationToken token) { diff --git a/AsbCloudWebApi/appsettings.json b/AsbCloudWebApi/appsettings.json index 90d8a207..9e02897a 100644 --- a/AsbCloudWebApi/appsettings.json +++ b/AsbCloudWebApi/appsettings.json @@ -13,7 +13,7 @@ "LocalConnection": "Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True" }, "AllowedHosts": "*", - "Urls": "http://0.0.0.0:5000;https://0.0.0.0:5001" //, + "Urls": "http://0.0.0.0:5000",//;https://0.0.0.0:5001" //, // See https man: https://docs.microsoft.com/en-us/aspnet/core/fundamentals/servers/kestrel/endpoints?view=aspnetcore-6.0 //"Kestrel": { // "Endpoints": { diff --git a/ConsoleApp1/Program.cs b/ConsoleApp1/Program.cs index 017fc129..65203455 100644 --- a/ConsoleApp1/Program.cs +++ b/ConsoleApp1/Program.cs @@ -17,9 +17,28 @@ namespace ConsoleApp1 class Program { + private static double AssumeTimezoneOffset(DateTime nearToCurrentDate) + { + var offset = 5d; + if (nearToCurrentDate.Kind == DateTimeKind.Unspecified) + { + var now = DateTime.UtcNow; + var minutes = 60 * (now.Hour - nearToCurrentDate.Hour) + now.Minute - nearToCurrentDate.Minute; + var minutesPositive = (1440_0000 + minutes) % 1440; //60*24 + var halfsHours = Math.Round(1d * minutesPositive / 30d); // quarters are ignored + var hours = halfsHours / 2; + offset = hours < 12 ? hours : 24 - hours ; + } + if (nearToCurrentDate.Kind == DateTimeKind.Local) + offset = TimeZoneInfo.Local.BaseUtcOffset.TotalHours; + + return offset; + } + static void Main(/*string[] args*/) { - DbDemoDataService.AddDemoData(); + var o = AssumeTimezoneOffset(new DateTime(2022, 01, 10, 15, 40, 00)); + //DbDemoDataService.AddDemoData(); //.GetAwaiter().GetResult(); Console.WriteLine("End of Test");