From e26ef9d7f4862c737e88768b406fe09748463ca4 Mon Sep 17 00:00:00 2001 From: Danil Kislov Date: Fri, 13 Sep 2019 11:02:46 +0300 Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D0=A1=D0=BE=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .semver.txt | 2 +- src/JiraTimeBot/Configuration/Settings.cs | 4 +- src/JiraTimeBot/JiraIntegration/JiraApi.cs | 8 +-- .../JiraIntegration/JiraHistory.cs | 7 +-- src/JiraTimeBot/Job.cs | 2 +- src/JiraTimeBot/Mercurial/MercurialLog.cs | 2 +- src/JiraTimeBot/Properties/AssemblyInfo.cs | 62 +++++++++---------- 7 files changed, 43 insertions(+), 44 deletions(-) diff --git a/.semver.txt b/.semver.txt index c8b4742..01c08cf 100644 --- a/.semver.txt +++ b/.semver.txt @@ -1 +1 @@ -1.0.67 +1.0.68 diff --git a/src/JiraTimeBot/Configuration/Settings.cs b/src/JiraTimeBot/Configuration/Settings.cs index 84a3f37..6353429 100644 --- a/src/JiraTimeBot/Configuration/Settings.cs +++ b/src/JiraTimeBot/Configuration/Settings.cs @@ -61,7 +61,7 @@ namespace JiraTimeBot.Configuration var errors = new List(); message = null; - if (settings.RoundToMinutes == default(int)) + if (settings.RoundToMinutes == default) { errors.Add("Укажите округление времени, например, 10 (минут)"); } @@ -137,7 +137,7 @@ namespace JiraTimeBot.Configuration File.WriteAllText(settingsPath, settingsString); } - private static string _settingsFileName = "settings.json"; + private static readonly string _settingsFileName = "settings.json"; } public enum WorkType diff --git a/src/JiraTimeBot/JiraIntegration/JiraApi.cs b/src/JiraTimeBot/JiraIntegration/JiraApi.cs index fdb4c40..10d1521 100644 --- a/src/JiraTimeBot/JiraIntegration/JiraApi.cs +++ b/src/JiraTimeBot/JiraIntegration/JiraApi.cs @@ -42,7 +42,7 @@ namespace JiraTimeBot.JiraIntegration } } - public List GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken)) + public List GetIssuesByJQL(string jql, Settings settings, DateTime? date = null, CancellationToken cancellationToken = default) { var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword); date = date.GetValueOrDefault(DateTime.Now.Date); @@ -69,14 +69,14 @@ namespace JiraTimeBot.JiraIntegration } } - public List GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken)) + public List GetWorkloggedIssuesByDate(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default) { 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 taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default(CancellationToken)) + private void RemoveWorklogsAddedByUser(List taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, CancellationToken cancellationToken = default) { var alreadyLoggedToday = GetWorkloggedIssuesByDate(settings, date); foreach (var issue in alreadyLoggedToday) @@ -100,7 +100,7 @@ namespace JiraTimeBot.JiraIntegration } } - public void SetTodayWorklog(List taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default(CancellationToken)) + public void SetTodayWorklog(List taskTimeItems, Settings settings, DateTime? date = null, bool dummy = false, bool addCommentsToWorklog = false, CancellationToken cancellationToken = default) { date = date.GetValueOrDefault(DateTime.Now.Date).Date; var jira = Jira.CreateRestClient(settings.JiraUrl, settings.JiraUserName, settings.JiraPassword); diff --git a/src/JiraTimeBot/JiraIntegration/JiraHistory.cs b/src/JiraTimeBot/JiraIntegration/JiraHistory.cs index fe3a3f4..5f539bd 100644 --- a/src/JiraTimeBot/JiraIntegration/JiraHistory.cs +++ b/src/JiraTimeBot/JiraIntegration/JiraHistory.cs @@ -13,7 +13,7 @@ namespace JiraTimeBot.JiraIntegration { List GetDayWorklogs(DateTime date, Settings settings, - CancellationToken cancellationToken = default(CancellationToken)); + CancellationToken cancellationToken = default); } public class JiraHistory: IJiraHistory @@ -27,7 +27,7 @@ namespace JiraTimeBot.JiraIntegration public List GetDayWorklogs(DateTime date, Settings settings, - CancellationToken cancellationToken = default(CancellationToken)) + CancellationToken cancellationToken = default) { var tasks = _jiraApi.GetIssuesByJQL("worklogDate = \"%DATE%\" and worklogAuthor='%USER%'", settings, date, cancellationToken); List resultItems = new List(); @@ -35,7 +35,6 @@ namespace JiraTimeBot.JiraIntegration { var workLogs = issue.GetWorklogsAsync(cancellationToken).Result; var user = settings.JiraUserName; - //user = "Zoya.Aleksandridi"; var userWorklogs = workLogs.Where(w => w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(user, StringComparison.InvariantCultureIgnoreCase)).ToList(); @@ -46,7 +45,7 @@ namespace JiraTimeBot.JiraIntegration var firstWorklog = userWorklogs.First(); - var description = string.Join("\r\n", userWorklogs.Select(f => f.Comment).Distinct()); + var description = string.Join(Environment.NewLine, userWorklogs.Select(f => f.Comment).Distinct()); var totalTime = TimeSpan.FromSeconds(userWorklogs.Sum(f => f.TimeSpentInSeconds)); var startDate = firstWorklog?.CreateDate ?? date; var commits = userWorklogs.Sum(f => f.Comment.Count(c => c == '\n')); diff --git a/src/JiraTimeBot/Job.cs b/src/JiraTimeBot/Job.cs index d288bce..d5d4605 100644 --- a/src/JiraTimeBot/Job.cs +++ b/src/JiraTimeBot/Job.cs @@ -79,7 +79,7 @@ namespace JiraTimeBot mercurial = _mercurialProviders.JiraCommitEmulator; } - List taskTimes = null; + List taskTimes; if (!(tasksProcessor is MeetingProcessor)) { List commits = mercurial.GetMercurialLog(settings, realDate, cancellationToken); diff --git a/src/JiraTimeBot/Mercurial/MercurialLog.cs b/src/JiraTimeBot/Mercurial/MercurialLog.cs index dbe1de0..53a0cd0 100644 --- a/src/JiraTimeBot/Mercurial/MercurialLog.cs +++ b/src/JiraTimeBot/Mercurial/MercurialLog.cs @@ -24,7 +24,7 @@ namespace JiraTimeBot.Mercurial _technicalInfoSkipper = technicalInfoSkipper; } - public List GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default(CancellationToken)) + public List GetMercurialLog(Settings settings, DateTime? date = null, CancellationToken cancellationToken = default) { if (string.IsNullOrEmpty(settings.RepositoryPath) || !Directory.Exists(settings.RepositoryPath)) { diff --git a/src/JiraTimeBot/Properties/AssemblyInfo.cs b/src/JiraTimeBot/Properties/AssemblyInfo.cs index 6252520..badff3f 100644 --- a/src/JiraTimeBot/Properties/AssemblyInfo.cs +++ b/src/JiraTimeBot/Properties/AssemblyInfo.cs @@ -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.67")] -[assembly: AssemblyFileVersion("1.0.67")] -[assembly: AssemblyInformationalVersion("1.0.67")] +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.68")] +[assembly: AssemblyFileVersion("1.0.68")] +[assembly: AssemblyInformationalVersion("1.0.68")]