авточистка проекта

AsbCloudApp/Data/ClusterDto.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 ClusterDto : IMapPoint
     {

AsbCloudApp/Data/IMapPoint.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 interface IMapPoint
     {

AsbCloudApp/Services/IAnalyticsService.cs

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

AsbCloudApp/Services/IClusterService.cs

@@ -1,9 +1,5 @@
 using AsbCloudApp.Data;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AsbCloudApp.Services
 {

AsbCloudApp/Services/IReportService.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 AsbCloudDb.Model;
-using AsbCloudDb.Model;
+using System.Collections.Generic;
 
 namespace AsbCloudApp.Services
 {

AsbCloudApp/Services/IWellService.cs

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

AsbCloudDb/Model/CompanyType.cs

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

AsbCloudDb/Model/IMapPoint.cs

@@ -1,10 +1,4 @@
-using System;
+namespace AsbCloudDb.Model
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AsbCloudDb.Model
 {
     public interface IMapPoint
     {

AsbCloudDb/Model/Operation.cs

@@ -1,7 +1,7 @@
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System.Collections.Generic;
 
 namespace AsbCloudDb.Model
 {

AsbCloudDb/Model/Report.cs

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

AsbCloudDb/Model/WellSection.cs

@@ -1,7 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System;
 using System.Text.Json.Serialization;
 #nullable disable
 

AsbCloudDb/Model/WellSectionType.cs

@@ -1,9 +1,8 @@
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System;
 using System.Text.Json.Serialization;
-using System.Collections.Generic;
 #nullable disable
 
 namespace AsbCloudDb.Model

AsbCloudDb/Model/WellType.cs

@@ -1,9 +1,8 @@
 using Microsoft.EntityFrameworkCore;
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using System;
 using System.Text.Json.Serialization;
-using System.Collections.Generic;
 #nullable disable
 
 namespace AsbCloudDb.Model

AsbCloudInfrastructure/ReportDataSourcePgCloud.cs

@@ -1,9 +1,9 @@
-using AsbSaubReport.Model;
+using AsbCloudDb.Model;
+using AsbSaubReport.Model;
+using Microsoft.EntityFrameworkCore;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using AsbCloudDb.Model;
-using Microsoft.EntityFrameworkCore;
 
 namespace AsbSaubReport
 {

AsbCloudInfrastructure/Services/AnalyticsService.cs

@@ -1,10 +1,10 @@
-using System;
+using AsbCloudApp.Data;
-using System.Linq;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
-using AsbCloudInfrastructure.Services.Cache;
 using AsbCloudDb.Model;
+using AsbCloudInfrastructure.Services.Cache;
+using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace AsbCloudInfrastructure.Services
 {
@@ -147,10 +147,12 @@ namespace AsbCloudInfrastructure.Services
                               where a.IdTelemetry == telemetry.Id &&
                               a.IdOperation != null
                               join o in db.Operations on a.IdOperation equals o.Id
-                              group a by new {
+                              group a by new
+                              {
                                   Interval = Math.Floor((a.UnixDate - workBeginSeconds + timezoneOffset) / intervalSeconds),
                                   OperationId = a.IdOperation,
-                                  o.Name } into g
+                                  o.Name
+                              } into g
                               select new
                               {
                                   IntervalStart = g.Min(d => d.UnixDate),
@@ -159,9 +161,11 @@ namespace AsbCloudInfrastructure.Services
                               }).ToList();
 
             var operationsGroupedByInterval = operations.GroupBy(op => op.IntervalStart)
-                                                        .Select(o => new OperationInfoDto { 
+                                                        .Select(o => new OperationInfoDto
+                                                        {
                                                             IntervalBegin = DateTimeOffset.FromUnixTimeSeconds(o.Key),
-                                                            Operations = o.Select(opr => new OperationDetailsDto { 
+                                                            Operations = o.Select(opr => new OperationDetailsDto
+                                                            {
                                                                 OperationName = opr.OperationName,
                                                                 Duration = opr.OperationsDuration
                                                             }).ToList()

AsbCloudInfrastructure/Services/BackgroundQueue.cs

@@ -1,6 +1,6 @@
-using System;
+using AsbCloudApp.Services;
+using System;
 using System.Collections.Concurrent;
-using AsbCloudApp.Services;
 
 namespace AsbCloudInfrastructure.Services
 {

AsbCloudInfrastructure/Services/BackgroundWorkerService.cs

@@ -1,7 +1,7 @@
-using System.Threading;
+using AsbCloudApp.Services;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Hosting;
-using AsbCloudApp.Services;
+using System.Threading;
+using System.Threading.Tasks;
 
 namespace AsbCloudInfrastructure.Services
 {

AsbCloudInfrastructure/Services/Cache/CacheDb.cs

@@ -1,5 +1,5 @@
-using System;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
+using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 

AsbCloudInfrastructure/Services/OperationDetector.cs

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

AsbCloudInfrastructure/Services/OperationDetectorService.cs

@@ -1,6 +1,6 @@
-using System.Collections.Generic;
+using AsbCloudDb.Model;
+using System.Collections.Generic;
 using System.Linq;
-using AsbCloudDb.Model;
 
 namespace AsbCloudInfrastructure.Services
 {

AsbCloudInfrastructure/Services/ReportService.cs

@@ -1,13 +1,13 @@
-using AsbCloudApp.Services;
+using AsbCloudApp.Data;
-using AsbCloudApp.Data;
+using AsbCloudApp.Services;
 using AsbCloudDb.Model;
-using System;
+using AsbSaubReport;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
-using AsbSaubReport;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
 
 namespace AsbCloudInfrastructure.Services
 {
@@ -111,7 +111,8 @@ namespace AsbCloudInfrastructure.Services
                                     To = g.Max()
                                 }).OrderBy(gr => gr.From).FirstOrDefault();
 
-            return new DatesRangeDto { 
+            return new DatesRangeDto
+            {
                 From = datesRange.From,
                 To = datesRange.To.Year == 1 ? DateTime.MaxValue : datesRange.To
             };

AsbCloudInfrastructure/Services/SaubDataCache.cs

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

AsbCloudInfrastructure/Services/TelemetryTracker.cs

@@ -1,7 +1,7 @@
-using System;
+using AsbCloudApp.Services;
+using System;
 using System.Collections.Generic;
 using System.Linq;
-using AsbCloudApp.Services;
 
 namespace AsbCloudInfrastructure.Services
 {

AsbCloudInfrastructure/Services/TelemetryUserService.cs

@@ -1,6 +1,6 @@
-using AsbCloudApp.Data;
+using AsbCloudApp.Comparators;
+using AsbCloudApp.Data;
 using AsbCloudApp.Services;
-using AsbCloudApp.Comparators;
 using AsbCloudDb.Model;
 using AsbCloudInfrastructure.Services.Cache;
 using System.Collections.Generic;

AsbCloudInfrastructure/Services/WellService.cs

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

AsbCloudInfrastructure/Services/СlusterService.cs

@@ -1,13 +1,9 @@
 using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using AsbCloudDb.Model;
-using AsbCloudInfrastructure.Services.Cache;
 using Microsoft.EntityFrameworkCore;
-using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AsbCloudInfrastructure.Services
 {
@@ -120,7 +116,8 @@ namespace AsbCloudInfrastructure.Services
                 RateOfPenetrationPlan = e.RateOfPenetrationPlan,
                 RouteSpeedFact = e.RouteSpeedFact,
                 RouteSpeedPlan = e.RouteSpeedPlan,
-                Sections = e.Sections.Select(s => new WellSectionDto {
+                Sections = e.Sections.Select(s => new WellSectionDto
+                {
                     BhaDownSpeedFact = s.BhaDownSpeedFact,
                     BhaDownSpeedPlan = s.BhaDownSpeedPlan,
                     BhaUpSpeedFact = s.BhaUpSpeedFact,

AsbCloudWebApi.Tests/ControllersTests/AnalyticsControllerTests.cs

@@ -1,13 +1,13 @@
-using System;
+using AsbCloudApp.Data;
+using AsbCloudApp.Services;
+using AsbCloudWebApi.Controllers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Moq;
+using System;
 using System.Collections.Generic;
 using System.Security.Claims;
 using Xunit;
-using Moq;
-using Microsoft.AspNetCore.Mvc;
-using Microsoft.AspNetCore.Http;
-using AsbCloudWebApi.Controllers;
-using AsbCloudApp.Services;
-using AsbCloudApp.Data;
 
 namespace AsbCloudWebApi.Tests.ControllersTests
 {

AsbCloudWebApi/Controllers/AnalyticsController.cs

@@ -1,10 +1,10 @@
-using System;
+using AsbCloudApp.Data;
-using System.Linq;
-using System.Collections.Generic;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace AsbCloudWebApi.Controllers
 {

AsbCloudWebApi/Controllers/ClusterController.cs

@@ -1,12 +1,8 @@
 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
 {
@@ -45,36 +41,36 @@ namespace AsbCloudWebApi.Controllers
         /// <summary>
         /// Получение доступных пользователю скважин
         /// </summary>
-        /// <param name="clusterId"></param>
+        /// <param name="idCluster"></param>
         /// <returns></returns>
-        [HttpGet("{clusterId}")]
+        [HttpGet("{idCluster}")]
         [ProducesResponseType(typeof(IEnumerable<WellDto>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetWells(int clusterId)
+        public IActionResult GetWells(int idCluster)
         {
             int? idCompany = User.GetCompanyId();
 
             if (idCompany is null)
                 return Forbid();
 
-            var result = clusterService.GetWells((int)idCompany, clusterId);
+            var result = clusterService.GetWells((int)idCompany, idCluster);
             return Ok(result);
         }
 
         /// <summary>
-        /// Получение обопщенной аналитики по кусту (лучшая/худшая скважина)
+        /// Получение обопщенной статистики по кусту (лучшая/худшая скважина)
         /// </summary>
-        /// <param name="clusterId"></param>
+        /// <param name="idCluster"></param>
         /// <returns></returns>
-        [HttpGet("{clusterId}/Analysis")]
+        [HttpGet("{idCluster}/Stat")]
         [ProducesResponseType(typeof(IEnumerable<WellDrillingStatDto>), (int)System.Net.HttpStatusCode.OK)]
-        public IActionResult GetAnalysis(int clusterId)
+        public IActionResult GetStat(int idCluster)
         {
             int? idCompany = User.GetCompanyId();
 
             if (idCompany is null)
                 return Forbid();
 
-            var result = clusterService.GetStat((int)idCompany, clusterId);
+            var result = clusterService.GetStat((int)idCompany, idCluster);
             return Ok(result);
         }
     }

AsbCloudWebApi/Controllers/DepositController.cs

@@ -1,12 +1,8 @@
 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
 {

AsbCloudWebApi/Controllers/ReportController.cs

@@ -1,13 +1,13 @@
-using System;
+using AsbCloudApp.Data;
-using System.Collections.Generic;
-using System.Linq;
-using System.IO;
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using AsbCloudApp.Data;
 using AsbCloudApp.Services;
 using AsbCloudWebApi.SignalR;
+using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.SignalR;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.Controllers
 {
@@ -30,7 +30,8 @@ namespace AsbCloudWebApi.Controllers
         }
 
         private void HandleReportProgressAsync(float progress, string operation, int id) =>
-            Task.Run(()=> {
+            Task.Run(() =>
+            {
                 reportsHubContext.Clients.Group($"Report_{id}").SendAsync(
                     nameof(IReportHubClient.GetReportProgress),
                     new { Progress = progress, Operation = operation, ReportName = "" }
@@ -38,7 +39,8 @@ namespace AsbCloudWebApi.Controllers
             });
 
         private void HandleReportNameAsync(string reportName, int groupId) =>
-            Task.Run(() => {
+            Task.Run(() =>
+            {
                 reportsHubContext.Clients.All.SendAsync(
                     nameof(IReportHubClient.GetReportProgress),
                     new { Progress = 100, Operation = "Отчет успешно создан", ReportName = reportName }

AsbCloudWebApi/DependencyInjection.cs

@@ -1,6 +1,5 @@
 using AsbCloudInfrastructure.Services;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.IdentityModel.Tokens;
 using Microsoft.OpenApi.Models;

AsbCloudWebApi/SignalR/ReportsHub.cs

@@ -1,6 +1,6 @@
-using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.SignalR;
+using System.Threading.Tasks;
 
 namespace AsbCloudWebApi.SignalR
 {

ConsoleApp1/AnalyzeResult.cs

@@ -1,8 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace ConsoleApp1
 {
@@ -12,7 +8,8 @@ namespace ConsoleApp1
     public enum RotorState { Inactive, Active }
     public enum PressureState { Inactive, Active }
     public enum HookWeightState { Idle, None }
-    public enum DrillingOperation { 
+    public enum DrillingOperation
+    {
         Unknown,
         RotorDrilling,
         SlideDrilling,

ConsoleApp1/Program.cs

@@ -29,7 +29,8 @@ namespace ConsoleApp1
                 .UseNpgsql("Host=localhost;Database=postgres;Username=postgres;Password=q;Persist Security Info=True")
                 .Options;
 
-            var acfg = new MapperConfiguration(cfg => {
+            var acfg = new MapperConfiguration(cfg =>
+            {
                 cfg.CreateMap<DataSaubBase, DataSaubBaseDto>();
                 cfg.CreateMap<DataSaubBaseDto, DataSaubBase>();
 

DataTable/Program.cs

@@ -1,12 +1,4 @@
-using System;
+namespace DataTable
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using System.Text.Json;
-
-namespace DataTable
 {
     class Program
     {

DataTable/PropertyHelper.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq.Expressions;
 using System.Reflection;
-using System.ComponentModel;
 
 namespace DataTable
 {

DataTable/TestDto.cs

@@ -1,9 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace DataTable
 {