Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍
TypeScript angularetffinancefintechghostfoliohacktoberfestinvestingnestjsosspersonal-financeportfolioprismasoftwarestocktrackertradingtypescriptwealth-managementweb
Task/refactor Export interface to ExportResponse interface (#5805)
Ani07-057ee38d0067e7
diff --git a/apps/api/src/app/export/export.controller.ts b/apps/api/src/app/export/export.controller.tsindex 8fa2baa43d..0b4a2c6e05 100644--- a/apps/api/src/app/export/export.controller.ts+++ b/apps/api/src/app/export/export.controller.ts@@ -1,7 +1,7 @@import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request/transform-data-source-in-request.interceptor';import { ApiService } from '@ghostfolio/api/services/api/api.service';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import type { RequestWithUser } from '@ghostfolio/common/types';import {@@ -35,7 +35,7 @@ export class ExportController {@Query('dataSource') filterByDataSource?: string,@Query('symbol') filterBySymbol?: string,@Query('tags') filterByTags?: string- ): Promise<Export> {+ ): Promise<ExportResponse> {const activityIds = filterByActivityIds?.split(',') ?? [];const filters = this.apiService.buildFiltersFromQueryParams({filterByAccounts,diff --git a/apps/api/src/app/export/export.service.ts b/apps/api/src/app/export/export.service.tsindex 7d78bdf225..2001fd3e2b 100644--- a/apps/api/src/app/export/export.service.ts+++ b/apps/api/src/app/export/export.service.ts@@ -3,7 +3,7 @@ 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 { Filter, Export } from '@ghostfolio/common/interfaces';+import { ExportResponse, Filter } from '@ghostfolio/common/interfaces';import { Injectable } from '@nestjs/common';import { Platform, Prisma } from '@prisma/client';@@ -28,7 +28,7 @@ export class ExportService {filters?: Filter[];userCurrency: string;userId: string;- }): Promise<Export> {+ }): Promise<ExportResponse> {const { ACCOUNT: filtersByAccount } = groupBy(filters, ({ type }) => {return type;});diff --git a/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts b/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.tsindex ccdbafac8f..f4c99916fd 100644--- a/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts+++ b/apps/api/src/app/portfolio/calculator/portfolio-calculator-test-utils.ts@@ -1,4 +1,4 @@-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { readFileSync } from 'node:fs';@@ -39,6 +39,6 @@ export const userDummyData = {id: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx'};-export function loadExportFile(filePath: string): Export {+export function loadExportFile(filePath: string): ExportResponse {return JSON.parse(readFileSync(filePath, 'utf8'));}diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.tsindex 1ac0dcd160..ca9e5b0d5f 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btceur.spec.ts@@ -15,7 +15,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';import { parseDate } from '@ghostfolio/common/helper';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';import { Big } from 'big.js';@@ -52,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {});describe('PortfolioCalculator', () => {- let exportResponse: Export;+ let exportResponse: ExportResponse;let configurationService: ConfigurationService;let currentRateService: CurrentRateService;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.tsindex 29413c6adb..3e67389dde 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd-short.spec.ts@@ -15,7 +15,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';import { parseDate } from '@ghostfolio/common/helper';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';import { Big } from 'big.js';@@ -52,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {});describe('PortfolioCalculator', () => {- let exportResponse: Export;+ let exportResponse: ExportResponse;let configurationService: ConfigurationService;let currentRateService: CurrentRateService;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.tsindex 26b3325c2a..f08083554c 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-btcusd.spec.ts@@ -15,7 +15,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';import { parseDate } from '@ghostfolio/common/helper';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';import { Big } from 'big.js';@@ -52,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {});describe('PortfolioCalculator', () => {- let exportResponse: Export;+ let exportResponse: ExportResponse;let configurationService: ConfigurationService;let currentRateService: CurrentRateService;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.tsindex 0f1cdfff72..4678dbd5ea 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell-partially.spec.ts@@ -15,7 +15,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';import { parseDate } from '@ghostfolio/common/helper';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';import { Big } from 'big.js';@@ -52,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {});describe('PortfolioCalculator', () => {- let exportResponse: Export;+ let exportResponse: ExportResponse;let configurationService: ConfigurationService;let currentRateService: CurrentRateService;diff --git a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.tsindex e426a68fac..c4ccab7ada 100644--- a/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts+++ b/apps/api/src/app/portfolio/calculator/roai/portfolio-calculator-novn-buy-and-sell.spec.ts@@ -15,7 +15,7 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-import { PortfolioSnapshotService } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service';import { PortfolioSnapshotServiceMock } from '@ghostfolio/api/services/queues/portfolio-snapshot/portfolio-snapshot.service.mock';import { parseDate } from '@ghostfolio/common/helper';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type';import { Big } from 'big.js';@@ -52,7 +52,7 @@ jest.mock('@ghostfolio/api/app/redis-cache/redis-cache.service', () => {});describe('PortfolioCalculator', () => {- let exportResponse: Export;+ let exportResponse: ExportResponse;let configurationService: ConfigurationService;let currentRateService: CurrentRateService;diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.tsindex 66d84c09d6..d6d582c56e 100644--- a/apps/client/src/app/services/data.service.ts+++ b/apps/client/src/app/services/data.service.ts@@ -34,7 +34,7 @@ import {BenchmarkMarketDataDetailsResponse,BenchmarkResponse,DataProviderHealthResponse,- Export,+ ExportResponse,Filter,ImportResponse,InfoItem,@@ -407,7 +407,7 @@ export class DataService {params = params.append('activityIds', activityIds.join(','));}- return this.http.get<Export>('/api/v1/export', {+ return this.http.get<ExportResponse>('/api/v1/export', {params});}diff --git a/apps/client/src/app/services/ics/ics.service.ts b/apps/client/src/app/services/ics/ics.service.tsindex b94b2dee3f..a3235380ed 100644--- a/apps/client/src/app/services/ics/ics.service.ts+++ b/apps/client/src/app/services/ics/ics.service.ts@@ -1,5 +1,5 @@import { capitalize } from '@ghostfolio/common/helper';-import { Export } from '@ghostfolio/common/interfaces';+import { ExportResponse } from '@ghostfolio/common/interfaces';import { Injectable } from '@angular/core';import { Type } from '@prisma/client';@@ -13,7 +13,7 @@ export class IcsService {private readonly ICS_LINE_BREAK = '\r\n';public transformActivitiesToIcsContent(- aActivities: Export['activities']+ aActivities: ExportResponse['activities']): string {const header = ['BEGIN:VCALENDAR',diff --git a/libs/common/src/lib/interfaces/index.ts b/libs/common/src/lib/interfaces/index.tsindex 854c53df0b..6c8754ea99 100644--- a/libs/common/src/lib/interfaces/index.ts+++ b/libs/common/src/lib/interfaces/index.ts@@ -15,7 +15,6 @@ import type { Benchmark } from './benchmark.interface';import type { Coupon } from './coupon.interface';import type { DataProviderInfo } from './data-provider-info.interface';import type { EnhancedSymbolProfile } from './enhanced-symbol-profile.interface';-import type { Export } from './export.interface';import type { FilterGroup } from './filter-group.interface';import type { Filter } from './filter.interface';import type { FireWealth } from './fire-wealth.interface';@@ -49,6 +48,7 @@ import type { DataProviderGhostfolioStatusResponse } from './responses/data-provimport type { DataProviderHealthResponse } from './responses/data-provider-health-response.interface';import type { DividendsResponse } from './responses/dividends-response.interface';import type { ResponseError } from './responses/errors.interface';+import type { ExportResponse } from './responses/export-response.interface';import type { HistoricalResponse } from './responses/historical-response.interface';import type { ImportResponse } from './responses/import-response.interface';import type { InfoResponse } from './responses/info-response.interface';@@ -105,7 +105,7 @@ export {DataProviderInfo,DividendsResponse,EnhancedSymbolProfile,- Export,+ ExportResponse,Filter,FilterGroup,FireWealth,diff --git a/libs/common/src/lib/interfaces/export.interface.ts b/libs/common/src/lib/interfaces/responses/export-response.interface.tssimilarity index 82%rename from libs/common/src/lib/interfaces/export.interface.tsrename to libs/common/src/lib/interfaces/responses/export-response.interface.tsindex 16a49b0ef0..a5416e8868 100644--- a/libs/common/src/lib/interfaces/export.interface.ts+++ b/libs/common/src/lib/interfaces/responses/export-response.interface.ts@@ -7,10 +7,10 @@ import {Tag} from '@prisma/client';-import { AccountBalance } from './account-balance.interface';-import { MarketData } from './market-data.interface';+import { AccountBalance } from '../account-balance.interface';+import { MarketData } from '../market-data.interface';-export interface Export {+export interface ExportResponse {accounts: (Omit<Account, 'createdAt' | 'updatedAt' | 'userId'> & {balances: AccountBalance[];})[];