Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/Shared/Shared/ApiControllerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,18 @@ public ApiControllerBase(IOptions<WorkflowManagerOptions> Options)
/// <param name="uriService">Uri service.</param>
/// <param name="route">Route.</param>
/// <returns>Returns <see cref="PagedResponse{T}"/>.</returns>
public PagedResponse<IEnumerable<T>> CreatePagedReponse<T>(IEnumerable<T> pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route)
public PagedResponse<IEnumerable<T>> CreatePagedResponse<T>(IEnumerable<T> pagedData, PaginationFilter validFilter, long totalRecords, IUriService uriService, string route)
{
Guard.Against.Null(pagedData);
Guard.Against.Null(validFilter);
Guard.Against.Null(route);
Guard.Against.Null(uriService);

var pageSize = validFilter.PageSize ?? Options.Value.EndpointSettings.DefaultPageSize;
var respose = new PagedResponse<IEnumerable<T>>(pagedData, validFilter.PageNumber, pageSize);
var response = new PagedResponse<IEnumerable<T>>(pagedData, validFilter.PageNumber, pageSize);

respose.SetUp(validFilter, totalRecords, uriService, route);
return respose;
response.SetUp(validFilter, totalRecords, uriService, route);
return response;
}


Expand Down
2 changes: 1 addition & 1 deletion src/WorkflowManager/Common/Services/PayloadService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ private async Task<IList<PayloadDto>> CreatePayloadsDto(IList<Payload> 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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public async Task<IActionResult> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ public async Task<IActionResult> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ public async Task<IActionResult> 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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public async Task<IActionResult> 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);
}
Expand Down Expand Up @@ -328,7 +328,7 @@ public async Task<IActionResult> 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);
}
Expand Down
4 changes: 2 additions & 2 deletions tests/UnitTests/Common.Tests/Services/PayloadServiceTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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,
}
};
Expand Down