From 10661a88c6dd8c9bc7e4fe7bf3032efb27007f8d Mon Sep 17 00:00:00 2001 From: Mikhail Kuznetsov Date: Wed, 6 Mar 2024 16:06:07 +1000 Subject: [PATCH] =?UTF-8?q?fix(api):=20=D0=B7=D0=B0=D0=BA=D0=BE=D0=BC?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D1=83=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1=D1=8A=D0=B5?= =?UTF-8?q?=D0=BA=D1=82=D0=BE=D0=B2=20=D1=83=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D1=8F=20=D1=82=D1=80=D1=83=D0=B4=D0=BE=D0=B7?= =?UTF-8?q?=D0=B0=D1=82=D1=80=D0=B0=D1=82=D0=B0=D0=BC=D0=B8.=20=D0=9C?= =?UTF-8?q?=D0=BE=D0=B3=D0=BB=D0=BE=20=D0=BF=D1=80=D0=B8=D0=B2=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=20=D0=BA=20=D0=BD=D0=B5=D0=B7=D0=B0=D0=BF=D0=BB?= =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=BD=D0=BE?= =?UTF-8?q?=D0=BC=D1=83=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8E?= =?UTF-8?q?=20=D0=B7=D0=B0=D0=B2=D0=B8=D1=81=D0=B8=D0=BC=D1=8B=D1=85=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=8A=D0=B5=D0=BA=D1=82=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PARR.API/Controllers/V1/ProcessController.cs | 34 +++++++++---------- .../Controllers/V1/SubprocessController.cs | 22 ++++++------ PARR.API/Controllers/V1/TnkController.cs | 22 ++++++------ PARR.API/Controllers/V1/WorkController.cs | 22 ++++++------ 4 files changed, 50 insertions(+), 50 deletions(-) diff --git a/PARR.API/Controllers/V1/ProcessController.cs b/PARR.API/Controllers/V1/ProcessController.cs index 020f503d..8e55ad9b 100644 --- a/PARR.API/Controllers/V1/ProcessController.cs +++ b/PARR.API/Controllers/V1/ProcessController.cs @@ -2,19 +2,19 @@ using FluentValidation; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; using PARR.API.Contracts.V1; using PARR.API.Contracts.V1.Requests; -using PARR.API.Contracts.V1.Responses.Base; +using PARR.API.Contracts.V1.Requests.Queries; using PARR.API.Contracts.V1.Responses; +using PARR.API.Contracts.V1.Responses.Base; using PARR.API.Controllers.V1.Base; +using PARR.API.Extensions; using PARR.API.Services.Interfaces; using PARR.Constants; -using PARR.DAL.Services.Interfaces; -using Microsoft.EntityFrameworkCore; -using PARR.DAL.Models; -using PARR.API.Contracts.V1.Requests.Queries; -using PARR.API.Extensions; using PARR.DAL.DomainModels; +using PARR.DAL.Models; +using PARR.DAL.Services.Interfaces; namespace PARR.API.Controllers.V1 { @@ -182,20 +182,20 @@ namespace PARR.API.Controllers.V1 /// /// /// - [HttpDelete(ApiRoutes.Process.Delete)] - public async Task Delete([FromRoute] Guid id) - { - var process = await processService.GetAsync(id); + //[HttpDelete(ApiRoutes.Process.Delete)] + //public async Task Delete([FromRoute] Guid id) + //{ + // var process = await processService.GetAsync(id); - if (process == null) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении процесса. Не найден процесс Id: {id}" } })); + // if (process == null) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении процесса. Не найден процесс Id: {id}" } })); - if (!processService.Delete(process) || !await processService.CommitAsync()) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении процесса из базы данных" } })); + // if (!processService.Delete(process) || !await processService.CommitAsync()) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении процесса из базы данных" } })); - logger.LogInformation($"Пользователь {User.Identity?.Name} удалил процесс: {process.Id}, {process.Name}, {process.EsppId}"); + // logger.LogInformation($"Пользователь {User.Identity?.Name} удалил процесс: {process.Id}, {process.Name}, {process.EsppId}"); - return NoContent(); - } + // return NoContent(); + //} } } diff --git a/PARR.API/Controllers/V1/SubprocessController.cs b/PARR.API/Controllers/V1/SubprocessController.cs index 1da2c3a7..c2b48e60 100644 --- a/PARR.API/Controllers/V1/SubprocessController.cs +++ b/PARR.API/Controllers/V1/SubprocessController.cs @@ -184,20 +184,20 @@ namespace PARR.API.Controllers.V1 /// /// /// - [HttpDelete(ApiRoutes.Subprocess.Delete)] - public async Task Delete([FromRoute] Guid id) - { - var subprocess = await subprocessService.GetAsync(id); + //[HttpDelete(ApiRoutes.Subprocess.Delete)] + //public async Task Delete([FromRoute] Guid id) + //{ + // var subprocess = await subprocessService.GetAsync(id); - if (subprocess == null) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении подпроцесса. Не найден подпроцесс Id: {id}" } })); + // if (subprocess == null) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении подпроцесса. Не найден подпроцесс Id: {id}" } })); - if (!subprocessService.Delete(subprocess) || !await subprocessService.CommitAsync()) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении подпроцесса из базы данных" } })); + // if (!subprocessService.Delete(subprocess) || !await subprocessService.CommitAsync()) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении подпроцесса из базы данных" } })); - logger.LogInformation($"Пользователь {User.Identity?.Name} удалил подпроцесс: {subprocess.Id}, {subprocess.Name}, {subprocess.EsppId}, {subprocess.ProcessId}"); + // logger.LogInformation($"Пользователь {User.Identity?.Name} удалил подпроцесс: {subprocess.Id}, {subprocess.Name}, {subprocess.EsppId}, {subprocess.ProcessId}"); - return NoContent(); - } + // return NoContent(); + //} } } diff --git a/PARR.API/Controllers/V1/TnkController.cs b/PARR.API/Controllers/V1/TnkController.cs index 7d58c368..8980f3d4 100644 --- a/PARR.API/Controllers/V1/TnkController.cs +++ b/PARR.API/Controllers/V1/TnkController.cs @@ -184,20 +184,20 @@ namespace PARR.API.Controllers.V1 /// /// /// - [HttpDelete(ApiRoutes.Tnk.Delete)] - public async Task Delete([FromRoute] Guid id) - { - var tnk = await tnkService.GetAsync(id); + //[HttpDelete(ApiRoutes.Tnk.Delete)] + //public async Task Delete([FromRoute] Guid id) + //{ + // var tnk = await tnkService.GetAsync(id); - if (tnk == null) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении ТНК. Не найдена ТНК Id: {id}" } })); + // if (tnk == null) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении ТНК. Не найдена ТНК Id: {id}" } })); - if (!tnkService.Delete(tnk) || !await tnkService.CommitAsync()) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении ТНК из базы данных" } })); + // if (!tnkService.Delete(tnk) || !await tnkService.CommitAsync()) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении ТНК из базы данных" } })); - logger.LogInformation($"Пользователь {User.Identity?.Name} удалил ТНК: {tnk.Id}, {tnk.Name}, {tnk.EsppId}, {tnk.SubprocessId}"); + // logger.LogInformation($"Пользователь {User.Identity?.Name} удалил ТНК: {tnk.Id}, {tnk.Name}, {tnk.EsppId}, {tnk.SubprocessId}"); - return NoContent(); - } + // return NoContent(); + //} } } diff --git a/PARR.API/Controllers/V1/WorkController.cs b/PARR.API/Controllers/V1/WorkController.cs index d21a0a20..b1c6cfdd 100644 --- a/PARR.API/Controllers/V1/WorkController.cs +++ b/PARR.API/Controllers/V1/WorkController.cs @@ -163,21 +163,21 @@ namespace PARR.API.Controllers.V1 /// /// /// - [HttpDelete(ApiRoutes.Work.Delete)] - public async Task Delete([FromRoute] Guid id) - { - var work = await workService.GetAsync(id); + //[HttpDelete(ApiRoutes.Work.Delete)] + //public async Task Delete([FromRoute] Guid id) + //{ + // var work = await workService.GetAsync(id); - if (work == null) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении вида работ. Не найдена работа Id: {id}" } })); + // if (work == null) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении вида работ. Не найдена работа, Id: {id}" } })); - if (!workService.Delete(work) || !await workService.CommitAsync()) - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении вида работ." } })); + // if (!workService.Delete(work) || !await workService.CommitAsync()) + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Ошибка при удалении вида работ." } })); - logger.LogInformation($"Пользователь {User.Identity?.Name} удалил вид работ: {work.Id}, {work.Name}, {work.EsppId}, {work.TnkId}"); + // logger.LogInformation($"Пользователь {User.Identity?.Name} удалил вид работ: {work.Id}, {work.Name}, {work.EsppId}, {work.TnkId}"); - return NoContent(); - } + // return NoContent(); + //} } }