Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/extend historical data view in admin control (#646)

Thomas Kaul9c086edffe3e
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40bfd330b7..cae550a08d 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
+- Extended the historical data view in the admin control panel
- Upgraded _Stripe_ dependencies
- Upgraded `prisma` from version `3.7.0` to `3.8.1`
diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts
index 3ea3d8f22a..4df3ea09f8 100644
--- a/apps/api/src/app/admin/admin.service.ts
+++ b/apps/api/src/app/admin/admin.service.ts
@@ -9,7 +9,8 @@ import { PROPERTY_CURRENCIES, baseCurrency } from '@ghostfolio/common/config';
import {
AdminData,
AdminMarketData,
- AdminMarketDataDetails
+ AdminMarketDataDetails,
+ AdminMarketDataItem
} from '@ghostfolio/common/interfaces';
import { Injectable } from '@nestjs/common';
import { Property } from '@prisma/client';
@@ -56,12 +57,67 @@ export class AdminService {
}
public async getMarketData(): Promise<AdminMarketData> {
- return {
- marketData: await (
- await this.dataGatheringService.getSymbolsMax()
- ).map((symbol) => {
- return symbol;
+ const marketData = await this.prismaService.marketData.groupBy({
+ _count: true,
+ by: ['dataSource', 'symbol']
+ });
+
+ const currencyPairsToGather: AdminMarketDataItem[] =
+ this.exchangeRateDataService
+ .getCurrencyPairs()
+ .map(({ dataSource, symbol }) => {
+ const marketDataItemCount =
+ marketData.find((marketDataItem) => {
+ return (
+ marketDataItem.dataSource === dataSource &&
+ marketDataItem.symbol === symbol
+ );
+ })?._count ?? 0;
+
+ return {
+ dataSource,
+ marketDataItemCount,
+ symbol
+ };
+ });
+
+ const symbolProfilesToGather: AdminMarketDataItem[] = (
+ await this.prismaService.symbolProfile.findMany({
+ orderBy: [{ symbol: 'asc' }],
+ select: {
+ _count: {
+ select: { Order: true }
+ },
+ dataSource: true,
+ Order: {
+ orderBy: [{ date: 'asc' }],
+ select: { date: true },
+ take: 1
+ },
+ scraperConfiguration: true,
+ symbol: true
+ }
})
+ ).map((symbolProfile) => {
+ const marketDataItemCount =
+ marketData.find((marketDataItem) => {
+ return (
+ marketDataItem.dataSource === symbolProfile.dataSource &&
+ marketDataItem.symbol === symbolProfile.symbol
+ );
+ })?._count ?? 0;
+
+ return {
+ marketDataItemCount,
+ activityCount: symbolProfile._count.Order,
+ dataSource: symbolProfile.dataSource,
+ date: symbolProfile.Order?.[0]?.date,
+ symbol: symbolProfile.symbol
+ };
+ });
+
+ return {
+ marketData: [...currencyPairsToGather, ...symbolProfilesToGather]
};
}
diff --git a/apps/client/src/app/components/admin-market-data/admin-market-data.html b/apps/client/src/app/components/admin-market-data/admin-market-data.html
index 50d6790a5f..d1e45bfc91 100644
--- a/apps/client/src/app/components/admin-market-data/admin-market-data.html
+++ b/apps/client/src/app/components/admin-market-data/admin-market-data.html
@@ -6,7 +6,9 @@
<tr class="mat-header-row">
<th class="mat-header-cell px-1 py-2" i18n>Symbol</th>
<th class="mat-header-cell px-1 py-2" i18n>Data Source</th>
- <th class="mat-header-cell px-1 py-2" i18n>First Transaction</th>
+ <th class="mat-header-cell px-1 py-2" i18n>First Activity</th>
+ <th class="mat-header-cell px-1 py-2" i18n>Activity Count</th>
+ <th class="mat-header-cell px-1 py-2" i18n>Historical Data</th>
<th class="mat-header-cell px-1 py-2"></th>
</tr>
</thead>
@@ -21,6 +23,8 @@
<td class="mat-cell px-1 py-2">
{{ (item.date | date: defaultDateFormat) ?? '' }}
</td>
+ <td class="mat-cell px-1 py-2">{{ item.activityCount }}</td>
+ <td class="mat-cell px-1 py-2">{{ item.marketDataItemCount }}</td>
<td class="mat-cell px-1 py-2">
<button
class="mx-1 no-min-width px-2"
diff --git a/apps/client/src/app/components/home-overview/home-overview.html b/apps/client/src/app/components/home-overview/home-overview.html
index 7889daed2d..a6e1c63f8b 100644
--- a/apps/client/src/app/components/home-overview/home-overview.html
+++ b/apps/client/src/app/components/home-overview/home-overview.html
@@ -13,7 +13,7 @@
[showYAxis]="false"
></gf-line-chart>
<div
- *ngIf="hasPermissionToCreateOrder&& historicalDataItems?.length === 0"
+ *ngIf="hasPermissionToCreateOrder && historicalDataItems?.length === 0"
class="align-items-center d-flex h-100 justify-content-center w-100"
>
<div class="d-flex justify-content-center">
diff --git a/libs/common/src/lib/interfaces/admin-market-data.interface.ts b/libs/common/src/lib/interfaces/admin-market-data.interface.ts
index c46c3e37c5..826cca8616 100644
--- a/libs/common/src/lib/interfaces/admin-market-data.interface.ts
+++ b/libs/common/src/lib/interfaces/admin-market-data.interface.ts
@@ -1,7 +1,12 @@
+import { DataSource } from '@prisma/client';
+
export interface AdminMarketData {
marketData: AdminMarketDataItem[];
}
export interface AdminMarketDataItem {
+ dataSource: DataSource;
+ date?: Date;
+ marketDataItemCount?: number;
symbol: string;
}
diff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.ts
index d88a572ce3..5a0c715905 100644
--- a/libs/common/src/lib/interfaces/index.ts
+++ b/libs/common/src/lib/interfaces/index.ts
@@ -2,7 +2,10 @@ import { Access } from './access.interface';
import { Accounts } from './accounts.interface';
import { AdminData } from './admin-data.interface';
import { AdminMarketDataDetails } from './admin-market-data-details.interface';
-import { AdminMarketData } from './admin-market-data.interface';
+import {
+ AdminMarketData,
+ AdminMarketDataItem
+} from './admin-market-data.interface';
import { Coupon } from './coupon.interface';
import { Export } from './export.interface';
import { InfoItem } from './info-item.interface';
@@ -29,6 +32,7 @@ export {
AdminData,
AdminMarketData,
AdminMarketDataDetails,
+ AdminMarketDataItem,
Coupon,
Export,
InfoItem,