mikhail/parr_api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(api,dal): удалена старая таблица Works. Переделаны запросы в API из в Works в Jobs

Browse Source
This commit is contained in:
Mikhail Trubnikov
2025-12-09 16:00:38 +10:00
parent 362da02233
commit b033f95116
22 changed files with 4035 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PARR.API/Controllers/V1/TnkController.cs
View File

@@ -102,19 +102,19 @@ namespace PARR.API.Controllers.V1
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet(ApiRoutes.Tnk.GetWorks)]
[HttpGet(ApiRoutes.Tnk.GetJobs)]
public async Task<IActionResult> Get([FromRoute] Guid id)
{
var tnk = await tnkService.Get()
.Include(w => w.Works)
.Include(w => w.Jobs)
.FirstOrDefaultAsync(t => t.Id == id);
if (tnk == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Не найдена ТНК с id: {id}" } }));
var response = mapper.Map<List<WorkResponse>>(tnk.Works.OrderBy(t => t.Name).ToList());
var response = mapper.Map<List<JobBaseResponse>>(tnk.Jobs.OrderBy(t => t.Name).ToList());
return Ok(new Response<List<WorkResponse>>(response, true));
return Ok(new Response<List<JobBaseResponse>>(response, true));
}
@@ -206,13 +206,13 @@ namespace PARR.API.Controllers.V1
[HttpDelete(ApiRoutes.Tnk.Delete)]
public async Task<IActionResult> Delete([FromRoute] Guid id)
{
var tnk = await tnkService.Get().Include(t => t.Works).FirstOrDefaultAsync(t => t.Id == id);
var tnk = await tnkService.Get().Include(t => t.Jobs).FirstOrDefaultAsync(t => t.Id == id);
if (tnk == null)
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК." } }));
if (tnk.Works.Any())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК. У данного ТНК есть работы ({tnk.Works.Count()} шт.)" } }));
if (tnk.Jobs.Any())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК. У данного ТНК есть работы ({tnk.Jobs.Count()} шт.)" } }));
if (!tnkService.Delete(tnk) || !await tnkService.CommitAsync())
return BadRequest(new Response(false, new List<ErrorModel> { new ErrorModel { Message = $"Ошибка при удалении ТНК." } }));