Исправил Сообщения

.semver.txt

@@ -1 +1 @@
-1.0.66
+1.0.68

src/JiraTimeBot/Configuration/Settings.cs

@@ -61,7 +61,7 @@ namespace JiraTimeBot.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RoundToMinutes == default(int))
+            if (settings.RoundToMinutes == default)
             {
                 errors.Add("Укажите округление времени, например, 10 (минут)");
             }
@@ -137,7 +137,7 @@ namespace JiraTimeBot.Configuration
             File.WriteAllText(settingsPath, settingsString);
         }
 
-        private static string _settingsFileName = "settings.json";
+        private static readonly string _settingsFileName = "settings.json";
     }
 
     public enum WorkType

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -42,7 +42,7 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<Issue> GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
             date = date.GetValueOrDefault(DateTime.Now.Date);
@@ -69,14 +69,14 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             date = date.GetValueOrDefault(DateTime.Now.Date);
             var jql = "issueFunction in workLogged(\"on %DATE% by '%USER%'\")";
             return GetIssuesByJQL(jql, settings, date, cancellationToken);
         }
 
-        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default(CancellationToken))
+        private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
         {
             var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
             foreach (var issue in alreadyLoggedToday)
@@ -85,7 +85,7 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                     var userWorklogs = workLogs.Where(w =>
-                        w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
+                        w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
                             StringComparison.InvariantCultureIgnoreCase)).ToList();
                     foreach (var userWorklog in userWorklogs)
                     {
@@ -100,7 +100,7 @@ namespace JiraTimeBot.JiraIntegration
             }
         }
 
-        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(CancellationToken))
+        public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default)
         {
             date = date.GetValueOrDefault(DateTime.Now.Date).Date;
             var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);

src/JiraTimeBot/JiraIntegration/JiraHistory.cs

@@ -13,7 +13,7 @@ namespace JiraTimeBot.JiraIntegration
     {
         List<TaskTimeItem> GetDayWorklogs(DateTime date,
                                           Settings settings,
-                                          CancellationToken cancellationToken = default(CancellationToken));
+                                          CancellationToken cancellationToken = default);
     }
 
     public class JiraHistory: IJiraHistory
@@ -27,17 +27,16 @@ namespace JiraTimeBot.JiraIntegration
 
         public List<TaskTimeItem> GetDayWorklogs(DateTime date,
                                                  Settings settings,
-                                                 CancellationToken cancellationToken = default(CancellationToken))
+                                                 CancellationToken cancellationToken = default)
         {
-            var tasks = _jiraApi.GetIssuesByJQL("status changed by '%USER%' during (\"%DATE%\",\"%DATE%\")", settings, date, cancellationToken);
+            var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken);
             List<TaskTimeItem> resultItems = new List<TaskTimeItem>();
             foreach (var issue in tasks)
             {
                 var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
                 var user = settings.JiraUserName;
-                //user = "Zoya.Aleksandridi";
                 var userWorklogs = workLogs.Where(w =>
-                    w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
+                    w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user,
                         StringComparison.InvariantCultureIgnoreCase)).ToList();
                 if (!userWorklogs.Any())
                 {
@@ -46,10 +45,14 @@ namespace JiraTimeBot.JiraIntegration
 
                 var firstWorklog = userWorklogs.First();
 
-                var description = string.Join("\r\n", userWorklogs.Select(f => f.Comment).Distinct());
+                var description = string.Join(Environment.NewLine, userWorklogs.Select(f => f.Comment).Distinct());
                 var totalTime = TimeSpan.FromSeconds(userWorklogs.Sum(f => f.TimeSpentInSeconds));
                 var startDate = firstWorklog?.CreateDate ?? date;
                 var commits = userWorklogs.Sum(f => f.Comment.Count(c => c == '\n'));
+                if (commits == 0)
+                {
+                    commits = 1;
+                }
                 var taskType = CommitType.Task;
                 if (description.Contains("Подготовка и публикация"))
                 {

src/JiraTimeBot/Job.cs

@@ -79,7 +79,7 @@ namespace JiraTimeBot
                 mercurial = _mercurialProviders.JiraCommitEmulator;
             }
 
-            List<TaskTimeItem> taskTimes = null;
+            List<TaskTimeItem> taskTimes;
             if (!(tasksProcessor is MeetingProcessor))
             {
                 List<TaskTimeItem> commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken);

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -24,7 +24,7 @@ namespace JiraTimeBot.Mercurial
             _technicalInfoSkipper = technicalInfoSkipper;
         }
         
-        public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default)
         {
             if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath))
             {

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.66")] 
+[assembly: AssemblyVersion("1.0.68")] 
-[assembly: AssemblyFileVersion("1.0.66")] 
+[assembly: AssemblyFileVersion("1.0.68")] 
-[assembly: AssemblyInformationalVersion("1.0.66")] 
+[assembly: AssemblyInformationalVersion("1.0.68")] 

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -21,7 +21,8 @@ namespace JiraTimeBot.TasksProcessors
 
         public void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
         {
-            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
+            var totalTime = TimeSpan.FromSeconds(taskTimes.Sum(f => f.TimeSpent.TotalSeconds));
+            _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам ({totalTime:hh':'mm':'ss}):");
 
             foreach (var taskTime in taskTimes.Where(f=>f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
             {