From 40db7d9412c30c100379dfb465f1e6c309cb7c3e Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Thu, 27 Jun 2019 19:47:41 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A3=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0?= =?UTF-8?q?=D0=B5=D0=BC=20=D0=B2=D1=80=D0=B5=D0=BC=D1=8F=20=D0=BD=D0=B0=20?= =?UTF-8?q?=D1=80=D0=B5=D0=BB=D0=B8=D0=B7=D1=8B.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/JiraTimeBot/TaskTime/TaskTimeSpread.cs | 3 ++- src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/JiraTimeBot/TaskTime/TaskTimeSpread.cs b/src/JiraTimeBot/TaskTime/TaskTimeSpread.cs index 520da39..d379051 100644 --- a/src/JiraTimeBot/TaskTime/TaskTimeSpread.cs +++ b/src/JiraTimeBot/TaskTime/TaskTimeSpread.cs @@ -44,7 +44,8 @@ namespace JiraTimeBot.TaskTime Commits = taskGroup.Sum(f=>f.Commits), Description = sb.ToString(), StartTime = taskGroup.Min(f=>f.StartTime), - FilesAffected = taskGroup.Sum(f=>f.FilesAffected) + FilesAffected = taskGroup.Sum(f=>f.FilesAffected), + Type = taskGroup.First().Type }; newList.Add(taskTimeItem); diff --git a/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs b/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs index 51fcba4..d50e192 100644 --- a/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs +++ b/src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs @@ -23,11 +23,19 @@ namespace JiraTimeBot.TasksProcessors { _log.Trace($"На реальную дату {realDate:dd.MM.yyyy} распределение по задачам:"); - foreach (var taskTime in taskTimes.OrderByDescending(f => f.TimeSpent)) + foreach (var taskTime in taskTimes.Where(f=>f.Type == 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); + foreach (var release in releases) + { + var sum = release.Sum(f => (int) f.TimeSpent.TotalMinutes); + var description = release.First().Description.Replace(Environment.NewLine, ""); + _log.Trace($" - [Release, задач {release.Count()}]: {description} - {TimeSpan.FromMinutes(sum)}"); + } } } }