Merge pull request #2 from typinghard/feature/49

ElvisCSouza · web-flow · commit 04699062449b · 2021-09-27T18:54:03.000-03:00
Feature/49
diff --git a/AzureDevopsTracker/Adapters/WorkItemAdapter.cs b/AzureDevopsTracker/Adapters/WorkItemAdapter.cs
@@ -1,6 +1,8 @@
 ﻿using AzureDevopsTracker.DTOs;
 using AzureDevopsTracker.Entities;
+using AzureDevopsTracker.Extensions;
 using AzureDevopsTracker.Interfaces;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -86,8 +88,8 @@ public TimeByStateDTO ToTimeByStateDTO(TimeByState workItemStatusTime)
             {
                 CreatedAt = workItemStatusTime.CreatedAt,
                 State = workItemStatusTime.State,
-                //TotalTime = workItemStatusTime.TotalTimeText,
-                //TotalWorkedTime = workItemStatusTime.TotalWorkedTimeText
+                TotalTime = TimeSpan.FromSeconds(workItemStatusTime.TotalTime).ToTextTime(),
+                TotalWorkedTime = TimeSpan.FromSeconds(workItemStatusTime.TotalWorkedTime).ToTextTime()
             };
         }
 
diff --git a/AzureDevopsTracker/AzureDevopsTracker.csproj b/AzureDevopsTracker/AzureDevopsTracker.csproj
@@ -8,22 +8,30 @@
     <Company>TypingHard</Company>
     <Product>Azure DevOps Tracker</Product>
     <PackageLicenseExpression></PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/typinghard/azure-devops-state-tracker</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/typinghard/azure-devops-state-tracker</RepositoryUrl>
+    <PackageProjectUrl>https://github.com/typinghard/azure-devops-tracker</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/typinghard/azure-devops-tracker</RepositoryUrl>
     <PackageIcon>adst_icon.png</PackageIcon>
     <PackageIconUrl />
     <RepositoryType>GitHub</RepositoryType>
     <PackageTags>Azure DevOps Tracker Columns State Tracking Track Board Scrum Kanbam Time Column Timing Workitem Worked Hours Team Performance</PackageTags>
     <NeutralLanguage>en</NeutralLanguage>
     <PackageLicenseFile>LICENSE.md.txt</PackageLicenseFile>
+    <Description>A NuGet that allows you to use a Azure DevOps Service Hook to track workitems changes in a simply and detailed way.</Description>
+    <AssemblyVersion>1.0.0.0</AssemblyVersion>
+    <FileVersion>1.0.0.0</FileVersion>
+    <Version>1.0.1</Version>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.7" />
-    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup>
+    <None Include="..\..\..\..\..\..\..\Downloads\adst_icon.png">
+      <Pack>True</Pack>
+      <PackagePath></PackagePath>
+    </None>
     <None Include="LICENSE.md.txt">
       <Pack>True</Pack>
       <PackagePath></PackagePath>
diff --git a/AzureDevopsTracker/Configurations/Configuration.cs b/AzureDevopsTracker/Configurations/Configuration.cs
@@ -13,22 +13,22 @@ namespace AzureDevopsTracker.Configurations
 {
     public static class Configuration
     {
-        public static IServiceCollection AddAzureDevopsStateTracker(this IServiceCollection services, DataBaseConfig configurations)
+        public static IServiceCollection AddAzureDevopsTracker(this IServiceCollection services, DataBaseConfig configurations)
         {
-            services.AddDbContext<AzureDevopsStateTrackerContext>(options =>
+            services.AddDbContext<AzureDevopsTrackerContext>(options =>
                     options.UseSqlServer(DataBaseConfig.ConnectionsString));
 
-            services.AddScoped<AzureDevopsStateTrackerContext>();
+            services.AddScoped<AzureDevopsTrackerContext>();
             services.AddScoped<IWorkItemAdapter, WorkItemAdapter>();
             services.AddScoped<IWorkItemRepository, WorkItemRepository>();
-            services.AddScoped<IAzureDevopsStateTrackerService, AzureDevopsStateTrackerService>();
+            services.AddScoped<IAzureDevopsTrackerService, AzureDevopsTrackerService>();
 
             return services;
         }
 
-        public static IApplicationBuilder UseAzureDevopsStateTracker(this IApplicationBuilder app, IServiceProvider serviceProvider)
+        public static IApplicationBuilder UseAzureDevopsTracker(this IApplicationBuilder app, IServiceProvider serviceProvider)
         {
-            var context = serviceProvider.GetService<AzureDevopsStateTrackerContext>();
+            var context = serviceProvider.GetService<AzureDevopsTrackerContext>();
             context.Database.Migrate();
 
             return app;
diff --git a/AzureDevopsTracker/Data/Context/AzureDevopsTrackerContext.cs b/AzureDevopsTracker/Data/Context/AzureDevopsTrackerContext.cs
@@ -5,9 +5,9 @@
 
 namespace AzureDevopsTracker.Data.Context
 {
-    public class AzureDevopsStateTrackerContext : DbContext, IDisposable
+    public class AzureDevopsTrackerContext : DbContext, IDisposable
     {
-        public AzureDevopsStateTrackerContext(DbContextOptions options) : base(options)
+        public AzureDevopsTrackerContext(DbContextOptions options) : base(options)
         { }
 
         public DbSet<WorkItem> WorkItems { get; set; }
diff --git a/AzureDevopsTracker/Data/Repository.cs b/AzureDevopsTracker/Data/Repository.cs
@@ -10,10 +10,10 @@ namespace AzureDevopsTracker.Data
 {
     internal abstract class Repository<TEntity> : IRepository<TEntity> where TEntity : Entity
     {
-        protected readonly AzureDevopsStateTrackerContext Db;
+        protected readonly AzureDevopsTrackerContext Db;
         protected readonly DbSet<TEntity> DbSet;
 
-        public Repository(AzureDevopsStateTrackerContext db)
+        public Repository(AzureDevopsTrackerContext db)
         {
             Db = db;
             DbSet = db.Set<TEntity>();
diff --git a/AzureDevopsTracker/Data/WorkItemRepository.cs b/AzureDevopsTracker/Data/WorkItemRepository.cs
@@ -10,7 +10,7 @@ namespace AzureDevopsTracker.Data
 {
     internal class WorkItemRepository : Repository<WorkItem>, IWorkItemRepository
     {
-        public WorkItemRepository(AzureDevopsStateTrackerContext context) : base(context) { }
+        public WorkItemRepository(AzureDevopsTrackerContext context) : base(context) { }
 
         public async Task<WorkItem> GetByWorkItemId(string workItemId)
         {
diff --git a/AzureDevopsTracker/Extensions/HelperExtenions.cs b/AzureDevopsTracker/Extensions/HelperExtenions.cs
@@ -25,7 +25,7 @@ public static string ExtractEmail(this string user)
         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";
+                return $@"{timeSpan:%d} Day(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";
diff --git a/AzureDevopsTracker/Interfaces/IAzureDevopsTrackerService.cs b/AzureDevopsTracker/Interfaces/IAzureDevopsTrackerService.cs
@@ -5,7 +5,7 @@
 
 namespace AzureDevopsTracker.Interfaces
 {
-    public interface IAzureDevopsStateTrackerService
+    public interface IAzureDevopsTrackerService
     {
         Task Create(CreateWorkItemDTO createDto, bool addWorkItemChange = true);
         Task Update(UpdatedWorkItemDTO updateDto);
diff --git a/AzureDevopsTracker/Migrations/20210719163846_AzureDevopsStateTrackerInitial.Designer.cs b/AzureDevopsTracker/Migrations/20210719163846_AzureDevopsStateTrackerInitial.Designer.cs
diff --git a/AzureDevopsTracker/Migrations/20210720105645_FunctionToTimeInitial.Designer.cs b/AzureDevopsTracker/Migrations/20210720105645_FunctionToTimeInitial.Designer.cs
diff --git a/AzureDevopsTracker/Migrations/20210831213210_UpdatingColumns.Designer.cs b/AzureDevopsTracker/Migrations/20210831213210_UpdatingColumns.Designer.cs
diff --git a/AzureDevopsTracker/Migrations/20210831213948_UpdatingCustomColumn.Designer.cs b/AzureDevopsTracker/Migrations/20210831213948_UpdatingCustomColumn.Designer.cs
diff --git a/AzureDevopsTracker/Migrations/AzureDevopsStateTrackerContextModelSnapshot.cs b/AzureDevopsTracker/Migrations/AzureDevopsStateTrackerContextModelSnapshot.cs
@@ -9,7 +9,7 @@
 
 namespace AzureDevopsTracker.Migrations
 {
-    [DbContext(typeof(AzureDevopsStateTrackerContext))]
+    [DbContext(typeof(AzureDevopsTrackerContext))]
     partial class AzureDevopsStateTrackerContextModelSnapshot : ModelSnapshot
     {
         protected override void BuildModel(ModelBuilder modelBuilder)
diff --git a/AzureDevopsTracker/Services/AzureDevopsTrackerService.cs b/AzureDevopsTracker/Services/AzureDevopsTrackerService.cs
@@ -11,12 +11,12 @@
 
 namespace AzureDevopsTracker.Services
 {
-    public class AzureDevopsStateTrackerService : IAzureDevopsStateTrackerService
+    public class AzureDevopsTrackerService : IAzureDevopsTrackerService
     {
         public readonly IWorkItemRepository _workItemRepository;
         public readonly IWorkItemAdapter _workItemAdapter;
 
-        public AzureDevopsStateTrackerService(
+        public AzureDevopsTrackerService(
             IWorkItemAdapter workItemAdapter, IWorkItemRepository workItemRepository)
         {
             _workItemAdapter = workItemAdapter;
@@ -103,7 +103,10 @@ public async Task<WorkItemDTO> GetByWorkItemId(string workItemId)
         }
 
         #region Support Methods
-        public WorkItemChange ToWorkItemChange(string workItemId, string changedBy, string iterationPath, DateTime newDate, string newState, string oldState = null, DateTime? oldDate = null)
+        public WorkItemChange ToWorkItemChange(
+            string workItemId, string changedBy,
+            string iterationPath, DateTime newDate, string newState,
+            string oldState = null, DateTime? oldDate = null)
         {
             return new WorkItemChange(workItemId, changedBy.ExtractEmail(), iterationPath, newDate, newState, oldState, oldDate);
         }

Original file line number	Diff line number	Diff line change
`@@ -13,22 +13,22 @@ namespace AzureDevopsTracker.Configurations`
`13`	`13`	`{`
`14`	`14`	`public static class Configuration`
`15`	`15`	`{`
`16`		`- public static IServiceCollection AddAzureDevopsStateTracker(this IServiceCollection services, DataBaseConfig configurations)`
	`16`	`+ public static IServiceCollection AddAzureDevopsTracker(this IServiceCollection services, DataBaseConfig configurations)`
`17`	`17`	`{`
`18`		`- services.AddDbContext<AzureDevopsStateTrackerContext>(options =>`
	`18`	`+ services.AddDbContext<AzureDevopsTrackerContext>(options =>`
`19`	`19`	`options.UseSqlServer(DataBaseConfig.ConnectionsString));`
`20`	`20`
`21`		`- services.AddScoped<AzureDevopsStateTrackerContext>();`
	`21`	`+ services.AddScoped<AzureDevopsTrackerContext>();`
`22`	`22`	`services.AddScoped<IWorkItemAdapter, WorkItemAdapter>();`
`23`	`23`	`services.AddScoped<IWorkItemRepository, WorkItemRepository>();`
`24`		`- services.AddScoped<IAzureDevopsStateTrackerService, AzureDevopsStateTrackerService>();`
	`24`	`+ services.AddScoped<IAzureDevopsTrackerService, AzureDevopsTrackerService>();`
`25`	`25`
`26`	`26`	`return services;`
`27`	`27`	`}`
`28`	`28`
`29`		`- public static IApplicationBuilder UseAzureDevopsStateTracker(this IApplicationBuilder app, IServiceProvider serviceProvider)`
	`29`	`+ public static IApplicationBuilder UseAzureDevopsTracker(this IApplicationBuilder app, IServiceProvider serviceProvider)`
`30`	`30`	`{`
`31`		`- var context = serviceProvider.GetService<AzureDevopsStateTrackerContext>();`
	`31`	`+ var context = serviceProvider.GetService<AzureDevopsTrackerContext>();`
`32`	`32`	`context.Database.Migrate();`
`33`	`33`
`34`	`34`	`return app;`
Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,9 @@`
`5`	`5`
`6`	`6`	`namespace AzureDevopsTracker.Data.Context`
`7`	`7`	`{`
`8`		`- public class AzureDevopsStateTrackerContext : DbContext, IDisposable`
	`8`	`+ public class AzureDevopsTrackerContext : DbContext, IDisposable`
`9`	`9`	`{`
`10`		`- public AzureDevopsStateTrackerContext(DbContextOptions options) : base(options)`
	`10`	`+ public AzureDevopsTrackerContext(DbContextOptions options) : base(options)`
`11`	`11`	`{ }`
`12`	`12`
`13`	`13`	`public DbSet<WorkItem> WorkItems { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,10 @@ namespace AzureDevopsTracker.Data`
`10`	`10`	`{`
`11`	`11`	`internal abstract class Repository<TEntity> : IRepository<TEntity> where TEntity : Entity`
`12`	`12`	`{`
`13`		`- protected readonly AzureDevopsStateTrackerContext Db;`
	`13`	`+ protected readonly AzureDevopsTrackerContext Db;`
`14`	`14`	`protected readonly DbSet<TEntity> DbSet;`
`15`	`15`
`16`		`- public Repository(AzureDevopsStateTrackerContext db)`
	`16`	`+ public Repository(AzureDevopsTrackerContext db)`
`17`	`17`	`{`
`18`	`18`	`Db = db;`
`19`	`19`	`DbSet = db.Set<TEntity>();`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace AzureDevopsTracker.Data`
`10`	`10`	`{`
`11`	`11`	`internal class WorkItemRepository : Repository<WorkItem>, IWorkItemRepository`
`12`	`12`	`{`
`13`		`- public WorkItemRepository(AzureDevopsStateTrackerContext context) : base(context) { }`
	`13`	`+ public WorkItemRepository(AzureDevopsTrackerContext context) : base(context) { }`
`14`	`14`
`15`	`15`	`public async Task<WorkItem> GetByWorkItemId(string workItemId)`
`16`	`16`	`{`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public static string ExtractEmail(this string user)`
`25`	`25`	`public static string ToTextTime(this TimeSpan timeSpan)`
`26`	`26`	`{`
`27`	`27`	`if (timeSpan.Days > 0)`
`28`		`- return $@"{timeSpan:%d} Dia(s) {timeSpan:%h} h e {timeSpan:%m} min e {timeSpan:%s} s";`
	`28`	`+ return $@"{timeSpan:%d} Day(s) {timeSpan:%h} h e {timeSpan:%m} min e {timeSpan:%s} s";`
`29`	`29`
`30`	`30`	`if (timeSpan.Hours > 0)`
`31`	`31`	`return $@"{timeSpan:%h} h e {timeSpan:%m} min e {timeSpan:%s} s";`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace AzureDevopsTracker.Interfaces`
`7`	`7`	`{`
`8`		`- public interface IAzureDevopsStateTrackerService`
	`8`	`+ public interface IAzureDevopsTrackerService`
`9`	`9`	`{`
`10`	`10`	`Task Create(CreateWorkItemDTO createDto, bool addWorkItemChange = true);`
`11`	`11`	`Task Update(UpdatedWorkItemDTO updateDto);`