From 78e760a9890b07af7cb8403fa2c28e60dc2d9ada Mon Sep 17 00:00:00 2001 From: Sam Rooke Date: Thu, 11 May 2023 15:03:03 +0100 Subject: [PATCH] use payload is to filter workflow instances Signed-off-by: Sam Rooke --- src/Shared/Shared/ApiControllerBase.cs | 8 ++++---- src/WorkflowManager/Common/Services/PayloadService.cs | 2 +- .../WorkflowManager/Controllers/PayloadsController.cs | 2 +- .../WorkflowManager/Controllers/TasksController.cs | 2 +- .../Controllers/WorkflowInstanceController.cs | 2 +- .../WorkflowManager/Controllers/WorkflowsController.cs | 4 ++-- .../Common.Tests/Services/PayloadServiceTests.cs | 4 ++-- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Shared/Shared/ApiControllerBase.cs b/src/Shared/Shared/ApiControllerBase.cs index e8e7a5afd..2bcf08114 100644 --- a/src/Shared/Shared/ApiControllerBase.cs +++ b/src/Shared/Shared/ApiControllerBase.cs @@ -67,7 +67,7 @@ public ApiControllerBase(IOptions Options) /// Uri service. /// Route. /// Returns . - public PagedResponse> CreatePagedReponse(IEnumerable pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route) + public PagedResponse> CreatePagedResponse(IEnumerable pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route) { Guard.Against.Null(pagedData); Guard.Against.Null(validFilter); @@ -75,10 +75,10 @@ public PagedResponse> CreatePagedReponse(IEnumerable pagedD Guard.Against.Null(uriService); var pageSize = validFilter.PageSize ?? Options.Value.EndpointSettings.DefaultPageSize; - var respose = new PagedResponse>(pagedData, validFilter.PageNumber, pageSize); + var response = new PagedResponse>(pagedData, validFilter.PageNumber, pageSize); - respose.SetUp(validFilter, totalRecords, uriService, route); - return respose; + response.SetUp(validFilter, totalRecords, uriService, route); + return response; } diff --git a/src/WorkflowManager/Common/Services/PayloadService.cs b/src/WorkflowManager/Common/Services/PayloadService.cs index 7e0e4a2e3..c1b82be29 100644 --- a/src/WorkflowManager/Common/Services/PayloadService.cs +++ b/src/WorkflowManager/Common/Services/PayloadService.cs @@ -141,7 +141,7 @@ private async Task> CreatePayloadsDto(IList payloads) foreach (var payload in payloads) { var payloadDto = new PayloadDto(payload); - var wfs = workflowInstances?.Where(wf => wf.PayloadId == payload.Id); + var wfs = workflowInstances?.Where(wf => wf.PayloadId == payload.PayloadId); if (wfs == null || wfs.Any() is false) { payloadDto.PayloadStatus = PayloadStatus.Complete; diff --git a/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs index dceeb735c..a7c7982cd 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/PayloadsController.cs @@ -91,7 +91,7 @@ public async Task GetAllAsync([FromQuery] PaginationFilter filter patientName); var dataTotal = await _payloadService.CountAsync(); - var pagedReponse = CreatePagedReponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); + var pagedReponse = CreatePagedResponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); return Ok(pagedReponse); } diff --git a/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs b/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs index bab1a2a81..fdbade648 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/TasksController.cs @@ -87,7 +87,7 @@ public async Task GetListAsync([FromQuery] PaginationFilter filte (validFilter.PageNumber - 1) * validFilter.PageSize, validFilter.PageSize); - var pagedReponse = CreatePagedReponse(pagedData.Tasks.ToList(), validFilter, pagedData.Count, _uriService, route); + var pagedReponse = CreatePagedResponse(pagedData.Tasks.ToList(), validFilter, pagedData.Count, _uriService, route); return Ok(pagedReponse); } diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs index 1978f765b..a8d6799f7 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowInstanceController.cs @@ -110,7 +110,7 @@ public async Task GetListAsync([FromQuery] PaginationFilter filte var dataTotal = await _workflowInstanceService.FilteredCountAsync(parsedStatus, payloadId); - var pagedReponse = CreatePagedReponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); + var pagedReponse = CreatePagedResponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); return Ok(pagedReponse); } diff --git a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs index ab990a21d..e9134aa98 100644 --- a/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs +++ b/src/WorkflowManager/WorkflowManager/Controllers/WorkflowsController.cs @@ -92,7 +92,7 @@ public async Task GetList([FromQuery] PaginationFilter filter) validFilter.PageSize); var dataTotal = await _workflowService.CountAsync(); - var pagedReponse = CreatePagedReponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); + var pagedReponse = CreatePagedResponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); return Ok(pagedReponse); } @@ -328,7 +328,7 @@ public async Task GetByAeTitle([FromRoute] string title, [FromQue validFilter.PageSize); var dataTotal = await _workflowService.GetCountByAeTitleAsync(title); - var pagedReponse = CreatePagedReponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); + var pagedReponse = CreatePagedResponse(pagedData.ToList(), validFilter, dataTotal, _uriService, route); return Ok(pagedReponse); } diff --git a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs index 2aadd4619..9c35ad06c 100644 --- a/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs +++ b/tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs @@ -308,12 +308,12 @@ public async Task GetAll_ReturnsPayloads() { new WorkflowInstance() { - PayloadId = input.First().Id, + PayloadId = input.First().PayloadId, Status = Status.Created }, new WorkflowInstance() { - PayloadId = input.Skip(1).First().Id, + PayloadId = input.Skip(1).First().PayloadId, Status = Status.Succeeded, } };