diff --git a/src/HelloShop.IdentityService/Authentication/CustomJwtBearerHandler.cs b/src/HelloShop.IdentityService/Authentication/CustomJwtBearerHandler.cs index d3abc10..842f401 100644 --- a/src/HelloShop.IdentityService/Authentication/CustomJwtBearerHandler.cs +++ b/src/HelloShop.IdentityService/Authentication/CustomJwtBearerHandler.cs @@ -12,13 +12,13 @@ using System.Text.Encodings.Web; namespace HelloShop.IdentityService.Authentication; -public class CustomJwtBearerHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder) : SignInAuthenticationHandler(options, logger, encoder) +public class CustomJwtBearerHandler(IOptionsMonitor options, ILoggerFactory logger, UrlEncoder encoder,TimeProvider timeProvider) : SignInAuthenticationHandler(options, logger, encoder) { protected override Task HandleAuthenticateAsync() => throw new NotImplementedException(); protected override async Task HandleSignInAsync(ClaimsPrincipal user, AuthenticationProperties? properties) { - var utcNow = TimeProvider.GetUtcNow(); + var utcNow =timeProvider.GetUtcNow(); JwtSecurityTokenHandler tokenHandler = new(); diff --git a/src/HelloShop.IdentityService/Controllers/WeatherForecastController.cs b/src/HelloShop.IdentityService/Controllers/WeatherForecastController.cs deleted file mode 100644 index 1e5ee3b..0000000 --- a/src/HelloShop.IdentityService/Controllers/WeatherForecastController.cs +++ /dev/null @@ -1,35 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -using Microsoft.AspNetCore.Mvc; - -namespace HelloShop.IdentityService.Controllers; - -[ApiController] -[Route("[controller]")] -public class WeatherForecastController : ControllerBase -{ - private static readonly string[] Summaries = new[] - { - "Freezing", "Bracing", "Chilly", "Cool", "Mild", "Warm", "Balmy", "Hot", "Sweltering", "Scorching" - }; - - private readonly ILogger _logger; - - public WeatherForecastController(ILogger logger) - { - _logger = logger; - } - - [HttpGet(Name = "GetWeatherForecast")] - public IEnumerable Get() - { - return Enumerable.Range(1, 5).Select(index => new WeatherForecast - { - Date = DateOnly.FromDateTime(DateTime.Now.AddDays(index)), - TemperatureC = Random.Shared.Next(-20, 55), - Summary = Summaries[Random.Shared.Next(Summaries.Length)] - }) - .ToArray(); - } -} diff --git a/src/HelloShop.IdentityService/Program.cs b/src/HelloShop.IdentityService/Program.cs index acbec42..44a5004 100644 --- a/src/HelloShop.IdentityService/Program.cs +++ b/src/HelloShop.IdentityService/Program.cs @@ -61,6 +61,7 @@ builder.Services.AddPermissionDefinitions(); builder.Services.AddAuthorization().AddDistributedMemoryCache().AddHttpClient().AddHttpContextAccessor().AddTransient().AddCustomAuthorization(); builder.Services.AddModelMapper().AddModelValidator(); builder.Services.AddCustomLocalization(); +builder.Services.AddSingleton(TimeProvider.System); var app = builder.Build(); diff --git a/src/HelloShop.IdentityService/WeatherForecast.cs b/src/HelloShop.IdentityService/WeatherForecast.cs deleted file mode 100644 index 061ce26..0000000 --- a/src/HelloShop.IdentityService/WeatherForecast.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) HelloShop Corporation. All rights reserved. -// See the license file in the project root for more information. - -namespace HelloShop.IdentityService; - -public class WeatherForecast -{ - public DateOnly Date { get; set; } - - public int TemperatureC { get; set; } - - public int TemperatureF => 32 + (int)(TemperatureC / 0.5556); - - public string? Summary { get; set; } -} diff --git a/src/HelloShop.OrderingService/Extensions/Extensions.cs b/src/HelloShop.OrderingService/Extensions/Extensions.cs index a5c178b..d4319a7 100644 --- a/src/HelloShop.OrderingService/Extensions/Extensions.cs +++ b/src/HelloShop.OrderingService/Extensions/Extensions.cs @@ -69,6 +69,8 @@ namespace HelloShop.OrderingService.Extensions builder.Services.AddTransient>(); builder.Services.AddOpenApi(); + + builder.Services.AddSingleton(TimeProvider.System); } public static WebApplication MapApplicationEndpoints(this WebApplication app) diff --git a/src/HelloShop.OrderingService/Validations/Commands/CreateOrderCommandValidator.cs b/src/HelloShop.OrderingService/Validations/Commands/CreateOrderCommandValidator.cs index 36c8d76..2b863c5 100644 --- a/src/HelloShop.OrderingService/Validations/Commands/CreateOrderCommandValidator.cs +++ b/src/HelloShop.OrderingService/Validations/Commands/CreateOrderCommandValidator.cs @@ -8,7 +8,7 @@ namespace HelloShop.OrderingService.Validations.Commands { public class CreateOrderCommandValidator : AbstractValidator { - public CreateOrderCommandValidator() + public CreateOrderCommandValidator(TimeProvider timeProvider) { RuleFor(x => x.UserId).GreaterThan(0); RuleFor(x => x.UserName).NotNull().NotEmpty().Length(1, 16); @@ -23,7 +23,7 @@ namespace HelloShop.OrderingService.Validations.Commands RuleFor(x => x.CardNumber).NotNull().NotEmpty().Length(16).Must(x => x.All(char.IsNumber)); RuleFor(x => x.CardHolderName).NotNull().NotEmpty().Length(1, 8); RuleFor(x => x.CardSecurityNumber).NotNull().NotEmpty().Length(6).Must(x => x.All(char.IsNumber)); - RuleFor(x => x.CardExpiration).Must(x => x.HasValue && x.Value > DateTimeOffset.Now); + RuleFor(x => x.CardExpiration).Must(x => x.HasValue && x.Value > timeProvider.GetUtcNow()); } public class BasketListItemValidator : AbstractValidator diff --git a/src/HelloShop.OrderingService/Validations/Models/CreateOrderRequestValidator.cs b/src/HelloShop.OrderingService/Validations/Models/CreateOrderRequestValidator.cs index 990c6cb..51e5b78 100644 --- a/src/HelloShop.OrderingService/Validations/Models/CreateOrderRequestValidator.cs +++ b/src/HelloShop.OrderingService/Validations/Models/CreateOrderRequestValidator.cs @@ -8,7 +8,7 @@ namespace HelloShop.OrderingService.Validations.Models { public class CreateOrderRequestValidator : AbstractValidator { - public CreateOrderRequestValidator() + public CreateOrderRequestValidator(TimeProvider timeProvider) { RuleFor(x => x.Items).NotNull().NotEmpty(); RuleForEach(x => x.Items).SetValidator(new BasketListItemValidator()); @@ -21,7 +21,7 @@ namespace HelloShop.OrderingService.Validations.Models RuleFor(x => x.CardNumber).NotNull().NotEmpty().Length(16).Must(x => x.All(char.IsNumber)); RuleFor(x => x.CardHolderName).NotNull().NotEmpty().Length(1, 8); RuleFor(x => x.CardSecurityNumber).NotNull().NotEmpty().Length(6).Must(x => x.All(char.IsNumber)); - RuleFor(x => x.CardExpiration).Must(x => x.HasValue && x.Value > DateTimeOffset.Now); + RuleFor(x => x.CardExpiration).Must(x => x.HasValue && x.Value > timeProvider.GetLocalNow()); } public class BasketListItemValidator : AbstractValidator diff --git a/src/HelloShop.OrderingService/Workers/GracePeriodWorker.cs b/src/HelloShop.OrderingService/Workers/GracePeriodWorker.cs index 6b18c63..461cd5f 100644 --- a/src/HelloShop.OrderingService/Workers/GracePeriodWorker.cs +++ b/src/HelloShop.OrderingService/Workers/GracePeriodWorker.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore; namespace HelloShop.OrderingService.Workers { - public class GracePeriodWorker(IServiceScopeFactory serviceScopeFactory, ILogger logger) : BackgroundService + public class GracePeriodWorker(IServiceScopeFactory serviceScopeFactory, ILogger logger,TimeProvider timeProvider) : BackgroundService { protected async override Task ExecuteAsync(CancellationToken stoppingToken) { @@ -25,7 +25,7 @@ namespace HelloShop.OrderingService.Workers var dbContext = scope.ServiceProvider.GetRequiredService(); var distributedEventBus = scope.ServiceProvider.GetRequiredService(); - DateTimeOffset dateTimeOffset = DateTimeOffset.UtcNow.AddMinutes(-1); + DateTimeOffset dateTimeOffset = timeProvider.GetUtcNow().AddMinutes(-1); try { diff --git a/src/HelloShop.ProductService/Program.cs b/src/HelloShop.ProductService/Program.cs index 2e99bd4..5c102bd 100644 --- a/src/HelloShop.ProductService/Program.cs +++ b/src/HelloShop.ProductService/Program.cs @@ -43,6 +43,7 @@ builder.Services.AddLocalization().AddPermissionDefinitions(); builder.Services.AddAuthorization().AddRemotePermissionChecker().AddCustomAuthorization(); builder.AddDaprDistributedEventBus().AddSubscriptionFromAssembly(); builder.Services.AddSingleton(); +builder.Services.AddSingleton(TimeProvider.System); // End addd extensions services to the container. var app = builder.Build(); diff --git a/src/HelloShop.ServiceDefaults/Authorization/PermissionChecker.cs b/src/HelloShop.ServiceDefaults/Authorization/PermissionChecker.cs index b22f597..f738c21 100644 --- a/src/HelloShop.ServiceDefaults/Authorization/PermissionChecker.cs +++ b/src/HelloShop.ServiceDefaults/Authorization/PermissionChecker.cs @@ -8,7 +8,7 @@ using System.Security.Claims; namespace HelloShop.ServiceDefaults.Authorization; -public abstract class PermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache) : IPermissionChecker +public abstract class PermissionChecker(IHttpContextAccessor httpContextAccessor, IDistributedCache distributedCache,TimeProvider timeProvider) : IPermissionChecker { protected HttpContext HttpContext { get; init; } = httpContextAccessor.HttpContext ?? throw new InvalidOperationException(); @@ -36,7 +36,7 @@ public abstract class PermissionChecker(IHttpContextAccessor httpContextAccessor await distributedCache.SetObjectAsync(cacheKey, new PermissionGrantCacheItem(isGranted), new DistributedCacheEntryOptions { - AbsoluteExpiration = DateTimeOffset.Now + AbsoluteExpiration = timeProvider.GetUtcNow() }); if (isGranted) diff --git a/src/HelloShop.ServiceDefaults/DistributedEvents/Abstractions/DistributedEvent.cs b/src/HelloShop.ServiceDefaults/DistributedEvents/Abstractions/DistributedEvent.cs index 167cf0d..3a1057b 100644 --- a/src/HelloShop.ServiceDefaults/DistributedEvents/Abstractions/DistributedEvent.cs +++ b/src/HelloShop.ServiceDefaults/DistributedEvents/Abstractions/DistributedEvent.cs @@ -11,7 +11,7 @@ namespace HelloShop.ServiceDefaults.DistributedEvents.Abstractions public DistributedEvent() { Id = Guid.NewGuid(); - CreationTime = DateTimeOffset.UtcNow; + CreationTime = TimeProvider.System.GetUtcNow(); } public Guid Id { get; set; } diff --git a/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj b/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj index 982d087..088fa1e 100644 --- a/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj +++ b/tests/HelloShop.ProductService.UnitTests/HelloShop.ProductService.UnitTests.csproj @@ -13,6 +13,7 @@ + diff --git a/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs b/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs index afc1e48..aa6b8db 100644 --- a/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs +++ b/tests/HelloShop.ProductService.UnitTests/ProductsControllerTest.cs @@ -9,6 +9,7 @@ using HelloShop.ProductService.Infrastructure; using HelloShop.ProductService.Models.Products; using HelloShop.ProductService.UnitTests.Helpers; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Time.Testing; namespace HelloShop.ProductService.UnitTests { @@ -60,5 +61,16 @@ namespace HelloShop.ProductService.UnitTests Assert.Equal(productName, result?.Name); }); } + + [Fact] + public async Task UseTimeProviderTestService() + { + FakeTimeProvider fakeTimeProvider = new(); + fakeTimeProvider.SetUtcNow(fakeTimeProvider.GetUtcNow().AddDays(1)); + + Assert.Equal(DateTime.UtcNow.AddHours(1), fakeTimeProvider.GetUtcNow()); + + await Task.CompletedTask; + } } } \ No newline at end of file