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

Добавил галку на удаление внесённых руками ворклогов, тестово поправил Estimate (не факт что взлетит).

Browse Source
This commit is contained in:
d.kislov
2020-04-15 12:21:21 +03:00
parent 5c01943fc6
commit 813c59cccc
10 changed files with 117 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.semver.txt
+1 -1
View File
@@ -1 +1 @@
1.0.82
1.0.83
src/JiraTimeBot/Configuration/Settings.cs
+1
View File
@@ -14,6 +14,7 @@ namespace JiraTimeBot.Configuration
public string JiraUrl { get; set; }
public bool PullBeforeProcess { get; set; }
public bool RemoveManuallyAddedWorklogs { get; set; }
public string RepositoryPath { get; set; }
public string MercurialAuthorEmail { get; set; }
public string JiraUserName { get; set; }
src/JiraTimeBot/DI/ContainerBuilder.cs
+2 -1
View File
@@ -61,7 +61,8 @@ namespace JiraTimeBot.DI
_builder.RegisterType<JiraHistory>().AsSelf().As<IJiraHistory>();
_builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(), c.Resolve<ILog>())).AsSelf();
_builder.Register(c => new Job(c.Resolve<IAllRepositoryProviders>(), c.Resolve<ITaskTimeCalculator>(),
c.Resolve<IJiraApi>(), c.Resolve<ILog>())).AsSelf();
_builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
_builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();
src/JiraTimeBot/JiraIntegration/JiraApi.cs
+28 -2
View File
@@ -15,6 +15,7 @@ namespace JiraTimeBot.JiraIntegration
string GetTaskName(string branch, Settings settings);
List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default);
void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default);
List<Worklog> GetManuallyWorklogged(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date, CancellationToken cancellationToken = default);
}
public class JiraApi : IJiraApi
@@ -77,6 +78,28 @@ namespace JiraTimeBot.JiraIntegration
return GetIssuesByJQL(jql, settings, date, cancellationToken);
}
public List<Worklog> GetManuallyWorklogged(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date, CancellationToken cancellationToken = default)
{
var result = new List<Worklog>();
var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
foreach (var issue in alreadyLoggedToday)
{
if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
{
var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
var userWorklogs = workLogs.Where(w =>
w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
StringComparison.InvariantCultureIgnoreCase)).ToList();
foreach (var userWorklog in userWorklogs)
{
result.Add(userWorklog);
}
}
}
return result;
}
private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default)
{
var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
@@ -106,8 +129,11 @@ namespace JiraTimeBot.JiraIntegration
date = date.GetValueOrDefault(DateTime.Now.Date).Date;
var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
if (settings.RemoveManuallyAddedWorklogs)
{
//Удаляем добавленные вручную пользователем данные.
RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
}
foreach (TaskTimeItem taskTimeItem in taskTimeItems)
{
@@ -155,7 +181,7 @@ namespace JiraTimeBot.JiraIntegration
{
try
{
issue.DeleteWorklogAsync(workLog, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken);
issue.DeleteWorklogAsync(workLog, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken);
}
catch (Exception ex)
{
@@ -181,7 +207,7 @@ namespace JiraTimeBot.JiraIntegration
{
try
{
workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.RetainRemainingEstimate, token: cancellationToken).Result;
workLogToAdd = issue.AddWorklogAsync(workLogToAdd, WorklogStrategy.AutoAdjustRemainingEstimate, token: cancellationToken).Result;
}
catch (Exception ex)
{
src/JiraTimeBot/JiraTimeBot.csproj
+1 -1
View File
@@ -121,7 +121,7 @@
<Compile Include="Job.cs" />
<Compile Include="Logger.cs" />
<Compile Include="Configuration\Settings.cs" />
<Compile Include="JiraIntegration\JiraCommitEmulator.cs" />
<Compile Include="RepositoryProviders\JiraCommitEmulator.cs" />
<Compile Include="RepositoryProviders\GitLog.cs" />
<Compile Include="RepositoryProviders\Interfaces\IAllVcsProviders.cs" />
<Compile Include="RepositoryProviders\Modifiers\ITechnicalInfoSkipper.cs" />
src/JiraTimeBot/Job.cs
+25 -5
View File
@@ -8,6 +8,7 @@ using System.Collections.Generic;
using System.Linq;
using System.Threading;
using System.Threading.Tasks;
using JiraTimeBot.JiraIntegration;
namespace JiraTimeBot
{
@@ -15,12 +16,14 @@ namespace JiraTimeBot
{
private readonly IAllRepositoryProviders _mercurialProviders;
private readonly ITaskTimeCalculator _taskTimeDiscoverer;
private readonly IJiraApi _jiraApi;
private readonly ILog _log;
public Job(IAllRepositoryProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
public Job(IAllRepositoryProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, IJiraApi jiraApi, ILog log)
{
_mercurialProviders = mercurialProviders;
_taskTimeDiscoverer = taskTimeDiscoverer;
_jiraApi = jiraApi;
_log = log;
}
@@ -72,22 +75,23 @@ namespace JiraTimeBot
private bool SetTaskTimesForDateImpl(DateTime setForDate, DateTime realDate, Settings settings, ITasksProcessor tasksProcessor, bool dummyMode, CancellationToken cancellationToken)
{
IRepositoryLog mercurial = _mercurialProviders.MercurialLog;
IRepositoryLog repository = _mercurialProviders.MercurialLog;
if (settings.WorkType == WorkType.JiraLogs)
{
_log.Info("Использую Jira как источник информации.");
mercurial = _mercurialProviders.JiraCommitEmulator;
repository = _mercurialProviders.JiraCommitEmulator;
}
else if (settings.WorkType == WorkType.GitLogs)
{
_log.Info("Использую Git как источник информации.");
mercurial = _mercurialProviders.GitLog;
repository = _mercurialProviders.GitLog;
}
List<TaskTimeItem> taskTimes;
if (!(tasksProcessor is MeetingProcessor))
{
List<TaskTimeItem> commits = mercurial.GetRepositoryLog(settings, realDate, cancellationToken);
List<TaskTimeItem> commits = repository.GetRepositoryLog(settings, realDate, cancellationToken);
ModifyWorktimeByManualLogs(setForDate, settings, cancellationToken, commits);
taskTimes = _taskTimeDiscoverer.CalculateTaskTime(commits, settings, cancellationToken);
}
else
@@ -111,5 +115,21 @@ namespace JiraTimeBot
_log.Info("Готово.");
return true;
}
private void ModifyWorktimeByManualLogs(DateTime setForDate, Settings settings, CancellationToken cancellationToken,
List<TaskTimeItem> commits)
{
if (settings.RemoveManuallyAddedWorklogs)
{
return;
}
//если не удаляем добавленное вручную, то посчитаем сколько там надобавляли и отнимем от рабочего дня
var manuallyWorklogged = _jiraApi.GetManuallyWorklogged(commits, settings, setForDate, cancellationToken);
if (manuallyWorklogged.Any() && manuallyWorklogged.Sum(f => f.TimeSpentInSeconds) < settings.MinuterPerWorkDay)
{
settings.MinuterPerWorkDay = (int) (settings.MinuterPerWorkDay - manuallyWorklogged.Sum(f => f.TimeSpentInSeconds));
}
}
}
}
src/JiraTimeBot/Properties/AssemblyInfo.cs
+3 -3
View File
@@ -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.82")]
[assembly: AssemblyFileVersion("1.0.82")]
[assembly: AssemblyInformationalVersion("1.0.82")]
[assembly: AssemblyVersion("1.0.83")]
[assembly: AssemblyFileVersion("1.0.83")]
[assembly: AssemblyInformationalVersion("1.0.83")]
src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs → src/JiraTimeBot/RepositoryProviders/JiraCommitEmulator.cs
+7 -7
View File
@@ -1,14 +1,14 @@
using Atlassian.Jira;
using JiraTimeBot.Configuration;
using JiraTimeBot.RepositoryProviders.Interfaces;
using JiraTimeBot.TaskTime.Objects;
using System;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using Atlassian.Jira;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.RepositoryProviders.Interfaces;
using JiraTimeBot.TaskTime.Objects;
namespace JiraTimeBot.JiraIntegration
namespace JiraTimeBot.RepositoryProviders
{
public class JiraCommitEmulator : IRepositoryLog
{
src/JiraTimeBot/UI/frmSettings.Designer.cs
Generated
+16 -3
View File
@@ -56,6 +56,7 @@
this.label4 = new System.Windows.Forms.Label();
this.lblJiraUrl = new System.Windows.Forms.Label();
this.txtJiraUrl = new System.Windows.Forms.TextBox();
this.chkRemoveManuallyAddedWorklogs = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// label5
@@ -154,7 +155,7 @@
//
// btnSave
//
this.btnSave.Location = new System.Drawing.Point(86, 412);
this.btnSave.Location = new System.Drawing.Point(86, 432);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(75, 23);
this.btnSave.TabIndex = 32;
@@ -262,7 +263,7 @@
// chkPullBeforeProcess
//
this.chkPullBeforeProcess.AutoSize = true;
this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 389);
this.chkPullBeforeProcess.Location = new System.Drawing.Point(65, 409);
this.chkPullBeforeProcess.Name = "chkPullBeforeProcess";
this.chkPullBeforeProcess.Size = new System.Drawing.Size(83, 17);
this.chkPullBeforeProcess.TabIndex = 45;
@@ -303,11 +304,22 @@
this.txtJiraUrl.Size = new System.Drawing.Size(100, 20);
this.txtJiraUrl.TabIndex = 46;
//
// chkRemoveManuallyAddedWorklogs
//
this.chkRemoveManuallyAddedWorklogs.AutoSize = true;
this.chkRemoveManuallyAddedWorklogs.Location = new System.Drawing.Point(65, 387);
this.chkRemoveManuallyAddedWorklogs.Name = "chkRemoveManuallyAddedWorklogs";
this.chkRemoveManuallyAddedWorklogs.Size = new System.Drawing.Size(157, 17);
this.chkRemoveManuallyAddedWorklogs.TabIndex = 48;
this.chkRemoveManuallyAddedWorklogs.Text = "Удалять \"ручные записи\"";
this.chkRemoveManuallyAddedWorklogs.UseVisualStyleBackColor = true;
//
// frmSettings
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(243, 442);
this.ClientSize = new System.Drawing.Size(243, 467);
this.Controls.Add(this.chkRemoveManuallyAddedWorklogs);
this.Controls.Add(this.lblJiraUrl);
this.Controls.Add(this.txtJiraUrl);
this.Controls.Add(this.chkPullBeforeProcess);
@@ -377,5 +389,6 @@
private System.Windows.Forms.Label label4;
private System.Windows.Forms.Label lblJiraUrl;
private System.Windows.Forms.TextBox txtJiraUrl;
private System.Windows.Forms.CheckBox chkRemoveManuallyAddedWorklogs;
}
}
src/JiraTimeBot/UI/frmSettings.cs
+3 -1
View File
@@ -42,6 +42,7 @@ namespace JiraTimeBot.UI
txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
txtRandomMinutes.Text = settings.RandomWorkMinutes.ToString();
chkPullBeforeProcess.Checked = settings.PullBeforeProcess;
chkRemoveManuallyAddedWorklogs.Checked = settings.RemoveManuallyAddedWorklogs;
cboWorkType_SelectedIndexChanged(null, null);
}
@@ -76,7 +77,8 @@ namespace JiraTimeBot.UI
TimeControlTask = txtTimeControlTask.Text,
MinuterPerWorkDay = minuterPerWorkDay,
RandomWorkMinutes = randomWorkMinutes,
PullBeforeProcess = chkPullBeforeProcess.Checked
PullBeforeProcess = chkPullBeforeProcess.Checked,
RemoveManuallyAddedWorklogs = chkRemoveManuallyAddedWorklogs.Checked
};
//LockUnlock(false);