- Editorconfig

- Файл со словами-исключениями в spellchecker

.editorconfig

@@ -0,0 +1,273 @@
+# Remove the line below if you want to inherit .editorconfig settings from higher directories
+root = true
+
+# C# files
+[*.cs]
+
+#### Core EditorConfig Options ####
+
+# Indentation and spacing
+indent_size = 4
+indent_style = space
+tab_width = 4
+
+# New line preferences
+end_of_line = crlf
+insert_final_newline = false
+
+#### .NET Coding Conventions ####
+
+# Organize usings
+dotnet_separate_import_directive_groups = false
+dotnet_sort_system_directives_first = false
+file_header_template = unset
+
+# this. and Me. preferences
+dotnet_style_qualification_for_event = false
+dotnet_style_qualification_for_field = false
+dotnet_style_qualification_for_method = false
+dotnet_style_qualification_for_property = false
+
+# Language keywords vs BCL types preferences
+dotnet_style_predefined_type_for_locals_parameters_members = true
+dotnet_style_predefined_type_for_member_access = true
+
+# Parentheses preferences
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity
+
+# Modifier preferences
+dotnet_style_require_accessibility_modifiers = for_non_interface_members
+
+# Expression-level preferences
+dotnet_style_coalesce_expression = true
+dotnet_style_collection_initializer = true
+dotnet_style_explicit_tuple_names = true
+dotnet_style_namespace_match_folder = true
+dotnet_style_null_propagation = true
+dotnet_style_object_initializer = true
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+dotnet_style_prefer_auto_properties = true
+dotnet_style_prefer_collection_expression = when_types_loosely_match
+dotnet_style_prefer_compound_assignment = true
+dotnet_style_prefer_conditional_expression_over_assignment = true
+dotnet_style_prefer_conditional_expression_over_return = true
+dotnet_style_prefer_foreach_explicit_cast_in_source = when_strongly_typed
+dotnet_style_prefer_inferred_anonymous_type_member_names = true
+dotnet_style_prefer_inferred_tuple_names = true
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true
+dotnet_style_prefer_simplified_boolean_expressions = true
+dotnet_style_prefer_simplified_interpolation = true
+
+# Field preferences
+dotnet_style_readonly_field = true
+
+# Parameter preferences
+dotnet_code_quality_unused_parameters = all
+
+# Suppression preferences
+dotnet_remove_unnecessary_suppression_exclusions = none
+
+# New line preferences
+dotnet_style_allow_multiple_blank_lines_experimental = true
+dotnet_style_allow_statement_immediately_after_block_experimental = true
+
+#### C# Coding Conventions ####
+
+# var preferences
+csharp_style_var_elsewhere = false:silent
+csharp_style_var_for_built_in_types = false:silent
+csharp_style_var_when_type_is_apparent = false:silent
+
+# Expression-bodied members
+csharp_style_expression_bodied_accessors = true:silent
+csharp_style_expression_bodied_constructors = false:silent
+csharp_style_expression_bodied_indexers = true:silent
+csharp_style_expression_bodied_lambdas = true:silent
+csharp_style_expression_bodied_local_functions = false:silent
+csharp_style_expression_bodied_methods = false:silent
+csharp_style_expression_bodied_operators = false:silent
+csharp_style_expression_bodied_properties = true:silent
+
+# Pattern matching preferences
+csharp_style_pattern_matching_over_as_with_null_check = true:suggestion
+csharp_style_pattern_matching_over_is_with_cast_check = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
+
+# Null-checking preferences
+csharp_style_conditional_delegate_call = true:suggestion
+
+# Modifier preferences
+csharp_prefer_static_local_function = true:suggestion
+csharp_preferred_modifier_order = public,private,protected,internal,file,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,required,volatile,async
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+
+# Code-block preferences
+csharp_prefer_braces = true:silent
+csharp_prefer_simple_using_statement = true:suggestion
+csharp_style_namespace_declarations = file_scoped:silent
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_primary_constructors = false:none
+csharp_style_prefer_top_level_statements = true:silent
+
+# Expression-level preferences
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_throw_expression = true:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_expression_statement_preference = discard_variable:silent
+
+# 'using' directive preferences
+csharp_using_directive_placement = outside_namespace:silent
+
+# New line preferences
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+
+#### C# Formatting Rules ####
+
+# New line preferences
+csharp_new_line_before_catch = true
+csharp_new_line_before_else = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_open_brace = all
+csharp_new_line_between_query_expression_clauses = true
+
+# Indentation preferences
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents = true
+csharp_indent_case_contents_when_block = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_switch_labels = true
+
+# Space preferences
+csharp_space_after_cast = false
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_after_comma = true
+csharp_space_after_dot = false
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_around_declaration_statements = false
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_before_comma = false
+csharp_space_before_dot = false
+csharp_space_before_open_square_brackets = false
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_parentheses = false
+csharp_space_between_square_brackets = false
+
+# Wrapping preferences
+csharp_preserve_single_line_blocks = true
+csharp_preserve_single_line_statements = true
+
+#### Naming styles ####
+
+# Naming rules
+
+dotnet_naming_rule.interface_should_be_begins_with_i.severity = suggestion
+dotnet_naming_rule.interface_should_be_begins_with_i.symbols = interface
+dotnet_naming_rule.interface_should_be_begins_with_i.style = begins_with_i
+
+dotnet_naming_rule.types_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.types_should_be_pascal_case.symbols = types
+dotnet_naming_rule.types_should_be_pascal_case.style = pascal_case
+
+dotnet_naming_rule.non_field_members_should_be_pascal_case.severity = suggestion
+dotnet_naming_rule.non_field_members_should_be_pascal_case.symbols = non_field_members
+dotnet_naming_rule.non_field_members_should_be_pascal_case.style = pascal_case
+
+# Symbol specifications
+
+dotnet_naming_symbols.interface.applicable_kinds = interface
+dotnet_naming_symbols.interface.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.interface.required_modifiers = 
+
+dotnet_naming_symbols.types.applicable_kinds = class, struct, interface, enum
+dotnet_naming_symbols.types.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.types.required_modifiers = 
+
+dotnet_naming_symbols.non_field_members.applicable_kinds = property, event, method
+dotnet_naming_symbols.non_field_members.applicable_accessibilities = public, internal, private, protected, protected_internal, private_protected
+dotnet_naming_symbols.non_field_members.required_modifiers = 
+
+# Naming styles
+
+dotnet_naming_style.pascal_case.required_prefix = 
+dotnet_naming_style.pascal_case.required_suffix = 
+dotnet_naming_style.pascal_case.word_separator = 
+dotnet_naming_style.pascal_case.capitalization = pascal_case
+
+dotnet_naming_style.begins_with_i.required_prefix = I
+dotnet_naming_style.begins_with_i.required_suffix = 
+dotnet_naming_style.begins_with_i.word_separator = 
+dotnet_naming_style.begins_with_i.capitalization = pascal_case
+
+# Spell check
+
+spelling_languages = en-us,ru-RU
+spelling_exclusion_path = exclusion.dic
+
+[*.{cs,vb}]
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf
+dotnet_style_coalesce_expression = true:suggestion
+dotnet_style_null_propagation = true:suggestion
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:suggestion
+dotnet_style_prefer_auto_properties = true:silent
+dotnet_style_object_initializer = true:suggestion
+dotnet_style_collection_initializer = true:suggestion
+dotnet_style_prefer_simplified_boolean_expressions = true:suggestion
+dotnet_style_prefer_conditional_expression_over_assignment = true:silent
+dotnet_style_prefer_conditional_expression_over_return = true:silent
+dotnet_style_explicit_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:suggestion
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:silent
+dotnet_style_predefined_type_for_member_access = true:silent
+dotnet_style_qualification_for_field = false:silent
+dotnet_style_qualification_for_property = false:silent
+dotnet_style_qualification_for_method = false:silent
+dotnet_style_qualification_for_event = false:silent
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:silent
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:silent
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:silent

Persistence.API/Controllers/SetpointController.cs

@@ -1,8 +1,8 @@
-using System.Net;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Persistence.Models;
 using Persistence.Repositories;
+using System.Net;
 
 namespace Persistence.API.Controllers;
 
@@ -97,7 +97,6 @@ public class SetpointController : ControllerBase, ISetpointApi
     /// </summary>
     /// <param name="setpointKey"></param>
     /// <param name="newValue"></param>
-	/// <param name="idUser"></param>
     /// <param name="token"></param>
     /// <returns></returns>
     [HttpPost]

Persistence.API/Controllers/TechMessagesController.cs

@@ -1,8 +1,8 @@
-using System.Net;
+using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Persistence.Models;
 using Persistence.Repositories;
+using System.Net;
 
 namespace Persistence.API.Controllers;
 

Persistence.API/Controllers/TimeSeriesController.cs

@@ -11,7 +11,7 @@ namespace Persistence.API.Controllers;
 public class TimeSeriesController<TDto> : ControllerBase, ITimeSeriesDataApi<TDto>
    where TDto : class, ITimeSeriesAbstractDto, new()
 {
-    private ITimeSeriesDataRepository<TDto> timeSeriesDataRepository;
+    private readonly ITimeSeriesDataRepository<TDto> timeSeriesDataRepository;
 
     public TimeSeriesController(ITimeSeriesDataRepository<TDto> timeSeriesDataRepository)
     {
@@ -33,7 +33,7 @@ public class TimeSeriesController<TDto> : ControllerBase, ITimeSeriesDataApi<TDt
     }
 
     /// <summary>
-	/// Получить диапазон дат, для которых есть данные в репозиторие
+    /// Получить диапазон дат, для которых есть данные в репозитории
     /// </summary>
     /// <param name="token"></param>
     /// <returns></returns>

Persistence.API/Controllers/TimestampedSetController.cs

@@ -32,7 +32,7 @@ public class TimestampedSetController : ControllerBase
     /// <returns>кол-во затронутых записей</returns>
     [HttpPost]
     [ProducesResponseType(typeof(int), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> AddRange([FromRoute]Guid idDiscriminator, [FromBody]IEnumerable<TimestampedSetDto> sets, CancellationToken token)
+    public async Task<IActionResult> AddRange([FromRoute] Guid idDiscriminator, [FromBody] IEnumerable<TimestampedSetDto> sets, CancellationToken token)
     {
         var result = await repository.AddRange(idDiscriminator, sets, token);
         return Ok(result);
@@ -50,7 +50,7 @@ public class TimestampedSetController : ControllerBase
     /// <returns>Фильтрованный набор данных с сортировкой по отметке времени</returns>
     [HttpGet]
     [ProducesResponseType(typeof(IEnumerable<TimestampedSetDto>), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, [FromQuery]IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
+    public async Task<IActionResult> Get(Guid idDiscriminator, DateTimeOffset? geTimestamp, [FromQuery] IEnumerable<string>? columnNames, int skip, int take, CancellationToken token)
     {
         var result = await repository.Get(idDiscriminator, geTimestamp, columnNames, skip, take, token);
         return Ok(result);
@@ -66,7 +66,7 @@ public class TimestampedSetController : ControllerBase
     /// <returns>Фильтрованный набор данных с сортировкой по отметке времени</returns>
     [HttpGet("last")]
     [ProducesResponseType(typeof(IEnumerable<TimestampedSetDto>), (int)HttpStatusCode.OK)]
-    public async Task<IActionResult> GetLast(Guid idDiscriminator, [FromQuery]IEnumerable<string>? columnNames, int take, CancellationToken token)
+    public async Task<IActionResult> GetLast(Guid idDiscriminator, [FromQuery] IEnumerable<string>? columnNames, int take, CancellationToken token)
     {
         var result = await repository.GetLast(idDiscriminator, columnNames, take, token);
         return Ok(result);

Persistence.API/DependencyInjection.cs

@@ -1,5 +1,3 @@
-using System.Reflection;
-using System.Text.Json.Nodes;
 using Mapster;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.IdentityModel.Tokens;
@@ -9,6 +7,8 @@ using Persistence.Database.Entity;
 using Persistence.Models;
 using Persistence.Models.Configurations;
 using Swashbuckle.AspNetCore.SwaggerGen;
+using System.Reflection;
+using System.Text.Json.Nodes;
 
 namespace Persistence.API;
 
@@ -28,12 +28,12 @@ public static class DependencyInjection
             c.MapType<DateOnly>(() => new OpenApiSchema { Type = "string", Format = "date" });
             c.MapType<JsonValue>(() => new OpenApiSchema
             {
-                AnyOf = new OpenApiSchema[]
+                AnyOf =
-                {
+                [
-                    new OpenApiSchema {Type = "string", Format = "string" },
+                    new() {Type = "string", Format = "string" },
-                    new OpenApiSchema {Type = "number", Format = "int32" },
+                    new() {Type = "number", Format = "int32" },
-                    new OpenApiSchema {Type = "number", Format = "float" },
+                    new() {Type = "number", Format = "float" },
-                }
+                ]
             });
 
             c.CustomOperationIds(e =>
@@ -45,8 +45,8 @@ public static class DependencyInjection
 
             var needUseKeyCloak = configuration.GetSection("NeedUseKeyCloak").Get<bool>();
             if (needUseKeyCloak)
-				c.AddKeycloackSecurity(configuration);
+                c.AddKeycloakSecurity(configuration);
-			else c.AddDefaultSecurity(configuration);
+            else c.AddDefaultSecurity();
 
             var xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml";
             var xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile);
@@ -135,9 +135,9 @@ public static class DependencyInjection
     #endregion
 
     #region Security (Swagger)
-	private static void AddKeycloackSecurity(this SwaggerGenOptions options, IConfiguration configuration)
+    private static void AddKeycloakSecurity(this SwaggerGenOptions options, IConfiguration configuration)
     {
-		options.AddSecurityDefinition("Keycloack", new OpenApiSecurityScheme
+        options.AddSecurityDefinition("Keycloak", new OpenApiSecurityScheme
         {
             Description = @"JWT Authorization header using the Bearer scheme. Enter 'Bearer' [space] and then your token in the text input below. Example: 'Bearer 12345abcdef'",
             Name = "Authorization",
@@ -147,7 +147,8 @@ public static class DependencyInjection
             {
                 Implicit = new OpenApiOAuthFlow
                 {
-					AuthorizationUrl = new Uri(configuration["Authentication:AuthorizationUrl"]),
+                    
+                    AuthorizationUrl = new Uri(configuration["Authentication:AuthorizationUrl"]!),
                 }
             }
         });
@@ -160,7 +161,7 @@ public static class DependencyInjection
                     Reference = new OpenApiReference
                     {
                         Type = ReferenceType.SecurityScheme,
-						Id = "Keycloack"
+                        Id = "Keycloak"
                     },
                     Scheme = "Bearer",
                     Name = "Bearer",
@@ -171,7 +172,7 @@ public static class DependencyInjection
         });
     }
 
-	private static void AddDefaultSecurity(this SwaggerGenOptions options, IConfiguration configuration)
+    private static void AddDefaultSecurity(this SwaggerGenOptions options)
     {
         options.AddSecurityDefinition("Bearer", new OpenApiSecurityScheme
         {

Persistence.API/Program.cs

@@ -1,6 +1,3 @@
-
-using Persistence.Models;
-
 namespace Persistence.API;
 
 public class Program

Persistence.API/Startup.cs

@@ -1,6 +1,6 @@
-using Persistence.Repository;
+using Persistence.Database.Model;
-using Persistence.Database.Model;
 using Persistence.Database.Postgres;
+using Persistence.Repository;
 
 namespace Persistence.API;
 

Persistence.Client/Helpers/ApiTokenHelper.cs

@@ -1,11 +1,11 @@
-using System.IdentityModel.Tokens.Jwt;
+using Microsoft.Extensions.Configuration;
-using System.Net.Http.Headers;
-using System.Security.Claims;
-using System.Text.Json;
-using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 using Persistence.Models.Configurations;
 using RestSharp;
+using System.IdentityModel.Tokens.Jwt;
+using System.Net.Http.Headers;
+using System.Security.Claims;
+using System.Text.Json;
 
 namespace Persistence.Client.Helpers;
 public static class ApiTokenHelper
@@ -29,10 +29,10 @@ public static class ApiTokenHelper
 
     private static string CreateDefaultJwtToken(this AuthUser authUser)
     {
-		var nameIdetifier = Guid.NewGuid().ToString();
+        var nameIdentifier = Guid.NewGuid().ToString();
         var claims = new List<Claim>()
         {
-			new(ClaimTypes.NameIdentifier, nameIdetifier),
+            new(ClaimTypes.NameIdentifier, nameIdentifier),
             new("client_id", authUser.ClientId),
             new("username", authUser.Username),
             new("password", authUser.Password),
@@ -62,10 +62,10 @@ public static class ApiTokenHelper
         request.AddParameter("client_id", authUser.ClientId);
         request.AddParameter("grant_type", authUser.GrantType);
 
-		var keyCloackResponse = restClient.Post(request);
+        var keycloakResponse = restClient.Post(request);
-		if (keyCloackResponse.IsSuccessful && !String.IsNullOrEmpty(keyCloackResponse.Content))
+        if (keycloakResponse.IsSuccessful && !String.IsNullOrEmpty(keycloakResponse.Content))
         {
-			var token = JsonSerializer.Deserialize<JwtToken>(keyCloackResponse.Content)!;
+            var token = JsonSerializer.Deserialize<JwtToken>(keycloakResponse.Content)!;
             return token.AccessToken;
         }
 

Persistence.Client/PersistenceClientFactory.cs

@@ -1,7 +1,7 @@
-using System.Text.Json;
+using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.Configuration;
 using Persistence.Client.Helpers;
 using Refit;
+using System.Text.Json;
 
 namespace Persistence.Client
 {

Persistence.Database.Postgres/EFExtensionsInitialization.cs

@@ -1,11 +1,6 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
-using System;
-using System.Collections.Generic;
 using System.Diagnostics;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Persistence.Database.Postgres;
 public static class EFExtensionsInitialization

Persistence.Database.Postgres/PersistenceDbContext.cs

@@ -1,7 +1,5 @@
 using Microsoft.EntityFrameworkCore;
-using Npgsql;
 using Persistence.Database.Entity;
-using System.Data.Common;
 
 namespace Persistence.Database.Model;
 public partial class PersistenceDbContext : DbContext

Persistence.Database/EFExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.EntityFrameworkCore.ChangeTracking;
-using System.Text.Json.Serialization;
 using System.Text.Json;
+using System.Text.Json.Serialization;
 
 namespace Persistence.Database;
 

Persistence.Database/Entity/DataSaub.cs

@@ -1,5 +1,4 @@
-using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Persistence.Database.Model;

Persistence.Database/Entity/DrillingSystem.cs

@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
 
 namespace Persistence.Database.Entity;
 public class DrillingSystem

Persistence.Database/Entity/ITimestampedData.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Persistence.Database.Model;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Persistence.Database.Model;
 public interface ITimestampedData
 {
     /// <summary>

Persistence.Database/Entity/Setpoint.cs

@@ -1,5 +1,5 @@
-using System.ComponentModel.DataAnnotations.Schema;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Persistence.Database.Model
 {

Persistence.Database/Entity/TechMessage.cs

@@ -1,6 +1,6 @@
-using System.ComponentModel.DataAnnotations;
+using Microsoft.EntityFrameworkCore;
+using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using Microsoft.EntityFrameworkCore;
 
 namespace Persistence.Database.Entity
 {

Persistence.IntegrationTests/BaseIntegrationTest.cs

@@ -1,10 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 using Persistence.Database.Model;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using Xunit;
 
 namespace Persistence.IntegrationTests;

Persistence.IntegrationTests/Controllers/DataSaubControllerTest.cs

@@ -1,12 +1,11 @@
-using Persistence.Client;
+using Persistence.Database.Model;
-using Persistence.Database.Model;
 using Persistence.Repository.Data;
 using Xunit;
 
 namespace Persistence.IntegrationTests.Controllers;
 public class DataSaubControllerTest : TimeSeriesBaseControllerTest<DataSaub, DataSaubDto>
 {
-    private readonly DataSaubDto dto = new DataSaubDto()
+    private readonly DataSaubDto dto = new()
     {
         AxialLoad = 1,
         BitDepth = 2,

Persistence.IntegrationTests/Controllers/SetpointControllerTest.cs

@@ -1,9 +1,8 @@
-using System.Net;
+using Microsoft.Extensions.DependencyInjection;
-using Microsoft.AspNetCore.Mvc.TagHelpers.Cache;
-using Microsoft.Extensions.DependencyInjection;
 using Persistence.Client;
 using Persistence.Client.Clients;
 using Persistence.Database.Model;
+using System.Net;
 using Xunit;
 
 namespace Persistence.IntegrationTests.Controllers

Persistence.IntegrationTests/Controllers/TechMessagesControllerTest.cs

@@ -1,10 +1,10 @@
-using System.Net;
+using Microsoft.Extensions.Caching.Memory;
-using Microsoft.Extensions.Caching.Memory;
 using Microsoft.Extensions.DependencyInjection;
 using Persistence.Client;
 using Persistence.Client.Clients;
 using Persistence.Database.Entity;
 using Persistence.Models;
+using System.Net;
 using Xunit;
 
 namespace Persistence.IntegrationTests.Controllers
@@ -84,7 +84,7 @@ namespace Persistence.IntegrationTests.Controllers
             //arrange
             var dtos = new List<TechMessageDto>()
             {
-				new TechMessageDto()
+                new()
                 {
                     EventId = Guid.NewGuid(),
                     CategoryId = -1, // < 0
@@ -252,7 +252,7 @@ namespace Persistence.IntegrationTests.Controllers
 
             var dtos = new List<TechMessageDto>()
             {
-				new TechMessageDto()
+                new()
                 {
                     EventId = Guid.NewGuid(),
                     CategoryId = 1,
@@ -262,7 +262,7 @@ namespace Persistence.IntegrationTests.Controllers
                     System = nameof(TechMessageDto.System).ToLower(),
                     UserId = Guid.NewGuid()
                 },
-				new TechMessageDto()
+                new()
                 {
                     EventId = Guid.NewGuid(),
                     CategoryId = 2,

Persistence.IntegrationTests/Controllers/TimeSeriesBaseControllerTest.cs

@@ -1,12 +1,13 @@
-using System.Net;
 using Mapster;
 using Microsoft.Extensions.DependencyInjection;
 using Persistence.Client;
 using Persistence.Client.Clients;
 using Persistence.Database.Model;
+using System.Net;
 using Xunit;
 
 namespace Persistence.IntegrationTests.Controllers;
+
 public abstract class TimeSeriesBaseControllerTest<TEntity, TDto> : BaseIntegrationTest
     where TEntity : class, ITimestampedData, new()
     where TDto : class, new()
@@ -104,7 +105,7 @@ public abstract class TimeSeriesBaseControllerTest<TEntity, TDto> : BaseIntegrat
         Assert.Equal(HttpStatusCode.OK, response.StatusCode);
         Assert.NotNull(response.Content);
 
-        var ratio = entities.Count() / approxPointsCount;
+        var ratio = entities.Count / approxPointsCount;
         if (ratio > 1)
         {
             var expectedResampledCount = entities

Persistence.IntegrationTests/Controllers/TimestampedSetControllerTest.cs

@@ -39,7 +39,7 @@ public class TimestampedSetControllerTest : BaseIntegrationTest
         Guid idDiscriminator = Guid.NewGuid();
         int count = 10;
         IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        var insertResponse = await client.AddRange(idDiscriminator, testSets);
+        await client.AddRange(idDiscriminator, testSets);
 
         // act
         var response = await client.Get(idDiscriminator, null, null, 0, int.MaxValue);
@@ -58,7 +58,7 @@ public class TimestampedSetControllerTest : BaseIntegrationTest
         Guid idDiscriminator = Guid.NewGuid();
         int count = 10;
         IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        var insertResponse = await client.AddRange(idDiscriminator, testSets);
+        await client.AddRange(idDiscriminator, testSets);
         string[] props = ["A"];
 
         // act
@@ -69,7 +69,7 @@ public class TimestampedSetControllerTest : BaseIntegrationTest
         Assert.NotNull(response.Content);
         var items = response.Content!;
         Assert.Equal(count, items.Count());
-        foreach ( var item in items )
+        foreach (var item in items)
         {
             Assert.Single(item.Set);
             var kv = item.Set.First();
@@ -152,7 +152,7 @@ public class TimestampedSetControllerTest : BaseIntegrationTest
         Guid idDiscriminator = Guid.NewGuid();
         int count = 10;
         IEnumerable<TimestampedSetDto> testSets = Generate(count, DateTimeOffset.Now.ToOffset(TimeSpan.FromHours(7)));
-        var insertResponse = await client.AddRange(idDiscriminator, testSets);
+        await client.AddRange(idDiscriminator, testSets);
         var expectedCount = 8;
 
         // act
@@ -172,7 +172,7 @@ public class TimestampedSetControllerTest : BaseIntegrationTest
         Guid idDiscriminator = Guid.NewGuid();
         int count = 10;
         var dateMin = DateTimeOffset.Now;
-        var dateMax = DateTimeOffset.Now.AddSeconds(count-1);
+        var dateMax = DateTimeOffset.Now.AddSeconds(count - 1);
         IEnumerable<TimestampedSetDto> testSets = Generate(count, dateMin.ToOffset(TimeSpan.FromHours(7)));
         var insertResponse = await client.AddRange(idDiscriminator, testSets);
         var tolerance = TimeSpan.FromSeconds(1);

Persistence.IntegrationTests/DbConnection.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Persistence.IntegrationTests;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Persistence.IntegrationTests;
 public class DbConnection
 {
     public string Host { get; set; } = null!;

Persistence.IntegrationTests/EFCoreExtensions.cs

@@ -1,5 +1,4 @@
 using Microsoft.EntityFrameworkCore;
-using Persistence.Database.Model;
 
 namespace Persistence.IntegrationTests;
 public static class EFCoreExtensions

Persistence.IntegrationTests/Extensions/EFCoreExtensions.cs

@@ -7,8 +7,8 @@ public static class EFCoreExtensions
     public static void CleanupDbSet<T>(this PersistenceDbContext dbContext)
        where T : class
     {
-		var dbset = dbContext.Set<T>();
+        var dbSet = dbContext.Set<T>();
-		dbset.RemoveRange(dbset);
+        dbSet.RemoveRange(dbSet);
         dbContext.SaveChanges();
     }
 }

Persistence.IntegrationTests/WebAppFactoryFixture.cs

@@ -5,7 +5,6 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Persistence.API;
-using Persistence.Database;
 using Persistence.Client;
 using Persistence.Database.Model;
 using Persistence.Database.Postgres;

Persistence.Repository/CyclicArray.cs

@@ -1,9 +1,4 @@
-using System;
+using System.Collections;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Persistence.Repository;
 /// <summary>
@@ -134,20 +129,20 @@ public class CyclicArray<T> : IEnumerable<T>
 
     /// <inheritdoc/>
     public IEnumerator<T> GetEnumerator()
-        => new CyclycListEnumerator<T>(array, current, used);
+        => new CyclicListEnumerator<T>(array, current, used);
 
     /// <inheritdoc/>
     IEnumerator IEnumerable.GetEnumerator()
     => GetEnumerator();
 
-    class CyclycListEnumerator<Te> : IEnumerator<Te>
+    class CyclicListEnumerator<Te> : IEnumerator<Te>
     {
         private readonly Te[] array;
         private readonly int used;
         private readonly int first;
         private int current = -1;
 
-        public CyclycListEnumerator(Te[] array, int first, int used)
+        public CyclicListEnumerator(Te[] array, int first, int used)
         {
             this.array = new Te[array.Length];
             array.CopyTo(this.array, 0);

Persistence.Repository/Data/DataSaubDto.cs

@@ -1,5 +1,4 @@
 using Persistence.Models;
-using System.ComponentModel.DataAnnotations.Schema;
 
 namespace Persistence.Repository.Data;
 public class DataSaubDto : ITimeSeriesAbstractDto

Persistence.Repository/Extensions/EFExtensionsSortBy.cs

@@ -261,7 +261,7 @@ public static class EFExtensionsSortBy
             : orderByAscending;
 
         var newQuery = (IOrderedQueryable<TSource>)genericMethod
-            .Invoke(genericMethod, new object[] { query, lambdaExpression })!;
+            .Invoke(genericMethod, [ query, lambdaExpression ])!;
         return newQuery;
     }
 }

Persistence.Repository/Repositories/SetpointRepository.cs

@@ -8,7 +8,7 @@ namespace Persistence.Repository.Repositories
 {
     public class SetpointRepository : ISetpointRepository
     {
-		private DbContext db;
+        private readonly DbContext db;
         public SetpointRepository(DbContext db)
         {
             this.db = db;

Persistence.Repository/Repositories/TimeSeriesDataCachedRepository.cs

@@ -1,6 +1,4 @@
-using Mapster;
+using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json.Linq;
 using Persistence.Database.Model;
 using Persistence.Models;
 

Persistence/API/ITableDataApi.cs

@@ -1,10 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using Persistence.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Persistence.API;
 

Persistence/API/ITimeSeriesBaseDataApi.cs

@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Mvc;
-using Persistence.Models;
 
 namespace Persistence.API;
 

Persistence/API/ITimeSeriesDataApi.cs

@@ -1,10 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 using Persistence.Models;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace Persistence.API;
 

Persistence/Models/ChangeLogDto.cs

@@ -3,7 +3,7 @@ namespace Persistence.Models;
 /// <summary>
 /// Часть записи описывающая изменение
 /// </summary>
-public class ChangeLogDto<T> where T: class
+public class ChangeLogDto<T> where T : class
 {
     /// <summary>
     /// Запись

Persistence/Models/Configurations/JwtParams.cs

@@ -1,5 +1,5 @@
-using System.Text;
+using Microsoft.IdentityModel.Tokens;
-using Microsoft.IdentityModel.Tokens;
+using System.Text;
 
 namespace Persistence.Models.Configurations
 {

Persistence/Models/DatesRangeDto.cs

@@ -1,10 +1,4 @@
-using System;
+namespace Persistence.Models;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Persistence.Models;
 
 /// <summary>
 /// Диапазон дат

Persistence/Repositories/AbstractChangeLogRepository.cs

@@ -1,165 +0,0 @@
-using Microsoft.EntityFrameworkCore;
-using Microsoft.EntityFrameworkCore.Infrastructure;
-using Persistence.Models;
-using System.Linq;
-
-namespace Persistence.Repositories;
-//public abstract class AbstractChangeLogRepository<TEntity, TChangeLogDto, TDto> : IChangeLogRepository<TDto, TChangeLogDto>
-//    where TDto : class, new()
-//    where TEntity : class, IChangeLogAbstract
-//    where TChangeLogDto : ChangeLogDto<TDto>
-//{
-//    private readonly DbContext dbContext;
-
-//    protected AbstractChangeLogRepository(DbContext dbContext)
-//    {
-//        this.dbContext = dbContext;
-//    }
-
-//    public abstract TEntity Convert(TDto entity);
-//    public async Task<int> Clear(int idUser,CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-
-//        //var updateTime = DateTimeOffset.UtcNow;
-
-//        ////todo
-//        //var query = BuildQuery(request);
-//        //query = query.Where(e => e.Obsolete == null);
-
-//        //var entitiesToDelete = await query.ToArrayAsync(token);
-
-//        //foreach (var entity in entitiesToDelete)
-//        //{
-//        //    entity.IdState = IChangeLogAbstract.IdCleared;
-//        //    entity.Obsolete = updateTime;
-//        //    entity.IdEditor = idUser;
-//        //}
-
-//        //var result = await SaveChangesWithExceptionHandling(token);
-//        //return result;
-//    }
-
-//    public async Task<int> ClearAndInsertRange(int idUser, IEnumerable<TDto> dtos, CancellationToken token)
-//    {
-//        var result = 0;
-//        using var transaction = await dbContext.Database.BeginTransactionAsync(token);
-//        try
-//        {
-//            result += await Clear(idUser, token);
-//            result += await InsertRangeWithoutTransaction(idUser, dtos, token);
-
-//            await transaction.CommitAsync(token);
-//            return result;
-//        }
-//        catch
-//        {
-//            await transaction.RollbackAsync(token);
-//            throw;
-//        }
-//    }
-
-//    public Task<IEnumerable<TDto>> GetCurrent(DateTimeOffset moment, CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    public Task<IEnumerable<DateOnly>> GetDatesChange(CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    public Task<IEnumerable<TDto>> GetGtDate(DateTimeOffset date, CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    public async Task<int> AddRange(int idUser, IEnumerable<TDto> dtos, CancellationToken token)
-//    {
-//        using var transaction = dbContext.Database.BeginTransaction();
-//        try
-//        {
-//            var result = await InsertRangeWithoutTransaction(idUser, dtos, token);
-//            await transaction.CommitAsync(token);
-//            return result;
-//        }
-//        catch
-//        {
-//            await transaction.RollbackAsync(token);
-//            throw;
-//        }
-//    }
-
-//    protected abstract DatabaseFacade GetDataBase();
-
-//    public Task<int> MarkAsDeleted(int idUser, IEnumerable<int> ids, CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    public Task<int> UpdateOrInsertRange(int idUser, IEnumerable<TDto> dtos, CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    public Task<int> UpdateRange(int idUser, IEnumerable<TDto> dtos, CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    public Task<IEnumerable<TChangeLogDto>> GetChangeLogForDate(DateTimeOffset? updateFrom, CancellationToken token)
-//    {
-//        throw new NotImplementedException();
-//    }
-
-//    private async Task<int> InsertRangeWithoutTransaction(int idUser, IEnumerable<TDto> dtos, CancellationToken token)
-//    {
-//        var result = 0;
-//        if (dtos.Any())
-//        {
-//            var entities = dtos.Select(Convert);
-//            var creation = DateTimeOffset.UtcNow;
-//            var dbSet = dbContext.Set<TEntity>();
-//            foreach (var entity in entities)
-//            {
-//                entity.Id = default;
-//                entity.IdAuthor = idUser;
-//                entity.Creation = creation;
-//                entity.IdState = IChangeLogAbstract.IdStateActual;
-//                entity.IdEditor = null;
-//                entity.IdPrevious = null;
-//                entity.Obsolete = null;
-//                dbSet.Add(entity);
-//            }
-
-//            result += await SaveChangesWithExceptionHandling(token);
-//        }
-
-//        return result;
-//    }
-
-//    private async Task<int> SaveChangesWithExceptionHandling(CancellationToken token)
-//    {
-//        var result = await dbContext.SaveChangesAsync(token);
-//        return result;
-//        //try
-//        //{
-//        //    var result = await dbContext.SaveChangesAsync(token);
-//        //    return result;
-//        //}
-//        //catch (DbUpdateException ex)
-//        //{
-//        //    if (ex.InnerException is PostgresException pgException)
-//        //        TryConvertPostgresExceptionToValidateException(pgException);
-//        //    throw;
-//        //}
-//    }
-
-
-
-//    //private static void TryConvertPostgresExceptionToValidateException(PostgresException pgException)
-//    //{
-//    //    if (pgException.SqlState == PostgresErrorCodes.ForeignKeyViolation)
-//    //        throw new ArgumentInvalidException("dtos", pgException.Message + "\r\n" + pgException.Detail);
-//    //}
-//}

Persistence/Repositories/ISetpointRepository.cs

@@ -1,4 +1,3 @@
-using Microsoft.AspNetCore.Mvc;
 using Persistence.Models;
 
 namespace Persistence.Repositories;

Persistence/Repositories/ITechMessagesRepository.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
+using Persistence.Models;
-using Persistence.Models;
 
 namespace Persistence.Repositories
 {

exclusion.dic

@@ -0,0 +1,77 @@
+appsettings
+autohold
+Autostart
+dd
+dtos
+HH
+Impl
+MM
+mmss
+modbus
+noload
+Saub
+Toolface
+yyyy
+Автоудержание
+макрооперации
+Макрооперация
+расхаживаний
+расхаживания
+Соотв
+Noload
+updatables
+штропа
+страгивания
+updatables
+MM
+dd
+HH
+mmss
+sqlite
+Serializer
+Auth
+Saub
+lightgray
+appsettings
+AutoScale
+Hmmss
+pinger
+Desc
+qwertyuiopasdfghjklzxcvbnm
+Deserialize
+Deserializer
+Deserializers
+Impl
+Protobuf
+сериализацию
+param
+tcpclient
+tcpserver
+tcplistener
+serialport
+bigendianunicode
+Middlewares
+Referer
+бекапов
+Encoderless
+Безэнкодерный
+безэнкодерного
+энкодеру
+автоудержания
+дифф
+энкодера
+Коэфф
+Миним
+Проворот
+вспом
+Extrem
+выкл
+minidisplay
+oauth
+sbin
+прога
+Persistance
+yyyyMMdd_HHmmssfff
+Serializers
+keycloak
+Params