Поправлен баг с письмом о закрытии (#2839)

* И еще раз были проблемы с форматированием сообщений

* Добавить GlobalUsings в Services.Impl.Test

* Тесты на staledatecalculator

* Улучшены логи

* Убрать неиспользуемую переменную

Author: leotsarev

.editorconfig

@@ -91,7 +91,7 @@ dotnet_style_qualification_for_event = false:warning
 csharp_prefer_braces = true:warning
 
 csharp_style_unused_value_expression_statement_preference = discard_variable:suggestion
-csharp_style_unused_value_assignment_preference = discard_variable:suggestion
+csharp_style_unused_value_assignment_preference = discard_variable:warning
 
 dotnet_sort_system_directives_first = true
 
@@ -107,6 +107,32 @@ csharp_style_expression_bodied_operators = false:silent
 csharp_style_expression_bodied_indexers = true:silent
 csharp_style_throw_expression = true:suggestion
 csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_prefer_simple_default_expression = true:suggestion
+csharp_style_prefer_index_operator = true:suggestion
+csharp_style_prefer_range_operator = true:suggestion
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+csharp_style_inlined_variable_declaration = true:suggestion
+csharp_style_deconstructed_variable_declaration = true:suggestion
+csharp_prefer_static_local_function = true:suggestion
+csharp_style_prefer_readonly_struct = true:suggestion
+csharp_prefer_static_anonymous_function = true:suggestion
+csharp_style_prefer_readonly_struct_member = true:suggestion
+csharp_style_allow_embedded_statements_on_same_line_experimental = true:silent
+csharp_style_allow_blank_lines_between_consecutive_braces_experimental = true:silent
+csharp_style_allow_blank_line_after_colon_in_constructor_initializer_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_conditional_expression_experimental = true:silent
+csharp_style_allow_blank_line_after_token_in_arrow_expression_clause_experimental = true:silent
+csharp_style_prefer_switch_expression = true:suggestion
+csharp_style_prefer_pattern_matching = true:silent
+csharp_style_prefer_not_pattern = true:suggestion
+csharp_style_prefer_extended_property_pattern = true:suggestion
+csharp_style_var_elsewhere = false:silent
 
 
 [*.{cs,vb}]
@@ -159,3 +185,21 @@ dotnet_naming_style.pascal_case.capitalization = pascal_case
 
 # Default severity for analyzer diagnostics with category 'GeneratedRegex'
 dotnet_analyzer_diagnostic.category-GeneratedRegex.severity = warning
+
+
+dotnet_style_prefer_collection_expression = when_types_loosely_match:suggestion
+dotnet_style_readonly_field = true:suggestion
+dotnet_style_predefined_type_for_locals_parameters_members = true:warning
+dotnet_style_predefined_type_for_member_access = true:warning
+dotnet_style_require_accessibility_modifiers = always:warning
+dotnet_style_allow_multiple_blank_lines_experimental = true:silent
+dotnet_style_allow_statement_immediately_after_block_experimental = true:silent
+dotnet_code_quality_unused_parameters = all:suggestion
+dotnet_style_parentheses_in_arithmetic_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_relational_binary_operators = always_for_clarity:suggestion
+dotnet_style_parentheses_in_other_operators = never_if_unnecessary:suggestion
+dotnet_style_qualification_for_field = false:warning
+dotnet_style_qualification_for_property = false:warning
+dotnet_style_qualification_for_method = false:warning
+dotnet_style_qualification_for_event = false:warning

src/JoinRpg.Services.Email/MasterEmailServiceImpl.cs

@@ -27,7 +27,9 @@ public async Task EmailProjectStale(ProjectStaleMail email)
 
         var body = $@"Добрый день, {messageService.GetRecepientPlaceholderName()}
 
-Проект {metadata.ProjectName} был в последний раз активен {email.LastActiveDate:YYYY-MM-dd}. Если до {email.WillCloseDate:YYYY-MM-dd} активность в нем не появится, он автоматически будет закрыт.
+Проект {metadata.ProjectName} был в последний раз активен {email.LastActiveDate:yyyy-MM-dd}. Если до {email.WillCloseDate:yyyy-MM-dd} активность в нем не появится, он автоматически будет закрыт.
+
+Подробности в справке https://docs.joinrpg.ru/ru/latest/project/after.html#id3
 
 Не переживайте, закрытый проект всегда можно будет посмотреть, он не пропадет. Если проект завершен или больше не нужен, вы можете закрыть его сами.
 
@@ -74,7 +76,7 @@ async Task IMasterEmailService.EmailProjectClosedStale(ProjectClosedStaleMail em
 
         var body = $@"Добрый день, {messageService.GetRecepientPlaceholderName()}
 
-Проект {metadata.ProjectName} был закрыт, т.к. он не был активен с {email.LastActiveDate:YYYY-MM-dd}. Вы всегда можете найти его по ссылке {uriService.GetUri(email.ProjectId)}
+Проект {metadata.ProjectName} был закрыт, т.к. он не был активен с {email.LastActiveDate:yyyy-MM-dd}. Вы всегда можете найти его по ссылке {uriService.GetUri(email.ProjectId)}
 
 --
 {joinRpgSender.DisplayName}

src/JoinRpg.Services.Impl.Test/GlobalUsings.cs

@@ -0,0 +1,2 @@
+global using Shouldly;
+global using Xunit;

src/JoinRpg.Services.Impl.Test/ProjectStaleDateCalculatorTests.cs

@@ -0,0 +1,26 @@
+using JoinRpg.Services.Impl.Projects;
+
+namespace JoinRpg.Services.Impl.Test;
+public class ProjectStaleDateCalculatorTests
+{
+    [Fact]
+    public void InFutureShouldBeSixMonthLater()
+    {
+        var lastUpdated = new DateOnly(2025, 1, 1);
+        ProjectStaleDateCalculator.CalculateCloseDate(lastUpdated).ShouldBe(new DateOnly(2025, 8, 1));
+    }
+
+    [Fact]
+    public void ShouldBeAfterNovebmer2024()
+    {
+        var lastUpdated = new DateOnly(2021, 1, 1);
+        ProjectStaleDateCalculator.CalculateCloseDate(lastUpdated).ShouldBe(new DateOnly(2024, 11, 1));
+    }
+
+    [Fact]
+    public void Scrackanobaza()
+    {
+        var lastUpdated = new DateOnly(2024, 7, 16);
+        ProjectStaleDateCalculator.CalculateCloseDate(lastUpdated).ShouldBe(new DateOnly(2025, 2, 16));
+    }
+}

src/JoinRpg.Services.Impl.Test/SearchKeywordsResolverTest.cs

@@ -1,6 +1,4 @@
 using JoinRpg.Services.Impl.Search;
-using Shouldly;
-using Xunit;
 
 namespace JoinRpg.Services.Impl.Test;
 

src/JoinRpg.Services.Impl/Projects/ProjectPerformCloseJob.cs

@@ -23,7 +23,7 @@ public async Task RunOnce(CancellationToken cancellationToken)
             }
             else
             {
-                logger.LogInformation("Project {project} is stale since {staleDate}. It will be closed now .", staleProject.ProjectId, lastUpdateDate);
+                logger.LogInformation("Project {project} is stale since {staleDate}. It will be closed now.", staleProject.ProjectId, lastUpdateDate);
             }
 
             await projectService.CloseProjectAsStale(new(staleProject.ProjectId), lastUpdateDate);

src/JoinRpg.Services.Impl/Projects/ProjectWarnCloseJob.cs

@@ -15,12 +15,13 @@ public async Task RunOnce(CancellationToken cancellationToken)
         {
             if (staleProject.LastUpdated.Day != today.Day)
             {
-                logger.LogInformation("Project {project} is stale. It will be warned on {dayOfMonth} day of month", staleProject.ProjectId, staleProject.LastUpdated.Day);
+                logger.LogInformation("Project {project} is stale since {staleDate}. It will be warned on {dayOfMonth} day of month",
+                    staleProject.ProjectId,
+                    staleProject.LastUpdated,
+                    staleProject.LastUpdated.Day);
                 continue;
             }
 
-            var project = await projectRepository.GetProjectAsync(staleProject.ProjectId);
-
             var lastUpdateDate = DateOnly.FromDateTime(staleProject.LastUpdated);
             var email = new ProjectStaleMail()
             {