Browse Source

Various improvements

pull/4425/head
Thomas Kaul 4 weeks ago
parent
commit
d896fab6b2
  1. 3
      apps/api/src/app/export/export.controller.ts
  2. 4
      apps/api/src/app/export/export.service.ts

3
apps/api/src/app/export/export.controller.ts

@ -21,10 +21,11 @@ export class ExportController {
@UseGuards(AuthGuard('jwt'), HasPermissionGuard) @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
public async export( public async export(
@Query('accounts') filterByAccounts?: string, @Query('accounts') filterByAccounts?: string,
@Query('activityIds') activityIds?: string[], @Query('activityIds') filterByActivityIds?: string,
@Query('assetClasses') filterByAssetClasses?: string, @Query('assetClasses') filterByAssetClasses?: string,
@Query('tags') filterByTags?: string @Query('tags') filterByTags?: string
): Promise<Export> { ): Promise<Export> {
const activityIds = filterByActivityIds?.split(',') ?? [];
const filters = this.apiService.buildFiltersFromQueryParams({ const filters = this.apiService.buildFiltersFromQueryParams({
filterByAccounts, filterByAccounts,
filterByAssetClasses, filterByAssetClasses,

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

@ -38,7 +38,7 @@ export class ExportService {
withExcludedAccounts: true withExcludedAccounts: true
}); });
if (activityIds) { if (activityIds?.length > 0) {
activities = activities.filter(({ id }) => { activities = activities.filter(({ id }) => {
return activityIds.includes(id); return activityIds.includes(id);
}); });
@ -57,7 +57,7 @@ export class ExportService {
}) })
) )
.filter(({ id }) => { .filter(({ id }) => {
return filters.length > 0 return activities.length > 0
? activities.some(({ accountId }) => { ? activities.some(({ accountId }) => {
return accountId === id; return accountId === id;
}) })

Loading…
Cancel
Save