Updating

Author: DiegoGalante

AzureDevopsStateTracker/Adapters/WorkItemAdapter.cs

@@ -1,7 +1,6 @@
 using AzureDevopsStateTracker.DTOs;
 using AzureDevopsStateTracker.Entities;
 using AzureDevopsStateTracker.Interfaces;
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -87,8 +86,8 @@ public TimeByStateDTO ToTimeByStateDTO(TimeByState workItemStatusTime)
             {
                 CreatedAt = workItemStatusTime.CreatedAt,
                 State = workItemStatusTime.State,
-                TotalTime = ToStringTime(new DateTime(workItemStatusTime.TotalTime).TimeOfDay),
-                TotalWorkedTime = ToStringTime(new DateTime(workItemStatusTime.TotalWorkedTime).TimeOfDay)
+                TotalTime = workItemStatusTime.TotalTimeText,
+                TotalWorkedTime = workItemStatusTime.TotalWorkedTimeText
             };
         }
 
@@ -106,22 +105,5 @@ public List<TimeByStateDTO> ToTimeByStatesDTO(List<TimeByState> workItemStatusTi
                      .Where(w => w != null)
                      .ToList();
         }
-
-        public string ToStringTime(TimeSpan timeSpan)
-        {
-            if (timeSpan.Days > 0)
-                return $@"{timeSpan:%d} Dia(s) {timeSpan:%h}h e {timeSpan:%m}min e {timeSpan:%s}s";
-
-            if (timeSpan.Hours > 0)
-                return $@"{timeSpan:%h}h e {timeSpan:%m}min e {timeSpan:%s}s";
-
-            if (timeSpan.Minutes > 0)
-                return $@"{timeSpan:%m}min e {timeSpan:%s}s";
-
-            if (timeSpan.Seconds > 0)
-                return $@"{timeSpan:%s}s";
-
-            return $@"{timeSpan:%hh}:{timeSpan:%mm}:{timeSpan:%ss}";
-        }
     }
 }

AzureDevopsStateTracker/Entities/TimeByState.cs

@@ -8,17 +8,22 @@ public class TimeByState : Entity
         public string WorkItemId { get; private set; }
         public string State { get; private set; }
         public long TotalTime { get; private set; }
+        public string TotalTimeText { get; private set; }
         public long TotalWorkedTime { get; private set; }
+        public string TotalWorkedTimeText { get; private set; }
+
         public WorkItem WorkItem { get; private set; }
 
         private TimeByState() { }
 
-        public TimeByState(string workItemId, string state, long totalTime, long totalWorkedTime)
+        public TimeByState(string workItemId, string state, TimeSpan totalTime, TimeSpan totalWorkedTime)
         {
             WorkItemId = workItemId;
             State = state;
-            TotalTime = totalTime;
-            TotalWorkedTime = totalWorkedTime;
+            TotalTime = totalTime.Ticks;
+            TotalTimeText = totalTime.ToTextTime();
+            TotalWorkedTime = totalWorkedTime.Ticks;
+            TotalWorkedTimeText = totalWorkedTime.ToTextTime();
 
             Validate();
         }

AzureDevopsStateTracker/Entities/WorkItem.cs

@@ -119,7 +119,7 @@ public IEnumerable<TimeByState> CalculateTotalTimeByState()
                     totalWorkedTime += data.CalculateTotalWorkedTime();
                 }
 
-                timesByStateList.Add(new TimeByState(Id, workItemChange.Key, totalTime.Ticks, totalWorkedTime.Ticks));
+                timesByStateList.Add(new TimeByState(Id, workItemChange.Key, totalTime, totalWorkedTime));
             }
 
             return timesByStateList;

AzureDevopsStateTracker/Extensions/HelperExtenions.cs

@@ -1,8 +1,5 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Text.RegularExpressions;
 
 namespace AzureDevopsStateTracker.Extensions
 {
@@ -13,19 +10,6 @@ public static bool IsNullOrEmpty(this string text)
             return string.IsNullOrEmpty(text?.Trim());
         }
 
-        /// <summary>
-        /// Calculates the sum of the given timeSpans.
-        /// </summary>
-        public static TimeSpan Sum(this IEnumerable<TimeSpan> timeSpans)
-        {
-            TimeSpan sumTillNowTimeSpan = TimeSpan.Zero;
-
-            foreach (TimeSpan timeSpan in timeSpans)
-                sumTillNowTimeSpan += timeSpan;
-
-            return sumTillNowTimeSpan;
-        }
-
         public static string ExtractEmail(this string user)
         {
             if (user is null)
@@ -36,5 +20,22 @@ public static string ExtractEmail(this string user)
 
             return user.Split("<").LastOrDefault().Split(">").FirstOrDefault();
         }
+
+        public static string ToTextTime(this TimeSpan timeSpan)
+        {
+            if (timeSpan.Days > 0)
+                return $@"{timeSpan:%d} Dia(s) {timeSpan:%h} h e {timeSpan:%m} min e {timeSpan:%s} s";
+
+            if (timeSpan.Hours > 0)
+                return $@"{timeSpan:%h} h e {timeSpan:%m} min e {timeSpan:%s} s";
+
+            if (timeSpan.Minutes > 0)
+                return $@"{timeSpan:%m} min e {timeSpan:%s} s";
+
+            if (timeSpan.Seconds > 0)
+                return $@"{timeSpan:%s} s";
+
+            return "-";
+        }
     }
 }

…ureDevopsStateTrackerInitial.Designer.cs …ureDevopsStateTrackerInitial.Designer.csAzureDevopsStateTracker/Migrations/20210717144104_AzureDevopsStateTrackerInitial.Designer.cs renamed to AzureDevopsStateTracker/Migrations/20210718145727_AzureDevopsStateTrackerInitial.Designer.cs AzureDevopsStateTracker/Migrations/20210717144104_AzureDevopsStateTrackerInitial.Designer.cs renamed to AzureDevopsStateTracker/Migrations/20210718145727_AzureDevopsStateTrackerInitial.Designer.cs

@@ -47,7 +47,9 @@ protected override void Up(MigrationBuilder migrationBuilder)
                     WorkItemId = table.Column<string>(type: "varchar(200)", nullable: true),
                     State = table.Column<string>(type: "varchar(200)", nullable: true),
                     TotalTime = table.Column<long>(nullable: false),
-                    TotalWorkedTime = table.Column<long>(nullable: false)
+                    TotalTimeText = table.Column<string>(type: "varchar(200)", nullable: true),
+                    TotalWorkedTime = table.Column<long>(nullable: false),
+                    TotalWorkedTimeText = table.Column<string>(type: "varchar(200)", nullable: true)
                 },
                 constraints: table =>
                 {

…144104_AzureDevopsStateTrackerInitial.cs …145727_AzureDevopsStateTrackerInitial.csAzureDevopsStateTracker/Migrations/20210717144104_AzureDevopsStateTrackerInitial.cs renamed to AzureDevopsStateTracker/Migrations/20210718145727_AzureDevopsStateTrackerInitial.cs AzureDevopsStateTracker/Migrations/20210717144104_AzureDevopsStateTrackerInitial.cs renamed to AzureDevopsStateTracker/Migrations/20210718145727_AzureDevopsStateTrackerInitial.cs

@@ -35,9 +35,15 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<long>("TotalTime")
                         .HasColumnType("bigint");
 
+                    b.Property<string>("TotalTimeText")
+                        .HasColumnType("varchar(200)");
+
                     b.Property<long>("TotalWorkedTime")
                         .HasColumnType("bigint");
 
+                    b.Property<string>("TotalWorkedTimeText")
+                        .HasColumnType("varchar(200)");
+
                     b.Property<string>("WorkItemId")
                         .HasColumnType("varchar(200)");