From e99ac84c463cbf4ffaab62d2f3deffeac6c6e6c1 Mon Sep 17 00:00:00 2001 From: ngfrolov Date: Mon, 6 Jun 2022 17:00:53 +0500 Subject: [PATCH] Fix TimezoneId mapping, rename TimeZoneId to TimezoneId --- AsbCloudDb/Model/SimpleTimeZone.cs | 2 +- AsbCloudInfrastructure/DependencyInjection.cs | 17 +++++++++++++++++ .../ReportDataSourcePgCloud.cs | 2 +- .../Services/SAUB/TelemetryService.cs | 6 +++--- AsbCloudInfrastructure/Services/WellService.cs | 15 ++------------- AsbCloudWebApi/Startup.cs | 5 +++-- 6 files changed, 27 insertions(+), 20 deletions(-) diff --git a/AsbCloudDb/Model/SimpleTimeZone.cs b/AsbCloudDb/Model/SimpleTimeZone.cs index 2bcba28e..12a27c4d 100644 --- a/AsbCloudDb/Model/SimpleTimeZone.cs +++ b/AsbCloudDb/Model/SimpleTimeZone.cs @@ -4,7 +4,7 @@ namespace AsbCloudDb.Model public class SimpleTimezone { public double Hours { get; set; } - public string TimeZoneId { get; set; } + public string TimezoneId { get; set; } public bool IsOverride { get; set; } } diff --git a/AsbCloudInfrastructure/DependencyInjection.cs b/AsbCloudInfrastructure/DependencyInjection.cs index 435e6418..aff99304 100644 --- a/AsbCloudInfrastructure/DependencyInjection.cs +++ b/AsbCloudInfrastructure/DependencyInjection.cs @@ -51,6 +51,23 @@ namespace AsbCloudInfrastructure TypeAdapterConfig.GlobalSettings.Default.Config .ForType() .MapWith((source) => new(source)); + + TypeAdapterConfig.GlobalSettings.Default.Config + .ForType() + .Ignore(dst => dst.Cluster, + dst => dst.RelationCompaniesWells, + dst => dst.Telemetry, + dst => dst.WellComposites, + dst => dst.WellCompositeSrcs, + dst => dst.WellOperations, + dst => dst.WellType); + + TypeAdapterConfig.GlobalSettings.Default.Config + .ForType() + .Ignore(dst => dst.Deposit, + dst=>dst.Wells); + + } public static IServiceCollection AddInfrastructure(this IServiceCollection services, IConfiguration configuration) diff --git a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs index 67da6b82..b42f44cd 100644 --- a/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs +++ b/AsbCloudInfrastructure/ReportDataSourcePgCloud.cs @@ -58,7 +58,7 @@ namespace AsbCloudInfrastructure Well = well.Caption, Customer = well.RelationCompaniesWells.FirstOrDefault(c => c.Company.IdCompanyType == 1)?.Company.Caption, DrillingStartDate = well.Telemetry?.Info?.DrillingStartDate.ToRemoteDateTime(timezoneOffset) ?? default, - TimeZoneId = well.Telemetry?.Info?.TimeZoneId ?? well.Timezone?.TimeZoneId ?? default, + TimeZoneId = well.Telemetry?.Info?.TimeZoneId ?? well.Timezone?.TimezoneId ?? default, TimeZoneOffsetTotalHours = timezoneOffset, }; } diff --git a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs index 96f5df65..d327a02c 100644 --- a/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs +++ b/AsbCloudInfrastructure/Services/SAUB/TelemetryService.cs @@ -112,7 +112,7 @@ namespace AsbCloudInfrastructure.Services.SAUB telemetry.TimeZone = new SimpleTimezone() { Hours = info.TimeZoneOffsetTotalHours, - TimeZoneId = info.TimeZoneId + TimezoneId = info.TimeZoneId }; await cacheTelemetry.UpsertAsync(telemetry, token) @@ -135,7 +135,7 @@ namespace AsbCloudInfrastructure.Services.SAUB { Hours = telemetry.Info.TimeZoneOffsetTotalHours, IsOverride = false, - TimeZoneId = telemetry.Info.TimeZoneId, + TimezoneId = telemetry.Info.TimeZoneId, }; cacheTelemetry.Upsert(telemetry); return telemetry.TimeZone.Adapt(); @@ -186,7 +186,7 @@ namespace AsbCloudInfrastructure.Services.SAUB { Hours = 5, IsOverride = false, - TimeZoneId = "default", + TimezoneId = "default", } }); diff --git a/AsbCloudInfrastructure/Services/WellService.cs b/AsbCloudInfrastructure/Services/WellService.cs index a163ad6b..ffa5866f 100644 --- a/AsbCloudInfrastructure/Services/WellService.cs +++ b/AsbCloudInfrastructure/Services/WellService.cs @@ -16,17 +16,6 @@ namespace AsbCloudInfrastructure.Services { public class WellService : CrudCacheServiceBase, IWellService { - private static readonly TypeAdapterConfig typeAdapterConfig = TypeAdapterConfig - .NewConfig() - .Ignore(dst => dst.Cluster, - dst => dst.RelationCompaniesWells, - dst => dst.Telemetry, - dst => dst.WellComposites, - dst => dst.WellCompositeSrcs, - dst => dst.WellOperations, - dst => dst.WellType) - .Config; - private const string relationCompaniesWellsCacheTag = "RelationCompaniesWells"; private static readonly TimeSpan relationCompaniesWellsCacheObsolence = TimeSpan.FromMinutes(15); @@ -216,7 +205,7 @@ namespace AsbCloudInfrastructure.Services protected override Well Convert(WellDto dto) { - var entity = dto.Adapt(typeAdapterConfig); + var entity = dto.Adapt(); entity.IdTelemetry = entity.IdTelemetry ?? dto.IdTelemetry ?? dto.Telemetry?.Id; @@ -267,7 +256,7 @@ namespace AsbCloudInfrastructure.Services { Hours = 5, IsOverride = false, - TimeZoneId = "Assumed", + TimezoneId = "Assumed", }; await dbSet.Where(w => w.Timezone == null) diff --git a/AsbCloudWebApi/Startup.cs b/AsbCloudWebApi/Startup.cs index 16c286f0..fe6292e7 100644 --- a/AsbCloudWebApi/Startup.cs +++ b/AsbCloudWebApi/Startup.cs @@ -22,7 +22,9 @@ namespace AsbCloudWebApi services.AddControllers() .AddJsonOptions(new System.Action(options => { - options.JsonSerializerOptions.NumberHandling = System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals | System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString; })) + options.JsonSerializerOptions.NumberHandling = + System.Text.Json.Serialization.JsonNumberHandling.AllowNamedFloatingPointLiterals | + System.Text.Json.Serialization.JsonNumberHandling.AllowReadingFromString;})) .AddProtoBufNet(); ProtobufModel.EnshureRegistered(); @@ -41,7 +43,6 @@ namespace AsbCloudWebApi { policy.AllowAnyHeader() .AllowAnyMethod() - //.SetIsOriginAllowed(h => true) .WithOrigins( "http://0.0.0.0", "http://*",