thomas.nuyken/vegasco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: thomas.nuyken:5956f27646512484671e58e6765310c02fc9450a
Branches Tags
thomas.nuyken:main thomas.nuyken:production thomas.nuyken:ddd
...
compare: thomas.nuyken:ad77c2fe2b60b2c312ce875cf3a8ecc0208652d3
Branches Tags
thomas.nuyken:production thomas.nuyken:main thomas.nuyken:ddd

2 Commits
5956f27646 ... ad77c2fe2b

Author SHA1 Message Date
ThompsonNye
ad77c2fe2b Fix logs showing non enumerated enumerable as error messages
All checks were successful
continuous-integration/drone/push Build is passing
Details
2025-10-16 17:15:11 +02:00
ThompsonNye
87a0241f11 Update packages 2025-10-16 17:14:49 +02:00
10 changed files with 73 additions and 65 deletions
Expand all files Collapse all files

30
src/Vegasco.Server.Api/Cars/CreateCar.cs
View File

@@ -11,6 +11,7 @@ namespace Vegasco.Server.Api.Cars;
public static class CreateCar public static class CreateCar
{ {
public record Request(string Name); public record Request(string Name);
public record Response(Guid Id, string Name); public record Response(Guid Id, string Name);
public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder) public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
@@ -43,17 +44,21 @@ public static class CreateCar
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
ILogger logger = loggerFactory.CreateLogger(typeof(CreateCar)); ILogger logger = loggerFactory.CreateLogger(typeof(CreateCar));
List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken: cancellationToken); List<ValidationResult> failedValidations =
await validators.ValidateAllAsync(request, cancellationToken: cancellationToken);
if (failedValidations.Count > 0) if (failedValidations.Count > 0)
{ {
string[] errors = failedValidations
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage)
.ToArray();
logger.LogDebug( logger.LogDebug(
"Validation failed for request {@Request} with errors {@Errors}", "Validation failed for request {@Request} with errors {@Errors}",
request, request,
failedValidations errors);
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage));
return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary())); return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
} }
@@ -74,18 +79,11 @@ public static class CreateCar
{ {
logger.LogDebug("User with ID '{UserId}' not found, creating new user", userId); logger.LogDebug("User with ID '{UserId}' not found, creating new user", userId);
user = new User user = new User { Id = userId };
{
Id = userId
};
await dbContext.Users.AddAsync(user, cancellationToken); await dbContext.Users.AddAsync(user, cancellationToken);
} }
Car car = new() Car car = new() { Name = request.Name.Trim(), UserId = userId };
{
Name = request.Name.Trim(),
UserId = userId
};
await dbContext.Cars.AddAsync(car, cancellationToken); await dbContext.Cars.AddAsync(car, cancellationToken);
await dbContext.SaveChangesAsync(cancellationToken); await dbContext.SaveChangesAsync(cancellationToken);
@@ -95,4 +93,4 @@ public static class CreateCar
Response response = new(car.Id.Value, car.Name); Response response = new(car.Id.Value, car.Name);
return TypedResults.Created($"/v1/cars/{car.Id}", response); return TypedResults.Created($"/v1/cars/{car.Id}", response);
} }
} }

11
src/Vegasco.Server.Api/Cars/UpdateCar.cs
View File

@@ -49,13 +49,16 @@ public static class UpdateCar
List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken); List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken);
if (failedValidations.Count > 0) if (failedValidations.Count > 0)
{ {
string[] errors = failedValidations
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage)
.ToArray();
logger.LogDebug( logger.LogDebug(
"Validation failed for request {@Request} with errors {@Errors}", "Validation failed for request {@Request} with errors {@Errors}",
request, request,
failedValidations errors);
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage));
return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary())); return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
} }

11
src/Vegasco.Server.Api/Consumptions/CreateConsumption.cs
View File

@@ -58,13 +58,16 @@ public static class CreateConsumption
List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken); List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken);
if (failedValidations.Count > 0) if (failedValidations.Count > 0)
{ {
string[] errors = failedValidations
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage)
.ToArray();
logger.LogDebug( logger.LogDebug(
"Validation failed for request {@Request} with errors {@Errors}", "Validation failed for request {@Request} with errors {@Errors}",
request, request,
failedValidations errors);
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage));
return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary())); return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
} }

16
src/Vegasco.Server.Api/Consumptions/UpdateConsumption.cs
View File

@@ -52,17 +52,20 @@ public static class UpdateConsumption
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
ILogger logger = loggerFactory.CreateLogger(typeof(UpdateConsumption)); ILogger logger = loggerFactory.CreateLogger(typeof(UpdateConsumption));
List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken); List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken);
if (failedValidations.Count > 0) if (failedValidations.Count > 0)
{ {
string[] errors = failedValidations
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage)
.ToArray();
logger.LogDebug( logger.LogDebug(
"Validation failed for request {@Request} with errors {@Errors}", "Validation failed for request {@Request} with errors {@Errors}",
request, request,
failedValidations errors);
.Where(x => !x.IsValid)
.SelectMany(x => x.Errors)
.Select(x => x.ErrorMessage));
return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary())); return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
} }
@@ -81,6 +84,7 @@ public static class UpdateConsumption
logger.LogTrace("Updated consumption: {@Consumption}", consumption); logger.LogTrace("Updated consumption: {@Consumption}", consumption);
return TypedResults.Ok(new Response(consumption.Id.Value, consumption.DateTime, consumption.Distance, consumption.Amount, consumption.CarId.Value)); return TypedResults.Ok(new Response(consumption.Id.Value, consumption.DateTime, consumption.Distance,
consumption.Amount, consumption.CarId.Value));
} }
} }

22
src/Vegasco.Server.Api/Vegasco.Server.Api.csproj
View File

@@ -13,24 +13,24 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Asp.Versioning.Http" Version="8.1.0" /> <PackageReference Include="Asp.Versioning.Http" Version="8.1.0" />
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" /> <PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
<PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.4.2" /> <PackageReference Include="Aspire.Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.5.1" />
<PackageReference Include="Aspire.Seq" Version="9.4.2" /> <PackageReference Include="Aspire.Seq" Version="9.5.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" /> <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="9.0.10" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.10">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
<PackageReference Include="OpenTelemetry" Version="1.12.0" /> <PackageReference Include="OpenTelemetry" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.8.5" /> <PackageReference Include="Scalar.AspNetCore" Version="2.9.0" />
<PackageReference Include="StronglyTypedId" Version="1.0.0-beta08" PrivateAssets="all" ExcludeAssets="runtime" /> <PackageReference Include="StronglyTypedId" Version="1.0.0-beta08" PrivateAssets="all" ExcludeAssets="runtime" />
<PackageReference Include="StronglyTypedId.Templates" Version="1.0.0-beta08" /> <PackageReference Include="StronglyTypedId.Templates" Version="1.0.0-beta08" />
</ItemGroup> </ItemGroup>
@@ -41,7 +41,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.115" /> <PackageReference Update="Nerdbank.GitVersioning" Version="3.8.118" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
src/Vegasco.Server.AppHost.Shared/Vegasco.Server.AppHost.Shared.csproj
View File

@@ -8,7 +8,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning"> <PackageReference Update="Nerdbank.GitVersioning">
<Version>3.7.115</Version> <Version>3.8.118</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

10
src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj
View File

@@ -12,13 +12,13 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.4.2" /> <PackageReference Include="Aspire.Hosting.AppHost" Version="9.5.1" />
<PackageReference Include="Aspire.Hosting.NodeJs" Version="9.4.2" /> <PackageReference Include="Aspire.Hosting.NodeJs" Version="9.5.1" />
<PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.4.2" /> <PackageReference Include="Aspire.Hosting.PostgreSQL" Version="9.5.1" />
<PackageReference Update="Nerdbank.GitVersioning"> <PackageReference Update="Nerdbank.GitVersioning">
<Version>3.7.115</Version> <Version>3.8.118</Version>
</PackageReference> </PackageReference>
<PackageReference Include="Aspire.Hosting.Seq" Version="9.4.2" /> <PackageReference Include="Aspire.Hosting.Seq" Version="9.5.1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

10
src/Vegasco.Server.ServiceDefaults/Vegasco.Server.ServiceDefaults.csproj
View File

@@ -10,15 +10,15 @@
<ItemGroup> <ItemGroup>
<FrameworkReference Include="Microsoft.AspNetCore.App" /> <FrameworkReference Include="Microsoft.AspNetCore.App" />
<PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.9.0" /> <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
<PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.4.2" /> <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1" />
<PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
<PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Instrumentation.Http" Version="1.12.0" />
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" /> <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.12.0" />
<PackageReference Update="Nerdbank.GitVersioning"> <PackageReference Update="Nerdbank.GitVersioning">
<Version>3.7.115</Version> <Version>3.8.118</Version>
</PackageReference> </PackageReference>
</ItemGroup> </ItemGroup>

16
tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj
View File

@@ -10,21 +10,21 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Azure.Identity" Version="1.16.0" /> <PackageReference Include="Azure.Identity" Version="1.17.0" />
<PackageReference Include="Bogus" Version="35.6.3" /> <PackageReference Include="Bogus" Version="35.6.4" />
<PackageReference Include="coverlet.collector" Version="6.0.4"> <PackageReference Include="coverlet.collector" Version="6.0.4">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="FluentAssertions" Version="[7.2.0,8.0.0)" /> <PackageReference Include="FluentAssertions" Version="[7.2.0,8.0.0)" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.9" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.10" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="Respawn" Version="6.2.1" /> <PackageReference Include="Respawn" Version="6.2.1" />
<PackageReference Include="System.Formats.Asn1" Version="9.0.9" /> <PackageReference Include="System.Formats.Asn1" Version="9.0.10" />
<PackageReference Include="Testcontainers.PostgreSql" Version="4.7.0" /> <PackageReference Include="Testcontainers.PostgreSql" Version="4.7.0" />
<PackageReference Include="xunit" Version="2.9.3" /> <PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4"> <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@@ -40,7 +40,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.115" /> <PackageReference Update="Nerdbank.GitVersioning" Version="3.8.118" />
</ItemGroup> </ItemGroup>
</Project> </Project>

10
tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj
View File

@@ -14,12 +14,12 @@
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="FluentAssertions" Version="8.6.0" /> <PackageReference Include="FluentAssertions" Version="8.7.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.10" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
<PackageReference Include="NSubstitute" Version="5.3.0" /> <PackageReference Include="NSubstitute" Version="5.3.0" />
<PackageReference Include="xunit" Version="2.9.3" /> <PackageReference Include="xunit" Version="2.9.3" />
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.4"> <PackageReference Include="xunit.runner.visualstudio" Version="3.1.5">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
@@ -34,7 +34,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Update="Nerdbank.GitVersioning" Version="3.7.115" /> <PackageReference Update="Nerdbank.GitVersioning" Version="3.8.118" />
</ItemGroup> </ItemGroup>
</Project> </Project>