Merge branch 'develop'

.github/workflows/dotnet-core-build-and-test-develop.yml → .github/workflows/dotnet-build-and-test-develop.yml

@@ -12,14 +12,14 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.0.100
-    - name: Install dependencies
+        dotnet-version: 8.0.x
+    - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
-      run: dotnet test --filter Category=UnitTest --no-restore --verbosity normal 
+      run: dotnet test --filter Category=UnitTest --no-restore --verbosity normal 

.github/workflows/dotnet-core-build-and-test.yml → .github/workflows/dotnet-build-and-test.yml

@@ -12,12 +12,11 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
+    - uses: actions/checkout@v4
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
       with:
-        dotnet-version: 3.0.100
-    - name: Install dependencies
+        dotnet-version: 8.0.x
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore

Develappers.RedmineHourglassApi.Tests/Develappers.RedmineHourglassApi.Tests.csproj

@@ -1,8 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
-
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
@@ -11,10 +12,10 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
     <PackageReference Include="xunit" Version="2.9.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
     </PackageReference>

Develappers.RedmineHourglassApi.Tests/HourglassClientTests.cs

@@ -0,0 +1,43 @@
+using System;
+using Xunit;
+
+namespace Develappers.RedmineHourglassApi.Tests
+{
+    public class HourglassClientTests
+    {
+        [Fact]
+        public void ValidConfiguration_ShouldSetProperties()
+        {
+            var config = Helpers.GetTestConfiguration();
+            var hourglassClient = new HourglassClient(config);
+
+            Assert.NotNull(hourglassClient.TimeBookings);
+            Assert.NotNull(hourglassClient.TimeLogs);
+            Assert.NotNull(hourglassClient.TimeTrackers);
+        }
+
+        [Fact]
+        public void NullConfiguration_ShouldThrowArgumentNullException()
+        {
+            Assert.Throws<ArgumentNullException>(() => new HourglassClient(null));
+        }
+
+        [Fact]
+        public void InvalidApiKey_ShouldThrowArgumentException()
+        {
+            var config = new Configuration("https://redmineTest.de", "");
+
+            var exception = Assert.Throws<ArgumentException>(() => new HourglassClient(config));
+            Assert.Equal("invalid api key (Parameter 'configuration')", exception.Message);
+        }
+
+        [Fact]
+        public void InvalidRedmineUrl_ShouldThrowArgumentException()
+        {
+            var config = new Configuration("", "ApiKey");
+
+            var exception = Assert.Throws<ArgumentException>(() => new HourglassClient(config));
+            Assert.Equal("invalid base url (Parameter 'configuration')", exception.Message);
+        }
+    }
+}

Develappers.RedmineHourglassApi/BaseService.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Net;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Net;
 using Develappers.RedmineHourglassApi.Types;
 using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;

Develappers.RedmineHourglassApi/Configuration.cs

@@ -1,4 +1,4 @@
-using System;
+using System.Diagnostics.CodeAnalysis;
 
 namespace Develappers.RedmineHourglassApi
 {
@@ -9,6 +9,7 @@ public Configuration()
         {
         }
 
+        [SetsRequiredMembers]
         public Configuration(string redmineUrl, string apiKey)
         {
             RedmineUrl = redmineUrl;
@@ -18,12 +19,12 @@ public Configuration(string redmineUrl, string apiKey)
         /// <summary>
         /// The redmine installation url.
         /// </summary>
-        public string RedmineUrl { get; set; }
+        public required string RedmineUrl { get; set; }
 
         /// <summary>
         /// The api key.
         /// </summary>
-        public string ApiKey { get; set; }
+        public required string ApiKey { get; set; }
 
         internal Configuration DeepClone()
         {

Develappers.RedmineHourglassApi/Develappers.RedmineHourglassApi.csproj

@@ -1,7 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
     <AssemblyName>Develappers.RedmineHourglassApi</AssemblyName>
     <RootNamespace>Develappers.RedmineHourglassApi</RootNamespace>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
@@ -15,22 +17,19 @@
     <RepositoryType>Git</RepositoryType>
     <PackageLicenseUrl></PackageLicenseUrl>
     <PackageIconUrl>https://raw.githubusercontent.com/DevelappersGmbH/RedmineHourglassNet/master/icon.png</PackageIconUrl>
-    <Version>1.2.0</Version>
+    <Version>2.0.0-alpha</Version>
     <RepositoryUrl>https://github.com/DevelappersGmbH/RedmineHourglassNet.git</RepositoryUrl>
     <PackageReleaseNotes></PackageReleaseNotes>
     <LangVersion>default</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <AssemblyVersion>1.2.0.0</AssemblyVersion>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>TRACE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CSharp" Version="4.7.0">
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>

Develappers.RedmineHourglassApi/Extensions.cs

@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Net;
+using System.Net;
 using Develappers.RedmineHourglassApi.Types;
 using Newtonsoft.Json;
 

Develappers.RedmineHourglassApi/HourglassClient.cs

@@ -1,15 +1,14 @@
-using System;
-using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
 
 namespace Develappers.RedmineHourglassApi
 {
     /// <summary>
     /// Central object to access the API.
     /// </summary>
-    public class HourglassClient
+    public class HourglassClient : IHourglassClient
     {
-        public HourglassClient(Configuration configuration, ILogger logger = null)
+        public HourglassClient(Configuration configuration, ILogger? logger = null)
         {
             logger ??= NullLogger.Instance;
 

Develappers.RedmineHourglassApi/HttpClient.cs

@@ -1,9 +1,5 @@
-using System;
-using System.IO;
-using System.Net;
+using System.Net;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace Develappers.RedmineHourglassApi;

Develappers.RedmineHourglassApi/IHourglassClient.cs

@@ -0,0 +1,9 @@
+namespace Develappers.RedmineHourglassApi
+{
+    public interface IHourglassClient
+    {
+        ITimeBookingService TimeBookings { get; }
+        ITimeLogService TimeLogs { get; }
+        ITimeTrackerService TimeTrackers { get; }
+    }
+}

Develappers.RedmineHourglassApi/ITimeBookingService.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Develappers.RedmineHourglassApi.Types;
+using Develappers.RedmineHourglassApi.Types;
 
 namespace Develappers.RedmineHourglassApi;
 
@@ -16,7 +13,7 @@ public interface ITimeBookingService
     Task<PaginatedResult<TimeBooking>> GetListAsync(TimeBookingListQuery query, CancellationToken token = default);
 
     /// <summary>
-    /// Retrieves a time booking by it's id.
+    /// Retrieves a time booking by its id.
     /// </summary>
     /// <param name="id">The id of the time booking.</param>
     /// <param name="token">The cancellation token.</param>

Develappers.RedmineHourglassApi/ITimeLogService.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Develappers.RedmineHourglassApi.Types;
+using Develappers.RedmineHourglassApi.Types;
 
 namespace Develappers.RedmineHourglassApi;
 

Develappers.RedmineHourglassApi/ITimeTrackerService.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Threading;
-using System.Threading.Tasks;
-using Develappers.RedmineHourglassApi.Types;
+using Develappers.RedmineHourglassApi.Types;
 
 namespace Develappers.RedmineHourglassApi;
 

Develappers.RedmineHourglassApi/NotFoundException.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Runtime.Serialization;
-
-namespace Develappers.RedmineHourglassApi;
+namespace Develappers.RedmineHourglassApi;
 
 public class NotFoundException : Exception
 {
@@ -16,8 +13,4 @@ public NotFoundException(string message) : base(message)
     public NotFoundException(string message, Exception innerException) : base(message, innerException)
     {
     }
-
-    protected NotFoundException(SerializationInfo info, StreamingContext context) : base(info, context)
-    {
-    }
 }

Develappers.RedmineHourglassApi/TimeBookingService.cs

@@ -1,11 +1,6 @@
 using Develappers.RedmineHourglassApi.Types;
 using Microsoft.Extensions.Logging;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Develappers.RedmineHourglassApi;
 

Develappers.RedmineHourglassApi/TimeLogService.cs

@@ -1,10 +1,5 @@
 using Develappers.RedmineHourglassApi.Types;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace Develappers.RedmineHourglassApi;
@@ -148,11 +143,6 @@ public async Task BulkBookAsync(List<TimeBookingBulkUpdate> values, Cancellation
             throw new ArgumentNullException(nameof(values));
         }
 
-        if (values == null)
-        {
-            throw new ArgumentNullException(nameof(values));
-        }
-
         var dict = new Dictionary<string, TimeBookingBulkUpdate>();
         for (var i = 0; i < values.Count; i++)
         {

Develappers.RedmineHourglassApi/TimeTrackerService.cs

@@ -1,12 +1,7 @@
 using Develappers.RedmineHourglassApi.Types;
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Linq;
 using System.Net;
 using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
 namespace Develappers.RedmineHourglassApi;