Browse Source

changes as per suggestions alphabetically

pull/2382/head
shyam kachhadiya 2 years ago
committed by Thomas
parent
commit
d82b76d40e
  1. 10
      apps/api/src/app/order/order.controller.ts
  2. 8
      apps/api/src/app/order/order.service.ts

10
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<Activities> {
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 };

8
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<Activity[]> {
const where: Prisma.OrderWhereInput = { userId };

Loading…
Cancel
Save