Refactoring

apps/api/src/app/import/import.service.ts

@@ -50,7 +50,7 @@ export class ImportService {
   }: AssetProfileIdentifier): Promise<Activity[]> {
     try {
       const { firstBuyDate, historicalData, orders } =
-        await this.portfolioService.getPosition(dataSource, undefined, symbol);
+        await this.portfolioService.getHolding(dataSource, undefined, symbol);
 
       const [[assetProfile], dividends] = await Promise.all([
         this.symbolProfileService.getSymbolProfiles([

apps/api/src/app/portfolio/portfolio.controller.ts

@@ -20,6 +20,7 @@ import {
 import {
   PortfolioDetails,
   PortfolioDividends,
+  PortfolioHoldingResponse,
   PortfolioHoldingsResponse,
   PortfolioInvestments,
   PortfolioPerformanceResponse,
@@ -56,7 +57,6 @@ import { AssetClass, AssetSubClass, DataSource } from '@prisma/client';
 import { Big } from 'big.js';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
-import { PortfolioHoldingDetail } from './interfaces/portfolio-holding-detail.interface';
 import { PortfolioService } from './portfolio.service';
 import { UpdateHoldingTagsDto } from './update-holding-tags.dto';
 
@@ -374,8 +374,8 @@ export class PortfolioController {
     @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId: string,
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
-  ): Promise<PortfolioHoldingDetail> {
-    const holding = await this.portfolioService.getPosition(
+  ): Promise<PortfolioHoldingResponse> {
+    const holding = await this.portfolioService.getHolding(
       dataSource,
       impersonationId,
       symbol
@@ -621,8 +621,8 @@ export class PortfolioController {
     @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId: string,
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
-  ): Promise<PortfolioHoldingDetail> {
-    const holding = await this.portfolioService.getPosition(
+  ): Promise<PortfolioHoldingResponse> {
+    const holding = await this.portfolioService.getHolding(
       dataSource,
       impersonationId,
       symbol
@@ -672,7 +672,7 @@ export class PortfolioController {
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<void> {
-    const holding = await this.portfolioService.getPosition(
+    const holding = await this.portfolioService.getHolding(
       dataSource,
       impersonationId,
       symbol
@@ -707,7 +707,7 @@ export class PortfolioController {
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<void> {
-    const holding = await this.portfolioService.getPosition(
+    const holding = await this.portfolioService.getHolding(
       dataSource,
       impersonationId,
       symbol

apps/api/src/app/portfolio/portfolio.service.ts

@@ -41,6 +41,7 @@ import {
   HistoricalDataItem,
   InvestmentItem,
   PortfolioDetails,
+  PortfolioHoldingResponse,
   PortfolioInvestments,
   PortfolioPerformanceResponse,
   PortfolioPosition,
@@ -87,7 +88,6 @@ import { isEmpty } from 'lodash';
 
 import { PortfolioCalculator } from './calculator/portfolio-calculator';
 import { PortfolioCalculatorFactory } from './calculator/portfolio-calculator.factory';
-import { PortfolioHoldingDetail } from './interfaces/portfolio-holding-detail.interface';
 import { RulesService } from './rules.service';
 
 const asiaPacificMarkets = require('../../assets/countries/asia-pacific-markets.json');
@@ -631,11 +631,11 @@ export class PortfolioService {
     };
   }
 
-  public async getPosition(
+  public async getHolding(
     aDataSource: DataSource,
     aImpersonationId: string,
     aSymbol: string
-  ): Promise<PortfolioHoldingDetail> {
+  ): Promise<PortfolioHoldingResponse> {
     const userId = await this.getUserId(aImpersonationId, this.request.user.id);
     const user = await this.userService.user({ id: userId });
     const userCurrency = this.getUserCurrency(user);
@@ -927,7 +927,7 @@ export class PortfolioService {
     }
   }
 
-  public async getPositions({
+  public async getHoldings({
     dateRange = 'max',
     filters,
     impersonationId

apps/client/src/app/services/data.service.ts

@@ -13,7 +13,6 @@ import {
   Activity
 } from '@ghostfolio/api/app/order/interfaces/activities.interface';
 import { UpdateOrderDto } from '@ghostfolio/api/app/order/update-order.dto';
-import { PortfolioHoldingDetail } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-holding-detail.interface';
 import { SymbolItem } from '@ghostfolio/api/app/symbol/interfaces/symbol-item.interface';
 import { DeleteOwnUserDto } from '@ghostfolio/api/app/user/delete-own-user.dto';
 import { UserItem } from '@ghostfolio/api/app/user/interfaces/user-item.interface';
@@ -40,6 +39,7 @@ import {
   OAuthResponse,
   PortfolioDetails,
   PortfolioDividends,
+  PortfolioHoldingResponse,
   PortfolioHoldingsResponse,
   PortfolioInvestments,
   PortfolioPerformanceResponse,
@@ -406,7 +406,7 @@ export class DataService {
     symbol: string;
   }) {
     return this.http
-      .get<PortfolioHoldingDetail>(
+      .get<PortfolioHoldingResponse>(
         `/api/v1/portfolio/holding/${dataSource}/${symbol}`
       )
       .pipe(

libs/common/src/lib/interfaces/index.ts

@@ -52,6 +52,7 @@ import type { ImportResponse } from './responses/import-response.interface';
 import type { LookupResponse } from './responses/lookup-response.interface';
 import type { MarketDataDetailsResponse } from './responses/market-data-details-response.interface';
 import type { OAuthResponse } from './responses/oauth-response.interface';
+import { PortfolioHoldingResponse } from './responses/portfolio-holding-response.interface';
 import type { PortfolioHoldingsResponse } from './responses/portfolio-holdings-response.interface';
 import type { PortfolioPerformanceResponse } from './responses/portfolio-performance-response.interface';
 import type { PortfolioReportResponse } from './responses/portfolio-report.interface';
@@ -112,6 +113,7 @@ export {
   PortfolioChart,
   PortfolioDetails,
   PortfolioDividends,
+  PortfolioHoldingResponse,
   PortfolioHoldingsResponse,
   PortfolioInvestments,
   PortfolioItem,

apps/api/src/app/portfolio/interfaces/portfolio-holding-detail.interface.ts → libs/common/src/lib/interfaces/responses/portfolio-holding-response.interface.ts

@@ -7,7 +7,7 @@ import {
 
 import { Tag } from '@prisma/client';
 
-export interface PortfolioHoldingDetail {
+export interface PortfolioHoldingResponse {
   averagePrice: number;
   dataProviderInfo: DataProviderInfo;
   dividendInBaseCurrency: number;