From 212989b3b6c7a0f3a9317b16e096cae63d95e067 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A4=D1=80=D0=BE=D0=BB=D0=BE=D0=B2?= Date: Mon, 15 Nov 2021 16:52:12 +0500 Subject: [PATCH] fix analyze recomendations --- AsbCloudDb/EFExtentions.cs | 10 +++++----- AsbCloudInfrastructure/Services/FileService.cs | 5 ++--- .../Services/GoogleDriveService.cs | 2 +- .../Services/TelemetryDataBaseService.cs | 2 -- AsbCloudWebApi/Controllers/FileController.cs | 2 +- ConsoleApp1/Program.cs | 13 +------------ 6 files changed, 10 insertions(+), 24 deletions(-) diff --git a/AsbCloudDb/EFExtentions.cs b/AsbCloudDb/EFExtentions.cs index e15749b1..1490e747 100644 --- a/AsbCloudDb/EFExtentions.cs +++ b/AsbCloudDb/EFExtentions.cs @@ -13,7 +13,7 @@ namespace AsbCloudDb { static Dictionary QueryFactories { get; set; } = new Dictionary(); - static IQueryStringFactory GetQueryStringFactory(DbSet dbset, IEnumerable items) + static IQueryStringFactory GetQueryStringFactory(DbSet dbset) where T : class { var t = typeof(T); @@ -30,7 +30,7 @@ namespace AsbCloudDb public static Task ExecInsertOrUpdateAsync(this Microsoft.EntityFrameworkCore.Infrastructure.DatabaseFacade database, DbSet dbset, IEnumerable items, CancellationToken token) where T : class { - var factory = (QueryStringFactory)GetQueryStringFactory(dbset, items); + var factory = (QueryStringFactory)GetQueryStringFactory(dbset); var query = factory.MakeInsertOrUpdateSql(items); return database.ExecuteSqlRawAsync(query, token); } @@ -43,9 +43,9 @@ namespace AsbCloudDb { private readonly string pk; private readonly string tableName; - private string colunmsString; - private string conflictUpdateSet; - private IEnumerable getters; + private readonly string colunmsString; + private readonly string conflictUpdateSet; + private readonly IEnumerable getters; public QueryStringFactory(DbSet dbset) { diff --git a/AsbCloudInfrastructure/Services/FileService.cs b/AsbCloudInfrastructure/Services/FileService.cs index 44ac3bae..c4f792f0 100644 --- a/AsbCloudInfrastructure/Services/FileService.cs +++ b/AsbCloudInfrastructure/Services/FileService.cs @@ -43,7 +43,7 @@ namespace AsbCloudInfrastructure.Services return sharedUrl; } - public async Task GetSharedUrlAsync(FileInfoDto fileInfo, int idUser, + public async Task GetSharedUrlAsync( FileInfoDto fileInfo, int idUser, CancellationToken token) { var fileWebUrl = fileInfo.PublishInfo?.WebStorageFileUrl; @@ -118,8 +118,7 @@ namespace AsbCloudInfrastructure.Services using var newfileStream = new FileStream(filePath, FileMode.Create); await fileStream.CopyToAsync(newfileStream, token).ConfigureAwait(false); - await fileStream.CopyToAsync(newfileStream); - + var dto = entry.Entity.Adapt(); return dto; } diff --git a/AsbCloudInfrastructure/Services/GoogleDriveService.cs b/AsbCloudInfrastructure/Services/GoogleDriveService.cs index bf2234b9..41e85b9d 100644 --- a/AsbCloudInfrastructure/Services/GoogleDriveService.cs +++ b/AsbCloudInfrastructure/Services/GoogleDriveService.cs @@ -146,7 +146,7 @@ namespace AsbCloudInfrastructure.Services CancellationToken token = default) { var command = service.Files.Delete(fileId); - var result = await command.ExecuteAsync(token) + await command.ExecuteAsync(token) .ConfigureAwait(false); } diff --git a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs index b4582a15..e23be42b 100644 --- a/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs +++ b/AsbCloudInfrastructure/Services/TelemetryDataBaseService.cs @@ -24,7 +24,6 @@ namespace AsbCloudInfrastructure.Services protected readonly CacheTable cacheTelemetry; protected readonly CacheTable cacheTelemetryUsers; protected readonly CacheTable cacheWells; - private static int disorderId = (int)DateTime.Now.Ticks % 99; public TelemetryDataBaseService( IAsbCloudDbContext db, @@ -77,7 +76,6 @@ namespace AsbCloudInfrastructure.Services Trace.WriteLine($"Fail to save data telemerty uid: {uid}, idTelemetry {idTelemetry} count: {enitties.Count()} dataDate: {enitties.FirstOrDefault()?.Date}. Message: {ex.Message}"); return 0; } - } public virtual async Task> GetAsync(int idWell, diff --git a/AsbCloudWebApi/Controllers/FileController.cs b/AsbCloudWebApi/Controllers/FileController.cs index 1e659061..8dd2aa74 100644 --- a/AsbCloudWebApi/Controllers/FileController.cs +++ b/AsbCloudWebApi/Controllers/FileController.cs @@ -59,7 +59,7 @@ namespace AsbCloudWebApi.Controllers { var fileStream = file.OpenReadStream(); await fileService.SaveAsync(idWell, idUser??0, idCategory, file.FileName, - fileStream); + fileStream, token).ConfigureAwait(false); } return Ok(); diff --git a/ConsoleApp1/Program.cs b/ConsoleApp1/Program.cs index 0bcbedce..f23cdd81 100644 --- a/ConsoleApp1/Program.cs +++ b/ConsoleApp1/Program.cs @@ -18,18 +18,7 @@ namespace ConsoleApp1 class Program { static void Main(/*string[] args*/) - { - var options = new DbContextOptionsBuilder() - .UseNpgsql("Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True") - .Options; - var context = new AsbCloudDbContext(options); - - //var query = context.Clusters.GetInsertOrUpdateSql( - // new List { - // new Cluster{Caption = "cluster 1", }, - // new Cluster{Caption = "cluster 2"}, - // }); - + { Console.ReadKey(); } }