Фикс митинга с релизами

.semver.txt

@@ -1 +1 @@
-1.0.57
+1.0.62

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,28 @@ 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),
+                            issue.Project,
-                            Description = issue.Summary,
+                            issue.Updated.GetValueOrDefault(date.Value),
-                            Branch = issue.Key.Value,
+                            TimeSpan.Zero,
-                            FilesAffected = 1,
+                            1,
-                            Commits = 1,
+                            1,
-                            Type = CommitType.Task
+                            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),
+                        issue.Project,
-                        Description = issue.Summary,
+                        issue.Updated.GetValueOrDefault(date.Value),
-                        Branch = issue.Key.Value,
+                        TimeSpan.Zero,
-                        FilesAffected = 1,
+                        1,
-                        Commits = 1,
+                        1,
-                        Type = CommitType.Task
+                        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

@@ -48,6 +48,8 @@ namespace JiraTimeBot.Mercurial
                     continue;
                 }
 
+                var directoryInfo = new DirectoryInfo(repoDirectory);
+
                 var repo = new Repository(repoDirectory);
                 var logCommand = new LogCommand
                 {
@@ -72,24 +74,27 @@ namespace JiraTimeBot.Mercurial
                     }
                     commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
 
-                    var task = new TaskTimeItem
+                    var task = new TaskTimeItem(changeset.Branch,
-                    {
+                        commitMessage,
-                        StartTime = changeset.Timestamp,
+                        directoryInfo.Name,
-                        Description = commitMessage,
+                        changeset.Timestamp,
-                        Branch = changeset.Branch,
+                        TimeSpan.Zero,
-                        FilesAffected = changeset.PathActions.Count,
+                        1,
-                        Commits = 1,
+                        changeset.PathActions.Count,
-                        TimeSpent = TimeSpan.Zero,
+                        GetCommitType(changeset.Branch));
-                        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;
-                        task.Description = $"Подготовка и публикация версии {release}.";
+                        task.Description = $"Подготовка и публикация версии {task.Project} {release}.";
                     }
                     workTasks.Add(task);
                     _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");

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.57")] 
+[assembly: AssemblyVersion("1.0.62")] 
-[assembly: AssemblyFileVersion("1.0.57")] 
+[assembly: AssemblyFileVersion("1.0.62")] 
-[assembly: AssemblyInformationalVersion("1.0.57")] 
+[assembly: AssemblyInformationalVersion("1.0.62")] 

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

@@ -0,0 +1,10 @@
+using System;
+
+namespace JiraTimeBot.TaskTime.Objects
+{
+    [Flags]
+    public enum CommitType {
+        Task = 1,
+        Release = 2
+    }
+}

src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs

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

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -57,7 +57,19 @@ 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;
+                    existingItem.Type |= CommitType.Task;
+                    continue;
+                }
+
+                workTimeItems.Add(workTask);
+            }
             workTimeItems = workTimeItems.OrderByDescending(f => f.TimeSpent).ToList();
 
             remainMinutes = minutesPerWorkDay - (int) workTimeItems.Sum(f => f.TimeSpent.TotalMinutes);
@@ -82,13 +94,14 @@ namespace JiraTimeBot.TaskTime
             //Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
             if (!string.IsNullOrEmpty(timeControlTask))
             {
-                return new TaskTimeItem
+                return new TaskTimeItem(timeControlTask,
-                {
+                    "Ведение учета времени",
-                    TimeSpent = TimeSpan.FromMinutes(minutes),
+                    "Service",
-                    Branch = timeControlTask,
+                    DateTime.Now,
-                    Commits = 1,
+                    TimeSpan.FromMinutes(minutes),
-                    Description = "Ведение учета времени"
+                    1,
-                };
+                    1,
+                    CommitType.Task);
             }
 
             return null;

src/JiraTimeBot/TaskTime/TaskTimeSpread.cs

@@ -34,19 +34,21 @@ 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.First().Project,
-                    FilesAffected = taskGroup.Sum(f=>f.FilesAffected),
+                    taskGroup.Min(f => f.StartTime),
-                    Type = taskGroup.First().Type
+                    timeSpent,
-                };
+                    taskGroup.Sum(f => f.Commits),
+                    taskGroup.Sum(f => f.FilesAffected),
+                    taskGroup.First().Type);
 
                 newList.Add(taskTimeItem);
             }

src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs

@@ -23,13 +23,13 @@ namespace JiraTimeBot.TasksProcessors
         {
             _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:");
 
-            foreach (var taskTime in taskTimes.Where(f=>f.Type == CommitType.Task).OrderByDescending(f => f.TimeSpent))
+            foreach (var taskTime in taskTimes.Where(f=>f.Type.HasFlag(CommitType.Task)).OrderByDescending(f => f.TimeSpent))
             {
                 var taskName = _jiraApi.GetTaskName(taskTime.Branch, settings);
                 _log.Trace($" - [{taskTime.Branch}, коммитов {taskTime.Commits}]: {taskName} - {taskTime.TimeSpent}");
             }
 
-            var releases = taskTimes.Where(f => f.Type == CommitType.Release).GroupBy(f=>f.Description);
+            var releases = taskTimes.Where(f => f.Type.HasFlag(CommitType.Release)).GroupBy(f=>f.Description);
             foreach (var release in releases)
             {
                 var sum = release.Sum(f => (int) f.TimeSpent.TotalMinutes);