Merge pull request 'Use current datetime for validation' (#17) from main into production

Reviewed-on: #17

.drone.yml

@@ -42,9 +42,11 @@ steps:
   - name: docker build and push
     image: docker:24.0.7
     commands:
-      - docker build . -t $docker_registry$docker_repo:$DRONE_BRANCH
+      - dockerImageWithTag="$docker_registry$docker_repo:$DRONE_BRANCH"
+      - docker build . -t $dockerImageWithTag
       - echo $docker_password | docker login --username $docker_username --password-stdin $docker_registry
-      - docker push $docker_registry$docker_repo:$DRONE_BRANCH
+      - docker push $dockerImageWithTag
+      - echo "Built and pushed $dockerImageWithTag"
     environment:
       docker_username:
         from_secret: docker_username

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

@@ -26,13 +26,13 @@ public static class CreateConsumption
 	{
 		public Validator(TimeProvider timeProvider)
 		{
-			DateTime todayEndOfDay = timeProvider.GetUtcNow()
+			Func<DateTimeOffset> getTodayEndOfDay = () => timeProvider.GetUtcNow()
 				.Date
 				.AddDays(1)
 				.AddTicks(-1);
 			
 			RuleFor(x => x.DateTime.ToUniversalTime())
-				.LessThanOrEqualTo(todayEndOfDay)
+				.LessThanOrEqualTo(_ => getTodayEndOfDay())
 				.WithName(nameof(Request.DateTime));
 
 			RuleFor(x => x.Distance)

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

@@ -26,13 +26,13 @@ public static class UpdateConsumption
 	{
 		public Validator(TimeProvider timeProvider)
 		{
-			DateTime todayEndOfDay = timeProvider.GetUtcNow()
+			Func<DateTimeOffset> getTodayEndOfDay = () => timeProvider.GetUtcNow()
 				.Date
 				.AddDays(1)
 				.AddTicks(-1);
 
 			RuleFor(x => x.DateTime.ToUniversalTime())
-				.LessThanOrEqualTo(todayEndOfDay)
+				.LessThanOrEqualTo(_ => getTodayEndOfDay())
 				.WithName(nameof(Request.DateTime));
 
 			RuleFor(x => x.Distance)

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

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

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

@@ -0,0 +1,21 @@
+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 class GetServerInfo
+public static class GetServerInfo
 {
 	public record Response(
 		string FullVersion,

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

@@ -0,0 +1,32 @@
+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));
+	}
+}