Skip to content

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

Task/refactor PortfolioInvestments interface to PortfolioInvestmentsResponse interface (#5774)

Amanf940eb67259c
diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index 7d8ceecda2..03796dad64 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -22,7 +22,7 @@ import {
PortfolioDividendsResponse,
PortfolioHoldingResponse,
PortfolioHoldingsResponse,
- PortfolioInvestments,
+ PortfolioInvestmentsResponse,
PortfolioPerformanceResponse,
PortfolioReportResponse
} from '@ghostfolio/common/interfaces';
@@ -439,7 +439,7 @@ export class PortfolioController {
@Query('range') dateRange: DateRange = 'max',
@Query('symbol') filterBySymbol?: string,
@Query('tags') filterByTags?: string
- ): Promise<PortfolioInvestments> {
+ ): Promise<PortfolioInvestmentsResponse> {
const filters = this.apiService.buildFiltersFromQueryParams({
filterByAccounts,
filterByAssetClasses,
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index cb6eba5be5..b74b779f68 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -46,7 +46,7 @@ import {
InvestmentItem,
PortfolioDetails,
PortfolioHoldingResponse,
- PortfolioInvestments,
+ PortfolioInvestmentsResponse,
PortfolioPerformanceResponse,
PortfolioPosition,
PortfolioReportResponse,
@@ -397,7 +397,7 @@ export class PortfolioService {
impersonationId: string;
savingsRate: number;
userId: string;
- }): Promise<PortfolioInvestments> {
+ }): Promise<PortfolioInvestmentsResponse> {
userId = await this.getUserId(impersonationId, userId);
const user = await this.userService.user({ id: userId });
const userCurrency = this.getUserCurrency(user);
@@ -448,7 +448,7 @@ export class PortfolioService {
});
}
- let streaks: PortfolioInvestments['streaks'];
+ let streaks: PortfolioInvestmentsResponse['streaks'];
if (savingsRate) {
streaks = this.getStreaks({
diff --git a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
index 26d474f73c..63ed3569c2 100644
--- a/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
+++ b/apps/client/src/app/pages/portfolio/analysis/analysis-page.component.ts
@@ -6,7 +6,7 @@ import { UserService } from '@ghostfolio/client/services/user/user.service';
import {
HistoricalDataItem,
InvestmentItem,
- PortfolioInvestments,
+ PortfolioInvestmentsResponse,
PortfolioPerformance,
PortfolioPosition,
ToggleOption,
@@ -94,7 +94,7 @@ export class GfAnalysisPageComponent implements OnDestroy, OnInit {
public performanceDataItems: HistoricalDataItem[];
public performanceDataItemsInPercentage: HistoricalDataItem[];
public portfolioEvolutionDataLabel = $localize`Investment`;
- public streaks: PortfolioInvestments['streaks'];
+ public streaks: PortfolioInvestmentsResponse['streaks'];
public top3: PortfolioPosition[];
public unitCurrentStreak: string;
public unitLongestStreak: string;
diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts
index 0b5c4b2537..b5f6d9e012 100644
--- a/apps/client/src/app/services/data.service.ts
+++ b/apps/client/src/app/services/data.service.ts
@@ -45,7 +45,7 @@ import {
PortfolioDividendsResponse,
PortfolioHoldingResponse,
PortfolioHoldingsResponse,
- PortfolioInvestments,
+ PortfolioInvestmentsResponse,
PortfolioPerformanceResponse,
PortfolioReportResponse,
PublicPortfolioResponse,
@@ -463,7 +463,7 @@ export class DataService {
params = params.append('groupBy', groupBy);
params = params.append('range', range);
- return this.http.get<PortfolioInvestments>(
+ return this.http.get<PortfolioInvestmentsResponse>(
'/api/v1/portfolio/investments',
{ params }
);
diff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.ts
index d385029458..8a7ef85440 100644
--- a/libs/common/src/lib/interfaces/index.ts
+++ b/libs/common/src/lib/interfaces/index.ts
@@ -30,7 +30,6 @@ import type { LookupItem } from './lookup-item.interface';
import type { MarketData } from './market-data.interface';
import type { PortfolioChart } from './portfolio-chart.interface';
import type { PortfolioDetails } from './portfolio-details.interface';
-import type { PortfolioInvestments } from './portfolio-investments.interface';
import type { PortfolioPerformance } from './portfolio-performance.interface';
import type { PortfolioPosition } from './portfolio-position.interface';
import type { PortfolioReportRule } from './portfolio-report-rule.interface';
@@ -58,6 +57,7 @@ import type { OAuthResponse } from './responses/oauth-response.interface';
import type { PortfolioDividendsResponse } from './responses/portfolio-dividends-response.interface';
import { PortfolioHoldingResponse } from './responses/portfolio-holding-response.interface';
import type { PortfolioHoldingsResponse } from './responses/portfolio-holdings-response.interface';
+import type { PortfolioInvestmentsResponse } from './responses/portfolio-investments.interface';
import type { PortfolioPerformanceResponse } from './responses/portfolio-performance-response.interface';
import type { PortfolioReportResponse } from './responses/portfolio-report.interface';
import type { PublicPortfolioResponse } from './responses/public-portfolio-response.interface';
@@ -125,7 +125,7 @@ export {
PortfolioDividendsResponse,
PortfolioHoldingResponse,
PortfolioHoldingsResponse,
- PortfolioInvestments,
+ PortfolioInvestmentsResponse,
PortfolioPerformance,
PortfolioPerformanceResponse,
PortfolioPosition,
diff --git a/libs/common/src/lib/interfaces/portfolio-investments.interface.ts b/libs/common/src/lib/interfaces/portfolio-investments.interface.ts
deleted file mode 100644
index 70de5c7d65..0000000000
--- a/libs/common/src/lib/interfaces/portfolio-investments.interface.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import { InvestmentItem } from './investment-item.interface';
-
-export interface PortfolioInvestments {
- investments: InvestmentItem[];
- streaks: { currentStreak: number; longestStreak: number };
-}
diff --git a/libs/common/src/lib/interfaces/responses/portfolio-investments.interface.ts b/libs/common/src/lib/interfaces/responses/portfolio-investments.interface.ts
new file mode 100644
index 0000000000..6d0d60002c
--- /dev/null
+++ b/libs/common/src/lib/interfaces/responses/portfolio-investments.interface.ts
@@ -0,0 +1,6 @@
+import { InvestmentItem } from '../investment-item.interface';
+
+export interface PortfolioInvestmentsResponse {
+ investments: InvestmentItem[];
+ streaks: { currentStreak: number; longestStreak: number };
+}