Доделал респонс для шаблона.
This commit is contained in:
@@ -5,6 +5,6 @@
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Вернуть все значения string. Json в один уровень для Robin.
|
/// Вернуть все значения string. Json в один уровень для Robin.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public bool? String { get; set; }
|
public bool? Robin { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,26 +2,42 @@
|
|||||||
{
|
{
|
||||||
public class TemplateResponse
|
public class TemplateResponse
|
||||||
{
|
{
|
||||||
|
public Guid Id { get; set; }
|
||||||
public required string Name { get; set; }
|
public required string Name { get; set; }
|
||||||
public bool IsActive { 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 Category { get; set; }
|
||||||
public required string Branch { get; set; }
|
public required string Initiator { get; set; }
|
||||||
public required string SlaInterval { get; set; }
|
public required string ClosingCode { 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 Guid ParrTemplateId { get; set; }
|
|
||||||
public int StatusCode { 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
|
public class TemplateStringResponse
|
||||||
@@ -38,13 +54,21 @@
|
|||||||
public required string Description { get; set; }
|
public required string Description { get; set; }
|
||||||
public required string ResolutionCode { get; set; }
|
public required string ResolutionCode { get; set; }
|
||||||
public required string Resolution { get; set; }
|
public required string Resolution { get; set; }
|
||||||
|
|
||||||
public required string RzdMTNKprocess { get; set; }
|
public required string RzdMTNKprocess { get; set; }
|
||||||
|
public required string RzdMTNKprocessId { get; set; }
|
||||||
|
|
||||||
public required string RzdMTNKsubprocess { get; set; }
|
public required string RzdMTNKsubprocess { get; set; }
|
||||||
|
public required string RzdMTNKsubprocessId { get; set; }
|
||||||
|
|
||||||
public required string RzdMTNKtnk { get; set; }
|
public required string RzdMTNKtnk { get; set; }
|
||||||
|
public required string RzdMTNKtnkId { get; set; }
|
||||||
|
|
||||||
public required string RzdMTNKjob { 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; }
|
public required string StatusCode { get; set; }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,17 +18,14 @@ namespace PARR.API.Controllers.V1
|
|||||||
{
|
{
|
||||||
private readonly IMapper mapper;
|
private readonly IMapper mapper;
|
||||||
private readonly ITemplateService templateService;
|
private readonly ITemplateService templateService;
|
||||||
private readonly SettingsFromDb settingsFromDb;
|
|
||||||
|
|
||||||
public TemplateController(
|
public TemplateController(
|
||||||
IMapper mapper,
|
IMapper mapper,
|
||||||
ITemplateService templateService,
|
ITemplateService templateService
|
||||||
SettingsFromDb settingsFromDb
|
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
this.mapper = mapper;
|
this.mapper = mapper;
|
||||||
this.templateService = templateService;
|
this.templateService = templateService;
|
||||||
this.settingsFromDb = settingsFromDb;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -114,7 +111,7 @@ namespace PARR.API.Controllers.V1
|
|||||||
|
|
||||||
var response = mapper.Map<TemplateResponse>(template);
|
var response = mapper.Map<TemplateResponse>(template);
|
||||||
|
|
||||||
if (query.String == true)
|
if (query.Robin == true)
|
||||||
{
|
{
|
||||||
var stringResponse = mapper.Map<TemplateStringResponse>(response);
|
var stringResponse = mapper.Map<TemplateStringResponse>(response);
|
||||||
return Ok(stringResponse);
|
return Ok(stringResponse);
|
||||||
|
|||||||
@@ -27,24 +27,37 @@ namespace PARR.API.MappingProfiles
|
|||||||
|
|
||||||
CreateMap<V1_JobMode, JobModeResponse>();
|
CreateMap<V1_JobMode, JobModeResponse>();
|
||||||
|
|
||||||
|
// --- Template ---
|
||||||
CreateMap<Template, TemplateResponse>()
|
CreateMap<Template, TemplateResponse>()
|
||||||
.ForMember(d => d.ParrTemplateId, o => o.MapFrom(s => s.Id))
|
.ForMember(d => d.Work, o => o.MapFrom(s => s.ApplicationsInWork!.Work))
|
||||||
.ForMember(d => d.Assignment, o => o.MapFrom(s => s.Host!.WorkGroup))
|
.ForMember(d => d.Host, o => o.MapFrom(s => s.Host))
|
||||||
.ForMember(d => d.Title, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.ShortDescription))
|
.ForMember(d => d.Process, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess!.Process))
|
||||||
.ForMember(d => d.Branch, o => o.MapFrom(s => s.Host!.ResponseArea))
|
.ForMember(d => d.Subprocess, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk!.Subprocess))
|
||||||
.ForMember(d => d.SlaInterval, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.TemplateDuration))
|
.ForMember(d => d.Tnk, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.Tnk))
|
||||||
.ForMember(d => d.ConfigurationItem, o => o.MapFrom(s => s.Host!.Ek))
|
.ForMember(d => d.Initiator, o => o.MapFrom<TemplateInitiatorResolver>())
|
||||||
.ForMember(d => d.ContactName, o => o.MapFrom<TemplateInitiatorResolver>())
|
.ForMember(d => d.ClosingCode, o => o.MapFrom<TemplateClosingCodeResolver>())
|
||||||
.ForMember(d => d.Description, o => o.MapFrom(s => s.ApplicationsInWork!.Work!.FullDescription))
|
|
||||||
.ForMember(d => d.ResolutionCode, o => o.MapFrom<TemplateClosingCodeResolver>())
|
|
||||||
.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.Category, o => o.MapFrom<TemplateCategoryResolver>());
|
.ForMember(d => d.Category, o => o.MapFrom<TemplateCategoryResolver>());
|
||||||
|
|
||||||
CreateMap<TemplateResponse, TemplateStringResponse>();
|
CreateMap<TemplateResponse, TemplateStringResponse>()
|
||||||
|
.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<StatusTemplate, StatusTemplateResponse>();
|
CreateMap<StatusTemplate, StatusTemplateResponse>();
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user