From 0b28da879b234bc8bb4c360857fc340e67e9339b Mon Sep 17 00:00:00 2001
From: Vansh <140736931+Vansh-Parate@users.noreply.github.com>
Date: Thu, 23 Oct 2025 23:49:59 +0530
Subject: [PATCH] Task/extend export response by performanceCalculationType
 (#5816)

* Extend export response by performanceCalculationType

* Update changelog
---
 CHANGELOG.md                                  |  4 ++++
 apps/api/src/app/export/export.controller.ts  |  4 ++--
 apps/api/src/app/export/export.service.ts     | 19 +++++++++++++------
 .../responses/export-response.interface.ts    |  8 +++++++-
 4 files changed, 26 insertions(+), 9 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d46c1d3c1..c249cd7d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Added
+
+- Extended the export functionality by the user account’s performance calculation type
+
 ### Changed
 
 - Localized the number formatting in the static portfolio analysis rule: _Liquidity_ (Buying Power)
diff --git a/apps/api/src/app/export/export.controller.ts b/apps/api/src/app/export/export.controller.ts
index 0b4a2c6e0..5446f8789 100644
--- a/apps/api/src/app/export/export.controller.ts
+++ b/apps/api/src/app/export/export.controller.ts
@@ -48,8 +48,8 @@ export class ExportController {
     return this.exportService.export({
       activityIds,
       filters,
-      userCurrency: this.request.user.settings.settings.baseCurrency,
-      userId: this.request.user.id
+      userId: this.request.user.id,
+      userSettings: this.request.user.settings.settings
     });
   }
 }
diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.ts
index 2001fd3e2..d07b199be 100644
--- a/apps/api/src/app/export/export.service.ts
+++ b/apps/api/src/app/export/export.service.ts
@@ -3,7 +3,11 @@ import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { environment } from '@ghostfolio/api/environments/environment';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
-import { ExportResponse, Filter } from '@ghostfolio/common/interfaces';
+import {
+  ExportResponse,
+  Filter,
+  UserSettings
+} from '@ghostfolio/common/interfaces';
 
 import { Injectable } from '@nestjs/common';
 import { Platform, Prisma } from '@prisma/client';
@@ -21,13 +25,13 @@ export class ExportService {
   public async export({
     activityIds,
     filters,
-    userCurrency,
-    userId
+    userId,
+    userSettings
   }: {
     activityIds?: string[];
     filters?: Filter[];
-    userCurrency: string;
     userId: string;
+    userSettings: UserSettings;
   }): Promise<ExportResponse> {
     const { ACCOUNT: filtersByAccount } = groupBy(filters, ({ type }) => {
       return type;
@@ -36,11 +40,11 @@ export class ExportService {
 
     let { activities } = await this.orderService.getOrders({
       filters,
-      userCurrency,
       userId,
       includeDrafts: true,
       sortColumn: 'date',
       sortDirection: 'asc',
+      userCurrency: userSettings?.baseCurrency,
       withExcludedAccountsAndActivities: true
     });
 
@@ -244,7 +248,10 @@ export class ExportService {
         }
       ),
       user: {
-        settings: { currency: userCurrency }
+        settings: {
+          currency: userSettings?.baseCurrency,
+          performanceCalculationType: userSettings?.performanceCalculationType
+        }
       }
     };
   }
diff --git a/libs/common/src/lib/interfaces/responses/export-response.interface.ts b/libs/common/src/lib/interfaces/responses/export-response.interface.ts
index a5416e886..8b1697ca4 100644
--- a/libs/common/src/lib/interfaces/responses/export-response.interface.ts
+++ b/libs/common/src/lib/interfaces/responses/export-response.interface.ts
@@ -9,6 +9,7 @@ import {
 
 import { AccountBalance } from '../account-balance.interface';
 import { MarketData } from '../market-data.interface';
+import { UserSettings } from '../user-settings.interface';
 
 export interface ExportResponse {
   accounts: (Omit<Account, 'createdAt' | 'updatedAt' | 'userId'> & {
@@ -36,5 +37,10 @@ export interface ExportResponse {
   };
   platforms: Platform[];
   tags: Omit<Tag, 'userId'>[];
-  user: { settings: { currency: string } };
+  user: {
+    settings: {
+      currency: UserSettings['baseCurrency'];
+      performanceCalculationType: UserSettings['performanceCalculationType'];
+    };
+  };
 }