diff --git a/PARR.API/Controllers/V1/ApplicationInWorkController.cs b/PARR.API/Controllers/V1/ApplicationInWorkController.cs index 9018627e..b335db0b 100644 --- a/PARR.API/Controllers/V1/ApplicationInWorkController.cs +++ b/PARR.API/Controllers/V1/ApplicationInWorkController.cs @@ -59,7 +59,7 @@ namespace PARR.API.Controllers.V1 if (!resultValidate.IsValid) return BadRequest(new Response(resultValidate.Errors)); - var existSameAiW = await applicationsInWorkService.Get(request.ApplicationId, request.WorkId); + var existSameAiW = await applicationsInWorkService.GetAsync(request.ApplicationId, request.WorkId); if (existSameAiW != null) return BadRequest(new Response(false, new List { @@ -94,7 +94,7 @@ namespace PARR.API.Controllers.V1 /// - /// Получить список регламентных работ(ApplicationInWork) + /// Получить список заданий на выполнение работ(ApplicationInWork) постранично /// /// [HttpGet(ApiRoutes.Job.GetAll)] @@ -120,5 +120,25 @@ namespace PARR.API.Controllers.V1 return Ok(paginationResponse); } + + + /// + /// Получить задание на выполнение работ по id + /// + /// + /// + [HttpGet(ApiRoutes.Job.Get)] + public async Task GetById([FromRoute] Guid id) + { + var applicationInWork = await applicationsInWorkService.Get() + .FirstOrDefaultAsync(t => t.Id == id); + + if (applicationInWork == null) + return NotFound(); + + var response = mapper.Map(applicationInWork); + + return Ok(new Response(response, true)); + } } } diff --git a/PARR.API/Controllers/V1/RobotTaskController.cs b/PARR.API/Controllers/V1/RobotTaskController.cs index 490a00bb..cbbe0d14 100644 --- a/PARR.API/Controllers/V1/RobotTaskController.cs +++ b/PARR.API/Controllers/V1/RobotTaskController.cs @@ -55,7 +55,7 @@ namespace PARR.API.Controllers.V1 var query = robotConfigurationService.Get() .Where(t => t.RobotCode == (int)robotCode && t.TaskStatusCode == (int)taskStatusCode); - //var query = robotConfigurationService.Get(); + //var query = robotConfigurationService.GetAsync(); switch (robotCode) { diff --git a/PARR.API/Validators/GeneratorTemplateRequestValidator.cs b/PARR.API/Validators/GeneratorTemplateRequestValidator.cs index cfd71743..9feb4991 100644 --- a/PARR.API/Validators/GeneratorTemplateRequestValidator.cs +++ b/PARR.API/Validators/GeneratorTemplateRequestValidator.cs @@ -41,7 +41,7 @@ namespace PARR.API.Validators if (isValid.HasValue) return isValid.Value; - isValid = await applicationsInWorkService.Get(applicationId, request.WorkId) != null; + isValid = await applicationsInWorkService.GetAsync(applicationId, request.WorkId) != null; return isValid.Value; } diff --git a/PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs b/PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs index 3d061b5b..46786906 100644 --- a/PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs +++ b/PARR.DAL/Services/Implementations/ApplicationsInWorkService.cs @@ -23,7 +23,7 @@ namespace PARR.DAL.Services.Implementations protected override DataContext EntitiContext => dataContext; - public async Task Get(Guid applicationId, Guid workId) + public async Task GetAsync(Guid applicationId, Guid workId) { return await base.Get().FirstOrDefaultAsync(t => t.ApplicationId == applicationId && t.WorkId == workId); } diff --git a/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs b/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs index 69aab87c..74acaa2a 100644 --- a/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs +++ b/PARR.DAL/Services/Interfaces/IApplicationsInWorkService.cs @@ -5,6 +5,6 @@ namespace PARR.DAL.Services.Interfaces { public interface IApplicationsInWorkService : IBaseService { - Task Get(Guid applicationId, Guid workId); + Task GetAsync(Guid applicationId, Guid workId); } } diff --git a/PARR.GeneratorTemplates/Services/ValidatorService.cs b/PARR.GeneratorTemplates/Services/ValidatorService.cs index 10758ad7..039c922e 100644 --- a/PARR.GeneratorTemplates/Services/ValidatorService.cs +++ b/PARR.GeneratorTemplates/Services/ValidatorService.cs @@ -27,7 +27,7 @@ namespace PARR.GeneratorTemplates.Services if (service == null) throw new Exception($"Не найден сервис: {nameof(IApplicationsInWorkService)}"); - return await service.Get(applicationId, workId) != null; + return await service.GetAsync(applicationId, workId) != null; } } }