Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/deprecate transactionCount in GET api/v1/admin endpoint (#6265)
Thomas Kauleae2c20dfefb
diff --git a/CHANGELOG.md b/CHANGELOG.mdindex a3fb00a66b..39634dfc46 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+- Deprecated `transactionCount` in favor of `activitiesCount` in the endpoint `GET api/v1/admin`- Removed the deprecated `firstBuyDate` in the portfolio calculator## 2.234.0 - 2026-01-30diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.tsindex 705085a485..cd18eb239e 100644--- a/apps/api/src/app/admin/admin.service.ts+++ b/apps/api/src/app/admin/admin.service.ts@@ -138,11 +138,11 @@ export class AdminService {public async get(): Promise<AdminData> {const dataSources = Object.values(DataSource);- const [enabledDataSources, settings, transactionCount, userCount] =+ const [activitiesCount, enabledDataSources, settings, userCount] =await Promise.all([+ this.prismaService.order.count(),this.dataProviderService.getDataSources(),this.propertyService.get(),- this.prismaService.order.count(),this.countUsersWithAnalytics()]);@@ -182,10 +182,11 @@ export class AdminService {).filter(Boolean);return {+ activitiesCount,dataProviders,settings,- transactionCount,userCount,+ transactionCount: activitiesCount,version: environment.version};}diff --git a/apps/client/src/app/components/admin-overview/admin-overview.component.ts b/apps/client/src/app/components/admin-overview/admin-overview.component.tsindex 6284f05fda..c0ccb0f642 100644--- a/apps/client/src/app/components/admin-overview/admin-overview.component.ts+++ b/apps/client/src/app/components/admin-overview/admin-overview.component.ts@@ -73,6 +73,7 @@ import { takeUntil } from 'rxjs/operators';templateUrl: './admin-overview.html'})export class GfAdminOverviewComponent implements OnDestroy, OnInit {+ public activitiesCount: number;public couponDuration: StringValue = '14 days';public coupons: Coupon[];public hasPermissionForSubscription: boolean;@@ -83,7 +84,6 @@ export class GfAdminOverviewComponent implements OnDestroy, OnInit {public isDataGatheringEnabled: boolean;public permissions = permissions;public systemMessage: SystemMessage;- public transactionCount: number;public userCount: number;public user: User;public version: string;@@ -289,12 +289,12 @@ export class GfAdminOverviewComponent implements OnDestroy, OnInit {this.adminService.fetchAdminData().pipe(takeUntil(this.unsubscribeSubject))- .subscribe(({ settings, transactionCount, userCount, version }) => {+ .subscribe(({ activitiesCount, settings, userCount, version }) => {+ this.activitiesCount = activitiesCount;this.coupons = (settings[PROPERTY_COUPONS] as Coupon[]) ?? [];this.isDataGatheringEnabled =settings[PROPERTY_IS_DATA_GATHERING_ENABLED] === false ? false : true;this.systemMessage = settings[PROPERTY_SYSTEM_MESSAGE] as SystemMessage;- this.transactionCount = transactionCount;this.userCount = userCount;this.version = version;diff --git a/apps/client/src/app/components/admin-overview/admin-overview.html b/apps/client/src/app/components/admin-overview/admin-overview.htmlindex c47387f376..f0a6ea1d55 100644--- a/apps/client/src/app/components/admin-overview/admin-overview.html+++ b/apps/client/src/app/components/admin-overview/admin-overview.html@@ -20,11 +20,11 @@<div class="w-50"><gf-value[locale]="user?.settings?.locale"- [value]="transactionCount"+ [value]="activitiesCount"/>- @if (transactionCount && userCount) {+ @if (activitiesCount && userCount) {<div>- {{ transactionCount / userCount | number: '1.2-2' }}+ {{ activitiesCount / userCount | number: '1.2-2' }}<span i18n>per User</span></div>}diff --git a/libs/common/src/lib/interfaces/admin-data.interface.ts b/libs/common/src/lib/interfaces/admin-data.interface.tsindex 23821a86bb..63588300c6 100644--- a/libs/common/src/lib/interfaces/admin-data.interface.ts+++ b/libs/common/src/lib/interfaces/admin-data.interface.ts@@ -1,12 +1,16 @@import { DataProviderInfo } from './data-provider-info.interface';export interface AdminData {+ activitiesCount: number;dataProviders: (DataProviderInfo & {assetProfileCount: number;useForExchangeRates: boolean;})[];settings: { [key: string]: boolean | object | string | string[] };++ /** @deprecated use activitiesCount instead */transactionCount: number;+userCount: number;version: string;}