rename user setings services

This commit is contained in:
cuqmbr 2025-05-14 17:48:48 +03:00
parent b1aceac750
commit 74dc7ceff3
Signed by: cuqmbr
GPG Key ID: 0AA446880C766199
37 changed files with 46 additions and 49 deletions

View File

@ -9,7 +9,7 @@ public class AddAddressCommandValidator : AbstractValidator<AddAddressCommand>
{ {
public AddAddressCommandValidator( public AddAddressCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Name) RuleFor(v => v.Name)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateAddressCommandValidator : AbstractValidator<UpdateAddressComm
{ {
public UpdateAddressCommandValidator( public UpdateAddressCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetAddressesPageQueryValidator : AbstractValidator<GetAddressesPage
{ {
public GetAddressesPageQueryValidator( public GetAddressesPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -8,7 +8,7 @@ public class AddAircraftCommandValidator : AbstractValidator<AddAircraftCommand>
{ {
public AddAircraftCommandValidator( public AddAircraftCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Number) RuleFor(v => v.Number)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateAircraftCommandValidator : AbstractValidator<UpdateAircraftCo
{ {
public UpdateAircraftCommandValidator( public UpdateAircraftCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetAircraftsPageQueryValidator : AbstractValidator<GetAircraftsPage
{ {
public GetAircraftsPageQueryValidator( public GetAircraftsPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -8,7 +8,7 @@ public class AddBusCommandValidator : AbstractValidator<AddBusCommand>
{ {
public AddBusCommandValidator( public AddBusCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Number) RuleFor(v => v.Number)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateBusCommandValidator : AbstractValidator<UpdateBusCommand>
{ {
public UpdateBusCommandValidator( public UpdateBusCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetBusesPageQueryValidator : AbstractValidator<GetBusesPageQuery>
{ {
public GetBusesPageQueryValidator( public GetBusesPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -8,7 +8,7 @@ public class AddCityCommandValidator : AbstractValidator<AddCityCommand>
{ {
public AddCityCommandValidator( public AddCityCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Name) RuleFor(v => v.Name)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateCityCommandValidator : AbstractValidator<UpdateCityCommand>
{ {
public UpdateCityCommandValidator( public UpdateCityCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetCitiesPageQueryValidator : AbstractValidator<GetCitiesPageQuery>
{ {
public GetCitiesPageQueryValidator( public GetCitiesPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -1,6 +1,6 @@
namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services; namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services;
public interface TimeZoneService public interface SessionTimeZoneService
{ {
public TimeZoneInfo TimeZone { get; } public TimeZoneInfo TimeZone { get; }
} }

View File

@ -2,7 +2,7 @@ using System.Globalization;
namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services; namespace cuqmbr.TravelGuide.Application.Common.Interfaces.Services;
public interface CultureService public interface SessionCultureService
{ {
public CultureInfo Culture { get; } public CultureInfo Culture { get; }
} }

View File

@ -6,9 +6,9 @@ namespace cuqmbr.TravelGuide.Application.Common.Mappings.Resolvers;
public class DateTimeOffsetToLocalResolver : public class DateTimeOffsetToLocalResolver :
IMemberValueResolver<object, object, DateTimeOffset, DateTimeOffset> IMemberValueResolver<object, object, DateTimeOffset, DateTimeOffset>
{ {
private readonly TimeZoneService _timeZoneService; private readonly SessionTimeZoneService _timeZoneService;
public DateTimeOffsetToLocalResolver(TimeZoneService timeZoneService) public DateTimeOffsetToLocalResolver(SessionTimeZoneService timeZoneService)
{ {
_timeZoneService = timeZoneService; _timeZoneService = timeZoneService;
} }

View File

@ -8,7 +8,7 @@ public class AddCountryCommandValidator : AbstractValidator<AddCountryCommand>
{ {
public AddCountryCommandValidator( public AddCountryCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Name) RuleFor(v => v.Name)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateCountryCommandValidator : AbstractValidator<UpdateCountryComm
{ {
public UpdateCountryCommandValidator( public UpdateCountryCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -9,7 +9,7 @@ public class GetCountriesPageQueryValidator :
{ {
public GetCountriesPageQueryValidator( public GetCountriesPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -8,7 +8,7 @@ public class AddRegionCommandValidator : AbstractValidator<AddRegionCommand>
{ {
public AddRegionCommandValidator( public AddRegionCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Name) RuleFor(v => v.Name)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateRegionCommandValidator : AbstractValidator<UpdateRegionComman
{ {
public UpdateRegionCommandValidator( public UpdateRegionCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetRegionsPageQueryValidator : AbstractValidator<GetRegionsPageQuer
{ {
public GetRegionsPageQueryValidator( public GetRegionsPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -9,7 +9,7 @@ public class AddRouteCommandValidator : AbstractValidator<AddRouteCommand>
{ {
public AddRouteCommandValidator( public AddRouteCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Name) RuleFor(v => v.Name)
.NotEmpty() .NotEmpty()

View File

@ -9,7 +9,7 @@ public class UpdateRouteCommandValidator : AbstractValidator<UpdateRouteCommand>
{ {
public UpdateRouteCommandValidator( public UpdateRouteCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -9,7 +9,7 @@ public class GetRoutesPageQueryValidator : AbstractValidator<GetRoutesPageQuery>
{ {
public GetRoutesPageQueryValidator( public GetRoutesPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -8,7 +8,7 @@ public class AddTrainCommandValidator : AbstractValidator<AddTrainCommand>
{ {
public AddTrainCommandValidator( public AddTrainCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Number) RuleFor(v => v.Number)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class UpdateTrainCommandValidator : AbstractValidator<UpdateTrainCommand>
{ {
public UpdateTrainCommandValidator( public UpdateTrainCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetTrainsPageQueryValidator : AbstractValidator<GetTrainsPageQuery>
{ {
public GetTrainsPageQueryValidator( public GetTrainsPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -11,8 +11,8 @@ public class AddVehicleEnrollmentCommandValidator :
{ {
public AddVehicleEnrollmentCommandValidator( public AddVehicleEnrollmentCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService, SessionCultureService cultureService,
TimeZoneService timeZoneService) SessionTimeZoneService timeZoneService)
{ {
RuleFor(v => v.DepartureTime) RuleFor(v => v.DepartureTime)
.NotEmpty() .NotEmpty()

View File

@ -11,8 +11,8 @@ public class UpdateVehicleEnrollmentCommandValidator :
{ {
public UpdateVehicleEnrollmentCommandValidator( public UpdateVehicleEnrollmentCommandValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService, SessionCultureService cultureService,
TimeZoneService timeZoneService) SessionTimeZoneService timeZoneService)
{ {
RuleFor(v => v.Guid) RuleFor(v => v.Guid)
.NotEmpty() .NotEmpty()

View File

@ -8,7 +8,7 @@ public class GetVehicleEnrollmentsPageQueryValidator : AbstractValidator<GetVehi
{ {
public GetVehicleEnrollmentsPageQueryValidator( public GetVehicleEnrollmentsPageQueryValidator(
IStringLocalizer localizer, IStringLocalizer localizer,
CultureService cultureService) SessionCultureService cultureService)
{ {
RuleFor(v => v.PageNumber) RuleFor(v => v.PageNumber)
.GreaterThanOrEqualTo(1) .GreaterThanOrEqualTo(1)

View File

@ -12,7 +12,7 @@ public class TestsController : ControllerBase
private readonly UnitOfWork _unitOfWork; private readonly UnitOfWork _unitOfWork;
public TestsController( public TestsController(
CultureService cultureService, SessionCultureService cultureService,
IStringLocalizer localizer, IStringLocalizer localizer,
UnitOfWork unitOfWork) UnitOfWork unitOfWork)
{ {

View File

@ -13,7 +13,6 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="AspNetCore.Localizer.Json" Version="1.0.1" /> <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.AspNetCore.OpenApi" Version="9.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.4">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

View File

@ -5,9 +5,9 @@ namespace cuqmbr.TravelGuide.HttpApi.Middlewares;
public class ThreadCultureSetterMiddleware : IMiddleware public class ThreadCultureSetterMiddleware : IMiddleware
{ {
private readonly CultureService _cultureService; private readonly SessionCultureService _cultureService;
public ThreadCultureSetterMiddleware(CultureService cultureService) public ThreadCultureSetterMiddleware(SessionCultureService cultureService)
{ {
_cultureService = cultureService; _cultureService = cultureService;
} }

View File

@ -10,7 +10,6 @@ using cuqmbr.TravelGuide.HttpApi.Middlewares;
using cuqmbr.TravelGuide.HttpApi.Swashbuckle.OperationFilters; using cuqmbr.TravelGuide.HttpApi.Swashbuckle.OperationFilters;
using System.Net; using System.Net;
using Swashbuckle.AspNetCore.SwaggerUI; using Swashbuckle.AspNetCore.SwaggerUI;
// using MicroElements.Swashbuckle.FluentValidation.AspNetCore;
using Microsoft.OpenApi.Models; using Microsoft.OpenApi.Models;
using System.Reflection; using System.Reflection;
@ -30,8 +29,8 @@ services.ConfigureInfrastructure();
services.ConfigureApplication(); services.ConfigureApplication();
services.AddScoped<SessionUserService, AspNetSessionUserService>(); services.AddScoped<SessionUserService, AspNetSessionUserService>();
services.AddScoped<CultureService, AspNetCultureService>(); services.AddScoped<SessionCultureService, AspNetSessionCultureService>();
services.AddScoped<TimeZoneService, AspNetTimeZoneService>(); services.AddScoped<SessionTimeZoneService, AspNetSessionTimeZoneService>();
services.AddScoped<SessionCurrencyService, AspNetSessionCurrencyService>(); services.AddScoped<SessionCurrencyService, AspNetSessionCurrencyService>();
services.AddControllers(); services.AddControllers();
@ -95,7 +94,6 @@ services.AddSwaggerGen(options =>
Type = SecuritySchemeType.ApiKey Type = SecuritySchemeType.ApiKey
}); });
}); });
// services.AddFluentValidationRulesToSwagger();
services.AddScoped<ThreadCultureSetterMiddleware>(); services.AddScoped<ThreadCultureSetterMiddleware>();

View File

@ -3,12 +3,12 @@ using System.Globalization;
namespace cuqmbr.TravelGuide.HttpApi.Services; namespace cuqmbr.TravelGuide.HttpApi.Services;
public sealed class AspNetCultureService : CultureService public sealed class AspNetSessionCultureService : SessionCultureService
{ {
private readonly HttpContext _httpContext; private readonly HttpContext _httpContext;
private const string DefaultCultureId = "en-US"; private const string DefaultCultureId = "en-US";
public AspNetCultureService(IHttpContextAccessor httpContextAccessor) public AspNetSessionCultureService(IHttpContextAccessor httpContextAccessor)
{ {
_httpContext = httpContextAccessor.HttpContext!; _httpContext = httpContextAccessor.HttpContext!;
} }

View File

@ -2,11 +2,11 @@ using cuqmbr.TravelGuide.Application.Common.Interfaces.Services;
namespace cuqmbr.TravelGuide.HttpApi.Services; namespace cuqmbr.TravelGuide.HttpApi.Services;
public sealed class AspNetTimeZoneService : TimeZoneService public sealed class AspNetSessionTimeZoneService : SessionTimeZoneService
{ {
private readonly HttpContext _httpContext; private readonly HttpContext _httpContext;
public AspNetTimeZoneService(IHttpContextAccessor httpContextAccessor) public AspNetSessionTimeZoneService(IHttpContextAccessor httpContextAccessor)
{ {
_httpContext = httpContextAccessor.HttpContext!; _httpContext = httpContextAccessor.HttpContext!;
} }

View File

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