refator: requested changes

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

@@ -48,8 +48,8 @@ export class ExportController {
     return this.exportService.export({
       activityIds,
       filters,
-      userSettings: this.request.user.settings.settings,
+      userId: this.request.user.id,
-      userId: this.request.user.id
+      userSettings: this.request.user.settings.settings
     });
   }
 }

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

@@ -40,11 +40,11 @@ export class ExportService {
 
     let { activities } = await this.orderService.getOrders({
       filters,
-      userCurrency: userSettings?.baseCurrency,
       userId,
       includeDrafts: true,
       sortColumn: 'date',
       sortDirection: 'asc',
+      userCurrency: userSettings?.baseCurrency,
       withExcludedAccountsAndActivities: true
     });
 

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

@@ -7,9 +7,9 @@ import {
   Tag
 } from '@prisma/client';
 
-import { PerformanceCalculationType } from '../../types/performance-calculation-type.type';
 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'> & {
@@ -39,8 +39,8 @@ export interface ExportResponse {
   tags: Omit<Tag, 'userId'>[];
   user: {
     settings: {
-      currency: string;
+      currency: UserSettings['baseCurrency'];
-      performanceCalculationType: PerformanceCalculationType;
+      performanceCalculationType: UserSettings['performanceCalculationType'];
     };
   };
 }