Исправление алгоритма удаления ворклогов

.semver.txt

@@ -1 +1 @@
-1.0.21
+1.0.22

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -92,26 +92,34 @@ namespace JiraTimeBot.JiraIntegration
 
                 var hasTodayWorklog = false;
                 var workLogs = issue.GetWorklogsAsync().Result;
-                foreach (var workLog in workLogs)
+                var userWorklogs = workLogs.Where(w =>
+                    w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                        StringComparison.InvariantCultureIgnoreCase)).ToList();
+
+                foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
-                    if (workLog.CreateDate.GetValueOrDefault().Date == date && workLog.Author == settings.JiraUserName)
+                    var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
+                    if (timeDiff > 1 || userWorklogs.Count > 1)
                     {
-                        var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            if (!dummy)
-                            {
-                                issue.DeleteWorklogAsync(workLog);
-                            }
-                            hasTodayWorklog = false;
                         }
                         else
                         {
-                            _log.Trace($"По задаче {taskTimeItem.Branch} уже есть аналогичный worklog. Пропускаю.");
+                            _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
-                            hasTodayWorklog = true;
                         }
+                        if (!dummy)
+                        {
+                            issue.DeleteWorklogAsync(workLog);
+                        }
+                        hasTodayWorklog = false;
+                    }
+                    else
+                    {
+                        _log.Trace($"По задаче {taskTimeItem.Branch} уже есть аналогичный worklog. Пропускаю.");
+                        hasTodayWorklog = true;
                     }
                 }
 

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -1,31 +1,31 @@
-using System.Reflection;            
+using System.Reflection;             
-using System.Runtime.InteropServices;            
+using System.Runtime.InteropServices;             
-// General Information about an assembly is controlled through the following            
+// General Information about an assembly is controlled through the following             
-// set of attributes. Change these attribute values to modify the information            
+// set of attributes. Change these attribute values to modify the information             
-// associated with an assembly.            
+// associated with an assembly.             
-[assembly: AssemblyTitle("JiraTimeBot")]            
+[assembly: AssemblyTitle("JiraTimeBot")]             
-[assembly: AssemblyDescription("")]            
+[assembly: AssemblyDescription("")]             
-[assembly: AssemblyConfiguration("")]            
+[assembly: AssemblyConfiguration("")]             
-[assembly: AssemblyCompany("")]            
+[assembly: AssemblyCompany("")]             
-[assembly: AssemblyProduct("JiraTimeBot")]            
+[assembly: AssemblyProduct("JiraTimeBot")]             
-[assembly: AssemblyCopyright("Copyright © 2019")]            
+[assembly: AssemblyCopyright("Copyright © 2019")]             
-[assembly: AssemblyTrademark("")]            
+[assembly: AssemblyTrademark("")]             
-[assembly: AssemblyCulture("")]            
+[assembly: AssemblyCulture("")]             
-// Setting ComVisible to false makes the types in this assembly not visible            
+// Setting ComVisible to false makes the types in this assembly not visible             
-// to COM components.  If you need to access a type in this assembly from            
+// to COM components.  If you need to access a type in this assembly from             
-// COM, set the ComVisible attribute to true on that type.            
+// COM, set the ComVisible attribute to true on that type.             
-[assembly: ComVisible(false)]            
+[assembly: ComVisible(false)]             
-// The following GUID is for the ID of the typelib if this project is exposed to COM            
+// The following GUID is for the ID of the typelib if this project is exposed to COM             
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]            
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]             
-// Version information for an assembly consists of the following four values:            
+// Version information for an assembly consists of the following four values:             
-//            
+//             
-//      Major Version            
+//      Major Version             
-//      Minor Version            
+//      Minor Version             
-//      Build Number            
+//      Build Number             
-//      Revision            
+//      Revision             
-//            
+//             
-// You can specify all the values or you can default the Build and Revision Numbers            
+// You can specify all the values or you can default the Build and Revision Numbers             
-// by using the '*' as shown below:            
+// by using the '*' as shown below:             
-[assembly: AssemblyVersion("1.0.21")] 
+[assembly: AssemblyVersion("1.0.22")] 
-[assembly: AssemblyFileVersion("1.0.21")] 
+[assembly: AssemblyFileVersion("1.0.22")] 
-[assembly: AssemblyInformationalVersion("1.0.21")] 
+[assembly: AssemblyInformationalVersion("1.0.22")] 

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -78,7 +78,7 @@ namespace JiraTimeBot.TaskTime
                 _log.Trace($"Погрешность распределения времени: {remainMinutes}. Добавляю к первой задаче.");
             }
 
-            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes))
+            if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
             {
                 //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
                 workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);