monster/JiraTimeBot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Рефакторинг - переход на один класс с временем.

Browse Source
This commit is contained in:
Danil Kislov
2019-06-27 18:41:59 +03:00
parent 1488aafcfd
commit c8e0782c3a
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+6 -3
View File
@@ -18,7 +18,7 @@ namespace JiraTimeBot.TaskTime
_log = log; _log = log;
} }
private List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source, int minutes, int roundToMinutes, bool up = false) private List<TaskTimeItem> SpreadTime(List<TaskTimeItem> source, int minutes, int roundToMinutes, bool roundUp = false, bool appendTime = true)
{ {
if (source == null || !source.Any()) if (source == null || !source.Any())
{ {
@@ -32,7 +32,7 @@ namespace JiraTimeBot.TaskTime
foreach (var taskGroup in source.GroupBy(f => f.Branch).OrderByDescending(f => f.Count())) foreach (var taskGroup in source.GroupBy(f => f.Branch).OrderByDescending(f => f.Count()))
{ {
int currentTaskCommits = taskGroup.Count(); int currentTaskCommits = taskGroup.Count();
int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, up); int currentTaskTime = (int)RoundTo(minutes / source.Count * currentTaskCommits, roundToMinutes, roundUp);
remainMinutes = remainMinutes - currentTaskTime; remainMinutes = remainMinutes - currentTaskTime;
var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray(); var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
@@ -44,7 +44,10 @@ namespace JiraTimeBot.TaskTime
var taskTimeItem = new TaskTimeItem var taskTimeItem = new TaskTimeItem
{ {
Branch = taskGroup.Key, Branch = taskGroup.Key,
TimeSpent = TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime), TimeSpent = appendTime ?
TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime):
TimeSpan.FromMinutes(currentTaskTime)
,
Commits = taskGroup.Sum(f=>f.Commits), Commits = taskGroup.Sum(f=>f.Commits),
Description = sb.ToString(), Description = sb.ToString(),
StartTime = taskGroup.Min(f=>f.StartTime), StartTime = taskGroup.Min(f=>f.StartTime),