diff --git a/PARR.API/Contracts/V1/Requests/Queries/RobinQuery.cs b/PARR.API/Contracts/V1/Requests/Queries/RobinQuery.cs
index 11d92eb0..3942201b 100644
--- a/PARR.API/Contracts/V1/Requests/Queries/RobinQuery.cs
+++ b/PARR.API/Contracts/V1/Requests/Queries/RobinQuery.cs
@@ -5,6 +5,6 @@
///
/// Вернуть все значения string. Json в один уровень для Robin.
///
- public bool? String { get; set; }
+ public bool? Robin { get; set; }
}
}
diff --git a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs
index 23dab6dd..2eb5b5f7 100644
--- a/PARR.API/Contracts/V1/Responses/TemplateResponse.cs
+++ b/PARR.API/Contracts/V1/Responses/TemplateResponse.cs
@@ -2,26 +2,42 @@
{
public class TemplateResponse
{
+ public Guid Id { get; set; }
public required string Name { get; set; }
public bool 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 RzdMTNKsubprocess { get; set; }
- public required string RzdMTNKtnk { get; set; }
- public required string RzdMTNKjob { get; set; }
+ public required string Initiator { get; set; }
+ public required string ClosingCode { get; set; }
-
- public Guid ParrTemplateId { get; set; }
public int StatusCode { get; set; }
+
+ //work
+ //public required string Title { get; set; }
+ //public required string SlaInterval { get; set; }
+ //public required string Description { get; set; }
+ //public required string Resolution { get; set; }
+ //public required string RzdMTNKjob { get; set; }
+
+ public WorkResponse? Work { get; set; }
+
+ //host
+ //public required string Assignment { get; set; }
+ //public required string Branch { get; set; }
+ //public required string ConfigurationItem { get; set; }
+ public HostResponse? Host { get; set; }
+
+ //process
+ //public required string RzdMTNKprocess { get; set; }
+ public ProcessResponse? Process { get; set; }
+
+ //subprocess
+ //public required string RzdMTNKsubprocess { get; set; }
+ public SubprocessResponse? Subprocess { get; set; }
+
+ //tnk
+ //public required string RzdMTNKtnk { get; set; }
+ public TnkResponse? Tnk { get; set; }
}
public class TemplateStringResponse
@@ -38,13 +54,21 @@
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 RzdMTNKsubprocess { get; set; }
+ public required string RzdMTNKsubprocessId { 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 ParrTemplateId { get; set; }
+ public required string Id { get; set; }
public required string StatusCode { get; set; }
}
}
diff --git a/PARR.API/Controllers/V1/TemplateController.cs b/PARR.API/Controllers/V1/TemplateController.cs
index ea1089c3..39d6ee79 100644
--- a/PARR.API/Controllers/V1/TemplateController.cs
+++ b/PARR.API/Controllers/V1/TemplateController.cs
@@ -18,17 +18,14 @@ namespace PARR.API.Controllers.V1
{
private readonly IMapper mapper;
private readonly ITemplateService templateService;
- private readonly SettingsFromDb settingsFromDb;
public TemplateController(
IMapper mapper,
- ITemplateService templateService,
- SettingsFromDb settingsFromDb
+ ITemplateService templateService
)
{
this.mapper = mapper;
this.templateService = templateService;
- this.settingsFromDb = settingsFromDb;
}
@@ -114,7 +111,7 @@ namespace PARR.API.Controllers.V1
var response = mapper.Map(template);
- if (query.String == true)
+ if (query.Robin == true)
{
var stringResponse = mapper.Map(response);
return Ok(stringResponse);
diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
index 15c8b66b..4be70c75 100644
--- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs
+++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs
@@ -27,24 +27,37 @@ namespace PARR.API.MappingProfiles
CreateMap();
+ // --- Template ---
CreateMap()
- .ForMember(d => d.ParrTemplateId, o => o.MapFrom(s => s.Id))
- .ForMember(d => d.Assignment, o => o.MapFrom(s => s.Host!.WorkGroup))
- .ForMember(d => d.Title, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.ShortDescription))
- .ForMember(d => d.Branch, o => o.MapFrom(s => s.Host!.ResponseArea))
- .ForMember(d => d.SlaInterval, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.TemplateDuration))
- .ForMember(d => d.ConfigurationItem, o => o.MapFrom(s => s.Host!.Ek))
- .ForMember(d => d.ContactName, o => o.MapFrom())
- .ForMember(d => d.Description, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.FullDescription))
- .ForMember(d => d.ResolutionCode, o => o.MapFrom())
- .ForMember(d => d.Resolution, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Solution))
- .ForMember(d => d.RzdMTNKprocess, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process!.Name))
- .ForMember(d => d.RzdMTNKsubprocess, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Name))
- .ForMember(d => d.RzdMTNKtnk, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Name))
- .ForMember(d => d.RzdMTNKjob, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Name))
+ .ForMember(d => d.Work, o => o.MapFrom(s => s.ApplicationsInWork!.Work))
+ .ForMember(d => d.Host, o => o.MapFrom(s => s.Host))
+ .ForMember(d => d.Process, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process))
+ .ForMember(d => d.Subprocess, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess))
+ .ForMember(d => d.Tnk, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk))
+ .ForMember(d => d.Initiator, o => o.MapFrom())
+ .ForMember(d => d.ClosingCode, o => o.MapFrom())
.ForMember(d => d.Category, o => o.MapFrom());
- CreateMap();
+ CreateMap()
+ .ForMember(d => d.Assignment, o => o.MapFrom(s => s.Host!.WorkGroup))
+ .ForMember(d => d.Title, o => o.MapFrom(s => s.Work!.ShortDescription))
+ .ForMember(d => d.Branch, o => o.MapFrom(s => s.Host!.ResponseArea))
+ .ForMember(d => d.SlaInterval, o => o.MapFrom(s => s.Work!.TemplateDuration))
+ .ForMember(d => d.ConfigurationItem, o => o.MapFrom(s => s.Host!.Ek))
+ .ForMember(d => d.ContactName, o => o.MapFrom(s => s.Initiator))
+ .ForMember(d => d.Description, o => o.MapFrom(s => s.Work!.FullDescription))
+ .ForMember(d => d.ResolutionCode, o => o.MapFrom(s => s.ClosingCode))
+ .ForMember(d => d.Resolution, o => o.MapFrom(s => s.Work!.Solution))
+ .ForMember(d => d.RzdMTNKprocess, o => o.MapFrom(s => s.Process!.Name))
+ .ForMember(d => d.RzdMTNKprocessId, o => o.MapFrom(s => s.Process!.EsppId))
+ .ForMember(d => d.RzdMTNKsubprocess, o => o.MapFrom(s => s.Subprocess!.Name))
+ .ForMember(d => d.RzdMTNKsubprocessId, o => o.MapFrom(s => s.Subprocess!.EsppId))
+ .ForMember(d => d.RzdMTNKtnk, o => o.MapFrom(s => s.Tnk!.Name))
+ .ForMember(d => d.RzdMTNKtnkId, o => o.MapFrom(s => s.Tnk!.EsppId))
+ .ForMember(d => d.RzdMTNKjob, o => o.MapFrom(s => s.Work!.Name))
+ .ForMember(d => d.RzdMTNKjobId, o => o.MapFrom(s => s.Work!.EsppId));
+
+ // === Template ===
CreateMap();