v 0.12.0

.github/workflows/dotnet_develop.yml

@@ -11,6 +11,10 @@ jobs:
     env:
       BUILD_CONFIG: Debug
       NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      TEST_USER: root
+      TEST_PASSWORD: TestPass123
+      TEST_DATABASE: TestDatabase
+      DB_TEST_PROJECT: test/DbIntegrationTests
 
     runs-on: ubuntu-latest
 
@@ -21,6 +25,15 @@ jobs:
       with:
         dotnet-version: 6.0.x
         source-url: https://nuget.pkg.github.com/SSchulze1989/index.json
+    - name: Setup MySQL
+      uses: mirromutth/[email protected]
+      with:        
+        # Required if "mysql user" is empty, default is empty. The root superuser password
+        mysql root password: $TEST_PASSWORD
+        # MYSQL_DATABASE - name for the default database that is created
+        mysql database: $TEST_DATABASE
+    - name: Set secrets
+      run: dotnet user-secrets set "ConnectionStrings:ModelDb" "server=localhost;database=$TEST_DATABASE;user=$TEST_USER;password=$TEST_PASSWORD" --project $DB_TEST_PROJECT
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/dotnet_main_pr.yml

@@ -9,6 +9,10 @@ jobs:
     env:
       BUILD_CONFIG: Release
       NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      TEST_USER: root
+      TEST_PASSWORD: TestPass123
+      TEST_DATABASE: TestDatabase
+      DB_TEST_PROJECT: test/DbIntegrationTests
 
     runs-on: ubuntu-latest
 
@@ -19,6 +23,15 @@ jobs:
       with:
         dotnet-version: 6.0.x
         source-url: https://nuget.pkg.github.com/SSchulze1989/index.json
+    - name: Setup MySQL
+      uses: mirromutth/[email protected]
+      with:        
+        # Required if "mysql user" is empty, default is empty. The root superuser password
+        mysql root password: $TEST_PASSWORD
+        # MYSQL_DATABASE - name for the default database that is created
+        mysql database: $TEST_DATABASE
+    - name: Set secrets
+      run: dotnet user-secrets set "ConnectionStrings:ModelDb" "server=localhost;database=$TEST_DATABASE;user=$TEST_USER;password=$TEST_PASSWORD" --project $DB_TEST_PROJECT
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/dotnet_main_push.yml

@@ -9,6 +9,10 @@ jobs:
     env:
       BUILD_CONFIG: Release
       NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      TEST_USER: root
+      TEST_PASSWORD: TestPass123
+      TEST_DATABASE: TestDatabase
+      DB_TEST_PROJECT: test/DbIntegrationTests
 
     runs-on: ubuntu-latest
 
@@ -19,6 +23,15 @@ jobs:
       with:
         dotnet-version: 6.0.x
         source-url: https://nuget.pkg.github.com/SSchulze1989/index.json
+    - name: Setup MySQL
+      uses: mirromutth/[email protected]
+      with:        
+        # Required if "mysql user" is empty, default is empty. The root superuser password
+        mysql root password: $TEST_PASSWORD
+        # MYSQL_DATABASE - name for the default database that is created
+        mysql database: $TEST_DATABASE
+    - name: Set secrets
+      run: dotnet user-secrets set "ConnectionStrings:ModelDb" "server=localhost;database=$TEST_DATABASE;user=$TEST_USER;password=$TEST_PASSWORD" --project $DB_TEST_PROJECT
     - name: Restore dependencies
       run: dotnet restore
     - name: Build

.github/workflows/dotnet_tag_release.yml

@@ -9,7 +9,11 @@ jobs:
   publish:
     env:
       BUILD_CONFIG: Release
-      NUGET_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}
+      NUGET_AUTH_TOKEN: ${{secrets.NUGET_TOKEN}}
+      TEST_USER: root
+      TEST_PASSWORD: TestPass123
+      TEST_DATABASE: TestDatabase
+      DB_TEST_PROJECT: test/DbIntegrationTests
 
     runs-on: ubuntu-latest
 
@@ -19,12 +23,21 @@ jobs:
       uses: actions/setup-dotnet@v3
       with:
         dotnet-version: 6.0.x
-        source-url: https://nuget.pkg.github.com/SSchulze1989/index.json
+        source-url: https://api.nuget.org/v3/index.json
+    - name: Setup MySQL
+      uses: mirromutth/[email protected]
+      with:        
+        # Required if "mysql user" is empty, default is empty. The root superuser password
+        mysql root password: $TEST_PASSWORD
+        # MYSQL_DATABASE - name for the default database that is created
+        mysql database: $TEST_DATABASE
+    - name: Set secrets
+      run: dotnet user-secrets set "ConnectionStrings:ModelDb" "server=localhost;database=$TEST_DATABASE;user=$TEST_USER;password=$TEST_PASSWORD" --project $DB_TEST_PROJECT
     - name: Restore dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build -c $BUILD_CONFIG --no-restore
     - name: Test
       run: dotnet test -c $BUILD_CONFIG --no-build --verbosity normal
     - name: Publish
-      run: dotnet nuget push **\*.nupkg --skip-duplicate
+      run: dotnet nuget push **\*.nupkg --skip-duplicate -k ${NUGET_AUTH_TOKEN}

iRLeagueApiCore.sln

@@ -23,7 +23,17 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iRLeagueApiCore.Services",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iRLeagueApiCore.Services.Tests", "test\iRLeagueApiCore.Services.Tests\iRLeagueApiCore.Services.Tests.csproj", "{DB449DBD-703D-45F0-B935-6876F81516D6}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "iRLeagueApiCore.Mocking", "test\iRLeagueApiCore.Mocking\iRLeagueApiCore.Mocking\iRLeagueApiCore.Mocking.csproj", "{84F0108C-30A3-4CF1-9F03-EC4DDC979E7B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iRLeagueApiCore.Mocking", "test\iRLeagueApiCore.Mocking\iRLeagueApiCore.Mocking\iRLeagueApiCore.Mocking.csproj", "{84F0108C-30A3-4CF1-9F03-EC4DDC979E7B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iRLeagueApiCore.Common", "src\iRLeagueApiCore.Common\iRLeagueApiCore.Common.csproj", "{E9639AF9-8C03-4B30-AA3B-B85873D0C406}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iRLeagueDatabaseCore", "src\iRLeagueDatabaseCore\iRLeagueDatabaseCore.csproj", "{374D9358-C654-4882-AE9F-89DDB135A69D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "iRLeagueDatabaseCore.Migrations", "src\iRLeagueDatabaseCore.Migrations\iRLeagueDatabaseCore.Migrations.csproj", "{C335B0B3-B0AE-45EF-B620-87E9EBE257D3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DbIntegrationTests", "test\DbIntegrationTests\DbIntegrationTests.csproj", "{CBE19DF1-F112-4BCB-9DC4-BE33D971CCCC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UnitTests", "test\UnitTests\UnitTests.csproj", "{FB4E0FC3-97A9-4456-93DB-F8335175FA47}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -59,6 +69,26 @@ Global
 		{84F0108C-30A3-4CF1-9F03-EC4DDC979E7B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{84F0108C-30A3-4CF1-9F03-EC4DDC979E7B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{84F0108C-30A3-4CF1-9F03-EC4DDC979E7B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E9639AF9-8C03-4B30-AA3B-B85873D0C406}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E9639AF9-8C03-4B30-AA3B-B85873D0C406}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E9639AF9-8C03-4B30-AA3B-B85873D0C406}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E9639AF9-8C03-4B30-AA3B-B85873D0C406}.Release|Any CPU.Build.0 = Release|Any CPU
+		{374D9358-C654-4882-AE9F-89DDB135A69D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{374D9358-C654-4882-AE9F-89DDB135A69D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{374D9358-C654-4882-AE9F-89DDB135A69D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{374D9358-C654-4882-AE9F-89DDB135A69D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C335B0B3-B0AE-45EF-B620-87E9EBE257D3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C335B0B3-B0AE-45EF-B620-87E9EBE257D3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C335B0B3-B0AE-45EF-B620-87E9EBE257D3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C335B0B3-B0AE-45EF-B620-87E9EBE257D3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CBE19DF1-F112-4BCB-9DC4-BE33D971CCCC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CBE19DF1-F112-4BCB-9DC4-BE33D971CCCC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CBE19DF1-F112-4BCB-9DC4-BE33D971CCCC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CBE19DF1-F112-4BCB-9DC4-BE33D971CCCC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{FB4E0FC3-97A9-4456-93DB-F8335175FA47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{FB4E0FC3-97A9-4456-93DB-F8335175FA47}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{FB4E0FC3-97A9-4456-93DB-F8335175FA47}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{FB4E0FC3-97A9-4456-93DB-F8335175FA47}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/iRLeagueApiCore.Client/Endpoints/PutEndpoint.cs

@@ -0,0 +1,17 @@
+using iRLeagueApiCore.Client.Http;
+using iRLeagueApiCore.Client.QueryBuilder;
+using iRLeagueApiCore.Client.Results;
+
+namespace iRLeagueApiCore.Client.Endpoints;
+
+internal class PutEndpoint<TResult, TModel> : EndpointBase, IPutEndpoint<TResult, TModel> where TModel : notnull
+{
+    public PutEndpoint(HttpClientWrapper httpClientWrapper, RouteBuilder routeBuilder) :
+        base(httpClientWrapper, routeBuilder)
+    { }
+
+    async Task<ClientActionResult<TResult>> IPutEndpoint<TResult, TModel>.Put(TModel model, CancellationToken cancellationToken)
+    {
+        return await HttpClientWrapper.PutAsClientActionResult<TResult>(QueryUrl, model, cancellationToken);
+    }
+}

src/iRLeagueApiCore.Client/Endpoints/Results/IEventResultsEndpoint.cs

@@ -8,4 +8,5 @@ public interface IEventResultsEndpoint : IGetAllEndpoint<EventResultModel>, IDel
     IPostEndpoint<bool, ParseSimSessionResult> Upload();
     IPostEndpoint<bool> Calculate();
     IFetchResultsEndpoint Fetch();
+    IGetEndpoint<RawEventResultModel> Raw();
 }

src/iRLeagueApiCore.Client/Endpoints/Results/IRawResultsEndpoint.cs

@@ -0,0 +1,8 @@
+using iRLeagueApiCore.Common.Models;
+
+namespace iRLeagueApiCore.Client.Endpoints.Results;
+public interface IRawResultsEndpoint
+{
+    public IGetEndpoint<RawEventResultModel> EventResult(long eventId);
+    public IPutEndpoint<RawResultRowModel, RawResultRowModel> ModifyResultRow(long resultRowId, bool triggerCalculation = false);
+}

src/iRLeagueApiCore.Client/Endpoints/Results/IResultsEndpoint.cs

@@ -5,4 +5,5 @@ namespace iRLeagueApiCore.Client.Endpoints.Results;
 public interface IResultsEndpoint : IWithIdEndpoint<IResultByIdEndpoint>
 {
     public IGetEndpoint<IEnumerable<EventResultModel>> Latest();
+    public IPutEndpoint<RawResultRowModel, RawResultRowModel> ModifyResultRow(long resultRowId, bool triggerCalculation = false);
 }

src/iRLeagueApiCore.Client/Endpoints/Results/RawResultsEndpoint.cs

@@ -0,0 +1,13 @@
+using iRLeagueApiCore.Client.Http;
+using iRLeagueApiCore.Client.QueryBuilder;
+using iRLeagueApiCore.Common.Models;
+
+namespace iRLeagueApiCore.Client.Endpoints.Results;
+
+internal sealed class RawResultsEndpoint : GetEndpoint<RawEventResultModel>
+{
+    public RawResultsEndpoint(HttpClientWrapper httpClient, RouteBuilder routeBuilder) : base(httpClient, routeBuilder)
+    {
+        RouteBuilder.AddEndpoint("Raw");
+    }
+}

src/iRLeagueApiCore.Client/Endpoints/Results/ResultsEndpoint.cs

@@ -15,6 +15,20 @@ public ResultsEndpoint(HttpClientWrapper httpClientWrapper, RouteBuilder routeBu
         RouteBuilder.AddEndpoint("Results");
     }
 
+    public IGetEndpoint<RawEventResultModel> Raw()
+    {
+        return new RawResultsEndpoint(HttpClientWrapper, RouteBuilder);
+    }
+
+    public IPutEndpoint<RawResultRowModel, RawResultRowModel> ModifyResultRow(long resultRowId, bool triggerCalculation = false)
+    {
+        var routeBuilder = RouteBuilder.Copy();
+        routeBuilder.AddEndpoint("ModResultRow");
+        routeBuilder.AddParameter(resultRowId);
+        routeBuilder.WithParameters(x => x.Add("triggerCaculation", triggerCalculation));
+        return new PutEndpoint<RawResultRowModel, RawResultRowModel>(HttpClientWrapper, routeBuilder);
+    }
+
     public IPostEndpoint<bool, ParseSimSessionResult> Upload()
     {
         return new UploadResultEndpoint(HttpClientWrapper, RouteBuilder);

src/iRLeagueApiCore.Client/README.md

@@ -0,0 +1,25 @@
+# iRLeagueApiCore.Client
+
+Simple client for using the iRLeagueManager API from a .NET application
+
+## Usage
+
+### Register service
+
+```csharp
+services.AddLeagueApiClient();
+```
+
+### Use client
+
+```csharp
+client = service.GetRequiredService<ILeagueApiClient>();
+
+var leagues = await client.Leagues().Get();
+```
+
+### Log in as API user
+
+```csharp
+await client.LogIn("Username", "Password");
+```

src/iRLeagueApiCore.Client/Service/LeagueClientServiceCollectionExtensions.cs

@@ -3,17 +3,26 @@
 using iRLeagueApiCore.Client.Service;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Logging;
+using System.Text.Json.Serialization;
+using System.Text.Json;
 
 namespace Microsoft.Extensions.DependencyInjection;
 public static class IRLeagueApiClientServiceExtensions
 {
     public static IServiceCollection AddLeagueApiClient(this IServiceCollection services, Action<LeagueApiClientConfiguration>? configure = null)
     {
         services.AddHttpClient();
-        services.TryAddScoped<HttpClientWrapperFactory>();
+
+        var jsonOptions = new JsonSerializerOptions(JsonSerializerDefaults.Web);
+        jsonOptions.Converters.Add(new JsonStringEnumConverter());
+        jsonOptions.DefaultIgnoreCondition = JsonIgnoreCondition.WhenWritingNull;
+
+        services.TryAddScoped<HttpClientWrapperFactory>(sp => new(
+                sp.GetRequiredService<ILoggerFactory>(),
+                jsonOptions
+            ));
         services.TryAddScoped<ITokenStore, DefaultTokenStore>();
         services.TryAddScoped<IAsyncTokenProvider>(sp => sp.GetRequiredService<ITokenStore>());
-
         // run configuration
         var configuration = new LeagueApiClientConfiguration(services);
         configure?.Invoke(configuration);

src/iRLeagueApiCore.Client/iRLeagueApiCore.Client.csproj

@@ -3,7 +3,6 @@
   <PropertyGroup />
 
   <ItemGroup>
-    <PackageReference Include="iRLeagueApiCore.Common" Version="0.11.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc.Core" Version="2.2.5" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
     <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="7.3.1" />
@@ -13,14 +12,16 @@
 		<OutputType>Library</OutputType>
 		<TargetFrameworks>net6.0</TargetFrameworks>
 		<PackageId>iRLeagueApiCore.Client</PackageId>
-		<Version>0.11.4</Version>
+		<Version>0.12.0</Version>
 		<Authors>Simon Schulze</Authors>
 		<Company>Simon Schulze</Company>
 		<PackageDescription>This package contains shared objects for all members of the iRLeagueDatabase-iRLeagueApi stack</PackageDescription>
 		<RepositoryUrl>https://github.com/SSchulze1989/iRLeagueApiCore</RepositoryUrl>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageReadmeFile>README.md</PackageReadmeFile>
 	</PropertyGroup>
 
 	<ItemGroup>
@@ -29,5 +30,13 @@
 		</AssemblyAttribute>
 	</ItemGroup>
 
+	<ItemGroup>
+	    <ProjectReference Include="..\iRLeagueApiCore.Common\iRLeagueApiCore.Common.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<None Include="README.md" Pack="true" PackagePath="\"/>
+	</ItemGroup>
+
 </Project>
 

src/iRLeagueApiCore.Common/Converters/JsonTimeSpanConverter.cs

@@ -0,0 +1,41 @@
+#if NETCOREAPP
+using System.Text.Json;
+
+namespace iRLeagueApiCore.Common.Converters;
+
+public class JsonTimeSpanConverter : JsonConverter<TimeSpan>
+{
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (typeof(long).IsAssignableFrom(typeToConvert))
+        {
+            var longValue = reader.GetInt64();
+            return new TimeSpan(longValue);
+        }
+        else
+        {
+            var timeSpanString = reader.GetString();
+            if (string.IsNullOrWhiteSpace(timeSpanString))
+            {
+                return TimeSpan.Zero;
+            }
+            var hasDays = timeSpanString.Count(c => c == '.') > 1;
+            if (hasDays)
+            {
+                return TimeSpan.ParseExact(timeSpanString, @"dd\.hh\:mm\:ss\.fffff", null);
+            }
+            return TimeSpan.ParseExact(timeSpanString, @"hh\:mm\:ss\.fffff", null);
+        }
+    }
+
+    public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+    {
+        if (value.Days > 0)
+        {
+            writer.WriteStringValue(value.ToString(@"dd\.hh\:mm\:ss\.fffff"));
+            return;
+        }
+        writer.WriteStringValue(value.ToString(@"hh\:mm\:ss\.fffff"));
+    }
+}
+#endif

src/iRLeagueApiCore.Common/Converters/JsonTimeSpanToTicksConverter.cs

@@ -0,0 +1,21 @@
+using System.Text.Json;
+
+namespace iRLeagueApiCore.Common.Converters;
+
+public sealed class JsonTimeSpanToTicksConverter : JsonConverter<TimeSpan>
+{
+    public override TimeSpan Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
+    {
+        if (typeof(long).IsAssignableFrom(typeToConvert))
+        {
+            var longValue = reader.GetInt64();
+            return new TimeSpan(longValue);
+        }
+        return TimeSpan.Zero;
+    }
+
+    public override void Write(Utf8JsonWriter writer, TimeSpan value, JsonSerializerOptions options)
+    {
+        writer.WriteNumberValue(value.Ticks);
+    }
+}