Merge branch 'main' of github.com:ghostfolio/ghostfolio

CHANGELOG.md

@@ -5,10 +5,11 @@ 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
+## 2.145.0 - 2025-03-09
 
 ### Added
 
+- Extended the export functionality by the account balances
 - Added a _Copy portfolio data to clipboard for AI prompt_ action to the analysis page (experimental)
 
 ### Changed
@@ -17,6 +18,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Improved the language localization for German (`de`)
 - Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `9.0` to `13.1`
 
+### Fixed
+
+- Fixed an issue to get dividends in the _Financial Modeling Prep_ service
+- Fixed an issue to get historical market data in the _Financial Modeling Prep_ service
+- Fixed an issue with serving _Storybook_
+
 ## 2.144.0 - 2025-03-06
 
 ### Fixed

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

@@ -7,7 +7,13 @@ import { Filter } from '@ghostfolio/common/interfaces';
 
 import { Injectable } from '@nestjs/common';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { Account, Order, Platform, Prisma } from '@prisma/client';
+import {
+  Account,
+  AccountBalance,
+  Order,
+  Platform,
+  Prisma
+} from '@prisma/client';
 import { Big } from 'big.js';
 import { format } from 'date-fns';
 import { groupBy } from 'lodash';
@@ -56,13 +62,19 @@ export class AccountService {
     orderBy?: Prisma.AccountOrderByWithRelationInput;
   }): Promise<
     (Account & {
+      balances?: AccountBalance[];
       Order?: Order[];
       Platform?: Platform;
     })[]
   > {
     const { include = {}, skip, take, cursor, where, orderBy } = params;
 
-    include.balances = { orderBy: { date: 'desc' }, take: 1 };
+    const isBalancesIncluded = !!include.balances;
+
+    include.balances = {
+      orderBy: { date: 'desc' },
+      ...(isBalancesIncluded ? {} : { take: 1 })
+    };
 
     const accounts = await this.prismaService.account.findMany({
       cursor,
@@ -76,7 +88,9 @@ export class AccountService {
     return accounts.map((account) => {
       account = { ...account, balance: account.balances[0]?.value ?? 0 };
 
-      delete account.balances;
+      if (!isBalancesIncluded) {
+        delete account.balances;
+      }
 
       return account;
     });

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

@@ -31,6 +31,7 @@ export class ExportService {
     const accounts = (
       await this.accountService.accounts({
         include: {
+          balances: true,
           Platform: true
         },
         orderBy: {
@@ -41,6 +42,7 @@ export class ExportService {
     ).map(
       ({
         balance,
+        balances,
         comment,
         currency,
         id,
@@ -55,6 +57,9 @@ export class ExportService {
 
         return {
           balance,
+          balances: balances.map(({ date, value }) => {
+            return { date: date.toISOString(), value };
+          }),
           comment,
           currency,
           id,

apps/api/src/middlewares/html-template.middleware.ts

@@ -129,6 +129,7 @@ export const HtmlTemplateMiddleware = async (
 
   if (
     path.startsWith('/api/') ||
+    path.startsWith('/development/storybook') ||
     isFileRequest(path) ||
     !environment.production
   ) {

apps/api/src/services/data-provider/financial-modeling-prep/financial-modeling-prep.service.ts

@@ -244,7 +244,7 @@ export class FinancialModelingPrepService implements DataProviderInterface {
         [date: string]: IDataProviderHistoricalResponse;
       } = {};
 
-      const { historical } = await fetch(
+      const { historical = [] } = await fetch(
         `${this.URL}/historical-price-full/stock_dividend/${symbol}?apikey=${this.apiKey}`,
         {
           signal: AbortSignal.timeout(requestTimeout)
@@ -305,7 +305,7 @@ export class FinancialModelingPrepService implements DataProviderInterface {
           ? addYears(currentFrom, MAX_YEARS_PER_REQUEST)
           : to;
 
-        const { historical } = await fetch(
+        const { historical = [] } = await fetch(
           `${this.URL}/historical-price-full/${symbol}?apikey=${this.apiKey}&from=${format(currentFrom, DATE_FORMAT)}&to=${format(currentTo, DATE_FORMAT)}`,
           {
             signal: AbortSignal.timeout(requestTimeout)

apps/client/src/app/pages/api/api-page.component.ts

@@ -40,8 +40,8 @@ export class GfApiPageComponent implements OnInit {
     this.apiKey = prompt($localize`Please enter your Ghostfolio API key:`);
 
     this.dividends$ = this.fetchDividends({ symbol: 'KO' });
-    this.historicalData$ = this.fetchHistoricalData({ symbol: 'AAPL.US' });
-    this.quotes$ = this.fetchQuotes({ symbols: ['AAPL.US', 'VOO.US'] });
+    this.historicalData$ = this.fetchHistoricalData({ symbol: 'AAPL' });
+    this.quotes$ = this.fetchQuotes({ symbols: ['AAPL', 'VOO.US'] });
     this.status$ = this.fetchStatus();
     this.symbols$ = this.fetchSymbols({ query: 'apple' });
   }

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

@@ -1,7 +1,9 @@
 import { Account, Order, Platform, Tag } from '@prisma/client';
 
 export interface Export {
-  accounts: Omit<Account, 'createdAt' | 'updatedAt' | 'userId'>[];
+  accounts: (Omit<Account, 'createdAt' | 'updatedAt' | 'userId'> & {
+    balances: { date: string; value: number }[];
+  })[];
   activities: (Omit<
     Order,
     | 'accountUserId'

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "ghostfolio",
-  "version": "2.144.0",
+  "version": "2.145.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ghostfolio",
-      "version": "2.144.0",
+      "version": "2.145.0",
       "hasInstallScript": true,
       "license": "AGPL-3.0",
       "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghostfolio",
-  "version": "2.144.0",
+  "version": "2.145.0",
   "homepage": "https://ghostfol.io",
   "license": "AGPL-3.0",
   "repository": "https://github.com/ghostfolio/ghostfolio",