From 037d3b1a60bcc1729a5b60e39fc24194229157d0 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 9 May 2025 16:19:14 +0200
Subject: [PATCH] Feature/rename Order to activities in User database schema
 (#4669)

* Rename Order to activities in User database schema

* Update changelog
---
 CHANGELOG.md                                                | 1 +
 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 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a7e9eab..4034fd9a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+- Renamed `Order` to `activities` in the `User` database schema
 - Improved the language localization for Catalan (`ca`)
 - Improved the language localization for Italian (`it`)
 - Upgraded `nestjs` from version `10.4.15` to `11.0.12`
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index e4c50c1f..35b4ea73 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -821,7 +821,7 @@ export class AdminService {
       where,
       select: {
         _count: {
-          select: { Account: true, Order: true }
+          select: { Account: true, activities: true }
         },
         Analytics: {
           select: {
@@ -869,10 +869,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 56b2e0ea..1a4125d8 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 89e16575..79031425 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 7bf69c56..6182ebfe 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[]