From 218850dc8d530b4d8e3aedf804cce08b77acb076 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Tue, 6 May 2025 18:03:20 +0200
Subject: [PATCH] Rename Order to activities in User database schema

---
 apps/api/src/app/admin/admin.service.ts                     | 6 +++---
 apps/client/src/app/components/admin-users/admin-users.html | 2 +-
 libs/common/src/lib/interfaces/admin-users.interface.ts     | 2 +-
 prisma/schema.prisma                                        | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index 79beedea9..8b5f0ec2a 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -806,7 +806,7 @@ export class AdminService {
       where,
       select: {
         _count: {
-          select: { Account: true, Order: true }
+          select: { Account: true, activities: true }
         },
         Analytics: {
           select: {
@@ -854,10 +854,10 @@ export class AdminService {
           role,
           subscription,
           accountCount: _count.Account || 0,
+          activityCount: _count.activities || 0,
           country: Analytics?.country,
           dailyApiRequests: Analytics?.dataProviderGhostfolioDailyRequests || 0,
-          lastActivity: Analytics?.updatedAt,
-          transactionCount: _count.Order || 0
+          lastActivity: Analytics?.updatedAt
         };
       }
     );
diff --git a/apps/client/src/app/components/admin-users/admin-users.html b/apps/client/src/app/components/admin-users/admin-users.html
index 56b2e0eac..1a4125d84 100644
--- a/apps/client/src/app/components/admin-users/admin-users.html
+++ b/apps/client/src/app/components/admin-users/admin-users.html
@@ -142,7 +142,7 @@
               <gf-value
                 class="d-inline-block justify-content-end"
                 [locale]="user?.settings?.locale"
-                [value]="element.transactionCount"
+                [value]="element.activityCount"
               />
             </td>
           </ng-container>
diff --git a/libs/common/src/lib/interfaces/admin-users.interface.ts b/libs/common/src/lib/interfaces/admin-users.interface.ts
index 89e165752..79031425a 100644
--- a/libs/common/src/lib/interfaces/admin-users.interface.ts
+++ b/libs/common/src/lib/interfaces/admin-users.interface.ts
@@ -4,6 +4,7 @@ export interface AdminUsers {
   count: number;
   users: {
     accountCount: number;
+    activityCount: number;
     country: string;
     createdAt: Date;
     dailyApiRequests: number;
@@ -11,6 +12,5 @@ export interface AdminUsers {
     id: string;
     lastActivity: Date;
     role: Role;
-    transactionCount: number;
   }[];
 }
diff --git a/prisma/schema.prisma b/prisma/schema.prisma
index 7bf69c56a..6182ebfe4 100644
--- a/prisma/schema.prisma
+++ b/prisma/schema.prisma
@@ -245,6 +245,7 @@ model Tag {
 
 model User {
   accessToken   String?
+  activities    Order[]
   authChallenge String?
   createdAt     DateTime        @default(now())
   id            String          @id @default(uuid())
@@ -260,7 +261,6 @@ model User {
   Analytics     Analytics?
   ApiKey        ApiKey[]
   AuthDevice    AuthDevice[]
-  Order         Order[]
   Settings      Settings?
   SymbolProfile SymbolProfile[]
   Tag           Tag[]