From 8f61bbb73eea547e20d460528795d70184f550f3 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Tue, 19 May 2026 16:52:33 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=9E=D1=82=D0=BA=D0=BB=D1=8E?= =?UTF-8?q?=D1=87=D0=B5=D0=BD=D0=B0=20=D1=80=D1=83=D1=87=D0=B0=D0=BD=D1=8F?= =?UTF-8?q?=20=D0=B2=D0=B0=D0=BB=D0=B8=D0=B4=D0=B0=D1=86=D0=B8=D1=8F=20?= =?UTF-8?q?=D0=B2=20=D0=BA=D0=BE=D0=BD=D1=82=D1=80=D0=BE=D0=BB=D0=BB=D0=B5?= =?UTF-8?q?=D1=80=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/V1/AgentHistoryController.cs | 12 +++++----- .../Controllers/V1/DistributorController.cs | 12 +++++----- PARR.API/Controllers/V1/JobController.cs | 22 +++++++++---------- PARR.API/Controllers/V1/JobGroupController.cs | 18 +++++++-------- .../V1/JobUnitPreviewController.cs | 16 +++++++------- PARR.API/Controllers/V1/ProcessController.cs | 18 +++++++-------- .../V1/Statistics/StatRobotStateController.cs | 12 +++++----- .../Controllers/V1/SubprocessController.cs | 18 +++++++-------- .../V1/TemplateActivatorController.cs | 12 +++++----- .../Controllers/V1/TemplateScheduleEspp.cs | 12 +++++----- PARR.API/Controllers/V1/TnkController.cs | 18 +++++++-------- PARR.API/Controllers/V1/UserController.cs | 21 ++++++++++-------- PARR.API/Controllers/V1/WeekendController.cs | 10 ++++----- 13 files changed, 102 insertions(+), 99 deletions(-) diff --git a/PARR.API/Controllers/V1/AgentHistoryController.cs b/PARR.API/Controllers/V1/AgentHistoryController.cs index 99179b22..8db316be 100644 --- a/PARR.API/Controllers/V1/AgentHistoryController.cs +++ b/PARR.API/Controllers/V1/AgentHistoryController.cs @@ -24,7 +24,7 @@ namespace PARR.API.Controllers.V1 /// public class AgentHistoryController : BaseApiController { - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IAgentHistoryRepository agentHistoryService; private readonly IUriService uriService; private readonly IMapper mapper; @@ -34,7 +34,7 @@ namespace PARR.API.Controllers.V1 private readonly ILogger logger; public AgentHistoryController( - IValidator validator, + //IValidator validator, IAgentHistoryRepository agentHistoryService, IUriService uriService, IMapper mapper, @@ -44,7 +44,7 @@ namespace PARR.API.Controllers.V1 ILogger logger ) { - this.validator = validator; + //this.validator = validator; this.agentHistoryService = agentHistoryService; this.uriService = uriService; this.mapper = mapper; @@ -119,9 +119,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.AgentHistory.Create)] public async Task Create([FromBody] AgentHistoryRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var clientIp = clientService.GetClientIp()?.ToString(); diff --git a/PARR.API/Controllers/V1/DistributorController.cs b/PARR.API/Controllers/V1/DistributorController.cs index ecff455f..cc26ddb1 100644 --- a/PARR.API/Controllers/V1/DistributorController.cs +++ b/PARR.API/Controllers/V1/DistributorController.cs @@ -23,19 +23,19 @@ namespace PARR.API.Controllers.V1 { private readonly IRabbitService mqService; private readonly MqSettings mqSettings; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IClientService clientService; public DistributorController( IRabbitService mqService, MqSettings mqSettings, - IValidator validator, + //IValidator validator, IClientService clientService ) { this.mqService = mqService; this.mqSettings = mqSettings; - this.validator = validator; + //this.validator = validator; this.clientService = clientService; } @@ -47,9 +47,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.Distributor.Distribute)] public async Task Distribute([FromBody] DistributeRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var requestToMq = new TemplateDistributorMq { diff --git a/PARR.API/Controllers/V1/JobController.cs b/PARR.API/Controllers/V1/JobController.cs index 621554c1..fd2903b6 100644 --- a/PARR.API/Controllers/V1/JobController.cs +++ b/PARR.API/Controllers/V1/JobController.cs @@ -40,7 +40,7 @@ namespace PARR.API.Controllers.V1 private readonly IUriService uriService; private readonly IJobRepository jobService; private readonly ITemplateRepository templateService; - private readonly IValidator jobValidator; + //private readonly IValidator jobValidator; private readonly IRabbitService mqService; private readonly MqSettings mqSettings; private readonly IClientService clientService; @@ -54,7 +54,7 @@ namespace PARR.API.Controllers.V1 IJobRepository jobService, ITemplateRepository templateService, IJobGroupRepository jobGroupService, - IValidator jobValidator, + //IValidator jobValidator, IUnitFilterService unitFilterService, IUnitRepository unitService, IRabbitService mqService, @@ -69,7 +69,7 @@ namespace PARR.API.Controllers.V1 this.uriService = uriService; this.jobService = jobService; this.templateService = templateService; - this.jobValidator = jobValidator; + //this.jobValidator = jobValidator; this.mqService = mqService; this.mqSettings = mqSettings; this.clientService = clientService; @@ -188,12 +188,12 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.Job.Create)] public async Task Create([FromBody] JobRequest request) { - #region Валидация - var jobValidateResult = await jobValidator.ValidateAsync(request);//Валидация параметров самого задания + //#region Валидация + //var jobValidateResult = await jobValidator.ValidateAsync(request);//Валидация параметров самого задания - if (!jobValidateResult.IsValid) - return BadRequest(new Response(jobValidateResult.Errors)); - #endregion + //if (!jobValidateResult.IsValid) + // return BadRequest(new Response(jobValidateResult.Errors)); + //#endregion //TODO: !!!!!!! проверить, если тип ЗОНТИК или ГРУППИРОВКА, то обязательно должны быть заполнены поля min max @@ -262,9 +262,9 @@ namespace PARR.API.Controllers.V1 [HttpPut(ApiRoutes.Job.Update)] public async Task Update([FromRoute] Guid id, [FromBody] JobRequest request) { - var resultValidate = await jobValidator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await jobValidator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var orig = await jobService.Get() .Include(t => t.Tnk) diff --git a/PARR.API/Controllers/V1/JobGroupController.cs b/PARR.API/Controllers/V1/JobGroupController.cs index e568e2f9..95accb12 100644 --- a/PARR.API/Controllers/V1/JobGroupController.cs +++ b/PARR.API/Controllers/V1/JobGroupController.cs @@ -39,7 +39,7 @@ namespace PARR.API.Controllers.V1 private readonly IJobGroupRepository groupService; private readonly IJobRepository jobService; private readonly IEsppSchTypeConfigRepository esppConfigService; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IJobGroupTypeRepository jobGroupTypeService; private readonly IMatchingStatusService matchingStatusService; private readonly IScheduleResponseAreaTimeOffsetRepository scheduleResponseAreaTimeOffsetService; @@ -53,7 +53,7 @@ namespace PARR.API.Controllers.V1 IJobGroupRepository groupService, IJobRepository jobService, IEsppSchTypeConfigRepository esppConfigService, - IValidator validator, + //IValidator validator, IJobGroupTypeRepository jobGroupTypeService, IMatchingStatusService matchingStatusService, IScheduleResponseAreaTimeOffsetRepository scheduleResponseAreaTimeOffsetService, @@ -67,7 +67,7 @@ namespace PARR.API.Controllers.V1 this.groupService = groupService; this.jobService = jobService; this.esppConfigService = esppConfigService; - this.validator = validator; + //this.validator = validator; this.jobGroupTypeService = jobGroupTypeService; this.matchingStatusService = matchingStatusService; this.scheduleResponseAreaTimeOffsetService = scheduleResponseAreaTimeOffsetService; @@ -156,10 +156,10 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.JobGroup.Create)] public async Task Create([FromBody] JobGroupRequest request) { - var resultValidate = await validator.ValidateAsync(request); + //var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var jobGroup = new JobGroup { @@ -242,10 +242,10 @@ namespace PARR.API.Controllers.V1 [HttpPut(ApiRoutes.JobGroup.Update)] public async Task Update([FromRoute] Guid id, [FromBody] JobGroupRequest request) { - var resultValidate = await validator.ValidateAsync(request); + //var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var orig = await groupService.Get() .Include(t => t.Jobs) diff --git a/PARR.API/Controllers/V1/JobUnitPreviewController.cs b/PARR.API/Controllers/V1/JobUnitPreviewController.cs index 9d0993a8..f2cec171 100644 --- a/PARR.API/Controllers/V1/JobUnitPreviewController.cs +++ b/PARR.API/Controllers/V1/JobUnitPreviewController.cs @@ -24,7 +24,7 @@ namespace PARR.API.Controllers.V1 { private readonly ILogger logger; private readonly IUnitFilterService unitFilterService; - private readonly IValidator jobValidator; + //private readonly IValidator jobValidator; private readonly IUnitRepository unitService; private readonly IJobGroupRepository jobGroupService; private readonly IMapper mapper; @@ -32,7 +32,7 @@ namespace PARR.API.Controllers.V1 public JobUnitPreviewController( ILogger logger, IUnitFilterService unitFilterService, - IValidator jobValidator, + //IValidator jobValidator, IUnitRepository unitService, IJobGroupRepository jobGroupService, IMapper mapper @@ -40,7 +40,7 @@ namespace PARR.API.Controllers.V1 { this.logger = logger; this.unitFilterService = unitFilterService; - this.jobValidator = jobValidator; + //this.jobValidator = jobValidator; this.unitService = unitService; this.jobGroupService = jobGroupService; this.mapper = mapper; @@ -54,12 +54,12 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.JobUnitPreview.Preview)] public async Task Preview([FromBody] JobRequest request) { - #region Валидация - var jobValidateResult = await jobValidator.ValidateAsync(request);//Валидация параметров самого задания + //#region Валидация + //var jobValidateResult = await jobValidator.ValidateAsync(request);//Валидация параметров самого задания - if (!jobValidateResult.IsValid) - return BadRequest(new Response(jobValidateResult.Errors)); - #endregion + //if (!jobValidateResult.IsValid) + // return BadRequest(new Response(jobValidateResult.Errors)); + //#endregion var job = mapper.Map(request); diff --git a/PARR.API/Controllers/V1/ProcessController.cs b/PARR.API/Controllers/V1/ProcessController.cs index b3dd3be8..1f9dae1e 100644 --- a/PARR.API/Controllers/V1/ProcessController.cs +++ b/PARR.API/Controllers/V1/ProcessController.cs @@ -27,21 +27,21 @@ namespace PARR.API.Controllers.V1 private readonly ILogger logger; private readonly IMapper mapper; private readonly IProcessRepository processService; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IUriService uriService; public ProcessController( ILogger logger, IMapper mapper, IProcessRepository processService, - IValidator validator, + //IValidator validator, IUriService uriService ) { this.logger = logger; this.mapper = mapper; this.processService = processService; - this.validator = validator; + //this.validator = validator; this.uriService = uriService; } @@ -120,9 +120,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.Process.Create)] public async Task Create([FromBody] ProcessRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var existName = await processService.Get().FirstOrDefaultAsync(t => t.Name.ToLower() == request.Name.ToLower().Trim()); if (existName != null) @@ -159,9 +159,9 @@ namespace PARR.API.Controllers.V1 [HttpPut(ApiRoutes.Process.Update)] public async Task Update([FromRoute] Guid id, [FromBody] ProcessRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); //проверка на уникальность esppId var existEsppId = await processService.Get().FirstOrDefaultAsync(t => t.Id != id && t.EsppId == request.EsppId); diff --git a/PARR.API/Controllers/V1/Statistics/StatRobotStateController.cs b/PARR.API/Controllers/V1/Statistics/StatRobotStateController.cs index f6f98519..ec50a687 100644 --- a/PARR.API/Controllers/V1/Statistics/StatRobotStateController.cs +++ b/PARR.API/Controllers/V1/Statistics/StatRobotStateController.cs @@ -29,7 +29,7 @@ namespace PARR.API.Controllers.V1.Statistics public class StatRobotStateController : BaseApiController { private readonly IInfluxDbService influxDbService; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly InfluxDbSettings influxDbSettings; private readonly MonitoringSettings monitoringSettings; private readonly IClientService clientService; @@ -38,7 +38,7 @@ namespace PARR.API.Controllers.V1.Statistics public StatRobotStateController( IInfluxDbService influxDbService, - IValidator validator, + //IValidator validator, InfluxDbSettings influxDbSettings, MonitoringSettings monitoringSettings, IClientService clientService, @@ -47,7 +47,7 @@ namespace PARR.API.Controllers.V1.Statistics ) { this.influxDbService = influxDbService; - this.validator = validator; + //this.validator = validator; this.influxDbSettings = influxDbSettings; this.monitoringSettings = monitoringSettings; this.clientService = clientService; @@ -136,9 +136,9 @@ namespace PARR.API.Controllers.V1.Statistics [HttpPost(ApiRoutes.StatRobotState.Send)] public async Task Send([FromBody] RobotStateRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var result = influxDbService.Write(write => { diff --git a/PARR.API/Controllers/V1/SubprocessController.cs b/PARR.API/Controllers/V1/SubprocessController.cs index c8420792..1b5a691f 100644 --- a/PARR.API/Controllers/V1/SubprocessController.cs +++ b/PARR.API/Controllers/V1/SubprocessController.cs @@ -27,21 +27,21 @@ namespace PARR.API.Controllers.V1 private readonly ILogger logger; private readonly IMapper mapper; private readonly ISubprocessRepository subprocessService; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IUriService uriService; public SubprocessController( ILogger logger, IMapper mapper, ISubprocessRepository subprocessService, - IValidator validator, + //IValidator validator, IUriService uriService ) { this.logger = logger; this.mapper = mapper; this.subprocessService = subprocessService; - this.validator = validator; + //this.validator = validator; this.uriService = uriService; } @@ -124,9 +124,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.Subprocess.Create)] public async Task Create([FromBody] SubprocessRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var existName = await subprocessService.Get().FirstOrDefaultAsync(t => t.Name.ToLower() == request.Name.Trim().ToLower()); if (existName != null) @@ -164,9 +164,9 @@ namespace PARR.API.Controllers.V1 [HttpPut(ApiRoutes.Subprocess.Update)] public async Task Update([FromRoute] Guid id, [FromBody] SubprocessRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); //проверка на уникальность esppId var existEsppId = await subprocessService.Get().FirstOrDefaultAsync(t => t.Id != id && t.EsppId == request.EsppId); diff --git a/PARR.API/Controllers/V1/TemplateActivatorController.cs b/PARR.API/Controllers/V1/TemplateActivatorController.cs index 206f8d61..5e8e02db 100644 --- a/PARR.API/Controllers/V1/TemplateActivatorController.cs +++ b/PARR.API/Controllers/V1/TemplateActivatorController.cs @@ -22,7 +22,7 @@ namespace PARR.API.Controllers.V1 [Authorize(Roles = ParrRoles.Administrator.Role)] public class TemplateActivatorController : BaseApiController { - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IRabbitService mqService; private readonly IUriService uriService; private readonly MqSettings mqSettings; @@ -30,7 +30,7 @@ namespace PARR.API.Controllers.V1 private readonly IClientService clientService; public TemplateActivatorController( - IValidator validator, + //IValidator validator, IRabbitService mqService, IUriService uriService, MqSettings mqSettings, @@ -38,7 +38,7 @@ namespace PARR.API.Controllers.V1 IClientService clientService ) { - this.validator = validator; + //this.validator = validator; this.mqService = mqService; this.uriService = uriService; this.mqSettings = mqSettings; @@ -54,9 +54,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.TemplateActivator.SendRequest)] public async Task SendRequest([FromBody] TemplateActivatorRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var mqRequest = new TemplateActivatorMq { diff --git a/PARR.API/Controllers/V1/TemplateScheduleEspp.cs b/PARR.API/Controllers/V1/TemplateScheduleEspp.cs index a9dbe9af..23ef4fd3 100644 --- a/PARR.API/Controllers/V1/TemplateScheduleEspp.cs +++ b/PARR.API/Controllers/V1/TemplateScheduleEspp.cs @@ -21,19 +21,19 @@ namespace PARR.API.Controllers.V1 { private readonly ITemplateRepository templateService; private readonly IMapper mapper; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IUriService uriService; public TemplateScheduleEspp( ITemplateRepository templateService, IMapper mapper, - IValidator validator, + //IValidator validator, IUriService uriService ) { this.templateService = templateService; this.mapper = mapper; - this.validator = validator; + //this.validator = validator; this.uriService = uriService; } @@ -62,9 +62,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.TemplateScheduleEspp.Create)] public async Task SetEsppId([FromRoute] Guid templateId, [FromBody] TemplateScheduleEsppIdRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var template = await templateService.GetAsync(templateId); diff --git a/PARR.API/Controllers/V1/TnkController.cs b/PARR.API/Controllers/V1/TnkController.cs index 3da3a93d..9a501539 100644 --- a/PARR.API/Controllers/V1/TnkController.cs +++ b/PARR.API/Controllers/V1/TnkController.cs @@ -27,21 +27,21 @@ namespace PARR.API.Controllers.V1 private readonly ILogger logger; private readonly IMapper mapper; private readonly ITnkRepository tnkService; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IUriService uriService; public TnkController( ILogger logger, IMapper mapper, ITnkRepository tnkService, - IValidator validator, + //IValidator validator, IUriService uriService ) { this.logger = logger; this.mapper = mapper; this.tnkService = tnkService; - this.validator = validator; + //this.validator = validator; this.uriService = uriService; } @@ -127,9 +127,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.Tnk.Create)] public async Task Create([FromBody] TnkRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var existName = await tnkService.Get().FirstOrDefaultAsync(t => t.Name.ToLower() == request.Name.Trim().ToLower()); if (existName != null) @@ -168,9 +168,9 @@ namespace PARR.API.Controllers.V1 [HttpPut(ApiRoutes.Tnk.Update)] public async Task Update([FromRoute] Guid id, [FromBody] TnkRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); ////проверка на уникальность esppId //var existEsppId = await tnkService.Get().FirstOrDefaultAsync(t => t.Id != id && t.EsppId == request.EsppId); diff --git a/PARR.API/Controllers/V1/UserController.cs b/PARR.API/Controllers/V1/UserController.cs index 03b64fcb..3d130ab1 100644 --- a/PARR.API/Controllers/V1/UserController.cs +++ b/PARR.API/Controllers/V1/UserController.cs @@ -15,6 +15,7 @@ using PARR.Core.Repositories.Interfaces; using PARR.Domain.Common.Pagination; using PARR.Domain.Common.Roles; using PARR.Domain.Entities; +using PARR.Domain.Exceptions; namespace PARR.API.Controllers.V1 { @@ -26,21 +27,21 @@ namespace PARR.API.Controllers.V1 { private readonly IMapper mapper; private readonly IUserRepository userService; - private readonly IValidator validator; + //private readonly IValidator validator; private readonly IUriService uriService; private readonly ILogger logger; public UserController( IMapper mapper, IUserRepository userService, - IValidator validator, + //IValidator validator, IUriService uriService, ILogger logger ) { this.mapper = mapper; this.userService = userService; - this.validator = validator; + //this.validator = validator; this.uriService = uriService; this.logger = logger; } @@ -122,14 +123,16 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.User.Create)] public async Task Create([FromBody] UserRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var existIp = await userService.Get().FirstOrDefaultAsync(t => t.Ip == request.Ip); if (existIp != null) + //throw new AlreadyExistsException($"Ip {request.Ip} занят другим пользователем."); return BadRequest(new Response(false, new List { new ErrorModel { FieldName = nameof(request.Ip), Message = $"Ip {request.Ip} занят другим пользователем." } })); + var user = new User { Id = Guid.NewGuid(), @@ -158,9 +161,9 @@ namespace PARR.API.Controllers.V1 [HttpPut(ApiRoutes.User.Update)] public async Task Update([FromRoute] Guid id, [FromBody] UserRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var orig = await userService.Get() .Include(t => t.Roles).ThenInclude(t => t.Role) diff --git a/PARR.API/Controllers/V1/WeekendController.cs b/PARR.API/Controllers/V1/WeekendController.cs index 6bfdfbfa..937ad1ac 100644 --- a/PARR.API/Controllers/V1/WeekendController.cs +++ b/PARR.API/Controllers/V1/WeekendController.cs @@ -27,7 +27,7 @@ namespace PARR.API.Controllers.V1 private readonly IMapper mapper; private readonly IWeekendDayRepository weekendDayService; private readonly IUriService uriService; - private readonly IValidator validator; + //private readonly IValidator validator; public WeekendController( IMapper mapper, @@ -39,7 +39,7 @@ namespace PARR.API.Controllers.V1 this.mapper = mapper; this.weekendDayService = weekendDayService; this.uriService = uriService; - this.validator = validator; + //this.validator = validator; } @@ -94,9 +94,9 @@ namespace PARR.API.Controllers.V1 [HttpPost(ApiRoutes.Weekend.Create)] public async Task Create([FromBody] WeekendRequest request) { - var resultValidate = await validator.ValidateAsync(request); - if (!resultValidate.IsValid) - return BadRequest(new Response(resultValidate.Errors)); + //var resultValidate = await validator.ValidateAsync(request); + //if (!resultValidate.IsValid) + // return BadRequest(new Response(resultValidate.Errors)); var weekend = new WeekendDay { Id = Guid.NewGuid(), Date = request.WeekendDate };