Task/deprecate SymbolProfile in favor of assetProfile in activity interface (#7315)

* Deprecate SymbolProfile in favor of assetProfile

* Update changelog

CHANGELOG.md

@@ -13,6 +13,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Hardened the validation of the sectors in the asset profile endpoints
 - Rounded the value of the _Fear & Greed Index_ (market mood) in the twitter bot service
 - Set the change detection strategy to `OnPush` in the _X-ray_ page
+- Deprecated `SymbolProfile` in favor of `assetProfile` in the activity interface
 
 ## 3.25.0 - 2026-07-12
 

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

@@ -455,6 +455,23 @@ export class ActivitiesService {
           userId,
           accountId: account.id,
           accountUserId: account.userId,
+          assetProfile: {
+            activitiesCount: 0,
+            assetClass: AssetClass.LIQUIDITY,
+            assetSubClass: AssetSubClass.CASH,
+            countries: [],
+            createdAt: new Date(balanceItem.date),
+            currency: account.currency,
+            dataSource:
+              this.dataProviderService.getDataSourceForExchangeRates(),
+            holdings: [],
+            id: account.currency,
+            isActive: true,
+            name: account.currency,
+            sectors: [],
+            symbol: account.currency,
+            updatedAt: new Date(balanceItem.date)
+          },
           comment: account.name,
           createdAt: new Date(balanceItem.date),
           currency: account.currency,
@@ -823,6 +840,7 @@ export class ActivitiesService {
 
         return {
           ...order,
+          assetProfile,
           feeInAssetProfileCurrency,
           feeInBaseCurrency,
           unitPriceInAssetProfileCurrency,

apps/api/src/app/endpoints/public/public.controller.ts

@@ -110,26 +110,27 @@ export class PublicController {
       ? []
       : activities.map(
           ({
+            assetProfile,
             currency,
             date,
             fee,
             quantity,
-            SymbolProfile,
             type,
             unitPrice,
             value,
             valueInBaseCurrency
           }) => {
             return {
+              assetProfile,
               currency,
               date,
               fee,
               quantity,
-              SymbolProfile,
               type,
               unitPrice,
               value,
-              valueInBaseCurrency
+              valueInBaseCurrency,
+              SymbolProfile: assetProfile
             };
           }
         );

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

@@ -124,8 +124,8 @@ export class ExportService {
 
     const customAssetProfiles = uniqBy(
       activities
-        .map(({ SymbolProfile }) => {
+        .map(({ assetProfile }) => {
-          return SymbolProfile;
+          return assetProfile;
         })
         .filter(({ userId: assetProfileUserId }) => {
           return assetProfileUserId === userId;
@@ -224,13 +224,13 @@ export class ExportService {
       activities: activities.map(
         ({
           accountId,
+          assetProfile,
           comment,
           currency,
           date,
           fee,
           id,
           quantity,
-          SymbolProfile,
           tags: currentTags,
           type,
           unitPrice
@@ -243,10 +243,10 @@ export class ExportService {
             quantity,
             type,
             unitPrice,
-            currency: currency ?? SymbolProfile.currency,
+            currency: currency ?? assetProfile.currency,
-            dataSource: SymbolProfile.dataSource,
+            dataSource: assetProfile.dataSource,
             date: date.toISOString(),
-            symbol: SymbolProfile.symbol,
+            symbol: assetProfile.symbol,
             tags: currentTags.map(({ id: tagId }) => {
               return tagId;
             })

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

@@ -122,11 +122,11 @@ export class ImportService {
           const isDuplicate = activities.some((activity) => {
             return (
               activity.accountId === account?.id &&
-              activity.SymbolProfile.currency === assetProfile.currency &&
+              activity.assetProfile.currency === assetProfile.currency &&
-              activity.SymbolProfile.dataSource === assetProfile.dataSource &&
+              activity.assetProfile.dataSource === assetProfile.dataSource &&
               isSameSecond(activity.date, date) &&
               activity.quantity === quantity &&
-              activity.SymbolProfile.symbol === assetProfile.symbol &&
+              activity.assetProfile.symbol === assetProfile.symbol &&
               activity.type === 'DIVIDEND' &&
               activity.unitPrice === marketPrice
             );
@@ -138,6 +138,7 @@ export class ImportService {
 
           return {
             account,
+            assetProfile,
             date,
             error,
             quantity,
@@ -463,19 +464,18 @@ export class ImportService {
       const error = activity.error;
       const fee = activity.fee;
       const quantity = activity.quantity;
-      const SymbolProfile = activity.SymbolProfile;
       const tagIds = activity.tagIds ?? [];
       const type = activity.type;
       const unitPrice = activity.unitPrice;
 
       const assetProfile = assetProfiles[
         getAssetProfileIdentifier({
-          dataSource: SymbolProfile.dataSource,
+          dataSource: activity.assetProfile.dataSource,
-          symbol: SymbolProfile.symbol
+          symbol: activity.assetProfile.symbol
         })
       ] ?? {
-        dataSource: SymbolProfile.dataSource,
+        dataSource: activity.assetProfile.dataSource,
-        symbol: SymbolProfile.symbol
+        symbol: activity.assetProfile.symbol
       };
       const {
         assetClass,
@@ -619,6 +619,8 @@ export class ImportService {
 
       activities.push({
         ...order,
+        // @ts-ignore
+        assetProfile,
         error,
         value,
         valueInBaseCurrency,
@@ -633,19 +635,19 @@ export class ImportService {
 
     if (!isDryRun) {
       // Gather symbol data in the background, if not dry run
-      const uniqueActivities = uniqBy(activities, ({ SymbolProfile }) => {
+      const uniqueActivities = uniqBy(activities, ({ assetProfile }) => {
         return getAssetProfileIdentifier({
-          dataSource: SymbolProfile.dataSource,
+          dataSource: assetProfile.dataSource,
-          symbol: SymbolProfile.symbol
+          symbol: assetProfile.symbol
         });
       });
 
       this.dataGatheringService.gatherSymbols({
-        dataGatheringItems: uniqueActivities.map(({ date, SymbolProfile }) => {
+        dataGatheringItems: uniqueActivities.map(({ assetProfile, date }) => {
           return {
             date,
-            dataSource: SymbolProfile.dataSource,
+            dataSource: assetProfile.dataSource,
-            symbol: SymbolProfile.symbol
+            symbol: assetProfile.symbol
           };
         }),
         priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
@@ -692,12 +694,12 @@ export class ImportService {
             activity.accountId === accountId &&
             activity.comment === comment &&
             (activity.currency === currency ||
-              activity.SymbolProfile.currency === currency) &&
+              activity.assetProfile.currency === currency) &&
-            activity.SymbolProfile.dataSource === dataSource &&
+            activity.assetProfile.dataSource === dataSource &&
             isSameSecond(activity.date, date) &&
             activity.fee === fee &&
             activity.quantity === quantity &&
-            activity.SymbolProfile.symbol === symbol &&
+            activity.assetProfile.symbol === symbol &&
             activity.type === type &&
             activity.unitPrice === unitPrice
           );
@@ -717,7 +719,7 @@ export class ImportService {
           quantity,
           type,
           unitPrice,
-          SymbolProfile: {
+          assetProfile: {
             dataSource,
             symbol,
             activitiesCount: undefined,

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

@@ -22,7 +22,7 @@ export const activityDummyData = {
   valueInBaseCurrency: undefined
 };
 
-export const symbolProfileDummyData = {
+export const assetProfileDummyData = {
   activitiesCount: undefined,
   assetClass: undefined,
   assetSubClass: undefined,

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

@@ -121,11 +121,11 @@ export abstract class PortfolioCalculator {
     this.activities = activities
       .map(
         ({
+          assetProfile,
           date,
           feeInAssetProfileCurrency,
           feeInBaseCurrency,
           quantity,
-          SymbolProfile,
           tags = [],
           type,
           unitPriceInAssetProfileCurrency
@@ -141,9 +141,9 @@ export abstract class PortfolioCalculator {
           }
 
           return {
+            assetProfile,
             tags,
             type,
-            assetProfile: SymbolProfile,
             date: format(date, DATE_FORMAT),
             fee: new Big(feeInAssetProfileCurrency),
             feeInBaseCurrency: new Big(feeInBaseCurrency),

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,33 +85,33 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-11-22'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.55,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-22'),
+          feeInAssetProfileCurrency: 1.55,
+          feeInBaseCurrency: 1.55,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 142.9
         },
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.65,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.65,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 1.65,
+          feeInBaseCurrency: 1.65,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 136.6
         }

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,49 +85,49 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-11-22'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.55,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-22'),
+          feeInAssetProfileCurrency: 1.55,
+          feeInBaseCurrency: 1.55,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 142.9
         },
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.65,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.65,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 1.65,
+          feeInBaseCurrency: 1.65,
+          quantity: 1,
           type: 'SELL',
           unitPriceInAssetProfileCurrency: 136.6
         },
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 1,
           type: 'SELL',
           unitPriceInAssetProfileCurrency: 136.6
         }

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,33 +85,33 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-11-22'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.55,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-22'),
+          feeInAssetProfileCurrency: 1.55,
+          feeInBaseCurrency: 1.55,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 142.9
         },
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.65,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.65,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 1.65,
+          feeInBaseCurrency: 1.65,
+          quantity: 2,
           type: 'SELL',
           unitPriceInAssetProfileCurrency: 136.6
         }

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,17 +85,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.55,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 1.55,
+          feeInBaseCurrency: 1.55,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 136.6
         }
@@ -217,17 +217,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.55,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 1.55,
+          feeInBaseCurrency: 1.55,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 135.0
         }
@@ -257,17 +257,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-11-30'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1.55,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'CHF',
             dataSource: 'YAHOO',
             name: 'Bâloise Holding AG',
             symbol: 'BALN.SW'
           },
+          date: new Date('2021-11-30'),
+          feeInAssetProfileCurrency: 1.55,
+          feeInBaseCurrency: 1.55,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 135.0
         }

apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur-in-base-currency-eur.spec.ts

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -107,17 +107,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = exportResponse.activities.map(
         (activity) => ({
           ...activityDummyData,
-          ...activity,
+          assetProfile: {
-          date: parseDate(activity.date),
+            ...assetProfileDummyData,
-          feeInAssetProfileCurrency: 4.46,
-          feeInBaseCurrency: 3.94,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: activity.dataSource,
             name: 'Bitcoin',
             symbol: activity.symbol
           },
+          ...activity,
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: 4.46,
+          feeInBaseCurrency: 3.94,
           unitPriceInAssetProfileCurrency: 44558.42
         })
       );

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

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -95,17 +95,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = exportResponse.activities.map(
         (activity) => ({
           ...activityDummyData,
-          ...activity,
+          assetProfile: {
-          date: parseDate(activity.date),
+            ...assetProfileDummyData,
-          feeInAssetProfileCurrency: 4.46,
-          feeInBaseCurrency: 4.46,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: activity.dataSource,
             name: 'Bitcoin',
             symbol: activity.symbol
           },
+          ...activity,
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: 4.46,
+          feeInBaseCurrency: 4.46,
           unitPriceInAssetProfileCurrency: 44558.42
         })
       );

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -98,33 +98,33 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2015-01-01'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Bitcoin USD',
             symbol: 'BTCUSD'
           },
+          date: new Date('2015-01-01'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 2,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 320.43
         },
         {
           ...activityDummyData,
-          date: new Date('2017-12-31'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Bitcoin USD',
             symbol: 'BTCUSD'
           },
+          date: new Date('2017-12-31'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 1,
           type: 'SELL',
           unitPriceInAssetProfileCurrency: 14156.4
         }

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

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -96,16 +96,16 @@ describe('PortfolioCalculator', () => {
         (activity) => ({
           ...activityDummyData,
           ...activity,
-          date: parseDate(activity.date),
+          assetProfile: {
-          feeInAssetProfileCurrency: activity.fee,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: activity.fee,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: activity.dataSource,
             name: 'Bitcoin',
             symbol: activity.symbol
           },
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: activity.fee,
+          feeInBaseCurrency: activity.fee,
           unitPriceInAssetProfileCurrency: activity.unitPrice
         })
       );

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

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -96,16 +96,16 @@ describe('PortfolioCalculator', () => {
         (activity) => ({
           ...activityDummyData,
           ...activity,
-          date: parseDate(activity.date),
+          assetProfile: {
-          feeInAssetProfileCurrency: 4.46,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 4.46,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: activity.dataSource,
             name: 'Bitcoin',
             symbol: activity.symbol
           },
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: 4.46,
+          feeInBaseCurrency: 4.46,
           unitPriceInAssetProfileCurrency: 44558.42
         })
       );

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,17 +85,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-09-01'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 49,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 49,
-          quantity: 0,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'MANUAL',
             name: 'Account Opening Fee',
             symbol: '2c463fb3-af07-486e-adb0-8301b3d72141'
           },
+          date: new Date('2021-09-01'),
+          feeInAssetProfileCurrency: 49,
+          feeInBaseCurrency: 49,
+          quantity: 0,
           type: 'FEE',
           unitPriceInAssetProfileCurrency: 0
         }

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -97,17 +97,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2023-01-03'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 1,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0.9238,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Alphabet Inc.',
             symbol: 'GOOGL'
           },
+          date: new Date('2023-01-03'),
+          feeInAssetProfileCurrency: 1,
+          feeInBaseCurrency: 0.9238,
+          quantity: 1,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 89.12
         }

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

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -99,16 +99,16 @@ describe('PortfolioCalculator', () => {
         (activity) => ({
           ...activityDummyData,
           ...activity,
-          date: parseDate(activity.date),
+          assetProfile: {
-          feeInAssetProfileCurrency: activity.fee,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: activity.fee,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: activity.currency,
             dataSource: activity.dataSource,
             name: 'Direxion Daily Junior Gold Miners Index Bull 2X Shares',
             symbol: activity.symbol
           },
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: activity.fee,
+          feeInBaseCurrency: activity.fee,
           unitPriceInAssetProfileCurrency: activity.unitPrice
         })
       );

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,17 +85,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2023-01-01'), // Date in future
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'MANUAL',
             name: 'Loan',
             symbol: '55196015-1365-4560-aa60-8751ae6d18f8'
           },
+          date: new Date('2023-01-01'), // Date in future
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 1,
           type: 'LIABILITY',
           unitPriceInAssetProfileCurrency: 3000
         }

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -78,49 +78,49 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2024-03-08'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 0.3333333333333333,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Microsoft Inc.',
             symbol: 'MSFT'
           },
+          date: new Date('2024-03-08'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 0.3333333333333333,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 408
         },
         {
           ...activityDummyData,
-          date: new Date('2024-03-13'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 0.6666666666666666,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Microsoft Inc.',
             symbol: 'MSFT'
           },
+          date: new Date('2024-03-13'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 0.6666666666666666,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 400
         },
         {
           ...activityDummyData,
-          date: new Date('2024-03-14'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Microsoft Inc.',
             symbol: 'MSFT'
           },
+          date: new Date('2024-03-14'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 1,
           type: 'SELL',
           unitPriceInAssetProfileCurrency: 411
         }

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,33 +85,33 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2021-09-16'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 19,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 19,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Microsoft Inc.',
             symbol: 'MSFT'
           },
+          date: new Date('2021-09-16'),
+          feeInAssetProfileCurrency: 19,
+          feeInBaseCurrency: 19,
+          quantity: 1,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 298.58
         },
         {
           ...activityDummyData,
-          date: new Date('2021-11-16'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'YAHOO',
             name: 'Microsoft Inc.',
             symbol: 'MSFT'
           },
+          date: new Date('2021-11-16'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 1,
           type: 'DIVIDEND',
           unitPriceInAssetProfileCurrency: 0.62
         }

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

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -99,16 +99,16 @@ describe('PortfolioCalculator', () => {
         (activity) => ({
           ...activityDummyData,
           ...activity,
-          date: parseDate(activity.date),
+          assetProfile: {
-          feeInAssetProfileCurrency: activity.fee,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: activity.fee,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: activity.currency,
             dataSource: activity.dataSource,
             name: 'Novartis AG',
             symbol: activity.symbol
           },
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: activity.fee,
+          feeInBaseCurrency: activity.fee,
           unitPriceInAssetProfileCurrency: activity.unitPrice
         })
       );

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

@@ -1,7 +1,7 @@
 import {
   activityDummyData,
+  assetProfileDummyData,
   loadExportFile,
-  symbolProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -99,16 +99,16 @@ describe('PortfolioCalculator', () => {
         (activity) => ({
           ...activityDummyData,
           ...activity,
-          date: parseDate(activity.date),
+          assetProfile: {
-          feeInAssetProfileCurrency: activity.fee,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: activity.fee,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: activity.currency,
             dataSource: activity.dataSource,
             name: 'Novartis AG',
             symbol: activity.symbol
           },
+          date: parseDate(activity.date),
+          feeInAssetProfileCurrency: activity.fee,
+          feeInBaseCurrency: activity.fee,
           unitPriceInAssetProfileCurrency: activity.unitPrice
         })
       );

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

@@ -1,6 +1,6 @@
 import {
   activityDummyData,
-  symbolProfileDummyData,
+  assetProfileDummyData,
   userDummyData
 } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
 import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
@@ -85,17 +85,17 @@ describe('PortfolioCalculator', () => {
       const activities: Activity[] = [
         {
           ...activityDummyData,
-          date: new Date('2022-01-01'),
+          assetProfile: {
-          feeInAssetProfileCurrency: 0,
+            ...assetProfileDummyData,
-          feeInBaseCurrency: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
             currency: 'USD',
             dataSource: 'MANUAL',
             name: 'Penthouse Apartment',
             symbol: 'dac95060-d4f2-4653-a253-2c45e6fb5cde'
           },
+          date: new Date('2022-01-01'),
+          feeInAssetProfileCurrency: 0,
+          feeInBaseCurrency: 0,
+          quantity: 1,
           type: 'BUY',
           unitPriceInAssetProfileCurrency: 500000
         }

apps/api/src/app/portfolio/interfaces/portfolio-order.interface.ts

@@ -2,7 +2,7 @@ import { Activity } from '@ghostfolio/common/interfaces';
 
 export interface PortfolioOrder extends Pick<Activity, 'tags' | 'type'> {
   assetProfile: Pick<
-    Activity['SymbolProfile'],
+    Activity['assetProfile'],
     'assetSubClass' | 'currency' | 'dataSource' | 'name' | 'symbol' | 'userId'
   >;
   date: string;

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

@@ -373,15 +373,15 @@ describe('PortfolioService', () => {
           {
             account,
             accountId: account.id,
+            assetProfile: { symbol: 'AAPL' },
             quantity: 1,
-            SymbolProfile: { symbol: 'AAPL' },
             type: 'BUY'
           },
           {
             account: null,
             accountId: null,
+            assetProfile: { symbol: 'BABA' },
             quantity: 2,
-            SymbolProfile: { symbol: 'BABA' },
             type: 'BUY'
           }
         ],
@@ -409,8 +409,8 @@ describe('PortfolioService', () => {
           {
             account,
             accountId: account.id,
+            assetProfile: { symbol: 'AAPL' },
             quantity: 1,
-            SymbolProfile: { symbol: 'AAPL' },
             type: 'BUY'
           }
         ],

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

@@ -829,10 +829,9 @@ export class PortfolioService {
       timeWeightedInvestmentWithCurrencyEffect
     } = holding;
 
-    const activitiesOfHolding = activities.filter(({ SymbolProfile }) => {
+    const activitiesOfHolding = activities.filter(({ assetProfile }) => {
       return (
-        SymbolProfile.dataSource === dataSource &&
+        assetProfile.dataSource === dataSource && assetProfile.symbol === symbol
-        SymbolProfile.symbol === symbol
       );
     });
 
@@ -2056,11 +2055,11 @@ export class PortfolioService {
         .filter(({ isDraft, type }) => {
           return isDraft === false && type === activityType;
         })
-        .map(({ currency, quantity, SymbolProfile, unitPrice }) => {
+        .map(({ assetProfile, currency, quantity, unitPrice }) => {
           return new Big(
             this.exchangeRateDataService.toCurrency(
               new Big(quantity).mul(unitPrice).toNumber(),
-              currency ?? SymbolProfile.currency,
+              currency ?? assetProfile.currency,
               userCurrency
             )
           );
@@ -2198,16 +2197,11 @@ export class PortfolioService {
         }
       }
 
-      for (const {
+      for (const { account, assetProfile, quantity, type } of ordersByAccount) {
-        account,
-        quantity,
-        SymbolProfile,
-        type
-      } of ordersByAccount) {
         const currentValueOfSymbolInBaseCurrency =
           getFactor(type) *
           quantity *
-          (portfolioItemsNow[SymbolProfile.symbol]?.marketPriceInBaseCurrency ??
+          (portfolioItemsNow[assetProfile.symbol]?.marketPriceInBaseCurrency ??
             0);
 
         if (accounts[account?.id || UNKNOWN_KEY]?.valueInBaseCurrency) {

apps/api/src/interceptors/transform-data-source-in-response/transform-data-source-in-response.interceptor.ts

@@ -78,8 +78,12 @@ export class TransformDataSourceInResponseInterceptor<
             valueMap,
             object: data,
             paths: [
+              'activities[*].assetProfile.dataSource',
               'activities[*].dataSource',
+
+              /* @deprecated */
               'activities[*].SymbolProfile.dataSource',
+
               'assetProfile.dataSource',
               'benchmarks[*].dataSource',
               'errors[*].dataSource',
@@ -88,7 +92,10 @@ export class TransformDataSourceInResponseInterceptor<
               'holdings[*].assetProfile.dataSource',
               'holdings[*].dataSource',
               'items[*].dataSource',
+
+              /* @deprecated */
               'SymbolProfile.dataSource',
+
               'watchlist[*].dataSource'
             ]
           });

apps/client/src/app/pages/portfolio/activities/activities-page.component.ts

@@ -409,10 +409,10 @@ export class GfActivitiesPageComponent implements OnInit {
             activity: {
               ...aActivity,
               accountId: aActivity?.accountId,
+              assetProfile: null,
               date: new Date(),
               id: null,
               fee: 0,
-              SymbolProfile: null,
               type: aActivity?.type ?? 'BUY',
               unitPrice: null
             },

apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/create-or-update-activity-dialog.component.ts

@@ -119,7 +119,7 @@ export class GfCreateOrUpdateActivityDialogComponent {
   }
 
   public ngOnInit() {
-    this.currencyOfAssetProfile = this.data.activity?.SymbolProfile?.currency;
+    this.currencyOfAssetProfile = this.data.activity?.assetProfile?.currency;
     this.hasPermissionToCreateOwnTag =
       this.data.user?.settings?.isExperimentalFeatures &&
       hasPermission(this.data.user?.permissions, permissions.createOwnTag);
@@ -185,31 +185,31 @@ export class GfCreateOrUpdateActivityDialogComponent {
           ? this.data.accounts[0].id
           : this.data.activity?.accountId
       ],
-      assetClass: [this.data.activity?.SymbolProfile?.assetClass],
+      assetClass: [this.data.activity?.assetProfile?.assetClass],
-      assetSubClass: [this.data.activity?.SymbolProfile?.assetSubClass],
+      assetSubClass: [this.data.activity?.assetProfile?.assetSubClass],
       comment: [this.data.activity?.comment],
       currency: [
-        this.data.activity?.SymbolProfile?.currency,
+        this.data.activity?.assetProfile?.currency,
         Validators.required
       ],
       currencyOfUnitPrice: [
         this.data.activity?.currency ??
-          this.data.activity?.SymbolProfile?.currency,
+          this.data.activity?.assetProfile?.currency,
         Validators.required
       ],
       dataSource: [
-        this.data.activity?.SymbolProfile?.dataSource,
+        this.data.activity?.assetProfile?.dataSource,
         Validators.required
       ],
       date: [this.data.activity?.date, Validators.required],
       fee: [this.data.activity?.fee, Validators.required],
-      name: [this.data.activity?.SymbolProfile?.name, Validators.required],
+      name: [this.data.activity?.assetProfile?.name, Validators.required],
       quantity: [this.data.activity?.quantity, Validators.required],
       searchSymbol: [
-        this.data.activity?.SymbolProfile
+        this.data.activity?.assetProfile
           ? {
-              dataSource: this.data.activity?.SymbolProfile?.dataSource,
+              dataSource: this.data.activity?.assetProfile?.dataSource,
-              symbol: this.data.activity?.SymbolProfile?.symbol
+              symbol: this.data.activity?.assetProfile?.symbol
             }
           : null,
         Validators.required
@@ -310,7 +310,7 @@ export class GfCreateOrUpdateActivityDialogComponent {
 
     this.activityForm.get('searchSymbol')?.valueChanges.subscribe(() => {
       if (this.activityForm.get('searchSymbol')?.invalid) {
-        this.data.activity.SymbolProfile = null;
+        this.data.activity.assetProfile = null;
       } else if (
         ['BUY', 'DIVIDEND', 'SELL'].includes(
           this.activityForm.get('type')?.value
@@ -454,11 +454,11 @@ export class GfCreateOrUpdateActivityDialogComponent {
       this.activityForm.get('type')?.disable();
     }
 
-    if (this.data.activity?.SymbolProfile?.symbol) {
+    if (this.data.activity?.assetProfile?.symbol) {
       this.dataService
         .fetchSymbolItem({
-          dataSource: this.data.activity?.SymbolProfile?.dataSource,
+          dataSource: this.data.activity?.assetProfile?.dataSource,
-          symbol: this.data.activity?.SymbolProfile?.symbol
+          symbol: this.data.activity?.assetProfile?.symbol
         })
         .pipe(takeUntilDestroyed(this.destroyRef))
         .subscribe(({ marketPrice }) => {
@@ -569,7 +569,7 @@ export class GfCreateOrUpdateActivityDialogComponent {
       })
       .pipe(
         catchError(() => {
-          this.data.activity.SymbolProfile = null;
+          this.data.activity.assetProfile = null;
 
           this.isLoading = false;
 

apps/client/src/app/pages/portfolio/activities/create-or-update-activity-dialog/interfaces/interfaces.ts

@@ -4,9 +4,9 @@ import { Account } from '@prisma/client';
 
 export interface CreateOrUpdateActivityDialogParams {
   accounts: Account[];
-  activity: Partial<Omit<Activity, 'id' | 'SymbolProfile' | 'unitPrice'>> & {
+  activity: Partial<Omit<Activity, 'assetProfile' | 'id' | 'unitPrice'>> & {
+    assetProfile: Activity['assetProfile'] | null;
     id: string | null;
-    SymbolProfile: Activity['SymbolProfile'] | null;
     unitPrice: number | null;
   };
   user: User;

apps/client/src/app/services/import-activities.service.ts

@@ -165,12 +165,12 @@ export class ImportActivitiesService {
 
   private convertToCreateOrderDto({
     accountId,
+    assetProfile,
     comment,
     currency,
     date,
     fee,
     quantity,
-    SymbolProfile,
     tags,
     type,
     unitPrice,
@@ -184,10 +184,10 @@ export class ImportActivitiesService {
       updateAccountBalance,
       accountId: accountId ?? undefined,
       comment: comment ?? undefined,
-      currency: currency ?? SymbolProfile.currency ?? '',
+      currency: currency ?? assetProfile.currency ?? '',
-      dataSource: SymbolProfile.dataSource,
+      dataSource: assetProfile.dataSource,
       date: date.toString(),
-      symbol: SymbolProfile.symbol,
+      symbol: assetProfile.symbol,
       tags: tags?.map(({ id }) => {
         return id;
       })

libs/common/src/lib/config.ts

@@ -106,13 +106,20 @@ export const DEFAULT_REDACTED_PATHS = [
   'accounts[*].valueInBaseCurrency',
   'activities[*].account.balance',
   'activities[*].account.comment',
+  'activities[*].assetProfile.symbolMapping',
+  'activities[*].assetProfile.watchedByCount',
   'activities[*].comment',
   'activities[*].fee',
   'activities[*].feeInAssetProfileCurrency',
   'activities[*].feeInBaseCurrency',
   'activities[*].quantity',
+
+  /* @deprecated */
   'activities[*].SymbolProfile.symbolMapping',
+
+  /* @deprecated */
   'activities[*].SymbolProfile.watchedByCount',
+
   'activities[*].value',
   'activities[*].valueInBaseCurrency',
   'balance',
@@ -143,8 +150,13 @@ export const DEFAULT_REDACTED_PATHS = [
   'platforms[*].balance',
   'platforms[*].valueInBaseCurrency',
   'quantity',
+
+  /* @deprecated */
   'SymbolProfile.symbolMapping',
+
+  /* @deprecated */
   'SymbolProfile.watchedByCount',
+
   'totalBalanceInBaseCurrency',
   'totalDividendInBaseCurrency',
   'totalInterestInBaseCurrency',

libs/common/src/lib/interfaces/activities.interface.ts

@@ -5,10 +5,16 @@ import { Order, Tag } from '@prisma/client';
 
 export interface Activity extends Order {
   account?: AccountWithPlatform;
+  assetProfile: EnhancedSymbolProfile;
   error?: ActivityError;
   feeInAssetProfileCurrency: number;
   feeInBaseCurrency: number;
-  SymbolProfile: EnhancedSymbolProfile;
+
+  /**
+   * @deprecated Use `assetProfile` instead
+   */
+  SymbolProfile?: EnhancedSymbolProfile;
+
   tagIds?: string[];
   tags?: Tag[];
   unitPriceInAssetProfileCurrency: number;

libs/common/src/lib/interfaces/responses/public-portfolio-response.interface.ts

@@ -26,7 +26,13 @@ export interface PublicPortfolioResponse extends PublicPortfolioResponseV1 {
     Order,
     'currency' | 'date' | 'fee' | 'quantity' | 'type' | 'unitPrice'
   > & {
+    assetProfile?: EnhancedSymbolProfile;
+
+    /**
+     * @deprecated Use `assetProfile` instead
+     */
     SymbolProfile?: EnhancedSymbolProfile;
+
     value: number;
     valueInBaseCurrency: number;
   })[];

libs/ui/src/lib/activities-table/activities-table.component.html

@@ -149,9 +149,9 @@
       <th *matHeaderCellDef class="px-1" mat-header-cell></th>
       <td *matCellDef="let element" class="px-1 text-center" mat-cell>
         <gf-entity-logo
-          [dataSource]="element.SymbolProfile?.dataSource"
+          [dataSource]="element.assetProfile?.dataSource"
-          [symbol]="element.SymbolProfile?.symbol"
+          [symbol]="element.assetProfile?.symbol"
-          [tooltip]="element.SymbolProfile?.name"
+          [tooltip]="element.assetProfile?.name"
         />
       </td>
     </ng-container>
@@ -162,18 +162,18 @@
       </th>
       <td *matCellDef="let element" class="px-1" mat-cell>
         <div class="align-items-center d-flex line-height-1 text-nowrap">
-          <span class="text-truncate">{{ element.SymbolProfile?.name }}</span>
+          <span class="text-truncate">{{ element.assetProfile?.name }}</span>
           @if (element.isDraft) {
             <span class="badge badge-secondary ml-1" i18n>Draft</span>
           }
         </div>
         @if (
-          element.SymbolProfile?.dataSource !== 'MANUAL' &&
+          element.assetProfile?.dataSource !== 'MANUAL' &&
-          !isUUID(element.SymbolProfile?.symbol)
+          !isUUID(element.assetProfile?.symbol)
         ) {
           <div>
             <small class="text-muted">{{
-              element.SymbolProfile?.symbol | gfSymbol
+              element.assetProfile?.symbol | gfSymbol
             }}</small>
           </div>
         }
@@ -309,7 +309,7 @@
         class="d-none d-lg-table-cell px-1"
         mat-cell
       >
-        {{ element.currency ?? element.SymbolProfile?.currency }}
+        {{ element.currency ?? element.assetProfile?.currency }}
       </td>
     </ng-container>
 

libs/ui/src/lib/activities-table/activities-table.component.stories.ts

@@ -56,7 +56,7 @@ const activities: Activity[] = [
         url: 'https://interactivebrokers.com'
       }
     },
-    SymbolProfile: {
+    assetProfile: {
       assetClass: 'EQUITY',
       assetSubClass: 'ETF',
       comment: undefined,
@@ -123,7 +123,7 @@ const activities: Activity[] = [
         url: 'https://interactivebrokers.com'
       }
     },
-    SymbolProfile: {
+    assetProfile: {
       assetClass: 'EQUITY',
       assetSubClass: 'ETF',
       comment: undefined,
@@ -190,7 +190,7 @@ const activities: Activity[] = [
         url: 'https://interactivebrokers.com'
       }
     },
-    SymbolProfile: {
+    assetProfile: {
       assetClass: 'LIQUIDITY',
       assetSubClass: 'CRYPTOCURRENCY',
       comment: undefined,
@@ -257,7 +257,7 @@ const activities: Activity[] = [
         url: 'https://interactivebrokers.com'
       }
     },
-    SymbolProfile: {
+    assetProfile: {
       assetClass: 'FIXED_INCOME',
       assetSubClass: 'BOND',
       comment: 'No data',
@@ -324,7 +324,7 @@ const activities: Activity[] = [
         url: 'https://interactivebrokers.com'
       }
     },
-    SymbolProfile: {
+    assetProfile: {
       assetClass: 'EQUITY',
       assetSubClass: 'ETF',
       comment: undefined,

libs/ui/src/lib/activities-table/activities-table.component.ts

@@ -285,8 +285,8 @@ export class GfActivitiesTableComponent implements AfterViewInit, OnInit {
       }
     } else if (this.canClickActivity(activity)) {
       this.activityClicked.emit({
-        dataSource: activity.SymbolProfile.dataSource,
+        dataSource: activity.assetProfile.dataSource,
-        symbol: activity.SymbolProfile.symbol
+        symbol: activity.assetProfile.symbol
       });
     }
   }