Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Feature/rename Order to activities in User database schema (#4669)
Thomas Kaul037d3b1a60bc
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex 5a7e9eabeb..4034fd9a20 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.tsindex e4c50c1f2f..35b4ea73d1 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.htmlindex 56b2e0eac8..1a4125d84e 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-valueclass="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.tsindex 89e165752f..79031425a2 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.prismaindex 7bf69c56a8..6182ebfe45 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[]