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

.semver.txt

@@ -1 +1 @@
-1.0.61
+1.0.62

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

src/JiraTimeBot/TaskTime/Objects/CommitType.cs

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

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -64,6 +64,7 @@ namespace JiraTimeBot.TaskTime
                 {
                     existingItem.TimeSpent += workTask.TimeSpent;
                     existingItem.Description += "\r\n" + workTask.Description;
+                    existingItem.Type |= CommitType.Task;
                     continue;
                 }
 

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);