Merge remote-tracking branch 'origin/main' into feature/enable-strict-null-checks-in-ui

CHANGELOG.md

@@ -5,6 +5,17 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Unreleased
+
+### Added
+
+- Added the ability to fetch top holdings for ETF and mutual fund assets from _Yahoo Finance_
+
+### Changed
+
+- Deprecated `transactionCount` in favor of `activitiesCount` in the endpoint `GET api/v1/admin`
+- Removed the deprecated `firstBuyDate` in the portfolio calculator
+
 ## 2.234.0 - 2026-01-30
 
 ### Changed

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

@@ -138,11 +138,11 @@ export class AdminService {
   public async get(): Promise<AdminData> {
     const dataSources = Object.values(DataSource);
 
-    const [enabledDataSources, settings, transactionCount, userCount] =
+    const [activitiesCount, enabledDataSources, settings, userCount] =
       await Promise.all([
+        this.prismaService.order.count(),
         this.dataProviderService.getDataSources(),
         this.propertyService.get(),
-        this.prismaService.order.count(),
         this.countUsersWithAnalytics()
       ]);
 
@@ -182,10 +182,11 @@ export class AdminService {
     ).filter(Boolean);
 
     return {
+      activitiesCount,
       dataProviders,
       settings,
-      transactionCount,
       userCount,
+      transactionCount: activitiesCount,
       version: environment.version
     };
   }

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

@@ -416,7 +416,6 @@ export abstract class PortfolioCalculator {
         dividendInBaseCurrency: totalDividendInBaseCurrency,
         fee: item.fee,
         feeInBaseCurrency: item.feeInBaseCurrency,
-        firstBuyDate: item.firstBuyDate,
         grossPerformance: !hasErrors ? (grossPerformance ?? null) : null,
         grossPerformancePercentage: !hasErrors
           ? (grossPerformancePercentage ?? null)
@@ -1004,7 +1003,6 @@ export abstract class PortfolioCalculator {
           fee: oldAccumulatedSymbol.fee.plus(fee),
           feeInBaseCurrency:
             oldAccumulatedSymbol.feeInBaseCurrency.plus(feeInBaseCurrency),
-          firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
           includeInHoldings: oldAccumulatedSymbol.includeInHoldings,
           quantity: newQuantity,
           tags: oldAccumulatedSymbol.tags.concat(tags),
@@ -1024,7 +1022,6 @@ export abstract class PortfolioCalculator {
           averagePrice: unitPrice,
           dateOfFirstActivity: date,
           dividend: new Big(0),
-          firstBuyDate: date,
           includeInHoldings: INVESTMENT_ACTIVITY_TYPES.includes(type),
           investment: unitPrice.mul(quantity).mul(factor),
           quantity: quantity.mul(factor),

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-buy.spec.ts

@@ -153,7 +153,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('3.2'),
             feeInBaseCurrency: new Big('3.2'),
-            firstBuyDate: '2021-11-22',
             grossPerformance: new Big('36.6'),
             grossPerformancePercentage: new Big('0.07706261539956593567'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell-in-two-activities.spec.ts

@@ -169,7 +169,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('3.2'),
             feeInBaseCurrency: new Big('3.2'),
-            firstBuyDate: '2021-11-22',
             grossPerformance: new Big('-12.6'),
             grossPerformancePercentage: new Big('-0.04408677396780965649'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy-and-sell.spec.ts

@@ -153,7 +153,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('3.2'),
             feeInBaseCurrency: new Big('3.2'),
-            firstBuyDate: '2021-11-22',
             grossPerformance: new Big('-12.6'),
             grossPerformancePercentage: new Big('-0.0440867739678096571'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-baln-buy.spec.ts

@@ -143,7 +143,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('1.55'),
             feeInBaseCurrency: new Big('1.55'),
-            firstBuyDate: '2021-11-30',
             grossPerformance: new Big('24.6'),
             grossPerformancePercentage: new Big('0.09004392386530014641'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts

@@ -204,7 +204,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('4.46'),
             feeInBaseCurrency: new Big('4.46'),
-            firstBuyDate: '2021-12-12',
             grossPerformance: new Big('-1458.72'),
             grossPerformancePercentage: new Big('-0.03273724696701543726'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-buy-and-sell-partially.spec.ts

@@ -167,7 +167,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('0'),
             feeInBaseCurrency: new Big('0'),
-            firstBuyDate: '2015-01-01',
             grossPerformance: new Big('27172.74').mul(0.97373),
             grossPerformancePercentage: new Big('0.4241983590271396608571'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts

@@ -204,7 +204,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('4.46'),
             feeInBaseCurrency: new Big('4.46'),
-            firstBuyDate: '2021-12-12',
             grossPerformance: new Big('-1458.72'),
             grossPerformancePercentage: new Big('-0.03273724696701543726'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-cash.spec.ts

@@ -239,7 +239,6 @@ describe('PortfolioCalculator', () => {
         dividendInBaseCurrency: new Big(0),
         fee: new Big(0),
         feeInBaseCurrency: new Big(0),
-        firstBuyDate: '2023-12-31',
         grossPerformance: new Big(0),
         grossPerformancePercentage: new Big(0),
         grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-googl-buy.spec.ts

@@ -149,7 +149,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('1'),
             feeInBaseCurrency: new Big('0.9238'),
-            firstBuyDate: '2023-01-03',
             grossPerformance: new Big('27.33').mul(0.8854),
             grossPerformancePercentage: new Big('0.3066651705565529623'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-msft-buy-with-dividend.spec.ts

@@ -139,7 +139,6 @@ describe('PortfolioCalculator', () => {
             dividend: new Big('0.62'),
             dividendInBaseCurrency: new Big('0.62'),
             fee: new Big('19'),
-            firstBuyDate: '2021-09-16',
             grossPerformance: new Big('33.25'),
             grossPerformancePercentage: new Big('0.11136043941322258691'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts

@@ -149,7 +149,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('4.25'),
             feeInBaseCurrency: new Big('4.25'),
-            firstBuyDate: '2022-03-07',
             grossPerformance: new Big('21.93'),
             grossPerformancePercentage: new Big('0.15113417083448194384'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts

@@ -202,7 +202,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('0'),
             feeInBaseCurrency: new Big('0'),
-            firstBuyDate: '2022-03-07',
             grossPerformance: new Big('19.86'),
             grossPerformancePercentage: new Big('0.13100263852242744063'),
             grossPerformancePercentageWithCurrencyEffect: new Big(

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-valuable.spec.ts

@@ -125,7 +125,6 @@ describe('PortfolioCalculator', () => {
             dividendInBaseCurrency: new Big('0'),
             fee: new Big('0'),
             feeInBaseCurrency: new Big('0'),
-            firstBuyDate: '2022-01-01',
             grossPerformance: new Big('0'),
             grossPerformancePercentage: new Big('0'),
             grossPerformancePercentageWithCurrencyEffect: new Big('0'),

apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts

@@ -11,10 +11,6 @@ export interface TransactionPointSymbol {
   dividend: Big;
   fee: Big;
   feeInBaseCurrency: Big;
-
-  /** @deprecated use dateOfFirstActivity instead */
-  firstBuyDate: string;
-
   includeInHoldings: boolean;
   investment: Big;
   quantity: Big;

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

@@ -576,8 +576,8 @@ export class PortfolioService {
     for (const {
       activitiesCount,
       currency,
+      dateOfFirstActivity,
       dividend,
-      firstBuyDate,
       grossPerformance,
       grossPerformanceWithCurrencyEffect,
       grossPerformancePercentage,
@@ -633,7 +633,7 @@ export class PortfolioService {
         assetSubClass: assetProfile.assetSubClass,
         countries: assetProfile.countries,
         dataSource: assetProfile.dataSource,
-        dateOfFirstActivity: parseDate(firstBuyDate),
+        dateOfFirstActivity: parseDate(dateOfFirstActivity),
         dividend: dividend?.toNumber() ?? 0,
         grossPerformance: grossPerformance?.toNumber() ?? 0,
         grossPerformancePercent: grossPerformancePercentage?.toNumber() ?? 0,
@@ -801,9 +801,9 @@ export class PortfolioService {
       activitiesCount,
       averagePrice,
       currency,
+      dateOfFirstActivity,
       dividendInBaseCurrency,
       feeInBaseCurrency,
-      firstBuyDate,
       grossPerformance,
       grossPerformancePercentage,
       grossPerformancePercentageWithCurrencyEffect,
@@ -828,7 +828,10 @@ export class PortfolioService {
     });
 
     const dividendYieldPercent = getAnnualizedPerformancePercent({
-      daysInMarket: differenceInDays(new Date(), parseDate(firstBuyDate)),
+      daysInMarket: differenceInDays(
+        new Date(),
+        parseDate(dateOfFirstActivity)
+      ),
       netPerformancePercentage: timeWeightedInvestment.eq(0)
         ? new Big(0)
         : dividendInBaseCurrency.div(timeWeightedInvestment)
@@ -836,7 +839,10 @@ export class PortfolioService {
 
     const dividendYieldPercentWithCurrencyEffect =
       getAnnualizedPerformancePercent({
-        daysInMarket: differenceInDays(new Date(), parseDate(firstBuyDate)),
+        daysInMarket: differenceInDays(
+          new Date(),
+          parseDate(dateOfFirstActivity)
+        ),
         netPerformancePercentage: timeWeightedInvestmentWithCurrencyEffect.eq(0)
           ? new Big(0)
           : dividendInBaseCurrency.div(timeWeightedInvestmentWithCurrencyEffect)
@@ -845,7 +851,7 @@ export class PortfolioService {
     const historicalData = await this.dataProviderService.getHistorical(
       [{ dataSource, symbol }],
       'day',
-      parseISO(firstBuyDate),
+      parseISO(dateOfFirstActivity),
       new Date()
     );
 
@@ -910,7 +916,7 @@ export class PortfolioService {
       // Add historical entry for buy date, if no historical data available
       historicalDataArray.push({
         averagePrice: activitiesOfHolding[0].unitPriceInAssetProfileCurrency,
-        date: firstBuyDate,
+        date: dateOfFirstActivity,
         marketPrice: activitiesOfHolding[0].unitPriceInAssetProfileCurrency,
         quantity: activitiesOfHolding[0].quantity
       });
@@ -924,6 +930,7 @@ export class PortfolioService {
 
     return {
       activitiesCount,
+      dateOfFirstActivity,
       marketPrice,
       marketPriceMax,
       marketPriceMin,
@@ -931,7 +938,6 @@ export class PortfolioService {
       tags,
       averagePrice: averagePrice.toNumber(),
       dataProviderInfo: portfolioCalculator.getDataProviderInfos()?.[0],
-      dateOfFirstActivity: firstBuyDate,
       dividendInBaseCurrency: dividendInBaseCurrency.toNumber(),
       dividendYieldPercent: dividendYieldPercent.toNumber(),
       dividendYieldPercentWithCurrencyEffect:

apps/api/src/services/data-provider/data-enhancer/yahoo-finance/yahoo-finance.service.ts

@@ -135,10 +135,10 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
     shortName,
     symbol
   }: {
-    longName: Price['longName'];
+    longName?: Price['longName'];
-    quoteType: Price['quoteType'];
+    quoteType?: Price['quoteType'];
-    shortName: Price['shortName'];
+    shortName?: Price['shortName'];
-    symbol: Price['symbol'];
+    symbol?: Price['symbol'];
   }) {
     let name = longName;
 
@@ -217,6 +217,15 @@ export class YahooFinanceDataEnhancerService implements DataEnhancerInterface {
             });
           }
         }
+
+        response.holdings = assetProfile.topHoldings.holdings.map(
+          ({ holdingName, holdingPercent }) => {
+            return {
+              name: this.formatName({ longName: holdingName }),
+              weight: holdingPercent
+            };
+          }
+        );
       } else if (
         assetSubClass === 'STOCK' &&
         assetProfile.summaryProfile?.country

apps/client/src/app/components/admin-overview/admin-overview.component.ts

@@ -73,6 +73,7 @@ import { takeUntil } from 'rxjs/operators';
   templateUrl: './admin-overview.html'
 })
 export class GfAdminOverviewComponent implements OnDestroy, OnInit {
+  public activitiesCount: number;
   public couponDuration: StringValue = '14 days';
   public coupons: Coupon[];
   public hasPermissionForSubscription: boolean;
@@ -83,7 +84,6 @@ export class GfAdminOverviewComponent implements OnDestroy, OnInit {
   public isDataGatheringEnabled: boolean;
   public permissions = permissions;
   public systemMessage: SystemMessage;
-  public transactionCount: number;
   public userCount: number;
   public user: User;
   public version: string;
@@ -289,12 +289,12 @@ export class GfAdminOverviewComponent implements OnDestroy, OnInit {
     this.adminService
       .fetchAdminData()
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe(({ settings, transactionCount, userCount, version }) => {
+      .subscribe(({ activitiesCount, settings, userCount, version }) => {
+        this.activitiesCount = activitiesCount;
         this.coupons = (settings[PROPERTY_COUPONS] as Coupon[]) ?? [];
         this.isDataGatheringEnabled =
           settings[PROPERTY_IS_DATA_GATHERING_ENABLED] === false ? false : true;
         this.systemMessage = settings[PROPERTY_SYSTEM_MESSAGE] as SystemMessage;
-        this.transactionCount = transactionCount;
         this.userCount = userCount;
         this.version = version;
 

apps/client/src/app/components/admin-overview/admin-overview.html

@@ -20,11 +20,11 @@
             <div class="w-50">
               <gf-value
                 [locale]="user?.settings?.locale"
-                [value]="transactionCount"
+                [value]="activitiesCount"
               />
-              @if (transactionCount && userCount) {
+              @if (activitiesCount && userCount) {
                 <div>
-                  {{ transactionCount / userCount | number: '1.2-2' }}
+                  {{ activitiesCount / userCount | number: '1.2-2' }}
                   <span i18n>per User</span>
                 </div>
               }

libs/common/src/lib/interfaces/admin-data.interface.ts

@@ -1,12 +1,16 @@
 import { DataProviderInfo } from './data-provider-info.interface';
 
 export interface AdminData {
+  activitiesCount: number;
   dataProviders: (DataProviderInfo & {
     assetProfileCount: number;
     useForExchangeRates: boolean;
   })[];
   settings: { [key: string]: boolean | object | string | string[] };
+
+  /** @deprecated use activitiesCount instead */
   transactionCount: number;
+
   userCount: number;
   version: string;
 }

libs/common/src/lib/models/timeline-position.ts

@@ -35,9 +35,6 @@ export class TimelinePosition {
   @Type(() => Big)
   feeInBaseCurrency: Big;
 
-  /** @deprecated use dateOfFirstActivity instead */
-  firstBuyDate: string;
-
   @Transform(transformToBig, { toClassOnly: true })
   @Type(() => Big)
   grossPerformance: Big;