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-03-27 10:14:45 +03:00
parent 29c44e6027
commit a75efcb7af
13 changed files with 113 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/JiraTimeBot/Configuration/Settings.cs
+1
View File
@@ -23,6 +23,7 @@ namespace JiraTimeBot.Configuration
public WorkType WorkType { get; set; }
public string JiraQuery { get; set; }
public string TimeControlTask { get; set; }
public bool RemoveWorklogsAddedByUser { get; set; }
public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
{
src/JiraTimeBot/JiraIntegration/JiraApi.cs
+37 -1
View File
@@ -62,7 +62,37 @@ namespace JiraTimeBot.JiraIntegration
}
}
public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false)
public List<Issue> GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken))
{
date = date.GetValueOrDefault(DateTime.Now.Date);
var jql = "issueFunction in workLogged(\"on %DATE% by '%USER%'\")";
return GetIssuesByJQL(jql, settings, date, cancellationToken);
}
private void RemoveWorklogsAddedByUser(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default(CancellationToken))
{
var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date);
foreach (var issue in alreadyLoggedToday)
{
if (!taskTimeItems.Any(f => f.Branch.Equals(issue.Key.Value, StringComparison.InvariantCulture)))
{
_log.Trace($"Удаляю добавленный руками WorkLog для задачи {issue.Key.Value}.");
var workLogs = issue.GetWorklogsAsync(cancellationToken).Result;
var userWorklogs = workLogs.Where(w =>
w.CreateDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
StringComparison.InvariantCultureIgnoreCase)).ToList();
foreach (var userWorklog in userWorklogs)
{
if (!dummy)
{
issue.DeleteWorklogAsync(userWorklog, token: cancellationToken);
}
}
}
}
}
public void SetTodayWorklog(List<TaskTimeItem> taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(CancellationToken))
{
var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword);
@@ -72,6 +102,12 @@ namespace JiraTimeBot.JiraIntegration
}
date = date.Value.Date;
//Удаляем добавленные вручную пользователем данные.
if (settings.AddCommentsToWorklog)
{
RemoveWorklogsAddedByUser(taskTimeItems, settings, date, dummy, cancellationToken);
}
foreach (TaskTimeItem taskTimeItem in taskTimeItems)
{
Issue issue = null;
src/JiraTimeBot/JiraIntegration/JiraCommitEmulator.cs
+1
View File
@@ -37,6 +37,7 @@ namespace JiraTimeBot.JiraIntegration
var comments = issue.GetCommentsAsync(cancellationToken).Result?.ToList() ?? new List<Comment>();
var user = settings.JiraUserName;
//user = "Zoya.Aleksandridi";
var userComments = comments.Where(f => f.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList();
_log.Trace($"Получены комментарии по задаче {issue.Key} ({issue.Type?.Name}): {userComments.Count}.");
src/JiraTimeBot/Job.cs
+1 -1
View File
@@ -71,7 +71,7 @@ namespace JiraTimeBot
continue;
}
tasksProcessor.Process(date, taskTimes, settings, dummyMode);
tasksProcessor.Process(date, taskTimes, settings, dummyMode, cancellationToken);
_log.Info("Готово.");
return;
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.34")]
[assembly: AssemblyFileVersion("1.0.34")]
[assembly: AssemblyInformationalVersion("1.0.34")]
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.35")]
[assembly: AssemblyFileVersion("1.0.35")]
[assembly: AssemblyInformationalVersion("1.0.35")]
src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs
+12
View File
@@ -104,9 +104,21 @@ namespace JiraTimeBot.TaskTime
workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
}
PrintTotal(workTimeItems);
return workTimeItems;
}
private void PrintTotal(List<TaskTimeItem> workTimeItems)
{
var totalTime = TimeSpan.Zero;
foreach (var workTimeItem in workTimeItems)
{
totalTime += workTimeItem.Time;
}
_log.Trace($"Итоговое реально проставляемое время: {totalTime}");
}
private decimal RoundTo(decimal value, decimal to = 15, bool up = true)
src/JiraTimeBot/TasksProcessors/ITasksProcessor.cs
+2 -1
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
using JiraTimeBot.Configuration;
using JiraTimeBot.TaskTime.Objects;
@@ -7,6 +8,6 @@ namespace JiraTimeBot.TasksProcessors
{
interface ITasksProcessor
{
void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode);
void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken));
}
}
src/JiraTimeBot/TasksProcessors/MeetingProcessor.cs
+2 -1
View File
@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.TaskTime.Objects;
@@ -18,7 +19,7 @@ namespace JiraTimeBot.TasksProcessors
_jiraApi = jiraApi;
}
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
{
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
src/JiraTimeBot/TasksProcessors/WorkLogTasksProcessor.cs
+3 -2
View File
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Threading;
using JiraTimeBot.Configuration;
using JiraTimeBot.JiraIntegration;
using JiraTimeBot.TaskTime.Objects;
@@ -17,7 +18,7 @@ namespace JiraTimeBot.TasksProcessors
_jiraApi = jiraApi;
}
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode)
public void Process(DateTime date, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken))
{
_log.Trace($"На реальную дату {date:dd.MM.yyyy} распределение по задачам:");
foreach (var taskTime in taskTimes)
@@ -25,7 +26,7 @@ namespace JiraTimeBot.TasksProcessors
_log.Trace($"- {taskTime.Branch} (коммитов {taskTime.Commits}): {taskTime.Time}");
}
_jiraApi.SetTodayWorklog(taskTimes, settings, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog);
_jiraApi.SetTodayWorklog(taskTimes, settings, dummy: dummyMode, addCommentsToWorklog: settings.AddCommentsToWorklog, cancellationToken: cancellationToken);
}
}
}
src/JiraTimeBot/UI/frmSettings.Designer.cs
Generated
+15 -2
View File
@@ -49,6 +49,7 @@
this.label8 = new System.Windows.Forms.Label();
this.txtTimeControlTask = new System.Windows.Forms.TextBox();
this.chkAutostart = new System.Windows.Forms.CheckBox();
this.chkRemoveAddedByUser = new System.Windows.Forms.CheckBox();
this.SuspendLayout();
//
// label5
@@ -162,7 +163,7 @@
//
// btnSave
//
this.btnSave.Location = new System.Drawing.Point(72, 310);
this.btnSave.Location = new System.Drawing.Point(92, 322);
this.btnSave.Name = "btnSave";
this.btnSave.Size = new System.Drawing.Size(75, 23);
this.btnSave.TabIndex = 32;
@@ -234,11 +235,22 @@
this.chkAutostart.Text = "Автозагрузка";
this.chkAutostart.UseVisualStyleBackColor = true;
//
// chkRemoveAddedByUser
//
this.chkRemoveAddedByUser.AutoSize = true;
this.chkRemoveAddedByUser.Location = new System.Drawing.Point(56, 299);
this.chkRemoveAddedByUser.Name = "chkRemoveAddedByUser";
this.chkRemoveAddedByUser.Size = new System.Drawing.Size(153, 17);
this.chkRemoveAddedByUser.TabIndex = 41;
this.chkRemoveAddedByUser.Text = "Заменять время за день";
this.chkRemoveAddedByUser.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, 342);
this.ClientSize = new System.Drawing.Size(243, 357);
this.Controls.Add(this.chkRemoveAddedByUser);
this.Controls.Add(this.chkAutostart);
this.Controls.Add(this.label8);
this.Controls.Add(this.txtTimeControlTask);
@@ -294,5 +306,6 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox txtTimeControlTask;
private System.Windows.Forms.CheckBox chkAutostart;
private System.Windows.Forms.CheckBox chkRemoveAddedByUser;
}
}
src/JiraTimeBot/UI/frmSettings.cs
+4 -4
View File
@@ -33,11 +33,11 @@ namespace JiraTimeBot.UI
txtMercurialEmail.Text = settings.MercurialAuthorEmail;
txtRepoPath.Text = settings.RepositoryPath;
actTime.Text = settings.ActivationTime.ToString("hh\\:mm\\:ss");
//txtDummyMode.Checked = settings.DummyMode;
chkAddComments.Checked = settings.AddCommentsToWorklog;
txtRoundTo.Text = settings.RountToMinutes.ToString();
cboWorkType.SelectedIndex = (int) settings.WorkType;
txtTimeControlTask.Text = settings.TimeControlTask;
chkRemoveAddedByUser.Checked = settings.RemoveWorklogsAddedByUser;
txtJQL.Text = settings.JiraQuery;
txtJQL.Enabled = settings.WorkType == WorkType.JiraLogs;
}
@@ -56,14 +56,14 @@ namespace JiraTimeBot.UI
MercurialAuthorEmail = txtMercurialEmail.Text,
ActivationTime = TimeSpan.Parse(actTime.Text),
RepositoryPath = txtRepoPath.Text,
//DummyMode = txtDummyMode.Checked,
AddCommentsToWorklog = chkAddComments.Checked,
RountToMinutes = roundTo,
WorkType = (WorkType) cboWorkType.SelectedIndex,
JiraQuery = txtJQL.Text,
TimeControlTask = txtTimeControlTask.Text
TimeControlTask = txtTimeControlTask.Text,
RemoveWorklogsAddedByUser = chkRemoveAddedByUser.Checked
};
//LockUnlock(false);
return settings;