Skip to content

Instantly share code, notes, and snippets.

@jay-babu
Created June 17, 2024 16:19
Show Gist options
  • Save jay-babu/a99d8fa3127500c62b5eebd3413ebf9f to your computer and use it in GitHub Desktop.
Save jay-babu/a99d8fa3127500c62b5eebd3413ebf9f to your computer and use it in GitHub Desktop.
diff --git a/src/main/java/com/transformity/pos/api/TransactionsApiDelegateImpl.java b/src/main/java/com/transformity/pos/api/TransactionsApiDelegateImpl.java
index f443585d..6524247d 100644
--- a/src/main/java/com/transformity/pos/api/TransactionsApiDelegateImpl.java
+++ b/src/main/java/com/transformity/pos/api/TransactionsApiDelegateImpl.java
@@ -1007,10 +1007,12 @@ public class TransactionsApiDelegateImpl implements TransactionsApiDelegate {
final var entityId = entityIdProvider.get();
final Page<TransactionView> transactions;
+ final Page page;
final TransactionTotal transactionTotal;
if (!ids.isEmpty()) {
transactions = transactionViewRepository.findAllByTxIdIn(ids, pageable);
+ page = transactions;
transactionTotal = transactionViewRepository.sumAllByTxIdIn(ids);
} else {
final var transactionIds =
@@ -1035,10 +1037,9 @@ public class TransactionsApiDelegateImpl implements TransactionsApiDelegate {
brand,
minTransactionTotal,
maxTransactionTotal,
- pageable)
- .map(Transactions::getId)
- .toList();
- transactions = transactionViewRepository.findAllByTxIdIn(transactionIds, pageable);
+ pageable);
+ page = transactionIds;
+ transactions = transactionViewRepository.findAllByTxIdIn(transactionIds.map(Transactions::getId).toList(), Pageable.unpaged(pageable.getSort()));
transactionTotal =
transactionViewRepository.sumTransactions(
Optional.ofNullable(startDate)
@@ -1062,7 +1063,7 @@ public class TransactionsApiDelegateImpl implements TransactionsApiDelegate {
return ResponseEntity.ok(
new GetTransactions200Response(
- pageInfoMapper.pageInfoToPageMetadata(transactions),
+ pageInfoMapper.pageInfoToPageMetadata(page),
transactionMapper.convertListToOutput(transactions.getContent()),
transactionTotal));
}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment