on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

remove fluent validator

Browse Source
This commit is contained in:
eugeniy_ivanov 2023-03-10 06:01:36 +05:00
parent fe25c1e962
commit a35a89c7ff
6 changed files with 3 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AsbCloudInfrastructure/AsbCloudInfrastructure.csproj
View File

@ -39,7 +39,6 @@
<ItemGroup>
<PackageReference Include="CliWrap" Version="3.6.0" />
<PackageReference Include="ClosedXML" Version="0.96.0" />
<PackageReference Include="FluentValidation.AspNetCore" Version="11.2.2" />
<PackageReference Include="itext7" Version="7.2.3" />
<PackageReference Include="Mapster" Version="7.3.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />

10
AsbCloudInfrastructure/DependencyInjection.cs
View File

@ -17,8 +17,6 @@ using AsbCloudInfrastructure.Services.SAUB;
using AsbCloudInfrastructure.Services.Subsystems;
using AsbCloudInfrastructure.Services.Trajectory;
using AsbCloudInfrastructure.Services.WellOperationService;
using AsbCloudInfrastructure.Validators;
using FluentValidation.AspNetCore;
using Mapster;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Caching.Memory;
@ -92,9 +90,7 @@ namespace AsbCloudInfrastructure
#endif
services.AddDbContext<AsbCloudDbContext>(options =>
options.UseNpgsql(configuration.GetConnectionString(connectionStringName)));
// TODO: переместить FluentValidation в описание моделей
services.AddFluentValidationClientsideAdapters();
services.AddMemoryCache();
services.AddScoped<IAsbCloudDbContext>(provider => provider.GetService<AsbCloudDbContext>());
@ -195,9 +191,7 @@ namespace AsbCloudInfrastructure
services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record8Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record8Dto, AsbCloudDb.Model.WITS.Record8>>();
services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record50Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record50Dto, AsbCloudDb.Model.WITS.Record50>>();
services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record60Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record60Dto, AsbCloudDb.Model.WITS.Record60>>();
services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto, AsbCloudDb.Model.WITS.Record61>>();
services.AddValidators();
services.AddTransient<IWitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto>, WitsRecordRepository<AsbCloudApp.Data.WITS.Record61Dto, AsbCloudDb.Model.WITS.Record61>>();
return services;
}

30
AsbCloudInfrastructure/Validators/DependencyInjection.cs
View File

@ -1,30 +0,0 @@
using Microsoft.Extensions.DependencyInjection;
namespace AsbCloudInfrastructure.Validators
{
public static class DependencyInjection
{
public static IServiceCollection AddValidators(this IServiceCollection services)
{
// services.AddTransient<IValidator<AuthDto>, AuthDtoValidator>();
// services.AddTransient<IValidator<ClusterDto>, ClusterDtoValidator>();
// services.AddTransient<IValidator<CompanyDto>, CompanyDtoValidator>();
// services.AddTransient<IValidator<DepositDto>, DepositDtoValidator>();
// services.AddTransient<IValidator<DrillFlowChartDto>, ProcessMapValidator>();
// services.AddTransient<IValidator<EventDto>, EventDtoValidator>();
// services.AddTransient<IValidator<FileInfoDto>, FileInfoDtoValidator>();
// services.AddTransient<IValidator<FileMarkDto>, FileMarkDtoValidator>();
// services.AddTransient<IValidator<MeasureDto>, MeasureDtoValidator>();
// services.AddTransient<IValidator<MessageDto>, MessageDtoValidator>();
// services.AddTransient<IValidator<PermissionDto>, PermissionDtoValidator>();
// services.AddTransient<IValidator<ReportPropertiesDto>, ReportPropertiesDtoValidator>();
// services.AddTransient<IValidator<UserRegistrationDto>, UserRegistrationDtoValidator>();
// services.AddTransient<IValidator<UserRoleDto>, UserRoleDtoValidator>();
// services.AddTransient<IValidator<WellDto>, WellDtoValidator>();
// services.AddTransient<IValidator<WellOperationDto>, WellOperationDtoValidator>();
// TimeDtoValidator
return services;
}
}
}

21
AsbCloudInfrastructure/Validators/MessageDtoValidator.cs
View File

@ -1,21 +0,0 @@
using AsbCloudApp.Data;
using FluentValidation;
namespace AsbCloudInfrastructure.Validators
{
public class MessageDtoValidator : AbstractValidator<MessageDto>
{
//TODO: в модели дто сообщения отсутствует поле Id скважины
// скорее всего опечатка т.к. используется глубина в правиле валидатора
//в других валидаторах парамтр глубины идет рэнжированный от...до
public MessageDtoValidator()
{
RuleFor(x => x.WellDepth).GreaterThan(-1)
.WithMessage("Id скважины не может быть ниже 1");
}
}
}

28
AsbCloudInfrastructure/Validators/TimeDtoValidator.cs
View File

@ -1,28 +0,0 @@
using AsbCloudApp.Data;
using FluentValidation;
namespace AsbCloudInfrastructure.Validators
{
public class TimeDtoValidator : AbstractValidator<TimeDto>
{
//TODO: в текущей реализации данные проверки регулируются в свойстве модели блоком set
// какая предпочтительнее?
public TimeDtoValidator()
{
RuleFor(x => x.Hour)
.InclusiveBetween(0, 23)
.WithMessage("hour should be in [0; 23]");
RuleFor(x => x.Minute)
.InclusiveBetween(0, 59)
.WithMessage("minute should be in [0; 59]");
RuleFor(x => x.Second)
.InclusiveBetween(0, 59)
.WithMessage("second should be in [0; 59]");
}
}
}

5
ConsoleApp1/Program.cs
View File

@ -18,10 +18,7 @@ namespace ConsoleApp1
static void Main(/*string[] args*/)
{
var n = "-159.99";
var s = "159.99s";
var r1 = reg.IsMatch( n );
var r2 = reg.IsMatch( s );
}
}
}