From a1fb365f8ce1f6cee635d6063d942658cacbd060 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 22 Aug 2026 10:59:29 +0200
Subject: [PATCH] Limit type filter in activities table component to used types

---
 apps/api/src/app/user/user.service.ts          |  2 +-
 .../holding-detail-dialog.component.ts         | 18 +++++-------------
 .../migration.sql                              |  2 +-
 prisma/schema.prisma                           |  2 +-
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index cb64e52d5..c8220a824 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -163,7 +163,7 @@ export class UserService {
 
     const activitiesCount = impersonationUserId
       ? (impersonationUser?.activitiesCount ?? 0)
-      : user.activitiesCount;
+      : (user.activitiesCount ?? 0);
 
     const activityTypes = activitiesGroupedByType.map(({ type }) => {
       return type;
diff --git a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
index 52050072f..33a0695aa 100644
--- a/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
+++ b/apps/client/src/app/components/holding-detail-dialog/holding-detail-dialog.component.ts
@@ -647,19 +647,11 @@ export class GfHoldingDetailDialogComponent implements OnInit {
 
     this.dataService
       .postActivity(activity)
-      .pipe(
-        takeUntilDestroyed(this.destroyRef),
-        switchMap(() => {
-          return this.userService.get(true);
-        })
-      )
-      .subscribe({
-        error: () => {
-          this.navigateToActivities();
-        },
-        next: () => {
-          this.navigateToActivities();
-        }
+      .pipe(takeUntilDestroyed(this.destroyRef))
+      .subscribe(() => {
+        this.userService.get(true).subscribe();
+
+        this.navigateToActivities();
       });
   }
 
diff --git a/prisma/migrations/20260822000000_updated_indexes_of_order/migration.sql b/prisma/migrations/20260822000000_updated_indexes_of_order/migration.sql
index 8ae5fcd3a..b9eb5ee55 100644
--- a/prisma/migrations/20260822000000_updated_indexes_of_order/migration.sql
+++ b/prisma/migrations/20260822000000_updated_indexes_of_order/migration.sql
@@ -11,7 +11,7 @@ DROP INDEX "Order_userId_idx";
 CREATE INDEX "Order_symbolProfileId_date_idx" ON "Order"("symbolProfileId", "date");
 
 -- CreateIndex
-CREATE INDEX "Order_userId_date_type_idx" ON "Order"("userId", "date", "type");
+CREATE INDEX "Order_userId_date_idx" ON "Order"("userId", "date");
 
 -- CreateIndex
 CREATE INDEX "Order_userId_type_date_idx" ON "Order"("userId", "type", "date");
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 01011ef8e..06ba23563 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -196,7 +196,7 @@ model Order {
   @@index([accountId])
   @@index([date])
   @@index([symbolProfileId, date])
-  @@index([userId, date, type])
+  @@index([userId, date])
   @@index([userId, type, date])
 }