Browse Source

fix: set default activity query limit and add explicit take parameters

pull/6864/head
Andrea Bugeja 1 week ago
parent
commit
bd232203f6
  1. 1
      apps/api/src/app/activities/activities.controller.ts
  2. 4
      apps/api/src/app/activities/activities.service.ts
  3. 1
      apps/api/src/app/portfolio/portfolio.controller.ts
  4. 1
      apps/api/src/app/portfolio/portfolio.service.ts

1
apps/api/src/app/activities/activities.controller.ts

@ -177,6 +177,7 @@ export class ActivitiesController {
const { activities } = await this.activitiesService.getActivities({ const { activities } = await this.activitiesService.getActivities({
userCurrency, userCurrency,
take: Number.MAX_SAFE_INTEGER,
includeDrafts: true, includeDrafts: true,
userId: impersonationUserId || this.request.user.id, userId: impersonationUserId || this.request.user.id,
withExcludedAccountsAndActivities: true withExcludedAccountsAndActivities: true

4
apps/api/src/app/activities/activities.service.ts

@ -288,6 +288,7 @@ export class ActivitiesService {
filters, filters,
userId, userId,
includeDrafts: true, includeDrafts: true,
take: Number.MAX_SAFE_INTEGER,
userCurrency: undefined, userCurrency: undefined,
withExcludedAccountsAndActivities: true withExcludedAccountsAndActivities: true
}); });
@ -470,7 +471,7 @@ export class ActivitiesService {
sortColumn, sortColumn,
sortDirection = 'asc', sortDirection = 'asc',
startDate, startDate,
take = Number.MAX_SAFE_INTEGER, take = 100,
types, types,
userCurrency, userCurrency,
userId, userId,
@ -766,6 +767,7 @@ export class ActivitiesService {
}) { }) {
const activities = await this.getActivities({ const activities = await this.getActivities({
filters, filters,
take: Number.MAX_SAFE_INTEGER,
userCurrency, userCurrency,
userId, userId,
withExcludedAccountsAndActivities: false // TODO withExcludedAccountsAndActivities: false // TODO

1
apps/api/src/app/portfolio/portfolio.controller.ts

@ -328,6 +328,7 @@ export class PortfolioController {
endDate, endDate,
filters, filters,
startDate, startDate,
take: Number.MAX_SAFE_INTEGER,
userCurrency, userCurrency,
userId: impersonationUserId || this.request.user.id, userId: impersonationUserId || this.request.user.id,
types: ['DIVIDEND'] types: ['DIVIDEND']

1
apps/api/src/app/portfolio/portfolio.service.ts

@ -1904,6 +1904,7 @@ export class PortfolioService {
const user = await this.userService.user({ id: userId }); const user = await this.userService.user({ id: userId });
const { activities } = await this.activitiesService.getActivities({ const { activities } = await this.activitiesService.getActivities({
take: Number.MAX_SAFE_INTEGER,
userCurrency, userCurrency,
userId, userId,
withExcludedAccountsAndActivities: true withExcludedAccountsAndActivities: true

Loading…
Cancel
Save