diff --git a/PARR.API/Contracts/V1/Responses/JobResponse.cs b/PARR.API/Contracts/V1/Responses/JobResponse.cs index 97927ba3..42179e88 100644 --- a/PARR.API/Contracts/V1/Responses/JobResponse.cs +++ b/PARR.API/Contracts/V1/Responses/JobResponse.cs @@ -6,7 +6,7 @@ public DateTimeOffset StartAt { get; set; } public int FrequencyMinute { get; set; } public required JobModeResponse JobMode { get; set; } - public required string ScriptName { get; set; } + public required string Script { get; set; } } public class JobGetAllResponse : JobBaseResponse @@ -19,4 +19,11 @@ { } + + public class JobMinResponse + { + public DateTimeOffset StartAt { get; set; } + + public required string Script { get; set; } + } } diff --git a/PARR.API/Controllers/V1/JobController.cs b/PARR.API/Controllers/V1/JobController.cs index 8b0c30ee..bf0d16d7 100644 --- a/PARR.API/Controllers/V1/JobController.cs +++ b/PARR.API/Controllers/V1/JobController.cs @@ -133,14 +133,16 @@ namespace PARR.API.Controllers.V1 // возврат минимального ответа - try - { - return Ok(jobsToResponse.ToDictionary(t => t.ScriptName, d => d.StartAt)); - } - catch (ArgumentException ex) - { - return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Не могу создать json объект с одинаковым значением ключа (ScriptName). {ex.Message}" } })); - } + return Ok(mapper.Map>(jobsToResponse)); + + //try + //{ + // return Ok(jobsToResponse.ToDictionary(t => t.ScriptName, d => d.StartAt)); + //} + //catch (ArgumentException ex) + //{ + // return BadRequest(new Response(false, new List { new ErrorModel { Message = $"Не могу создать json объект с одинаковым значением ключа (ScriptName). {ex.Message}" } })); + //} } diff --git a/PARR.API/MappingProfiles/DomainToResponseProfile.cs b/PARR.API/MappingProfiles/DomainToResponseProfile.cs index 998cb073..fb49d63c 100644 --- a/PARR.API/MappingProfiles/DomainToResponseProfile.cs +++ b/PARR.API/MappingProfiles/DomainToResponseProfile.cs @@ -11,9 +11,16 @@ namespace PARR.API.MappingProfiles // --- Job --- CreateMap() .Include() - .ForMember(d => d.FrequencyMinute, o => o.MapFrom(s => s.Frequency)); + .ForMember(d => d.FrequencyMinute, o => o.MapFrom(s => s.Frequency)) + .ForMember(d => d.Script, o => o.MapFrom(s => s.ScriptName)); + CreateMap(); + CreateMap() + .ForMember(d => d.Script, o => o.MapFrom(s => s.ScriptName)); + // === Job === + + CreateMap(); } diff --git a/PARR.API/MappingProfiles/Resolvers/.gitkeep b/PARR.API/MappingProfiles/Resolvers/.gitkeep new file mode 100644 index 00000000..70abcb05 --- /dev/null +++ b/PARR.API/MappingProfiles/Resolvers/.gitkeep @@ -0,0 +1,6 @@ +namespace PARR.API.MappingProfiles.Resolvers +{ + public class _ + { + } +} diff --git a/PARR.API/PARR.API.csproj b/PARR.API/PARR.API.csproj index 454dd83a..d839331e 100644 --- a/PARR.API/PARR.API.csproj +++ b/PARR.API/PARR.API.csproj @@ -33,11 +33,6 @@ - - - - - diff --git a/PARR.API/Validators/.gitkeep b/PARR.API/Validators/.gitkeep new file mode 100644 index 00000000..9093214c --- /dev/null +++ b/PARR.API/Validators/.gitkeep @@ -0,0 +1,6 @@ +namespace PARR.API.Validators +{ + public class _ + { + } +}