Очистка и анализ кода

AsbCloudApp/Data/ClusterStatDto.cs

@@ -1,8 +1,4 @@
-using System;
+using System.Collections.Generic;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AsbCloudApp.Data
 {

AsbCloudApp/Data/WellOperationDto.cs

@@ -1,10 +1,4 @@
-using System;
+namespace AsbCloudApp.Data
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AsbCloudApp.Data
 {
     public class WellOperationDto : IId
     {

AsbCloudApp/Services/IFileService.cs

@@ -1,6 +1,6 @@
-using System;
+using AsbCloudApp.Data;
+using System;
 using System.Collections.Generic;
-using AsbCloudApp.Data;
 
 namespace AsbCloudApp.Services
 {

AsbCloudApp/Services/ISaubDataCache.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
+using AsbCloudApp.Data;
-using AsbCloudApp.Data;
+using System.Collections.Generic;
 
 namespace AsbCloudApp.Services
 {

AsbCloudDb/Model/AsbCloudDbContext.cs

@@ -139,7 +139,8 @@ namespace AsbCloudDb.Model
                     .HasConstraintName("t_well_t_telemetry_id_fk");
             });
 
-            modelBuilder.Entity<RelationCompanyWell>(entity => {
+            modelBuilder.Entity<RelationCompanyWell>(entity =>
+            {
 
                 entity.HasKey(nameof(RelationCompanyWell.IdCompany), nameof(RelationCompanyWell.IdWell));
 
@@ -298,7 +299,8 @@ namespace AsbCloudDb.Model
                 });
             });
 
-            modelBuilder.Entity<RelationCompanyWell>(entity => {
+            modelBuilder.Entity<RelationCompanyWell>(entity =>
+            {
                 entity.HasData(new List<RelationCompanyWell> {
                     new RelationCompanyWell{ IdWell = 1, IdCompany = 1},
                     new RelationCompanyWell{ IdWell = 2, IdCompany = 1},

AsbCloudDb/Model/RelationCompanyWell.cs

@@ -1,6 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 #nullable disable

AsbCloudDb/Model/User.cs

@@ -1,5 +1,5 @@
-using System.Collections.Generic;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 

AsbCloudInfrastructure/MapsterExtension.cs

@@ -1,8 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Mapster
 {

AsbCloudInfrastructure/ReportDataSourcePgCloud.cs

@@ -74,7 +74,8 @@ namespace AsbSaubReport
             var dataMinDate = dataQuery.Min(e => e.Date);
             var dataMaxDate = dataQuery.Max(e => e.Date);
 
-            var result = new AnalyzeResult { 
+            var result = new AnalyzeResult
+            {
                 MaxDate = dataMinDate < messagesMinDate ? dataMinDate : messagesMinDate,
                 MinDate = dataMaxDate > messagesMaxDate ? dataMaxDate : messagesMaxDate,
                 MessagesCount = messagesCount,

AsbCloudInfrastructure/Services/AnalyticsService.cs

@@ -2,11 +2,11 @@
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
 using AsbCloudInfrastructure.Services.Cache;
+using Mapster;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using Microsoft.EntityFrameworkCore;
-using Mapster;
 
 namespace AsbCloudInfrastructure.Services
 {

AsbCloudInfrastructure/Services/CrudService.cs

@@ -1,9 +1,9 @@
-using System.Collections.Generic;
+using AsbCloudApp.Services;
-using System.Linq;
 using AsbCloudDb.Model;
-using AsbCloudApp.Services;
 using Mapster;
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace AsbCloudInfrastructure.Services
 {

AsbCloudInfrastructure/Services/FileService.cs

@@ -1,10 +1,10 @@
-using System;
+using AsbCloudApp.Data;
-using System.Linq;
-using System.Collections.Generic;
-using Microsoft.EntityFrameworkCore;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace AsbCloudInfrastructure.Services
 {
@@ -12,13 +12,11 @@ namespace AsbCloudInfrastructure.Services
     {
         public string RootPath { get; private set; }
         private readonly IAsbCloudDbContext db;
-        private readonly ITelemetryService telemetryService;
 
-        public FileService(IAsbCloudDbContext db, ITelemetryService telemetryService)
+        public FileService(IAsbCloudDbContext db)
         {
             RootPath = "files";
             this.db = db;
-            this.telemetryService = telemetryService;
         }
 
         public IDictionary<string, int> SaveFilesPropertiesToDb(int idWell, int idCategory,

AsbCloudInfrastructure/Services/LastDataService.cs

@@ -1,7 +1,7 @@
-using System.Linq;
+using AsbCloudApp.Services;
 using AsbCloudDb.Model;
-using AsbCloudApp.Services;
 using Mapster;
+using System.Linq;
 using System.Text.Json;
 
 namespace AsbCloudInfrastructure.Services

AsbCloudInfrastructure/Services/TelemetryOperationDetector.cs

@@ -1,5 +1,5 @@
-using AsbCloudDb.Model;
+using AsbCloudApp.Data;
-using AsbCloudApp.Data;
+using AsbCloudDb.Model;
 using System;
 
 namespace AsbCloudInfrastructure.Services

AsbCloudInfrastructure/Services/TelemetryOperationDetectorService.cs

@@ -1,5 +1,5 @@
-using AsbCloudDb.Model;
+using AsbCloudApp.Data;
-using AsbCloudApp.Data;
+using AsbCloudDb.Model;
 using System.Collections.Generic;
 using System.Linq;
 

AsbCloudInfrastructure/Services/СlusterService.cs

@@ -37,13 +37,15 @@ namespace AsbCloudInfrastructure.Services
                 Latitude = gDeposit.Key.Latitude,
                 Longitude = gDeposit.Key.Longitude,
                 Description = "",
-                Clusters = gDeposit.Select(gCluster=>new ClusterDto {
+                Clusters = gDeposit.Select(gCluster => new ClusterDto
+                {
                     Id = gCluster.Key.Id,
                     Caption = gCluster.Key.Caption,
                     Latitude = gCluster.Key.Latitude,
                     Longitude = gCluster.Key.Longitude,
                     Description = "",
-                    Wells = gCluster.Select(well => new WellDto {
+                    Wells = gCluster.Select(well => new WellDto
+                    {
                         Id = well.Id,
                         Caption = well.Caption,
                         Latitude = well.Latitude,
@@ -169,7 +171,8 @@ namespace AsbCloudInfrastructure.Services
 
             var clusterById = db.Clusters.FirstOrDefault(c => c.Id == idCluster);
 
-            return new ClusterStatDto {
+            return new ClusterStatDto
+            {
                 Id = clusterById.Id,
                 Description = "",
                 Caption = clusterById.Caption,

AsbCloudWebApi/Controllers/CrudController.cs

@@ -1,7 +1,6 @@
-using Microsoft.AspNetCore.Mvc;
+using AsbCloudApp.Data;
-using System.Collections.Generic;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
+using Microsoft.AspNetCore.Mvc;
 
 // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860
 

AsbCloudWebApi/Controllers/FileController.cs

@@ -1,11 +1,11 @@
-using System;
+using AsbCloudApp.Data;
-using System.Linq;
-using System.IO;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.IO;
+using System.Linq;
 
 namespace AsbCloudWebApi.Controllers
 {

AsbCloudWebApi/Controllers/FluidController.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using AsbCloudApp.Data;
-using Microsoft.AspNetCore.Authorization;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace AsbCloudWebApi.Controllers
 {

AsbCloudWebApi/Controllers/LastDataController.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Mvc;
+using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
-using AsbCloudApp.Services;
+using Microsoft.AspNetCore.Mvc;
 
 namespace AsbCloudWebApi.Controllers
 {

AsbCloudWebApi/Controllers/MudDiagramController.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using AsbCloudApp.Data;
-using Microsoft.AspNetCore.Authorization;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace AsbCloudWebApi.Controllers
 {

AsbCloudWebApi/Controllers/NnbDataController.cs

@@ -1,7 +1,7 @@
-using Microsoft.AspNetCore.Mvc;
+using AsbCloudApp.Data;
-using Microsoft.AspNetCore.Authorization;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
 
 namespace AsbCloudWebApi.Controllers
 {

AsbCloudWebApi/Controllers/WellSectionController.cs

@@ -1,12 +1,7 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Controllers
 {

ConsoleApp1/Program.cs

@@ -6,9 +6,6 @@
 //using AutoMapper;
 //using Microsoft.EntityFrameworkCore;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using Mapster;
 
 namespace ConsoleApp1
 {