Merge pull request '[PROD] Add seq support' (#7) from main into production

Reviewed-on: #7

.drone.yml

@@ -42,11 +42,9 @@ steps:
   - name: docker build and push
     image: docker:24.0.7
     commands:
-      - dockerImageWithTag="$docker_registry$docker_repo:$DRONE_BRANCH"
+      - docker build . -t $docker_registry$docker_repo:$DRONE_BRANCH
-      - docker build . -t $dockerImageWithTag
       - echo $docker_password | docker login --username $docker_username --password-stdin $docker_registry
-      - docker push $dockerImageWithTag
+      - docker push $docker_registry$docker_repo:$DRONE_BRANCH
-      - echo "Built and pushed $dockerImageWithTag"
     environment:
       docker_username:
         from_secret: docker_username
@@ -62,10 +60,6 @@ steps:
     when:
       branch:
         - main
-        - production
-      event:
-        exclude:
-          - pull_request
     depends_on:
       - compile (.NET)
       - test

src/Vegasco.Server.Api/Cars/CreateCar.cs

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

src/Vegasco.Server.Api/Cars/UpdateCar.cs

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

src/Vegasco.Server.Api/Common/DependencyInjectionExtensions.cs

@@ -34,14 +34,7 @@ public static class DependencyInjectionExtensions
 		string? seqHost = builder.Configuration.GetConnectionString("seq");
 		if (!string.IsNullOrEmpty(seqHost))
 		{
-			builder.AddSeqEndpoint("seq", o =>
+			builder.AddSeqEndpoint("seq");
-			{
-				var apiKey = builder.Configuration.GetValue<string>("seq-api-key");
-				if (!string.IsNullOrEmpty(apiKey))
-				{
-					o.ApiKey = apiKey;
-				}
-			});
 		}
 
 		return builder;

src/Vegasco.Server.Api/Consumptions/CreateConsumption.cs

@@ -26,13 +26,13 @@ public static class CreateConsumption
 	{
 		public Validator(TimeProvider timeProvider)
 		{
-			Func<DateTimeOffset> getTodayEndOfDay = () => timeProvider.GetUtcNow()
+			DateTime todayEndOfDay = timeProvider.GetUtcNow()
 				.Date
 				.AddDays(1)
 				.AddTicks(-1);
-			
+
 			RuleFor(x => x.DateTime.ToUniversalTime())
-				.LessThanOrEqualTo(_ => getTodayEndOfDay())
+				.LessThanOrEqualTo(todayEndOfDay)
 				.WithName(nameof(Request.DateTime));
 
 			RuleFor(x => x.Distance)
@@ -58,16 +58,13 @@ public static class CreateConsumption
 		List<ValidationResult> failedValidations = await validators.ValidateAllAsync(request, cancellationToken);
 		if (failedValidations.Count > 0)
 		{
-			string[] errors = failedValidations
-				.Where(x => !x.IsValid)
-				.SelectMany(x => x.Errors)
-				.Select(x => x.ErrorMessage)
-				.ToArray();
-
 			logger.LogDebug(
 				"Validation failed for request {@Request} with errors {@Errors}",
 				request,
-				errors);
+				failedValidations
+					.Where(x => !x.IsValid)
+					.SelectMany(x => x.Errors)
+					.Select(x => x.ErrorMessage));
 
 			return TypedResults.BadRequest(new HttpValidationProblemDetails(failedValidations.ToCombinedDictionary()));
 		}

src/Vegasco.Server.Api/Consumptions/UpdateConsumption.cs

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

src/Vegasco.Server.Api/Endpoints/EndpointExtensions.cs

@@ -41,6 +41,5 @@ public static class EndpointExtensions
 			.RequireAuthorization(Constants.Authorization.RequireAuthenticatedUserPolicy);
 
 		GetServerInfo.MapEndpoint(versionedApis);
-		GetCurrentTime.MapEndpoint(versionedApis);
 	}
 }

src/Vegasco.Server.Api/Info/GetCurrentTime.cs

@@ -1,21 +0,0 @@
-using Microsoft.AspNetCore.Http.HttpResults;
-
-namespace Vegasco.Server.Api.Info;
-
-public static class GetCurrentTime
-{
-	public record Response(DateTimeOffset CurrentTime);
-	
-	public static RouteHandlerBuilder MapEndpoint(IEndpointRouteBuilder builder)
-	{
-		return builder
-			.MapGet("info/time", Endpoint)
-			.WithTags("Info");
-	}
-
-	private static Ok<Response> Endpoint(
-		TimeProvider timeProvider)
-	{
-		return TypedResults.Ok(new Response(timeProvider.GetUtcNow()));
-	}
-}

src/Vegasco.Server.Api/Info/GetServerInfo.cs

@@ -2,7 +2,7 @@
 
 namespace Vegasco.Server.Api.Info;
 
-public static class GetServerInfo
+public class GetServerInfo
 {
 	public record Response(
 		string FullVersion,

src/Vegasco.Server.Api/Vegasco.Server.Api.csproj

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

src/Vegasco.Server.AppHost.Shared/Vegasco.Server.AppHost.Shared.csproj

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

src/Vegasco.Server.AppHost/Vegasco.Server.AppHost.csproj

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

src/Vegasco.Server.ServiceDefaults/Vegasco.Server.ServiceDefaults.csproj

@@ -10,15 +10,15 @@
   <ItemGroup>
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
 
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.10.0" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.5.0" />
-    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.5.1" />
+    <PackageReference Include="Microsoft.Extensions.ServiceDiscovery" Version="9.3.0" />
-    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.13.1" />
+    <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.12.0" />
-    <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.13.1" />
+    <PackageReference Include="OpenTelemetry.Extensions.Hosting" 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.Runtime" Version="1.12.0" />
     <PackageReference Update="Nerdbank.GitVersioning">
-      <Version>3.8.118</Version>
+      <Version>3.7.115</Version>
     </PackageReference>
   </ItemGroup>
 

tests/Vegasco.Server.Api.Tests.Integration/Info/GetCurrentTimeTests.cs

@@ -1,32 +0,0 @@
-using FluentAssertions;
-using FluentAssertions.Extensions;
-using System.Net.Http.Json;
-using Vegasco.Server.Api.Info;
-
-namespace Vegasco.Server.Api.Tests.Integration.Info;
-
-[Collection(SharedTestCollection.Name)]
-public sealed class GetCurrentTimeTests
-{
-	private readonly WebAppFactory _factory;
-
-	public GetCurrentTimeTests(WebAppFactory factory)
-	{
-		_factory = factory;
-	}
-
-	[Fact]
-	public async Task GetServerInfo_ShouldReturnServerInfo_WhenCalled()
-	{
-		// Arrange
-
-		// Act
-		using HttpResponseMessage response = await _factory.HttpClient.GetAsync("/v1/info/time");
-
-		// Assert
-		response.IsSuccessStatusCode.Should().BeTrue();
-		GetCurrentTime.Response? timeInfo = await response.Content.ReadFromJsonAsync<GetCurrentTime.Response>();
-		timeInfo.Should().NotBeNull();
-		timeInfo.CurrentTime.Should().BeCloseTo(DateTimeOffset.UtcNow, TimeSpan.FromSeconds(10));
-	}
-}

tests/Vegasco.Server.Api.Tests.Integration/Vegasco.Server.Api.Tests.Integration.csproj

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

tests/Vegasco.Server.Api.Tests.Unit/Vegasco.Server.Api.Tests.Unit.csproj

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