немного рефакторинга

.semver.txt

@@ -1 +1 @@
-1.0.56
+1.0.60

README.md

@@ -1,5 +1,5 @@
-# JiraTimeBot [![Build status](https://ci.appveyor.com/api/projects/status/anmhfvuj4oq84j1f?svg=true)](https://ci.appveyor.com/project/Monster1025/JiraTimeBot)
+# JiraTimeBot [![Build status](https://ci.appveyor.com/api/projects/status/anmhfvuj4oq84j1f/branch/master?svg=true)](https://ci.appveyor.com/project/monster1025/jiratimebot/branch/master)
-Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку.
+Приложение для автоматического добавления Jira Worklog'ов исходя из количества коммитов в ветку. Возможна работа по JQL-запросу JIRA.
 
 # Ограничения
  - Предполагается что все Ваши репозитории находятся в одной папке (к которой вы указываете путь в настройках).
@@ -19,7 +19,7 @@
  - Время запуска - время автоматического запуска бота. Если была установлена галочка "тестовый прогон" - она будет снята.
  - Минут в рабочем дне - количество распределяемых минут (оыбчно 8 * 60).
  - Рандомных минут - если > 0, то будет прибавлено рандомное количество минут к рабочему времени (но кратное значению округления).
- - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - добавляются стандартные фразы программистов (типа "написание кода").
+ - Добавлять описание (Режим Mercurial) - добавлять ли в описание CommitMessage, если не установлено - описание не заполняются.
  - Автозагрузка - загружать ли программу при старте ОС.
 # Скачать
 Скачать актуальную версию можно тут: https://github.com/monster1025/JiraTimeBot/releases/latest

src/JiraTimeBot/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -1,32 +1,13 @@
 using JiraTimeBot.Configuration;
 using JiraTimeBot.TaskTime.Objects;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 
 namespace JiraTimeBot.JiraIntegration.Comments
 {
     public class JiraDescriptionSource : IJiraDescriptionSource
     {
-        private readonly List<string> _dummyComments = new List<string>
-        {
-            "Написание кода", "написание кода", "программирование", "реализация задачи", "кодинг", "код + тесты", 
-            "кодинг", "написание кода и тестов"
-        };
-
         public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)
         {
-            if (addCommentsToWorklog)
+            return addCommentsToWorklog ? taskTimeItem.Description : "";
-            {
-                return taskTimeItem.Description;
-            }
-
-            if (settings.WorkType == WorkType.Mercurial)
-            {
-                return _dummyComments.OrderBy(f => Guid.NewGuid()).FirstOrDefault();
-            }
-
-            return "";
         }
     }
 }

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -107,9 +107,9 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     issue = jira.Issues.Queryable.FirstOrDefault(f => f.Key == taskTimeItem.Branch);
                 }
-                catch (Exception)
+                catch (Exception ex)
                 {
-
+                    _log.Error($"Ошибка получения задачи из JIRA: {ex.Message} - {ex.InnerException?.Message}");
                 }
                 if (issue == null)
                 {

src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs

@@ -46,28 +46,26 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     foreach (var comment in userComments.OrderBy(f=>f.CreatedDate))
                     {
-                        workTasks.Add(new TaskTimeItem
+                        var item = new TaskTimeItem(issue.Key.Value,
-                        {
+                            issue.Summary,
-                            StartTime = issue.Updated.GetValueOrDefault(date.Value),
+                            1,
-                            Description = issue.Summary,
+                            TimeSpan.Zero,
-                            Branch = issue.Key.Value,
+                            issue.Updated.GetValueOrDefault(date.Value),
-                            FilesAffected = 1,
+                            1,
-                            Commits = 1,
+                            CommitType.Task);
-                            Type = CommitType.Task
+                        workTasks.Add(item);
-                        });
                     }
                 }
                 else
                 {
-                    workTasks.Add(new TaskTimeItem
+                    var item = new TaskTimeItem(issue.Key.Value,
-                    {
+                        issue.Summary,
-                        StartTime = issue.Updated.GetValueOrDefault(date.Value),
+                        1,
-                        Description = issue.Summary,
+                        TimeSpan.Zero,
-                        Branch = issue.Key.Value,
+                        issue.Updated.GetValueOrDefault(date.Value),
-                        FilesAffected = 1,
+                        1,
-                        Commits = 1,
+                        CommitType.Task);
-                        Type = CommitType.Task
+                    workTasks.Add(item);
-                    });
                 }
             }
 

src/JiraTimeBot/JiraTimeBot.csproj

@@ -92,6 +92,7 @@
     <Compile Include="Mercurial\IMercurialLog.cs" />
     <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
     <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
+    <Compile Include="TaskTime\Objects\CommitType.cs" />
     <Compile Include="TaskTime\TaskTimeSpread.cs" />
     <Compile Include="UI\frmMain.cs">
       <SubType>Form</SubType>

src/JiraTimeBot/Mercurial/MercurialLog.cs

@@ -72,19 +72,22 @@ namespace JiraTimeBot.Mercurial
                     }
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
 
-                    var task = new TaskTimeItem
+                    var task = new TaskTimeItem(changeset.Branch,
-                    {
+                        commitMessage,
-                        StartTime = changeset.Timestamp,
+                        1,
-                        Description = commitMessage,
+                        TimeSpan.Zero,
-                        Branch = changeset.Branch,
+                        changeset.Timestamp,
-                        FilesAffected = changeset.PathActions.Count,
+                        changeset.PathActions.Count,
-                        Commits = 1,
+                        GetCommitType(changeset.Branch));
-                        TimeSpent = TimeSpan.Zero,
+
-                        Type = GetCommitType(changeset.Branch)
-                    };
                     if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
                     {
-                        var branch = task.Description.Replace("Merge with", "").Replace(" ", "");
+                        var description = task.Description;
+                        if (description.Contains("\n"))
+                        {
+                            description = description.Split('\n')[0];
+                        }
+                        var branch = description.Replace("Merge with", "").Replace(" ", "");
                         var release = task.Branch.Replace("release", "");
 
                         task.Branch = branch;

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.56")] 
+[assembly: AssemblyVersion("1.0.60")] 
-[assembly: AssemblyFileVersion("1.0.56")] 
+[assembly: AssemblyFileVersion("1.0.60")] 
-[assembly: AssemblyInformationalVersion("1.0.56")] 
+[assembly: AssemblyInformationalVersion("1.0.60")] 

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -0,0 +1,7 @@
+namespace JiraTimeBot.TaskTime.Objects
+{
+    public enum CommitType {
+        Task = 0,
+        Release = 1
+    }
+}

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

@@ -11,10 +11,17 @@ namespace JiraTimeBot.TaskTime.Objects
         public int Commits { get; set; }
         public int FilesAffected { get; set; }
         public CommitType Type { get; set; }
-    }
 
-    public enum CommitType {
+        public TaskTimeItem(string branch, string description, int commits, TimeSpan timeSpent, DateTime startTime, 
-        Task = 0,
+                            int filesAffected, CommitType type)
-        Release = 1
+        {
+            Branch = branch;
+            Description = description;
+            Commits = commits;
+            TimeSpent = timeSpent;
+            StartTime = startTime;
+            FilesAffected = filesAffected;
+            Type = type;
+        }
     }
 }

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -57,7 +57,18 @@ namespace JiraTimeBot.TaskTime
             }
 
             var workTasks = _spreadHelper.SpreadTime(taskCommits, remainMinutes, settings.RoundToMinutes);
-            workTimeItems.AddRange(workTasks);
+            foreach (var workTask in workTasks)
+            {
+                var existingItem = workTimeItems.FirstOrDefault(f => f.Branch == workTask.Branch);
+                if (existingItem != null)
+                {
+                    existingItem.TimeSpent += workTask.TimeSpent;
+                    existingItem.Description += "\r\n" + workTask.Description;
+                    continue;
+                }
+
+                workTimeItems.Add(workTask);
+            }
             workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
 
             remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
@@ -82,19 +93,19 @@ namespace JiraTimeBot.TaskTime
             //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
             if (!string.IsNullOrEmpty(timeControlTask))
             {
-                return new TaskTimeItem
+                return new TaskTimeItem(timeControlTask,
-                {
+                    "Ведение учета времени",
-                    TimeSpent = TimeSpan.FromMinutes(minutes),
+                    1,
-                    Branch = timeControlTask,
+                    TimeSpan.FromMinutes(minutes),
-                    Commits = 1,
+                    DateTime.Now,
-                    Description = "Ведение учета времени"
+                    1,
-                };
+                    CommitType.Task);
             }
 
             return null;
         }
 
-        private void FixTooBigInterval(Settings settings, int totalCommitsCount, int workHours)
+        private void FixTooBigInterval(Settings settings, int workHours, int totalCommitsCount)
         {
             //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
             while (totalCommitsCount > (workHours * (60.0 / settings.RoundToMinutes)))

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -34,19 +34,20 @@ namespace JiraTimeBot.TaskTime
                 {
                     sb.AppendLine($"- {task.Description}");
                 }
-                var taskTimeItem = new TaskTimeItem
+
-                {
+                var timeSpent = appendTime
-                    Branch = taskGroup.Key,
+                    ? TimeSpan.FromMinutes(taskGroup.Sum(f => f.TimeSpent.TotalMinutes)) +
-                    TimeSpent = appendTime ?
+                      TimeSpan.FromMinutes(currentTaskTime)
-                        TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime):
+                    : TimeSpan.FromMinutes(currentTaskTime);
-                        TimeSpan.FromMinutes(currentTaskTime)
+
-                    ,
+                var taskTimeItem = new TaskTimeItem(
-                    Commits = taskGroup.Sum(f=>f.Commits),
+                    taskGroup.Key,
-                    Description = sb.ToString(),
+                    sb.ToString(),
-                    StartTime = taskGroup.Min(f=>f.StartTime),
+                    taskGroup.Sum(f => f.Commits),
-                    FilesAffected = taskGroup.Sum(f=>f.FilesAffected),
+                    timeSpent,
-                    Type = taskGroup.First().Type
+                    taskGroup.Min(f => f.StartTime),
-                };
+                    taskGroup.Sum(f => f.FilesAffected),
+                    taskGroup.First().Type);
 
                 newList.Add(taskTimeItem);
             }