Browse Source
Bugfix/fix pagination issue in activities endpoint by adding secondary sort criterion (#3554)
* Add id as secondary sort criterion to ensure consistent ordering
* Update changelog
pull/3555/head^2
Thomas Kaul
7 months ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
9 additions and
2 deletions
-
CHANGELOG.md
-
apps/api/src/app/order/order.service.ts
|
|
@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file. |
|
|
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), |
|
|
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). |
|
|
|
|
|
|
|
## Unreleased |
|
|
|
|
|
|
|
### Fixed |
|
|
|
|
|
|
|
- Fixed a pagination issue in the activities endpoint by adding `id` as a secondary sort criterion to `date` to ensure consistent ordering |
|
|
|
|
|
|
|
## 2.93.0 - 2024-07-07 |
|
|
|
|
|
|
|
### Added |
|
|
|
|
|
@ -291,7 +291,8 @@ export class OrderService { |
|
|
|
withExcludedAccounts?: boolean; |
|
|
|
}): Promise<Activities> { |
|
|
|
let orderBy: Prisma.Enumerable<Prisma.OrderOrderByWithRelationInput> = [ |
|
|
|
{ date: 'asc' } |
|
|
|
{ date: 'asc' }, |
|
|
|
{ id: 'asc' } |
|
|
|
]; |
|
|
|
const where: Prisma.OrderWhereInput = { userId }; |
|
|
|
|
|
|
@ -367,7 +368,7 @@ export class OrderService { |
|
|
|
} |
|
|
|
|
|
|
|
if (sortColumn) { |
|
|
|
orderBy = [{ [sortColumn]: sortDirection }]; |
|
|
|
orderBy = [{ [sortColumn]: sortDirection }, { id: sortDirection }]; |
|
|
|
} |
|
|
|
|
|
|
|
if (types) { |
|
|
|