Сообщение об ошибке

.semver.txt

@@ -1 +1 @@
-1.0.40
+1.0.49

src/JiraTimeBot/Configuration/Settings.cs

@@ -9,7 +9,7 @@ namespace JiraTimeBot.Configuration
 {
     public class Settings
     {
-        public int MinuterPerWorkDay = 8 * 60;
+        public int MinuterPerWorkDay { get; set; }
         public int RountToMinutes { get; set; }
 
         public string JiraUrl = "https://myteam.aeroclub.ru";

src/JiraTimeBot/JiraIntegration/JiraApi.cs

@@ -51,8 +51,7 @@ namespace JiraTimeBot.JiraIntegration
 
             try
             {
-                List<Issue> affectedIssues =
+                List<Issue> affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
-                    jira.Issues.GetIssuesFromJqlAsync(jql, 100, 0, cancellationToken).Result.ToList();
                 return affectedIssues;
             }
             catch (Exception ex)
@@ -123,25 +122,38 @@ namespace JiraTimeBot.JiraIntegration
                 var userWorklogs = workLogs.Where(w =>
                     w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
                         StringComparison.InvariantCultureIgnoreCase)).ToList();
+                var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
 
                 foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
                     var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
-                    if (timeDiff > 1 || userWorklogs.Count > 1)
+                    if (timeDiff > 1 || userWorklogs.Count > 1 || userWorklogs.First().Comment != comment)
                     {
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
-                        else
+                        else if (userWorklogs.Count > 1)
                         {
                             _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
+                        else
+                        {
+                            _log.Trace($"Описание отличается, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
+                        }
                         if (!dummy)
+                        {
+                            try
                             {
                                 issue.DeleteWorklogAsync(workLog, token: cancellationToken);
                             }
+                            catch (Exception ex)
+                            {
+                                _log.Error($"Не могу удалить Worklog по задаче {taskTimeItem.Branch}: {ex.Message}.");
+                                continue;
+                            }
+                        }
                         hasTodayWorklog = false;
                     }
                     else
@@ -155,13 +167,19 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
 
-                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
-
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)
+                    {
+                        try
                         {
                             workLogToAdd = issue.AddWorklogAsync(workLogToAdd, token: cancellationToken).Result;
                         }
+                        catch (Exception ex)
+                        {
+                            _log.Error($"Не могу добавить Worklog по задаче {taskTimeItem.Branch}: {ex.Message} ({ex.InnerException?.Message}).");
+                            continue;
+                        }
+                    }
                     _log.Trace($"Добавили Worklog для {taskTimeItem.Branch}: {workLogToAdd.Author} {workLogToAdd.CreateDate}: {workLogToAdd.TimeSpent}");
                 }
             }

src/JiraTimeBot/Job.cs

@@ -49,6 +49,10 @@ namespace JiraTimeBot
                 {
                     return;
                 }
+                if (cancellationToken.IsCancellationRequested)
+                {
+                    return;
+                }
 
                 _log.Warn($"{realDate:dd.MM.yyyy} вы не сделали ничего полезного =) Использую предыдущий день.");
                 daysDiff--;

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -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.40")] 
+[assembly: AssemblyVersion("1.0.49")] 
-[assembly: AssemblyFileVersion("1.0.40")] 
+[assembly: AssemblyFileVersion("1.0.49")] 
-[assembly: AssemblyInformationalVersion("1.0.40")] 
+[assembly: AssemblyInformationalVersion("1.0.49")] 

src/JiraTimeBot/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -21,7 +21,7 @@ namespace JiraTimeBot.TaskTime
         public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
         {
             int minutesPerWorkDay = settings.MinuterPerWorkDay;
-            int remainMinutes = settings.MinuterPerWorkDay;
+            int workHours = (settings.MinuterPerWorkDay / 60);
             int totalCommitsCount = commits.Count;
 
             if (!commits.Any())
@@ -30,7 +30,7 @@ namespace JiraTimeBot.TaskTime
             }
 
             //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
-            while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes)))
+            while (totalCommitsCount > (workHours * (60.0 / settings.RountToMinutes)))
             {
                 settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5);
                 _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RountToMinutes}.");
@@ -55,6 +55,7 @@ namespace JiraTimeBot.TaskTime
                 });
             }
 
+            int remainMinutes = minutesPerWorkDay;
             //Нам нужно раскидать 480 минут в день.
             foreach (var taskGroup in commits.GroupBy(f => f.Branch).OrderByDescending(f=>f.Count()))
             {

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -34,6 +34,7 @@
             this.tmrStart = new System.Windows.Forms.Timer(this.components);
             this.tmrUpdate = new System.Windows.Forms.Timer(this.components);
             this.tlpControls = new System.Windows.Forms.TableLayoutPanel();
+            this.txtLog = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnMeeting = new System.Windows.Forms.Button();
@@ -43,7 +44,6 @@
             this.btnDoForDate = new System.Windows.Forms.Button();
             this.dteForDay = new System.Windows.Forms.DateTimePicker();
             this.btnSettings = new System.Windows.Forms.Button();
-            this.txtLog = new System.Windows.Forms.TextBox();
             this.tlpControls.SuspendLayout();
             this.panel2.SuspendLayout();
             this.pnlTopControls.SuspendLayout();
@@ -82,6 +82,18 @@
             this.tlpControls.Size = new System.Drawing.Size(759, 416);
             this.tlpControls.TabIndex = 19;
             // 
+            // txtLog
+            // 
+            this.txtLog.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtLog.Location = new System.Drawing.Point(153, 3);
+            this.txtLog.Multiline = true;
+            this.txtLog.Name = "txtLog";
+            this.txtLog.ReadOnly = true;
+            this.tlpControls.SetRowSpan(this.txtLog, 2);
+            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtLog.Size = new System.Drawing.Size(603, 410);
+            this.txtLog.TabIndex = 27;
+            // 
             // panel2
             // 
             this.panel2.Controls.Add(this.btnCancel);
@@ -103,6 +115,7 @@
             this.btnCancel.TabIndex = 19;
             this.btnCancel.Text = "Отменить операцию";
             this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
             // 
             // btnMeeting
             // 
@@ -112,6 +125,7 @@
             this.btnMeeting.TabIndex = 18;
             this.btnMeeting.Text = "Митинг";
             this.btnMeeting.UseVisualStyleBackColor = true;
+            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
             // 
             // txtDummyMode
             // 
@@ -131,6 +145,7 @@
             this.btnStart.TabIndex = 16;
             this.btnStart.Text = "Проставить время";
             this.btnStart.UseVisualStyleBackColor = true;
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
             // 
             // pnlTopControls
             // 
@@ -151,6 +166,7 @@
             this.btnDoForDate.TabIndex = 25;
             this.btnDoForDate.Text = "Проставить на дату";
             this.btnDoForDate.UseVisualStyleBackColor = true;
+            this.btnDoForDate.Click += new System.EventHandler(this.btnDoForDate_Click);
             // 
             // dteForDay
             // 
@@ -171,18 +187,7 @@
             this.btnSettings.TabIndex = 23;
             this.btnSettings.Text = "Настройки";
             this.btnSettings.UseVisualStyleBackColor = true;
-            // 
+            this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
-            // txtLog
-            // 
-            this.txtLog.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.txtLog.Location = new System.Drawing.Point(153, 3);
-            this.txtLog.Multiline = true;
-            this.txtLog.Name = "txtLog";
-            this.txtLog.ReadOnly = true;
-            this.tlpControls.SetRowSpan(this.txtLog, 2);
-            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.txtLog.Size = new System.Drawing.Size(603, 410);
-            this.txtLog.TabIndex = 27;
             // 
             // frmMain
             // 

src/JiraTimeBot/UI/frmMain.cs

@@ -172,6 +172,7 @@ namespace JiraTimeBot.UI
                 if (txtDummyMode.Checked)
                 {
                     _log.Info("Выключаем режим Тестового прогона");
+                    txtDummyMode.Checked = false;
                 }
 
                 using (var tokenSource = GetTokenSource())

src/JiraTimeBot/UI/frmSettings.Designer.cs

@@ -49,6 +49,8 @@
             this.label8 = new System.Windows.Forms.Label();
             this.txtTimeControlTask = new System.Windows.Forms.TextBox();
             this.chkAutostart = new System.Windows.Forms.CheckBox();
+            this.lblWorkDay = new System.Windows.Forms.Label();
+            this.txtWorkDayDuration = new System.Windows.Forms.TextBox();
             this.SuspendLayout();
             // 
             // label5
@@ -153,7 +155,7 @@
             // chkAddComments
             // 
             this.chkAddComments.AutoSize = true;
-            this.chkAddComments.Location = new System.Drawing.Point(65, 277);
+            this.chkAddComments.Location = new System.Drawing.Point(65, 308);
             this.chkAddComments.Name = "chkAddComments";
             this.chkAddComments.Size = new System.Drawing.Size(133, 17);
             this.chkAddComments.TabIndex = 31;
@@ -162,7 +164,7 @@
             // 
             // btnSave
             // 
-            this.btnSave.Location = new System.Drawing.Point(86, 300);
+            this.btnSave.Location = new System.Drawing.Point(86, 331);
             this.btnSave.Name = "btnSave";
             this.btnSave.Size = new System.Drawing.Size(75, 23);
             this.btnSave.TabIndex = 32;
@@ -227,18 +229,36 @@
             // chkAutostart
             // 
             this.chkAutostart.AutoSize = true;
-            this.chkAutostart.Location = new System.Drawing.Point(65, 254);
+            this.chkAutostart.Location = new System.Drawing.Point(65, 285);
             this.chkAutostart.Name = "chkAutostart";
             this.chkAutostart.Size = new System.Drawing.Size(96, 17);
             this.chkAutostart.TabIndex = 40;
             this.chkAutostart.Text = "Автозагрузка";
             this.chkAutostart.UseVisualStyleBackColor = true;
             // 
+            // lblWorkDay
+            // 
+            this.lblWorkDay.AutoSize = true;
+            this.lblWorkDay.Location = new System.Drawing.Point(15, 258);
+            this.lblWorkDay.Name = "lblWorkDay";
+            this.lblWorkDay.Size = new System.Drawing.Size(117, 13);
+            this.lblWorkDay.TabIndex = 42;
+            this.lblWorkDay.Text = "Минут в рабочем дне:";
+            // 
+            // txtWorkDayDuration
+            // 
+            this.txtWorkDayDuration.Location = new System.Drawing.Point(133, 254);
+            this.txtWorkDayDuration.Name = "txtWorkDayDuration";
+            this.txtWorkDayDuration.Size = new System.Drawing.Size(99, 20);
+            this.txtWorkDayDuration.TabIndex = 41;
+            // 
             // frmSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(243, 334);
+            this.ClientSize = new System.Drawing.Size(243, 362);
+            this.Controls.Add(this.lblWorkDay);
+            this.Controls.Add(this.txtWorkDayDuration);
             this.Controls.Add(this.chkAutostart);
             this.Controls.Add(this.label8);
             this.Controls.Add(this.txtTimeControlTask);
@@ -294,5 +314,7 @@
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.TextBox txtTimeControlTask;
         private System.Windows.Forms.CheckBox chkAutostart;
+        private System.Windows.Forms.Label lblWorkDay;
+        private System.Windows.Forms.TextBox txtWorkDayDuration;
     }
 }

src/JiraTimeBot/UI/frmSettings.cs

@@ -38,6 +38,7 @@ namespace JiraTimeBot.UI
             cboWorkType.SelectedIndex = (int) settings.WorkType;
             txtTimeControlTask.Text = settings.TimeControlTask;
             txtJQL.Text = settings.JiraQuery;
+            txtWorkDayDuration.Text = settings.MinuterPerWorkDay.ToString();
 
             cboWorkType_SelectedIndexChanged(null, null);
         }
@@ -48,6 +49,10 @@ namespace JiraTimeBot.UI
             {
                 roundTo = 15;
             }
+            if (!int.TryParse(txtWorkDayDuration.Text, out var minuterPerWorkDay))
+            {
+                minuterPerWorkDay = 8 * 60;
+            }
 
             var settings = new Settings
             {
@@ -61,6 +66,7 @@ namespace JiraTimeBot.UI
                 WorkType = (WorkType) cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
+                MinuterPerWorkDay = minuterPerWorkDay
             };
 
             //LockUnlock(false);