Не трогаем RemainEstimate

.semver.txt

@@ -1 +1 @@
-1.0.52
+1.0.55

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -146,7 +146,7 @@ namespace JiraTimeBot.JiraIntegration
                         {
                             try
                             {
-                                issue.DeleteWorklogAsync(workLog, token: cancellationToken);
+                                issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
                             }
                             catch (Exception ex)
                             {
@@ -172,7 +172,7 @@ namespace JiraTimeBot.JiraIntegration
                     {
                         try
                         {
-                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result;
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
                         }
                         catch (Exception ex)
                         {

src/JiraTimeBot/Mercurial/Modifiers/CommitSkipper.cs

@@ -12,8 +12,8 @@ namespace JiraTimeBot.Mercurial.Modifiers
             }
 
             //Пропускаем Close и Merge коммиты
-            if (commitMessage.StartsWith($"Close {branch} ", StringComparison.InvariantCultureIgnoreCase) ||
+            if (commitMessage.StartsWith($"Close {branch}", StringComparison.InvariantCultureIgnoreCase) ||
-                commitMessage.StartsWith($"Merge with ", StringComparison.InvariantCultureIgnoreCase))
+                commitMessage.StartsWith($"Merge with", StringComparison.InvariantCultureIgnoreCase))
             {
                 return true;
             }

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
 //                                              
 // You can specify all the values or you can default the Build and Revision Numbers                                              
 // by using the '*' as shown below:                                              
-[assembly: AssemblyVersion("1.0.52")] 
+[assembly: AssemblyVersion("1.0.55")] 
-[assembly: AssemblyFileVersion("1.0.52")] 
+[assembly: AssemblyFileVersion("1.0.55")] 
-[assembly: AssemblyInformationalVersion("1.0.52")] 
+[assembly: AssemblyInformationalVersion("1.0.55")] 

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -65,7 +65,7 @@ namespace JiraTimeBot.TaskTime
                 }
 
                 int currentTaskCommits = taskGroup.Count();
-                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RoundToMinutes);
+                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RoundToMinutes, false);
                 remainMinutes = remainMinutes - currentTaskTime;
 
                 var orderedTasks = taskGroup.OrderBy(f => f.Time).ToArray();
@@ -99,7 +99,7 @@ namespace JiraTimeBot.TaskTime
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
             }
 
-            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
+            if ((workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0) || remainMinutes > 0)
             {
                 //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
                 workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);