Export accounts and tags filtered

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

@@ -28,6 +28,22 @@ export class ExportService {
   }): Promise<Export> {
     const platformsMap: { [platformId: string]: Platform } = {};
 
+    let { activities } = await this.orderService.getOrders({
+      filters,
+      userCurrency,
+      userId,
+      includeDrafts: true,
+      sortColumn: 'date',
+      sortDirection: 'asc',
+      withExcludedAccounts: true
+    });
+
+    if (activityIds) {
+      activities = activities.filter((activity) => {
+        return activityIds.includes(activity.id);
+      });
+    }
+
     const accounts = (
       await this.accountService.accounts({
         include: {
@@ -39,57 +55,49 @@ export class ExportService {
         },
         where: { userId }
       })
-    ).map(
-      ({
-        balance,
-        balances,
-        comment,
-        currency,
-        id,
-        isExcluded,
-        name,
-        Platform: platform,
-        platformId
-      }) => {
-        if (platformId) {
-          platformsMap[platformId] = platform;
-        }
-
-        return {
+    )
+      .filter((account) =>
+        activities.some(({ accountId }) => accountId === account.id)
+      )
+      .map(
+        ({
           balance,
-          balances: balances.map(({ date, value }) => {
-            return { date: date.toISOString(), value };
-          }),
+          balances,
           comment,
           currency,
           id,
           isExcluded,
           name,
+          Platform: platform,
           platformId
-        };
-      }
-    );
-
-    let { activities } = await this.orderService.getOrders({
-      filters,
-      userCurrency,
-      userId,
-      includeDrafts: true,
-      sortColumn: 'date',
-      sortDirection: 'asc',
-      withExcludedAccounts: true
-    });
+        }) => {
+          if (platformId) {
+            platformsMap[platformId] = platform;
+          }
 
-    if (activityIds) {
-      activities = activities.filter((activity) => {
-        return activityIds.includes(activity.id);
-      });
-    }
+          return {
+            balance,
+            balances: balances.map(({ date, value }) => {
+              return { date: date.toISOString(), value };
+            }),
+            comment,
+            currency,
+            id,
+            isExcluded,
+            name,
+            platformId
+          };
+        }
+      );
 
     const tags = (await this.tagService.getTagsForUser(userId))
-      .filter(({ isUsed }) => {
-        return isUsed;
-      })
+      .filter(
+        (tag) =>
+          tag.isUsed &&
+          activities.some((activity) =>
+            activity.tags.some(({ id: tagId }) => tagId === tag.id)
+          )
+      )
       .map(({ id, name }) => {
         return {
           id,