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-07-02 18:22:12 +03:00
parent c95f228ef0
commit ad56f28b24
9 changed files with 95 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.semver.txt
+1 -1
View File
@@ -1 +1 @@
1.0.59
1.0.60
src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs
+16 -18
View File
@@ -46,28 +46,26 @@ namespace JiraTimeBot.JiraIntegration
{
foreach (var comment in userComments.OrderBy(f=>f.CreatedDate))
{
workTasks.Add(new TaskTimeItem
{
StartTime = issue.Updated.GetValueOrDefault(date.Value),
Description = issue.Summary,
Branch = issue.Key.Value,
FilesAffected = 1,
Commits = 1,
Type = CommitType.Task
});
var item = new TaskTimeItem(issue.Key.Value,
issue.Summary,
1,
TimeSpan.Zero,
issue.Updated.GetValueOrDefault(date.Value),
1,
CommitType.Task);
workTasks.Add(item);
}
}
else
{
workTasks.Add(new TaskTimeItem
{
StartTime = issue.Updated.GetValueOrDefault(date.Value),
Description = issue.Summary,
Branch = issue.Key.Value,
FilesAffected = 1,
Commits = 1,
Type = CommitType.Task
});
var item = new TaskTimeItem(issue.Key.Value,
issue.Summary,
1,
TimeSpan.Zero,
issue.Updated.GetValueOrDefault(date.Value),
1,
CommitType.Task);
workTasks.Add(item);
}
}
src/JiraTimeBot/JiraTimeBot.csproj
+1
View File
@@ -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
+7 -10
View File
@@ -72,16 +72,13 @@ namespace JiraTimeBot.Mercurial
}
commitMessage = _technicalInfoSkipper.StripTechnicalInfo(commitMessage);
var task = new TaskTimeItem
{
StartTime = changeset.Timestamp,
Description = commitMessage,
Branch = changeset.Branch,
FilesAffected = changeset.PathActions.Count,
Commits = 1,
TimeSpent = TimeSpan.Zero,
Type = GetCommitType(changeset.Branch)
};
var task = new TaskTimeItem(changeset.Branch,
commitMessage,
1,
TimeSpan.Zero,
changeset.Timestamp,
changeset.PathActions.Count,
GetCommitType(changeset.Branch));
if (task.Type == CommitType.Release && task.Description.StartsWith("Merge with", StringComparison.CurrentCultureIgnoreCase))
{
src/JiraTimeBot/Properties/AssemblyInfo.cs
+31 -31
View File
@@ -1,31 +1,31 @@
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("JiraTimeBot")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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.59")]
[assembly: AssemblyFileVersion("1.0.59")]
[assembly: AssemblyInformationalVersion("1.0.59")]
using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("JiraTimeBot")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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.60")]
[assembly: AssemblyFileVersion("1.0.60")]
[assembly: AssemblyInformationalVersion("1.0.60")]
src/JiraTimeBot/TaskTime/Objects/CommitType.cs
+7
View File
@@ -0,0 +1,7 @@
namespace JiraTimeBot.TaskTime.Objects
{
public enum CommitType {
Task = 0,
Release = 1
}
}
src/JiraTimeBot/TaskTime/Objects/TaskTimeItem.cs
+11 -4
View File
@@ -11,10 +11,17 @@ namespace JiraTimeBot.TaskTime.Objects
public int Commits { get; set; }
public int FilesAffected { get; set; }
public CommitType Type { get; set; }
}
public enum CommitType {
Task = 0,
Release = 1
public TaskTimeItem(string branch, string description, int commits, TimeSpan timeSpent, DateTime startTime,
int filesAffected, CommitType type)
{
Branch = branch;
Description = description;
Commits = commits;
TimeSpent = timeSpent;
StartTime = startTime;
FilesAffected = filesAffected;
Type = type;
}
}
}
src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+7 -7
View File
@@ -93,13 +93,13 @@ namespace JiraTimeBot.TaskTime
//Если указана задача контроля времени - то спишем туда 30 минут и вычеркнем их из общего рабочего времени.
if (!string.IsNullOrEmpty(timeControlTask))
{
return new TaskTimeItem
{
TimeSpent = TimeSpan.FromMinutes(minutes),
Branch = timeControlTask,
Commits = 1,
Description = "Ведение учета времени"
};
return new TaskTimeItem(timeControlTask,
"Ведение учета времени",
1,
TimeSpan.FromMinutes(minutes),
DateTime.Now,
1,
CommitType.Task);
}
return null;
src/JiraTimeBot/TaskTime/TaskTimeSpread.cs
+14 -13
View File
@@ -34,19 +34,20 @@ namespace JiraTimeBot.TaskTime
{
sb.AppendLine($"- {task.Description}");
}
var taskTimeItem = new TaskTimeItem
{
Branch = taskGroup.Key,
TimeSpent = appendTime ?
TimeSpan.FromMinutes(taskGroup.Sum(f=>f.TimeSpent.TotalMinutes)) + TimeSpan.FromMinutes(currentTaskTime):
TimeSpan.FromMinutes(currentTaskTime)
,
Commits = taskGroup.Sum(f=>f.Commits),
Description = sb.ToString(),
StartTime = taskGroup.Min(f=>f.StartTime),
FilesAffected = taskGroup.Sum(f=>f.FilesAffected),
Type = taskGroup.First().Type
};
var timeSpent = appendTime
? TimeSpan.FromMinutes(taskGroup.Sum(f => f.TimeSpent.TotalMinutes)) +
TimeSpan.FromMinutes(currentTaskTime)
: TimeSpan.FromMinutes(currentTaskTime);
var taskTimeItem = new TaskTimeItem(
taskGroup.Key,
sb.ToString(),
taskGroup.Sum(f => f.Commits),
timeSpent,
taskGroup.Min(f => f.StartTime),
taskGroup.Sum(f => f.FilesAffected),
taskGroup.First().Type);
newList.Add(taskTimeItem);
}