From c0a27488b5c26b87a86276d5db36c861da6a2eee Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Fri, 1 Dec 2023 21:02:05 +0100
Subject: [PATCH] Refactoring

---
 apps/client/src/app/services/data.service.ts         | 12 ++++++------
 .../src/lib/interfaces/account-balance.interface.ts  |  5 -----
 libs/common/src/lib/interfaces/index.ts              |  2 --
 .../account-balances/account-balances.component.ts   |  7 ++++---
 4 files changed, 10 insertions(+), 16 deletions(-)
 delete mode 100644 libs/common/src/lib/interfaces/account-balance.interface.ts

diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index 9901048bd..c384cd476 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -138,16 +138,16 @@ export class DataService {
     return this.http.get<AccountWithValue>(`/api/v1/account/${aAccountId}`);
   }
 
-  public fetchAccounts() {
-    return this.http.get<Accounts>('/api/v1/account');
-  }
-
-  public fetchAccountBalances(accountId: string) {
+  public fetchAccountBalances(aAccountId: string) {
     return this.http.get<AccountBalancesResponse>(
-      `/api/v1/account/${accountId}/balances`
+      `/api/v1/account/${aAccountId}/balances`
     );
   }
 
+  public fetchAccounts() {
+    return this.http.get<Accounts>('/api/v1/account');
+  }
+
   public fetchActivities({
     filters
   }: {
diff --git a/libs/common/src/lib/interfaces/account-balance.interface.ts b/libs/common/src/lib/interfaces/account-balance.interface.ts
deleted file mode 100644
index 05f3407a3..000000000
--- a/libs/common/src/lib/interfaces/account-balance.interface.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-export interface AccountBalance {
-  date: Date;
-  id: string;
-  value: number;
-}
diff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.ts
index 7634aad7b..7d76c419e 100644
--- a/libs/common/src/lib/interfaces/index.ts
+++ b/libs/common/src/lib/interfaces/index.ts
@@ -1,5 +1,4 @@
 import type { Access } from './access.interface';
-import type { AccountBalance } from './account-balance.interface';
 import type { Accounts } from './accounts.interface';
 import type { AdminData } from './admin-data.interface';
 import type { AdminJobs } from './admin-jobs.interface';
@@ -52,7 +51,6 @@ import type { User } from './user.interface';
 
 export {
   Access,
-  AccountBalance,
   AccountBalancesResponse,
   Accounts,
   AdminData,
diff --git a/libs/ui/src/lib/account-balances/account-balances.component.ts b/libs/ui/src/lib/account-balances/account-balances.component.ts
index 681bb4578..c552519d6 100644
--- a/libs/ui/src/lib/account-balances/account-balances.component.ts
+++ b/libs/ui/src/lib/account-balances/account-balances.component.ts
@@ -10,7 +10,7 @@ import {
 import { MatSort } from '@angular/material/sort';
 import { MatTableDataSource } from '@angular/material/table';
 import { DataService } from '@ghostfolio/client/services/data.service';
-import { AccountBalance } from '@ghostfolio/common/interfaces';
+import { AccountBalancesResponse } from '@ghostfolio/common/interfaces';
 import { get } from 'lodash';
 import { Subject, takeUntil } from 'rxjs';
 
@@ -26,8 +26,9 @@ export class AccountBalancesComponent implements OnDestroy, OnInit {
 
   @ViewChild(MatSort) sort: MatSort;
 
-  public dataSource: MatTableDataSource<AccountBalance> =
-    new MatTableDataSource();
+  public dataSource: MatTableDataSource<
+    AccountBalancesResponse['balances'][0]
+  > = new MatTableDataSource();
   public displayedColumns: string[] = ['date', 'value'];
 
   private unsubscribeSubject = new Subject<void>();