rename user setings services

2025-05-14 17:48:48 +03:00 · 2025-05-14 17:48:48 +03:00 · 74dc7ceff3
commit 74dc7ceff3
parent b1aceac750
37 changed files with 46 additions and 49 deletions
--- a/src/Application/Addresses/Commands/AddAddress/AddAddressCommandValidator.cs
+++ b/src/Application/Addresses/Commands/AddAddress/AddAddressCommandValidator.cs
@ -9,7 +9,7 @@ public class AddAddressCommandValidator : AbstractValidator<AddAddressCommand>
 {
    public AddAddressCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Name)
            .NotEmpty()
--- a/src/Application/Addresses/Commands/UpdateAddress/UpdateAddressCommandValidator.cs
+++ b/src/Application/Addresses/Commands/UpdateAddress/UpdateAddressCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateAddressCommandValidator : AbstractValidator<UpdateAddressComm
 {
    public UpdateAddressCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Addresses/Queries/GetAddressesPage/GetAddressesPageQueryValidator.cs
+++ b/src/Application/Addresses/Queries/GetAddressesPage/GetAddressesPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetAddressesPageQueryValidator : AbstractValidator<GetAddressesPage
 {
    public GetAddressesPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- a/src/Application/Aircrafts/Commands/AddAircraft/AddAircraftCommandValidator.cs
+++ b/src/Application/Aircrafts/Commands/AddAircraft/AddAircraftCommandValidator.cs
@ -8,7 +8,7 @@ public class AddAircraftCommandValidator : AbstractValidator<AddAircraftCommand>
 {
    public AddAircraftCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Number)
            .NotEmpty()
--- a/src/Application/Aircrafts/Commands/UpdateAircraft/UpdateAircraftCommandValidator.cs
+++ b/src/Application/Aircrafts/Commands/UpdateAircraft/UpdateAircraftCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateAircraftCommandValidator : AbstractValidator<UpdateAircraftCo
 {
    public UpdateAircraftCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Aircrafts/Queries/GetAircraftsPage/GetAircraftsPageQueryValidator.cs
+++ b/src/Application/Aircrafts/Queries/GetAircraftsPage/GetAircraftsPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetAircraftsPageQueryValidator : AbstractValidator<GetAircraftsPage
 {
    public GetAircraftsPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- a/src/Application/Buses/Commands/AddBus/AddBusCommandValidator.cs
+++ b/src/Application/Buses/Commands/AddBus/AddBusCommandValidator.cs
@ -8,7 +8,7 @@ public class AddBusCommandValidator : AbstractValidator<AddBusCommand>
 {
    public AddBusCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Number)
            .NotEmpty()
--- a/src/Application/Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs
+++ b/src/Application/Buses/Commands/UpdateBus/UpdateBusCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateBusCommandValidator : AbstractValidator<UpdateBusCommand>
 {
    public UpdateBusCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Buses/Queries/GetBusesPage/GetBusesPageQueryValidator.cs
+++ b/src/Application/Buses/Queries/GetBusesPage/GetBusesPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetBusesPageQueryValidator : AbstractValidator<GetBusesPageQuery>
 {
    public GetBusesPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- a/src/Application/Cities/Commands/AddCity/AddCityCommandValidator.cs
+++ b/src/Application/Cities/Commands/AddCity/AddCityCommandValidator.cs
@ -8,7 +8,7 @@ public class AddCityCommandValidator : AbstractValidator<AddCityCommand>
 {
    public AddCityCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Name)
            .NotEmpty()
--- a/src/Application/Cities/Commands/UpdateCity/UpdateCityCommandValidator.cs
+++ b/src/Application/Cities/Commands/UpdateCity/UpdateCityCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateCityCommandValidator : AbstractValidator<UpdateCityCommand>
 {
    public UpdateCityCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Cities/Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs
+++ b/src/Application/Cities/Queries/GetCitiesPage/GetCitiesPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetCitiesPageQueryValidator : AbstractValidator<GetCitiesPageQuery>
 {
    public GetCitiesPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- a/src/Application/Common/Interfaces/Services/SessionTimeZoneService.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; }
 }
--- a/src/Application/Common/Interfaces/Services/SessoionCultureService.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; }
 }
--- 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<object, object, DateTimeOffset, DateTimeOffset>
 {
-    private readonly TimeZoneService _timeZoneService;
+    private readonly SessionTimeZoneService _timeZoneService;

-    public DateTimeOffsetToLocalResolver(TimeZoneService timeZoneService)
+    public DateTimeOffsetToLocalResolver(SessionTimeZoneService timeZoneService)
    {
        _timeZoneService = timeZoneService;
    }
--- a/src/Application/Countries/Commands/AddCountry/AddCountryCommandValidator.cs
+++ b/src/Application/Countries/Commands/AddCountry/AddCountryCommandValidator.cs
@ -8,7 +8,7 @@ public class AddCountryCommandValidator : AbstractValidator<AddCountryCommand>
 {
    public AddCountryCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Name)
            .NotEmpty()
--- a/src/Application/Countries/Commands/UpdateCountry/UpdateCountryCommandValidator.cs
+++ b/src/Application/Countries/Commands/UpdateCountry/UpdateCountryCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateCountryCommandValidator : AbstractValidator<UpdateCountryComm
 {
    public UpdateCountryCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- 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)
--- a/src/Application/Regions/Commands/AddRegion/AddRegionCommandValidator.cs
+++ b/src/Application/Regions/Commands/AddRegion/AddRegionCommandValidator.cs
@ -8,7 +8,7 @@ public class AddRegionCommandValidator : AbstractValidator<AddRegionCommand>
 {
    public AddRegionCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Name)
            .NotEmpty()
--- a/src/Application/Regions/Commands/UpdateRegion/UpdateRegionCommandValidator.cs
+++ b/src/Application/Regions/Commands/UpdateRegion/UpdateRegionCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateRegionCommandValidator : AbstractValidator<UpdateRegionComman
 {
    public UpdateRegionCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Regions/Queries/GetRegionsPage/GetRegionsPageQueryValidator.cs
+++ b/src/Application/Regions/Queries/GetRegionsPage/GetRegionsPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetRegionsPageQueryValidator : AbstractValidator<GetRegionsPageQuer
 {
    public GetRegionsPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- a/src/Application/Routes/Commands/AddRoute/AddRouteCommandValidator.cs
+++ b/src/Application/Routes/Commands/AddRoute/AddRouteCommandValidator.cs
@ -9,7 +9,7 @@ public class AddRouteCommandValidator : AbstractValidator<AddRouteCommand>
 {
    public AddRouteCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Name)
            .NotEmpty()
--- a/src/Application/Routes/Commands/UpdateRoute/UpdateRouteCommandValidator.cs
+++ b/src/Application/Routes/Commands/UpdateRoute/UpdateRouteCommandValidator.cs
@ -9,7 +9,7 @@ public class UpdateRouteCommandValidator : AbstractValidator<UpdateRouteCommand>
 {
    public UpdateRouteCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Routes/Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs
+++ b/src/Application/Routes/Queries/GetRoutesPage/GetRoutesPageQueryValidator.cs
@ -9,7 +9,7 @@ public class GetRoutesPageQueryValidator : AbstractValidator<GetRoutesPageQuery>
 {
    public GetRoutesPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- a/src/Application/Trains/Commands/AddTrain/AddTrainCommandValidator.cs
+++ b/src/Application/Trains/Commands/AddTrain/AddTrainCommandValidator.cs
@ -8,7 +8,7 @@ public class AddTrainCommandValidator : AbstractValidator<AddTrainCommand>
 {
    public AddTrainCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Number)
            .NotEmpty()
--- a/src/Application/Trains/Commands/UpdateTrain/UpdateTrainCommandValidator.cs
+++ b/src/Application/Trains/Commands/UpdateTrain/UpdateTrainCommandValidator.cs
@ -8,7 +8,7 @@ public class UpdateTrainCommandValidator : AbstractValidator<UpdateTrainCommand>
 {
    public UpdateTrainCommandValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.Guid)
            .NotEmpty()
--- a/src/Application/Trains/Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs
+++ b/src/Application/Trains/Queries/GetTrainsPage/GetTrainsPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetTrainsPageQueryValidator : AbstractValidator<GetTrainsPageQuery>
 {
    public GetTrainsPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- 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()
--- 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()
--- a/src/Application/VehicleEnrollments/Queries/GetVehicleEnrollmentsPage/GetVehicleEnrollmentsPageQueryValidator.cs
+++ b/src/Application/VehicleEnrollments/Queries/GetVehicleEnrollmentsPage/GetVehicleEnrollmentsPageQueryValidator.cs
@ -8,7 +8,7 @@ public class GetVehicleEnrollmentsPageQueryValidator : AbstractValidator<GetVehi
 {
    public GetVehicleEnrollmentsPageQueryValidator(
        IStringLocalizer localizer,
-        CultureService cultureService)
+        SessionCultureService cultureService)
    {
        RuleFor(v => v.PageNumber)
            .GreaterThanOrEqualTo(1)
--- 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)
    {
--- a/src/HttpApi/HttpApi.csproj
+++ b/src/HttpApi/HttpApi.csproj
@ -13,7 +13,6 @@

  <ItemGroup>
    <PackageReference Include="AspNetCore.Localizer.Json" Version="1.0.1" />
-    <!-- <PackageReference Include="MicroElements.Swashbuckle.FluentValidation" Version="6.1.0" /> -->
    <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.4" />
    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
--- 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;
    }
--- 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<SessionUserService, AspNetSessionUserService>();
-services.AddScoped<CultureService, AspNetCultureService>();
-services.AddScoped<TimeZoneService, AspNetTimeZoneService>();
+services.AddScoped<SessionCultureService, AspNetSessionCultureService>();
+services.AddScoped<SessionTimeZoneService, AspNetSessionTimeZoneService>();
 services.AddScoped<SessionCurrencyService, AspNetSessionCurrencyService>();

 services.AddControllers();
@ -95,7 +94,6 @@ services.AddSwaggerGen(options =>
        Type = SecuritySchemeType.ApiKey
    });
 });
-// services.AddFluentValidationRulesToSwagger();


 services.AddScoped<ThreadCultureSetterMiddleware>();
--- a/src/HttpApi/Services/AspNetSessionCultureService.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!;
    }
--- a/src/HttpApi/Services/AspNetSessionTimeZoneService.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!;
    }
--- 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<CultureService>(_ =>
+            .AddScoped<SessionCultureService>(_ =>
            {
-                var mock = new Mock<CultureService>();
+                var mock = new Mock<SessionCultureService>();

                mock
                    .Setup(s => s.Culture)
@ -106,9 +106,9 @@ public abstract class TestBase : IDisposable
    public void SetTimeZone(string timeZone)
    {
        _serviceCollection
-            .AddScoped<TimeZoneService>(_ =>
+            .AddScoped<SessionTimeZoneService>(_ =>
            {
-                var mock = new Mock<TimeZoneService>();
+                var mock = new Mock<SessionTimeZoneService>();

                mock
                    .Setup(s => s.TimeZone)