From 7e55659a7cc8b9fb08b78066a77f5e0c053c909d Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Fri, 6 Oct 2023 15:13:40 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20TemplateController=20=D0=B0=D0=B4?= =?UTF-8?q?=D0=B0=D0=BF=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=BC?= =?UTF-8?q?=D0=B5=D1=82=D0=BE=D0=B4=20getAll=20=D0=BF=D0=BE=D0=B4=20=D0=BD?= =?UTF-8?q?=D0=BE=D0=B2=D1=83=D1=8E=20=D1=81=D1=82=D1=80=D1=83=D0=BA=D1=82?= =?UTF-8?q?=D1=83=D1=80=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V1/Requests/Queries/TemplateQuery.cs | 8 +- .../V1/Responses/TemplateResponse.cs | 62 +- .../V1/RobotTaskRobotStatusController.cs | 2 +- PARR.API/Controllers/V1/TemplateController.cs | 22 +- .../DomainToResponseProfile.cs | 25 +- ...0231006044458_TblTemplatesUpd2.Designer.cs | 1934 +++++++++++++++++ .../20231006044458_TblTemplatesUpd2.cs | 78 + .../Migrations/DataContextModelSnapshot.cs | 34 +- PARR.DAL/Models/RobotConfiguration.cs | 2 +- PARR.DAL/Models/RobotStatus.cs | 2 +- PARR.DAL/Models/TaskStatus.cs | 4 +- 11 files changed, 2066 insertions(+), 107 deletions(-) create mode 100644 PARR.DAL/Migrations/20231006044458_TblTemplatesUpd2.Designer.cs create mode 100644 PARR.DAL/Migrations/20231006044458_TblTemplatesUpd2.cs diff --git a/PARR.API/Contracts/V1/Requests/Queries/TemplateQuery.cs b/PARR.API/Contracts/V1/Requests/Queries/TemplateQuery.cs index 4f1b583e..a8682581 100644 --- a/PARR.API/Contracts/V1/Requests/Queries/TemplateQuery.cs +++ b/PARR.API/Contracts/V1/Requests/Queries/TemplateQuery.cs @@ -2,10 +2,10 @@ { public class TemplateQuery { - /// - /// Статус шаблона: 10, 20, 30 - /// - public int? StatusCode { get; set; } + ///// + ///// Статус шаблона: 10, 20, 30 + ///// + //public int? StatusCode { get; set; } /// /// Поиск по маске. Например: "*-ДВС" diff --git a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs index 41f2ce29..fffcf42e 100644 --- a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs +++ b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs @@ -4,24 +4,18 @@ { public Guid Id { get; set; } public required string Name { get; set; } - public bool IsActive { get; set; } + public bool IsActiveTemplate { get; set; } + public bool IsActiveSchedule { get; set; } public required string Category { get; set; } public required string Initiator { get; set; } public required string ClosingCode { get; set; } - public int StatusCode { get; set; } - public required string ShortDescription { get; set; } public required string FullDescription { get; set; } public required string Solution { get; set; } public required string TemplateDuration { get; set; } - public int RobotAttemptsNumber { get; set; } - public DateTimeOffset? RobotLastStatusUpdated { get; set; } - public RobotStatusResponse? RobotStatus { get; set; } - - //work //public required string Title { get; set; } //public required string SlaInterval { get; set; } @@ -48,37 +42,39 @@ //tnk //public required string RzdMTNKtnk { get; set; } public TnkResponse? Tnk { get; set; } + + public List? SyncStatus { get; set; } } - public class TemplateStringResponse - { - public required string Name { get; set; } - public required string IsActive { get; set; } - public required string Assignment { get; set; } - public required string Title { get; set; } - public required string Category { get; set; } - public required string Branch { get; set; } - public required string SlaInterval { get; set; } - public required string ConfigurationItem { get; set; } - public required string ContactName { get; set; } - public required string Description { get; set; } - public required string ResolutionCode { get; set; } - public required string Resolution { get; set; } + //public class TemplateStringResponse + //{ + // public required string Name { get; set; } + // public required string IsActive { get; set; } + // public required string Assignment { get; set; } + // public required string Title { get; set; } + // public required string Category { get; set; } + // public required string Branch { get; set; } + // public required string SlaInterval { get; set; } + // public required string ConfigurationItem { get; set; } + // public required string ContactName { get; set; } + // public required string Description { get; set; } + // public required string ResolutionCode { get; set; } + // public required string Resolution { get; set; } - public required string RzdMTNKprocess { get; set; } - public required string RzdMTNKprocessId { get; set; } + // public required string RzdMTNKprocess { get; set; } + // public required string RzdMTNKprocessId { get; set; } - public required string RzdMTNKsubprocess { get; set; } - public required string RzdMTNKsubprocessId { get; set; } + // public required string RzdMTNKsubprocess { get; set; } + // public required string RzdMTNKsubprocessId { get; set; } - public required string RzdMTNKtnk { get; set; } - public required string RzdMTNKtnkId { get; set; } + // public required string RzdMTNKtnk { get; set; } + // public required string RzdMTNKtnkId { get; set; } - public required string RzdMTNKjob { get; set; } - public required string RzdMTNKjobId { get; set; } + // public required string RzdMTNKjob { get; set; } + // public required string RzdMTNKjobId { get; set; } - public required string Id { get; set; } - public required string StatusCode { get; set; } - } + // public required string Id { get; set; } + // public required string StatusCode { get; set; } + //} } diff --git a/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs b/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs index cbd94384..e3347418 100644 --- a/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs +++ b/PARR.API/Controllers/V1/RobotTaskRobotStatusController.cs @@ -72,7 +72,7 @@ namespace PARR.API.Controllers.V1 var configToResonse = await robotConfigurationService.Get() .Include(t => t.Robot) - .Include(t => t.StatusTask) + .Include(t => t.TaskStatus) .Include(t => t.RobotStatus) .FirstOrDefaultAsync(t => t.Id == taskId); diff --git a/PARR.API/Controllers/V1/TemplateController.cs b/PARR.API/Controllers/V1/TemplateController.cs index 2f0e4463..9422f4a5 100644 --- a/PARR.API/Controllers/V1/TemplateController.cs +++ b/PARR.API/Controllers/V1/TemplateController.cs @@ -44,28 +44,12 @@ namespace PARR.API.Controllers.V1 var paginationFilter = mapper.Map(paginationQuery); IQueryable