Не падаем в случае ошибки добавления-удаления ворклогов

.semver.txt

@@ -1 +1 @@
-1.0.41
+1.0.43

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -123,24 +123,37 @@ namespace JiraTimeBot.JiraIntegration
                 var userWorklogs = workLogs.Where(w =>
                     w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
                         StringComparison.InvariantCultureIgnoreCase)).ToList();
+                var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
 
                 foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
                     var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
-                    if (timeDiff > 1 || userWorklogs.Count > 1)
+                    if (timeDiff > 1 || userWorklogs.Count > 1 || userWorklogs.First().Comment != comment)
                     {
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
-                        else
+                        else if (userWorklogs.Count > 1)
                         {
                             _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
+                        else
+                        {
+                            _log.Trace($"Описание отличается, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
+                        }
                         if (!dummy)
                         {
-                            issue.DeleteWorklogAsync(workLog, token: cancellationToken);
+                            try
+                            {
+                                issue.DeleteWorklogAsync(workLog, token: cancellationToken);
+                            }
+                            catch (Exception ex)
+                            {
+                                _log.Error($"Не могу удалить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
+                                continue;
+                            }
                         }
                         hasTodayWorklog = false;
                     }
@@ -155,12 +168,18 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
 
-                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
-
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)
                     {
-                        workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result;
+                        try
+                        {
+                            workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result;
+                        }
+                        catch (Exception ex)
+                        {
+                            _log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
+                            continue;
+                        }
                     }
                     _log.Trace($"Добавили Worklog для {taskTimeItem.Branch}: {workLogToAdd.Author} {workLogToAdd.CreateDate}: {workLogToAdd.TimeSpent}");
                 }

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -37,7 +37,7 @@ namespace JiraTimeBot.JiraIntegration
                 var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
 
                 var user = settings.JiraUserName;
-                //user = "Zoya.Aleksandridi";
+                user = "Zoya.Aleksandridi";
                 var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList();
                 _log.Trace($"Получены комментарии по задаче {issue.Key} ({issue.Type?.Name}): {userComments.Count}.");
 

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.41")] 
+[assembly: AssemblyVersion("1.0.43")] 
-[assembly: AssemblyFileVersion("1.0.41")] 
+[assembly: AssemblyFileVersion("1.0.43")] 
-[assembly: AssemblyInformationalVersion("1.0.41")] 
+[assembly: AssemblyInformationalVersion("1.0.43")]