diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts index 56cebb291..282082ded 100644 --- a/apps/api/src/app/order/order.controller.ts +++ b/apps/api/src/app/order/order.controller.ts @@ -90,8 +90,8 @@ export class OrderController { @Query('accounts') filterByAccounts?: string, @Query('assetClasses') filterByAssetClasses?: string, @Query('tags') filterByTags?: string, - @Query('take') take?: number, - @Query('skip') skip?: number + @Query('skip') skip?: number, + @Query('take') take?: number ): Promise { const filters = this.apiService.buildFiltersFromQueryParams({ filterByAccounts, @@ -107,10 +107,10 @@ export class OrderController { filters, userCurrency, includeDrafts: true, - userId: impersonationUserId || this.request.user.id, - withExcludedAccounts: true, skip: isNaN(skip) ? undefined : skip, - take: isNaN(take) ? undefined : take + take: isNaN(take) ? undefined : take, + userId: impersonationUserId || this.request.user.id, + withExcludedAccounts: true }); return { activities }; diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts index 647a0acb1..102128bde 100644 --- a/apps/api/src/app/order/order.service.ts +++ b/apps/api/src/app/order/order.service.ts @@ -230,21 +230,21 @@ export class OrderService { public async getOrders({ filters, includeDrafts = false, + skip, + take = Number.MAX_SAFE_INTEGER, types, userCurrency, userId, withExcludedAccounts = false, - skip, - take = Number.MAX_SAFE_INTEGER }: { filters?: Filter[]; includeDrafts?: boolean; + skip?: number; + take?: number; types?: TypeOfOrder[]; userCurrency: string; userId: string; withExcludedAccounts?: boolean; - skip?: number; - take?: number; }): Promise { const where: Prisma.OrderWhereInput = { userId };