From a4956e3786159881abb3ec8f02865b948a5838ae Mon Sep 17 00:00:00 2001 From: Robert Parkinson Date: Tue, 14 Jan 2025 09:01:59 +0000 Subject: [PATCH] add returnReference as second orderby column (#1611) https://eaflood.atlassian.net/browse/WATER-4863 As part of the testing on the historic changes for a return version it was noticed that some of the return logs from the first page are showing up on the second page as well. This fix adds a second orderBy column to resolve the issue. --- app/services/licences/fetch-licence-returns.service.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/licences/fetch-licence-returns.service.js b/app/services/licences/fetch-licence-returns.service.js index 673dd05ecb..44a9eac313 100644 --- a/app/services/licences/fetch-licence-returns.service.js +++ b/app/services/licences/fetch-licence-returns.service.js @@ -36,7 +36,7 @@ async function _fetch(licenceId, page) { ]) .innerJoinRelated('licence') .where('licence.id', licenceId) - .orderBy([{ column: 'dueDate', order: 'desc' }]) + .orderBy([{ column: 'dueDate', order: 'desc' }, { column: 'returnReference' }]) .page(page - 1, DatabaseConfig.defaultPageSize) }