Further Updates

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator.ts

@@ -1292,7 +1292,6 @@ export class TWRPortfolioCalculator extends PortfolioCalculator {
       netPerformanceWithCurrencyEffectMap,
       timeWeightedInvestmentValues,
       timeWeightedInvestmentValuesWithCurrencyEffect,
-      totalAccountBalanceInBaseCurrency,
       totalDividend,
       totalDividendInBaseCurrency,
       totalInterest,

apps/api/src/app/portfolio/current-rate.service.ts

@@ -1,14 +1,11 @@
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
-import { DateQueryHelper } from '@ghostfolio/api/helper/dateQueryHelper';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { resetHours } from '@ghostfolio/common/helper';
 import {
   AssetProfileIdentifier,
   DataProviderInfo,
-  ResponseError,
+  ResponseError
-  UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import type { RequestWithUser } from '@ghostfolio/common/types';
 
@@ -23,8 +20,6 @@ import { GetValuesParams } from './interfaces/get-values-params.interface';
 
 @Injectable()
 export class CurrentRateService {
-  private dateQueryHelper = new DateQueryHelper();
-
   public constructor(
     private readonly dataProviderService: DataProviderService,
     private readonly marketDataService: MarketDataService,
@@ -43,33 +38,58 @@ export class CurrentRateService {
       (!dateQuery.lt || isBefore(new Date(), dateQuery.lt)) &&
       (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
       (!dateQuery.in || this.containsToday(dateQuery.in));
-    let { query, dates } = this.dateQueryHelper.handleDateQueryIn(dateQuery);
+
     const promises: Promise<GetValueObject[]>[] = [];
     const quoteErrors: ResponseError['errors'] = [];
     const today = resetHours(new Date());
 
     if (includesToday) {
       promises.push(
-        this.getTodayPrivate(
+        this.dataProviderService
-          dataGatheringItems,
+          .getQuotes({ items: dataGatheringItems, user: this.request?.user })
-          dataProviderInfos,
+          .then((dataResultProvider) => {
-          today,
+            const result: GetValueObject[] = [];
-          quoteErrors
+
-        )
+            for (const dataGatheringItem of dataGatheringItems) {
+              if (
+                dataResultProvider?.[dataGatheringItem.symbol]?.dataProviderInfo
+              ) {
+                dataProviderInfos.push(
+                  dataResultProvider[dataGatheringItem.symbol].dataProviderInfo
+                );
+              }
+
+              if (dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice) {
+                result.push({
+                  dataSource: dataGatheringItem.dataSource,
+                  date: today,
+                  marketPrice:
+                    dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice,
+                  symbol: dataGatheringItem.symbol
+                });
+              } else {
+                quoteErrors.push({
+                  dataSource: dataGatheringItem.dataSource,
+                  symbol: dataGatheringItem.symbol
+                });
+              }
+            }
+
+            return result;
+          })
       );
     }
 
-    const uniqueAssets: UniqueAsset[] = dataGatheringItems.map(
+    const assetProfileIdentifiers: AssetProfileIdentifier[] =
-      ({ dataSource, symbol }) => {
+      dataGatheringItems.map(({ dataSource, symbol }) => {
         return { dataSource, symbol };
-      }
+      });
-    );
 
     promises.push(
       this.marketDataService
         .getRange({
-          dateQuery: query,
+          assetProfileIdentifiers,
-          uniqueAssets
+          dateQuery
         })
         .then((data) => {
           return data.map(({ dataSource, date, marketPrice, symbol }) => {
@@ -90,12 +110,9 @@ export class CurrentRateService {
       errors: quoteErrors.map(({ dataSource, symbol }) => {
         return { dataSource, symbol };
       }),
-      values: uniqBy(values, ({ date, symbol }) => `${date}-${symbol}`).filter(
+      values: uniqBy(values, ({ date, symbol }) => `${date}-${symbol}`)
-        (v) =>
-          dates?.length === 0 ||
-          dates.some((d: Date) => d.getTime() === v.date.getTime())
-      )
     };
+
     if (!isEmpty(quoteErrors)) {
       for (const { dataSource, symbol } of quoteErrors) {
         try {
@@ -145,61 +162,6 @@ export class CurrentRateService {
     return response;
   }
 
-  public async getToday(
-    dataGatheringItems: IDataGatheringItem[]
-  ): Promise<GetValueObject[]> {
-    const dataProviderInfos: DataProviderInfo[] = [];
-    const quoteErrors: UniqueAsset[] = [];
-    const today = resetHours(new Date());
-
-    return this.getTodayPrivate(
-      dataGatheringItems,
-      dataProviderInfos,
-      today,
-      quoteErrors
-    );
-  }
-
-  private async getTodayPrivate(
-    dataGatheringItems: IDataGatheringItem[],
-    dataProviderInfos: DataProviderInfo[],
-    today: Date,
-    quoteErrors: UniqueAsset[]
-  ): Promise<GetValueObject[]> {
-    return this.dataProviderService
-      .getQuotes({ items: dataGatheringItems, user: this.request?.user })
-      .then((dataResultProvider) => {
-        const result: GetValueObject[] = [];
-
-        for (const dataGatheringItem of dataGatheringItems) {
-          if (
-            dataResultProvider?.[dataGatheringItem.symbol]?.dataProviderInfo
-          ) {
-            dataProviderInfos.push(
-              dataResultProvider[dataGatheringItem.symbol].dataProviderInfo
-            );
-          }
-
-          if (dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice) {
-            result.push({
-              dataSource: dataGatheringItem.dataSource,
-              date: today,
-              marketPrice:
-                dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice,
-              symbol: dataGatheringItem.symbol
-            });
-          } else {
-            quoteErrors.push({
-              dataSource: dataGatheringItem.dataSource,
-              symbol: dataGatheringItem.symbol
-            });
-          }
-        }
-
-        return result;
-      });
-  }
-
   private containsToday(dates: Date[]): boolean {
     for (const date of dates) {
       if (isToday(date)) {

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

@@ -214,7 +214,7 @@ export class PortfolioService {
     };
   }
 
-   @LogPerformance
+  @LogPerformance
   public async getDividends({
     activities,
     groupBy
@@ -1225,18 +1225,6 @@ export class PortfolioService {
       };
     }
 
-    const portfolioCalculator = this.calculatorFactory.createCalculator({
-      accountBalanceItems,
-      activities,
-      dateRange,
-      userId,
-      calculationType: PerformanceCalculationType.TWR,
-      currency: userCurrency,
-      hasFilters: filters?.length > 0,
-      isExperimentalFeatures:
-        this.request.user.Settings.settings.isExperimentalFeatures
-    });
-
     const { endDate, startDate } = getIntervalFromDateRange(dateRange);
 
     const { chart } = await portfolioCalculator.getPerformance({
@@ -1267,9 +1255,8 @@ export class PortfolioService {
 
     return {
       chart,
-      errors,
+      hasErrors: false,
-      hasErrors,
+      firstOrderDate: parseDate(chart[0]?.date),
-      firstOrderDate: parseDate(historicalData[0]?.date),
       performance: {
         netPerformance,
         netPerformanceWithCurrencyEffect,

apps/api/src/services/market-data/market-data.service.ts

@@ -24,10 +24,6 @@ export class MarketDataService {
 
   private dateQueryHelper = new DateQueryHelper();
 
-  lock = new AwaitLock();
-
-  private dateQueryHelper = new DateQueryHelper();
-
   public async deleteMany({ dataSource, symbol }: AssetProfileIdentifier) {
     return this.prismaService.marketData.deleteMany({
       where: {