Коммиты отсортированы по времени

This commit is contained in:
Danil Kislov
2019-03-15 13:59:53 +03:00
parent 27af894759
commit e84d5413cd
3 changed files with 12 additions and 3 deletions
+1 -1
View File
@@ -93,7 +93,7 @@ namespace JiraTimeBotForm.JiraIntegration
{ {
var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m"; var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
var comment = _dummyComments.OrderBy(x => Guid.NewGuid()).FirstOrDefault(); var comment = _dummyComments.ElementAt(new Random(DateTime.Now.Millisecond).Next(_dummyComments.Count));
if (addCommentsToWorklog) if (addCommentsToWorklog)
{ {
comment = taskTimeItem.Description; comment = taskTimeItem.Description;
@@ -72,6 +72,8 @@ namespace JiraTimeBotForm.TaskTime
Description = commitMessage, Description = commitMessage,
Branch = changeset.Branch, Branch = changeset.Branch,
Commits = 1, Commits = 1,
StartTime = changeset.Timestamp,
EndTime = changeset.Timestamp
}); });
_log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}"); _log?.Trace($" - Найден changeset: {changeset.Timestamp} - {changeset.Branch} - {changeset.AuthorEmailAddress} - {commitMessage}");
} }
@@ -91,8 +93,9 @@ namespace JiraTimeBotForm.TaskTime
int currentTaskTime = (int)RoundTo(settings.MinuterPerWorkDay / totalCommitsCount * currentTaskCommits); int currentTaskTime = (int)RoundTo(settings.MinuterPerWorkDay / totalCommitsCount * currentTaskCommits);
remainMinutes = remainMinutes - currentTaskTime; remainMinutes = remainMinutes - currentTaskTime;
var orderedTasks = taskGroup.OrderBy(f => f.StartTime).ToArray();
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
foreach (var task in taskGroup) foreach (var task in orderedTasks)
{ {
sb.AppendLine($"- {task.Description}"); sb.AppendLine($"- {task.Description}");
} }
@@ -102,7 +105,10 @@ namespace JiraTimeBotForm.TaskTime
Branch = taskGroup.Key, Branch = taskGroup.Key,
Time = TimeSpan.FromMinutes(currentTaskTime), Time = TimeSpan.FromMinutes(currentTaskTime),
Commits = taskGroup.Count(), Commits = taskGroup.Count(),
Description = sb.ToString() Description = sb.ToString(),
StartTime = orderedTasks.First().StartTime,
EndTime = orderedTasks.Last().StartTime
}; };
workTimeItems.Add(taskTimeItem); workTimeItems.Add(taskTimeItem);
+3
View File
@@ -8,5 +8,8 @@ namespace JiraTimeBotForm.TaskTime
public string Branch { get; set; } public string Branch { get; set; }
public TimeSpan Time { get; set; } public TimeSpan Time { get; set; }
public int Commits { get; set; } public int Commits { get; set; }
public DateTime StartTime { get; set; }
public DateTime EndTime { get; set; }
} }
} }