From 74dc7ceff3d0fc767ffba9d901dce235ac76877e Mon Sep 17 00:00:00 2001 From: cuqmbr Date: Wed, 14 May 2025 17:48:48 +0300 Subject: [PATCH] rename user setings services --- .../Commands/AddAddress/AddAddressCommandValidator.cs | 2 +- .../UpdateAddress/UpdateAddressCommandValidator.cs | 2 +- .../GetAddressesPage/GetAddressesPageQueryValidator.cs | 2 +- .../Commands/AddAircraft/AddAircraftCommandValidator.cs | 2 +- .../UpdateAircraft/UpdateAircraftCommandValidator.cs | 2 +- .../GetAircraftsPage/GetAircraftsPageQueryValidator.cs | 2 +- .../Buses/Commands/AddBus/AddBusCommandValidator.cs | 2 +- .../Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs | 2 +- .../Queries/GetBusesPage/GetBusesPageQueryValidator.cs | 2 +- .../Cities/Commands/AddCity/AddCityCommandValidator.cs | 2 +- .../Commands/UpdateCity/UpdateCityCommandValidator.cs | 2 +- .../Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs | 2 +- .../{TimeZoneService.cs => SessionTimeZoneService.cs} | 2 +- .../{CultureService.cs => SessoionCultureService.cs} | 2 +- .../Common/Mappings/Resolvers/DateTimeOffsetResolver.cs | 4 ++-- .../Commands/AddCountry/AddCountryCommandValidator.cs | 2 +- .../UpdateCountry/UpdateCountryCommandValidator.cs | 2 +- .../GetCountriesPage/GetCountriesPageQueryValidator.cs | 2 +- .../Commands/AddRegion/AddRegionCommandValidator.cs | 2 +- .../Commands/UpdateRegion/UpdateRegionCommandValidator.cs | 2 +- .../GetRegionsPage/GetRegionsPageQueryValidator.cs | 2 +- .../Routes/Commands/AddRoute/AddRouteCommandValidator.cs | 2 +- .../Commands/UpdateRoute/UpdateRouteCommandValidator.cs | 2 +- .../Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs | 2 +- .../Trains/Commands/AddTrain/AddTrainCommandValidator.cs | 2 +- .../Commands/UpdateTrain/UpdateTrainCommandValidator.cs | 2 +- .../Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs | 2 +- .../AddVehicleEnrollmentCommandValidator.cs | 4 ++-- .../UpdateVehicleEnrollmentCommandValidator.cs | 4 ++-- .../GetVehicleEnrollmentsPageQueryValidator.cs | 2 +- src/HttpApi/Controllers/TestsController.cs | 2 +- src/HttpApi/HttpApi.csproj | 1 - src/HttpApi/Middlewares/ThreadCultureSetterMiddleware.cs | 4 ++-- src/HttpApi/Program.cs | 6 ++---- ...etCultureService.cs => AspNetSessionCultureService.cs} | 4 ++-- ...TimeZoneService.cs => AspNetSessionTimeZoneService.cs} | 4 ++-- tst/Application.IntegrationTests/BaseTest.cs | 8 ++++---- 37 files changed, 46 insertions(+), 49 deletions(-) rename src/Application/Common/Interfaces/Services/{TimeZoneService.cs => SessionTimeZoneService.cs} (74%) rename src/Application/Common/Interfaces/Services/{CultureService.cs => SessoionCultureService.cs} (78%) rename src/HttpApi/Services/{AspNetCultureService.cs => AspNetSessionCultureService.cs} (87%) rename src/HttpApi/Services/{AspNetTimeZoneService.cs => AspNetSessionTimeZoneService.cs} (79%) diff --git a/src/Application/Addresses/Commands/AddAddress/AddAddressCommandValidator.cs b/src/Application/Addresses/Commands/AddAddress/AddAddressCommandValidator.cs index 2ca5840..59adff1 100644 --- a/src/Application/Addresses/Commands/AddAddress/AddAddressCommandValidator.cs +++ b/src/Application/Addresses/Commands/AddAddress/AddAddressCommandValidator.cs @@ -9,7 +9,7 @@ public class AddAddressCommandValidator : AbstractValidator { public AddAddressCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Name) .NotEmpty() diff --git a/src/Application/Addresses/Commands/UpdateAddress/UpdateAddressCommandValidator.cs b/src/Application/Addresses/Commands/UpdateAddress/UpdateAddressCommandValidator.cs index 59770c9..ceae48d 100644 --- a/src/Application/Addresses/Commands/UpdateAddress/UpdateAddressCommandValidator.cs +++ b/src/Application/Addresses/Commands/UpdateAddress/UpdateAddressCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateAddressCommandValidator : AbstractValidator v.Guid) .NotEmpty() diff --git a/src/Application/Addresses/Queries/GetAddressesPage/GetAddressesPageQueryValidator.cs b/src/Application/Addresses/Queries/GetAddressesPage/GetAddressesPageQueryValidator.cs index af43f25..b1eb480 100644 --- a/src/Application/Addresses/Queries/GetAddressesPage/GetAddressesPageQueryValidator.cs +++ b/src/Application/Addresses/Queries/GetAddressesPage/GetAddressesPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetAddressesPageQueryValidator : AbstractValidator v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Aircrafts/Commands/AddAircraft/AddAircraftCommandValidator.cs b/src/Application/Aircrafts/Commands/AddAircraft/AddAircraftCommandValidator.cs index 76f5fe1..617c394 100644 --- a/src/Application/Aircrafts/Commands/AddAircraft/AddAircraftCommandValidator.cs +++ b/src/Application/Aircrafts/Commands/AddAircraft/AddAircraftCommandValidator.cs @@ -8,7 +8,7 @@ public class AddAircraftCommandValidator : AbstractValidator { public AddAircraftCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Number) .NotEmpty() diff --git a/src/Application/Aircrafts/Commands/UpdateAircraft/UpdateAircraftCommandValidator.cs b/src/Application/Aircrafts/Commands/UpdateAircraft/UpdateAircraftCommandValidator.cs index 70fb15a..c33cecc 100644 --- a/src/Application/Aircrafts/Commands/UpdateAircraft/UpdateAircraftCommandValidator.cs +++ b/src/Application/Aircrafts/Commands/UpdateAircraft/UpdateAircraftCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateAircraftCommandValidator : AbstractValidator v.Guid) .NotEmpty() diff --git a/src/Application/Aircrafts/Queries/GetAircraftsPage/GetAircraftsPageQueryValidator.cs b/src/Application/Aircrafts/Queries/GetAircraftsPage/GetAircraftsPageQueryValidator.cs index bed93b0..49c58b3 100644 --- a/src/Application/Aircrafts/Queries/GetAircraftsPage/GetAircraftsPageQueryValidator.cs +++ b/src/Application/Aircrafts/Queries/GetAircraftsPage/GetAircraftsPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetAircraftsPageQueryValidator : AbstractValidator v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Buses/Commands/AddBus/AddBusCommandValidator.cs b/src/Application/Buses/Commands/AddBus/AddBusCommandValidator.cs index 46bf658..1ce4caa 100644 --- a/src/Application/Buses/Commands/AddBus/AddBusCommandValidator.cs +++ b/src/Application/Buses/Commands/AddBus/AddBusCommandValidator.cs @@ -8,7 +8,7 @@ public class AddBusCommandValidator : AbstractValidator { public AddBusCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Number) .NotEmpty() diff --git a/src/Application/Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs b/src/Application/Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs index 7097ab2..4224d6f 100644 --- a/src/Application/Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs +++ b/src/Application/Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateBusCommandValidator : AbstractValidator { public UpdateBusCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Guid) .NotEmpty() diff --git a/src/Application/Buses/Queries/GetBusesPage/GetBusesPageQueryValidator.cs b/src/Application/Buses/Queries/GetBusesPage/GetBusesPageQueryValidator.cs index f72c75e..7ab1118 100644 --- a/src/Application/Buses/Queries/GetBusesPage/GetBusesPageQueryValidator.cs +++ b/src/Application/Buses/Queries/GetBusesPage/GetBusesPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetBusesPageQueryValidator : AbstractValidator { public GetBusesPageQueryValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Cities/Commands/AddCity/AddCityCommandValidator.cs b/src/Application/Cities/Commands/AddCity/AddCityCommandValidator.cs index 2a0a931..6b20606 100644 --- a/src/Application/Cities/Commands/AddCity/AddCityCommandValidator.cs +++ b/src/Application/Cities/Commands/AddCity/AddCityCommandValidator.cs @@ -8,7 +8,7 @@ public class AddCityCommandValidator : AbstractValidator { public AddCityCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Name) .NotEmpty() diff --git a/src/Application/Cities/Commands/UpdateCity/UpdateCityCommandValidator.cs b/src/Application/Cities/Commands/UpdateCity/UpdateCityCommandValidator.cs index b813ca2..bdc49c0 100644 --- a/src/Application/Cities/Commands/UpdateCity/UpdateCityCommandValidator.cs +++ b/src/Application/Cities/Commands/UpdateCity/UpdateCityCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateCityCommandValidator : AbstractValidator { public UpdateCityCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Guid) .NotEmpty() diff --git a/src/Application/Cities/Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs b/src/Application/Cities/Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs index dde8a20..53e5264 100644 --- a/src/Application/Cities/Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs +++ b/src/Application/Cities/Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetCitiesPageQueryValidator : AbstractValidator { public GetCitiesPageQueryValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Common/Interfaces/Services/TimeZoneService.cs b/src/Application/Common/Interfaces/Services/SessionTimeZoneService.cs similarity index 74% rename from src/Application/Common/Interfaces/Services/TimeZoneService.cs rename to src/Application/Common/Interfaces/Services/SessionTimeZoneService.cs index 6ec775c..ed60d8b 100644 --- a/src/Application/Common/Interfaces/Services/TimeZoneService.cs +++ b/src/Application/Common/Interfaces/Services/SessionTimeZoneService.cs @@ -1,6 +1,6 @@ namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services; -public interface TimeZoneService +public interface SessionTimeZoneService { public TimeZoneInfo TimeZone { get; } } diff --git a/src/Application/Common/Interfaces/Services/CultureService.cs b/src/Application/Common/Interfaces/Services/SessoionCultureService.cs similarity index 78% rename from src/Application/Common/Interfaces/Services/CultureService.cs rename to src/Application/Common/Interfaces/Services/SessoionCultureService.cs index 3ee1ee8..23d7389 100644 --- a/src/Application/Common/Interfaces/Services/CultureService.cs +++ b/src/Application/Common/Interfaces/Services/SessoionCultureService.cs @@ -2,7 +2,7 @@ using System.Globalization; namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services; -public interface CultureService +public interface SessionCultureService { public CultureInfo Culture { get; } } diff --git a/src/Application/Common/Mappings/Resolvers/DateTimeOffsetResolver.cs b/src/Application/Common/Mappings/Resolvers/DateTimeOffsetResolver.cs index 679eb28..56423e8 100644 --- a/src/Application/Common/Mappings/Resolvers/DateTimeOffsetResolver.cs +++ b/src/Application/Common/Mappings/Resolvers/DateTimeOffsetResolver.cs @@ -6,9 +6,9 @@ namespace cuqmbr.TravelGuide.Application.Common.Mappings.Resolvers; public class DateTimeOffsetToLocalResolver : IMemberValueResolver { - private readonly TimeZoneService _timeZoneService; + private readonly SessionTimeZoneService _timeZoneService; - public DateTimeOffsetToLocalResolver(TimeZoneService timeZoneService) + public DateTimeOffsetToLocalResolver(SessionTimeZoneService timeZoneService) { _timeZoneService = timeZoneService; } diff --git a/src/Application/Countries/Commands/AddCountry/AddCountryCommandValidator.cs b/src/Application/Countries/Commands/AddCountry/AddCountryCommandValidator.cs index 51e03ce..ec854f3 100644 --- a/src/Application/Countries/Commands/AddCountry/AddCountryCommandValidator.cs +++ b/src/Application/Countries/Commands/AddCountry/AddCountryCommandValidator.cs @@ -8,7 +8,7 @@ public class AddCountryCommandValidator : AbstractValidator { public AddCountryCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Name) .NotEmpty() diff --git a/src/Application/Countries/Commands/UpdateCountry/UpdateCountryCommandValidator.cs b/src/Application/Countries/Commands/UpdateCountry/UpdateCountryCommandValidator.cs index d2d0612..6809cb9 100644 --- a/src/Application/Countries/Commands/UpdateCountry/UpdateCountryCommandValidator.cs +++ b/src/Application/Countries/Commands/UpdateCountry/UpdateCountryCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateCountryCommandValidator : AbstractValidator v.Guid) .NotEmpty() diff --git a/src/Application/Countries/Queries/GetCountriesPage/GetCountriesPageQueryValidator.cs b/src/Application/Countries/Queries/GetCountriesPage/GetCountriesPageQueryValidator.cs index 59d2866..ceeea99 100644 --- a/src/Application/Countries/Queries/GetCountriesPage/GetCountriesPageQueryValidator.cs +++ b/src/Application/Countries/Queries/GetCountriesPage/GetCountriesPageQueryValidator.cs @@ -9,7 +9,7 @@ public class GetCountriesPageQueryValidator : { public GetCountriesPageQueryValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Regions/Commands/AddRegion/AddRegionCommandValidator.cs b/src/Application/Regions/Commands/AddRegion/AddRegionCommandValidator.cs index c35227d..9d3de32 100644 --- a/src/Application/Regions/Commands/AddRegion/AddRegionCommandValidator.cs +++ b/src/Application/Regions/Commands/AddRegion/AddRegionCommandValidator.cs @@ -8,7 +8,7 @@ public class AddRegionCommandValidator : AbstractValidator { public AddRegionCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Name) .NotEmpty() diff --git a/src/Application/Regions/Commands/UpdateRegion/UpdateRegionCommandValidator.cs b/src/Application/Regions/Commands/UpdateRegion/UpdateRegionCommandValidator.cs index 6cb3dfb..4366378 100644 --- a/src/Application/Regions/Commands/UpdateRegion/UpdateRegionCommandValidator.cs +++ b/src/Application/Regions/Commands/UpdateRegion/UpdateRegionCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateRegionCommandValidator : AbstractValidator v.Guid) .NotEmpty() diff --git a/src/Application/Regions/Queries/GetRegionsPage/GetRegionsPageQueryValidator.cs b/src/Application/Regions/Queries/GetRegionsPage/GetRegionsPageQueryValidator.cs index e075ef5..b064c3d 100644 --- a/src/Application/Regions/Queries/GetRegionsPage/GetRegionsPageQueryValidator.cs +++ b/src/Application/Regions/Queries/GetRegionsPage/GetRegionsPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetRegionsPageQueryValidator : AbstractValidator v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Routes/Commands/AddRoute/AddRouteCommandValidator.cs b/src/Application/Routes/Commands/AddRoute/AddRouteCommandValidator.cs index ead366b..79fec33 100644 --- a/src/Application/Routes/Commands/AddRoute/AddRouteCommandValidator.cs +++ b/src/Application/Routes/Commands/AddRoute/AddRouteCommandValidator.cs @@ -9,7 +9,7 @@ public class AddRouteCommandValidator : AbstractValidator { public AddRouteCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Name) .NotEmpty() diff --git a/src/Application/Routes/Commands/UpdateRoute/UpdateRouteCommandValidator.cs b/src/Application/Routes/Commands/UpdateRoute/UpdateRouteCommandValidator.cs index cc4ddd3..60b8485 100644 --- a/src/Application/Routes/Commands/UpdateRoute/UpdateRouteCommandValidator.cs +++ b/src/Application/Routes/Commands/UpdateRoute/UpdateRouteCommandValidator.cs @@ -9,7 +9,7 @@ public class UpdateRouteCommandValidator : AbstractValidator { public UpdateRouteCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Guid) .NotEmpty() diff --git a/src/Application/Routes/Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs b/src/Application/Routes/Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs index 3ad2ba7..e38376d 100644 --- a/src/Application/Routes/Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs +++ b/src/Application/Routes/Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs @@ -9,7 +9,7 @@ public class GetRoutesPageQueryValidator : AbstractValidator { public GetRoutesPageQueryValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/Trains/Commands/AddTrain/AddTrainCommandValidator.cs b/src/Application/Trains/Commands/AddTrain/AddTrainCommandValidator.cs index f8797c5..ec530dd 100644 --- a/src/Application/Trains/Commands/AddTrain/AddTrainCommandValidator.cs +++ b/src/Application/Trains/Commands/AddTrain/AddTrainCommandValidator.cs @@ -8,7 +8,7 @@ public class AddTrainCommandValidator : AbstractValidator { public AddTrainCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Number) .NotEmpty() diff --git a/src/Application/Trains/Commands/UpdateTrain/UpdateTrainCommandValidator.cs b/src/Application/Trains/Commands/UpdateTrain/UpdateTrainCommandValidator.cs index 689d2e8..b39eac1 100644 --- a/src/Application/Trains/Commands/UpdateTrain/UpdateTrainCommandValidator.cs +++ b/src/Application/Trains/Commands/UpdateTrain/UpdateTrainCommandValidator.cs @@ -8,7 +8,7 @@ public class UpdateTrainCommandValidator : AbstractValidator { public UpdateTrainCommandValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.Guid) .NotEmpty() diff --git a/src/Application/Trains/Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs b/src/Application/Trains/Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs index 1b56968..a4d9410 100644 --- a/src/Application/Trains/Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs +++ b/src/Application/Trains/Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetTrainsPageQueryValidator : AbstractValidator { public GetTrainsPageQueryValidator( IStringLocalizer localizer, - CultureService cultureService) + SessionCultureService cultureService) { RuleFor(v => v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/Application/VehicleEnrollments/Commands/AddVehicleEnrollment/AddVehicleEnrollmentCommandValidator.cs b/src/Application/VehicleEnrollments/Commands/AddVehicleEnrollment/AddVehicleEnrollmentCommandValidator.cs index c971787..c89f266 100644 --- a/src/Application/VehicleEnrollments/Commands/AddVehicleEnrollment/AddVehicleEnrollmentCommandValidator.cs +++ b/src/Application/VehicleEnrollments/Commands/AddVehicleEnrollment/AddVehicleEnrollmentCommandValidator.cs @@ -11,8 +11,8 @@ public class AddVehicleEnrollmentCommandValidator : { public AddVehicleEnrollmentCommandValidator( IStringLocalizer localizer, - CultureService cultureService, - TimeZoneService timeZoneService) + SessionCultureService cultureService, + SessionTimeZoneService timeZoneService) { RuleFor(v => v.DepartureTime) .NotEmpty() diff --git a/src/Application/VehicleEnrollments/Commands/UpdateVehicleEnrollment/UpdateVehicleEnrollmentCommandValidator.cs b/src/Application/VehicleEnrollments/Commands/UpdateVehicleEnrollment/UpdateVehicleEnrollmentCommandValidator.cs index c15552f..1cd8966 100644 --- a/src/Application/VehicleEnrollments/Commands/UpdateVehicleEnrollment/UpdateVehicleEnrollmentCommandValidator.cs +++ b/src/Application/VehicleEnrollments/Commands/UpdateVehicleEnrollment/UpdateVehicleEnrollmentCommandValidator.cs @@ -11,8 +11,8 @@ public class UpdateVehicleEnrollmentCommandValidator : { public UpdateVehicleEnrollmentCommandValidator( IStringLocalizer localizer, - CultureService cultureService, - TimeZoneService timeZoneService) + SessionCultureService cultureService, + SessionTimeZoneService timeZoneService) { RuleFor(v => v.Guid) .NotEmpty() diff --git a/src/Application/VehicleEnrollments/Queries/GetVehicleEnrollmentsPage/GetVehicleEnrollmentsPageQueryValidator.cs b/src/Application/VehicleEnrollments/Queries/GetVehicleEnrollmentsPage/GetVehicleEnrollmentsPageQueryValidator.cs index 9cfb2d3..5e0ba41 100644 --- a/src/Application/VehicleEnrollments/Queries/GetVehicleEnrollmentsPage/GetVehicleEnrollmentsPageQueryValidator.cs +++ b/src/Application/VehicleEnrollments/Queries/GetVehicleEnrollmentsPage/GetVehicleEnrollmentsPageQueryValidator.cs @@ -8,7 +8,7 @@ public class GetVehicleEnrollmentsPageQueryValidator : AbstractValidator v.PageNumber) .GreaterThanOrEqualTo(1) diff --git a/src/HttpApi/Controllers/TestsController.cs b/src/HttpApi/Controllers/TestsController.cs index b75627a..be91e8b 100644 --- a/src/HttpApi/Controllers/TestsController.cs +++ b/src/HttpApi/Controllers/TestsController.cs @@ -12,7 +12,7 @@ public class TestsController : ControllerBase private readonly UnitOfWork _unitOfWork; public TestsController( - CultureService cultureService, + SessionCultureService cultureService, IStringLocalizer localizer, UnitOfWork unitOfWork) { diff --git a/src/HttpApi/HttpApi.csproj b/src/HttpApi/HttpApi.csproj index b85d0a5..5719f8b 100644 --- a/src/HttpApi/HttpApi.csproj +++ b/src/HttpApi/HttpApi.csproj @@ -13,7 +13,6 @@ - runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/HttpApi/Middlewares/ThreadCultureSetterMiddleware.cs b/src/HttpApi/Middlewares/ThreadCultureSetterMiddleware.cs index 8b02796..3f245fb 100644 --- a/src/HttpApi/Middlewares/ThreadCultureSetterMiddleware.cs +++ b/src/HttpApi/Middlewares/ThreadCultureSetterMiddleware.cs @@ -5,9 +5,9 @@ namespace cuqmbr.TravelGuide.HttpApi.Middlewares; public class ThreadCultureSetterMiddleware : IMiddleware { - private readonly CultureService _cultureService; + private readonly SessionCultureService _cultureService; - public ThreadCultureSetterMiddleware(CultureService cultureService) + public ThreadCultureSetterMiddleware(SessionCultureService cultureService) { _cultureService = cultureService; } diff --git a/src/HttpApi/Program.cs b/src/HttpApi/Program.cs index 28b4764..472d41e 100644 --- a/src/HttpApi/Program.cs +++ b/src/HttpApi/Program.cs @@ -10,7 +10,6 @@ using cuqmbr.TravelGuide.HttpApi.Middlewares; using cuqmbr.TravelGuide.HttpApi.Swashbuckle.OperationFilters; using System.Net; using Swashbuckle.AspNetCore.SwaggerUI; -// using MicroElements.Swashbuckle.FluentValidation.AspNetCore; using Microsoft.OpenApi.Models; using System.Reflection; @@ -30,8 +29,8 @@ services.ConfigureInfrastructure(); services.ConfigureApplication(); services.AddScoped(); -services.AddScoped(); -services.AddScoped(); +services.AddScoped(); +services.AddScoped(); services.AddScoped(); services.AddControllers(); @@ -95,7 +94,6 @@ services.AddSwaggerGen(options => Type = SecuritySchemeType.ApiKey }); }); -// services.AddFluentValidationRulesToSwagger(); services.AddScoped(); diff --git a/src/HttpApi/Services/AspNetCultureService.cs b/src/HttpApi/Services/AspNetSessionCultureService.cs similarity index 87% rename from src/HttpApi/Services/AspNetCultureService.cs rename to src/HttpApi/Services/AspNetSessionCultureService.cs index 03388ab..1c4ef7e 100644 --- a/src/HttpApi/Services/AspNetCultureService.cs +++ b/src/HttpApi/Services/AspNetSessionCultureService.cs @@ -3,12 +3,12 @@ using System.Globalization; namespace cuqmbr.TravelGuide.HttpApi.Services; -public sealed class AspNetCultureService : CultureService +public sealed class AspNetSessionCultureService : SessionCultureService { private readonly HttpContext _httpContext; private const string DefaultCultureId = "en-US"; - public AspNetCultureService(IHttpContextAccessor httpContextAccessor) + public AspNetSessionCultureService(IHttpContextAccessor httpContextAccessor) { _httpContext = httpContextAccessor.HttpContext!; } diff --git a/src/HttpApi/Services/AspNetTimeZoneService.cs b/src/HttpApi/Services/AspNetSessionTimeZoneService.cs similarity index 79% rename from src/HttpApi/Services/AspNetTimeZoneService.cs rename to src/HttpApi/Services/AspNetSessionTimeZoneService.cs index eddcfb9..9feb264 100644 --- a/src/HttpApi/Services/AspNetTimeZoneService.cs +++ b/src/HttpApi/Services/AspNetSessionTimeZoneService.cs @@ -2,11 +2,11 @@ using cuqmbr.TravelGuide.Application.Common.Interfaces.Services; namespace cuqmbr.TravelGuide.HttpApi.Services; -public sealed class AspNetTimeZoneService : TimeZoneService +public sealed class AspNetSessionTimeZoneService : SessionTimeZoneService { private readonly HttpContext _httpContext; - public AspNetTimeZoneService(IHttpContextAccessor httpContextAccessor) + public AspNetSessionTimeZoneService(IHttpContextAccessor httpContextAccessor) { _httpContext = httpContextAccessor.HttpContext!; } diff --git a/tst/Application.IntegrationTests/BaseTest.cs b/tst/Application.IntegrationTests/BaseTest.cs index c919add..194ab99 100644 --- a/tst/Application.IntegrationTests/BaseTest.cs +++ b/tst/Application.IntegrationTests/BaseTest.cs @@ -88,9 +88,9 @@ public abstract class TestBase : IDisposable var cultureInfo = CultureInfo.GetCultureInfo(culture); _serviceCollection - .AddScoped(_ => + .AddScoped(_ => { - var mock = new Mock(); + var mock = new Mock(); mock .Setup(s => s.Culture) @@ -106,9 +106,9 @@ public abstract class TestBase : IDisposable public void SetTimeZone(string timeZone) { _serviceCollection - .AddScoped(_ => + .AddScoped(_ => { - var mock = new Mock(); + var mock = new Mock(); mock .Setup(s => s.TimeZone)