From 494441dbe60dc58904d1413bf34c9064b4f84248 Mon Sep 17 00:00:00 2001 From: Mikhail Trubnikov Date: Thu, 12 Oct 2023 09:10:10 +1000 Subject: [PATCH] =?UTF-8?q?feat(api):=20=D0=92=20=D1=80=D0=B5=D1=81=D0=BF?= =?UTF-8?q?=D0=BE=D0=BD=D1=81=20=D0=B7=D0=B0=D0=B4=D0=B0=D0=BD=D0=B8=D1=8F?= =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20?= =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=B5=20ScheduleTypeCode.=20=D0=97=D0=B0?= =?UTF-8?q?=D0=B3=D0=BE=D1=82=D0=BE=D0=B2=D0=BA=D0=B0=20=D1=80=D0=B5=D1=81?= =?UTF-8?q?=D0=BF=D0=BE=D0=BD=D1=81=D0=B0=20=D0=B4=D0=BB=D1=8F=20=D1=88?= =?UTF-8?q?=D0=B0=D0=B1=D0=BB=D0=BE=D0=BD=D0=B0=20=D1=81=20=D0=B2=D0=BA?= =?UTF-8?q?=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=BD=D1=8B=D0=BC=20=D0=B7=D0=B0?= =?UTF-8?q?=D0=B4=D0=B0=D0=BD=D0=B8=D0=B5=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V1/Responses/EsppScheduleResponse.cs | 45 +++++++++++++++++++ .../V1/Responses/RobotTaskScheduleResponse.cs | 5 +++ .../V1/Responses/TemplateResponse.cs | 3 ++ .../DomainToResponseProfile.cs | 2 + 4 files changed, 55 insertions(+) create mode 100644 PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs diff --git a/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs b/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs new file mode 100644 index 00000000..f6928004 --- /dev/null +++ b/PARR.API/Contracts/V1/Responses/EsppScheduleResponse.cs @@ -0,0 +1,45 @@ +namespace PARR.API.Contracts.V1.Responses +{ + // Вот это тот самый респонс + public class EsppScheduleResponse + { + public EsppScheduleTypeScheduleResponse? TypeSchedule { get; set; } + + public List? Values { get; set; } + } + + public class EsppScheduleValResponse + { + public int Order { get; set; } + + public EsppScheduleTypeResponse? Type { get; set; } + + public EsppScheduleTypeValueResponse? Value { get; set; } + } + + public class EsppScheduleTypeScheduleResponse + { + public int Id { get; set; } + + public required string Name { get; set; } + + public required string Description { get; set; } + } + + public class EsppScheduleTypeResponse + { + public int Id { get; set; } + + public required string Name { get; set; } + + public required string Description { get; set; } + } + + public class EsppScheduleTypeValueResponse + { + public Guid Id { get; set; } + + public required string Name { get; set; } + } + +} diff --git a/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs b/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs index 41d69fdf..4988e276 100644 --- a/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs +++ b/PARR.API/Contracts/V1/Responses/RobotTaskScheduleResponse.cs @@ -36,6 +36,11 @@ /// public required string ScheduleType { get; set; } + /// + /// Код задания + /// + public int ScheduleTypeCode { get; set; } + public List? Schedule { get; set; } } diff --git a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs index fffcf42e..b17ce02c 100644 --- a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs +++ b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs @@ -44,6 +44,9 @@ public TnkResponse? Tnk { get; set; } public List? SyncStatus { get; set; } + + //TODO: тут сделать биндинг!!!!!! !!!!!! !!!!!! !!!!!! !!!!!! !!!!!! + public EsppScheduleResponse? Schedule { get; set; } } //public class TemplateStringResponse diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index a617aa97..9e198f27 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -115,6 +115,8 @@ namespace PARR.API.MappingProfiles .ForMember(d => d.NextStart, o => o.MapFrom(s => EsppScheduleHelpers.GetFirstStart(s.Template!.ApplicationsInWork!.ScheduleStartDate, s.Template!.ApplicationsInWork!.ScheduleGenerationTime))) .ForMember(d => d.ScheduleType, o => o.MapFrom(s => s.Template!.ApplicationsInWork!.EsppSchValues!.First()!.EsppSchTypeConfig!.EsppSchTypeSchedule!.Description)) + .ForMember(d => d.ScheduleTypeCode, o => o.MapFrom(s => + s.Template!.ApplicationsInWork!.EsppSchValues!.First()!.EsppSchTypeConfig!.EsppSchTypeSchedule!.Id)) .ForMember(d => d.Schedule, o => o.MapFrom()); // === RobotConfiguration ===