Refactoring

.env.dev

@@ -1,25 +0,0 @@
-COMPOSE_PROJECT_NAME=ghostfolio-development
-
-# CACHE
-REDIS_HOST=localhost
-REDIS_PORT=6379
-REDIS_PASSWORD=<INSERT_REDIS_PASSWORD>
-
-# POSTGRES
-POSTGRES_DB=ghostfolio-db
-POSTGRES_USER=user
-POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
-
-# VARIOUS
-ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
-JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
-
-# DEVELOPMENT
-
-# Nx 18 enables using plugins to infer targets by default
-# This is disabled for existing workspaces to maintain compatibility
-# For more info, see: https://nx.dev/concepts/inferred-tasks
-NX_ADD_PLUGINS=false
-
-NX_NATIVE_COMMAND_RUNNER=false

.env.example

@@ -1,4 +1,4 @@
-COMPOSE_PROJECT_NAME=ghostfolio
+COMPOSE_PROJECT_NAME=ghostfolio-development
 
 # CACHE
 REDIS_HOST=localhost
@@ -10,7 +10,6 @@ POSTGRES_DB=ghostfolio-db
 POSTGRES_USER=user
 POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
 
-# VARIOUS
 ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
 DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?connect_timeout=300&sslmode=prefer
 JWT_SECRET_KEY=<INSERT_RANDOM_STRING>

.github/ISSUE_TEMPLATE/bug_report.md

@@ -6,13 +6,7 @@ labels: ''
 assignees: ''
 ---
 
-**Important Notice**
-
-The issue tracker is **ONLY** used for reporting bugs. New features should be discussed in our [Slack](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) community or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
-
-Incomplete or non-reproducible issues may be closed, but we are here to help! If you encounter difficulties reproducing the bug or need assistance, please reach out to our community channels mentioned above.
-
-Thank you for your understanding and cooperation!
+The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed in our [Slack](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) community or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
 
 **Bug Description**
 
@@ -42,9 +36,8 @@ Thank you for your understanding and cooperation!
 
 <!-- Please complete the following information -->
 
-- Ghostfolio Version X.Y.Z
 - Cloud or Self-hosted
-- Experimental Features enabled or disabled
+- Ghostfolio Version X.Y.Z
 - Browser
 - OS
 

.prettierignore

@@ -1,4 +1,3 @@
 /.nx/cache
-/apps/client/src/polyfills.ts
 /dist
 /test/import

.prettierrc

@@ -9,26 +9,7 @@
   ],
   "attributeSort": "ASC",
   "endOfLine": "auto",
-  "importOrder": ["^@ghostfolio/(.*)$", "<THIRD_PARTY_MODULES>", "^[./]"],
-  "importOrderSeparation": true,
-  "overrides": [
-    {
-      "files": "*.html",
-      "options": {
-        "parser": "angular"
-      }
-    },
-    {
-      "files": "*.ts",
-      "options": {
-        "importOrderParserPlugins": ["decorators-legacy", "typescript"]
-      }
-    }
-  ],
-  "plugins": [
-    "prettier-plugin-organize-attributes",
-    "@trivago/prettier-plugin-sort-imports"
-  ],
+  "plugins": ["prettier-plugin-organize-attributes"],
   "printWidth": 80,
   "singleQuote": true,
   "tabWidth": 2,

CHANGELOG.md

@@ -5,630 +5,12 @@ 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).
 
-## 2.72.0 - 2024-04-13
-
-### Added
-
-- Added support to immediately execute a queue job from the admin control panel
-- Added a priority column to the queue jobs view in the admin control panel
-
-### Changed
-
-- Adapted the priorities of queue jobs
-- Upgraded `angular` from version `17.2.4` to `17.3.3`
-- Upgraded `Nx` from version `18.1.2` to `18.2.3`
-- Upgraded `prisma` from version `5.11.0` to `5.12.1`
-- Upgraded `yahoo-finance2` from version `2.11.0` to `2.11.1`
-
-### Fixed
-
-- Fixed an issue in the public page
-
-## 2.71.0 - 2024-04-07
-
-### Added
-
-- Added the dividend yield to the position detail dialog (experimental)
-- Added support to override the asset class of an asset profile in the asset profile details dialog of the admin control
-- Added support to override the asset sub class of an asset profile in the asset profile details dialog of the admin control
-- Added support to override the url of an asset profile in the asset profile details dialog of the admin control
-- Added the asset profile icon to the asset profile details dialog of the admin control
-- Added the platform icon to the create or update platform dialog of the admin control
-- Extended the rules in the _X-ray_ section by a `key`
-- Added `currency` to the `Order` database schema as a preparation to set a custom currency
-- Extended the content of the _Self-Hosting_ section by the data providers on the Frequently Asked Questions (FAQ) page
-
-### Changed
-
-- Optimized the calculation of allocations by market
-- Improved the url validation in the create and update platform endpoint
-- Improved the language localization for German (`de`)
-
-### Fixed
-
-- Fixed the missing tags in the portfolio calculations
-
-## 2.70.0 - 2024-04-02
-
-### Added
-
-- Set up the language localization for Chinese (`zh`)
-- Added `init: true` to the `docker-compose` files (`docker-compose.yml` and `docker-compose.build.yml`) to avoid zombie processes
-- Set up _Webpack Bundle Analyzer_
-
-### Changed
-
-- Disabled the option to update the cash balance of an account if date is not today
-- Improved the usability of the date range support by specific years (`2023`, `2022`, `2021`, etc.) in the assistant (experimental)
-- Introduced a factory for the portfolio calculations to support different algorithms in future
-
-### Fixed
-
-- Fixed the duplicated tags in the position detail dialog
-- Removed `Tini` from the docker image
-
-## 2.69.0 - 2024-03-30
-
-### Added
-
-- Added the date range support in the activities table on the portfolio activities page (experimental)
-- Extended the date range support by specific years (`2021`, `2022`, `2023`, etc.) in the assistant (experimental)
-- Set up `Tini` to avoid zombie processes and perform signal forwarding in docker image
-
-### Changed
-
-- Improved the usability to delete an asset profile in the historical market data table and the asset profile details dialog of the admin control
-
-### Fixed
-
-- Added missing dates to edit historical market data in the asset profile details dialog of the admin control panel
-
-## 2.68.0 - 2024-03-29
-
-### Added
-
-- Extended the export functionality by the user account’s currency
-- Added support to override the name of an asset profile in the asset profile details dialog of the admin control
-
-### Changed
-
-- Optimized the portfolio calculations
-
-### Fixed
-
-- Fixed the chart tooltip of the benchmark comparator
-- Fixed an issue with names in the activities table on the portfolio activities page while using symbol profile overrides
-
-## 2.67.0 - 2024-03-26
-
-### Added
-
-- Added support for the cryptocurrency _Toncoin_ (`TON11419-USD`)
-
-### Changed
-
-- Replaced `Math.random()` with `crypto.randomBytes()` for generating cryptographically secure random strings
-- Upgraded `ionicons` from version `7.1.0` to `7.3.0`
-- Upgraded `yahoo-finance2` from version `2.10.0` to `2.11.0`
-- Upgraded `zone.js` from version `0.14.3` to `0.14.4`
-
-## 2.66.3 - 2024-03-23
-
-### Added
-
-- Extended the content of the _SaaS_ and _Self-Hosting_ sections by the backup strategy on the Frequently Asked Questions (FAQ) page
-- Added an index for `dataSource` / `symbol` to the market data database table
-
-### Changed
-
-- Improved the chart tooltip of the benchmark comparator by adding the benchmark name
-- Upgraded `angular` from version `17.1.3` to `17.2.4`
-- Upgraded `Nx` from version `18.0.4` to `18.1.2`
-
-### Fixed
-
-- Fixed the missing portfolio performance chart in the _Presenter View_ / _Zen Mode_
-
-## 2.65.0 - 2024-03-19
-
-### Added
-
-- Added the symbol and ISIN number to the position detail dialog
-- Added support to delete an asset profile in the asset profile details dialog of the admin control
-
-### Changed
-
-- Moved the support to grant private access with permissions from experimental to general availability
-- Set the meta theme color dynamically to respect the appearance (dark mode)
-- Improved the usability to edit market data in the admin control panel
-
-## 2.64.0 - 2024-03-16
-
-### Added
-
-- Added a toggle to switch between active and closed holdings on the portfolio holdings page
-- Added support to update the cash balance of an account when adding a fee activity
-- Added support to update the cash balance of an account when adding an interest activity
-- Extended the content of the _General_ section by the product roadmap on the Frequently Asked Questions (FAQ) page
-
-### Changed
-
-- Improved the usability of the platform management in the admin control panel
-- Improved the usability of the tag management in the admin control panel
-- Improved the exception handling of various rules in the _X-ray_ section
-- Increased the timeout to load benchmarks
-- Upgraded `prisma` from version `5.10.2` to `5.11.0`
-
-### Fixed
-
-- Fixed an issue in the dividend calculation of the portfolio holdings
-- Fixed the date conversion of the import of historical market data in the admin control panel
-
-## 2.63.2 - 2024-03-12
-
-### Added
-
-- Extended the content of the _Self-Hosting_ section by available home server systems on the Frequently Asked Questions (FAQ) page
-- Added support for the cryptocurrency _Real Smurf Cat_ (`SMURFCAT-USD`)
-
-### Changed
-
-- Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `8.3` to `9.0`
-- Upgraded `countries-list` from version `2.6.1` to `3.1.0`
-- Upgraded `yahoo-finance2` from version `2.9.1` to `2.10.0`
-
-### Fixed
-
-- Fixed an issue in the performance calculation caused by multiple `SELL` activities on the same day
-- Fixed an issue in the calculation on the allocations page caused by liabilities
-- Fixed an issue with the currency in the request to get quotes from _EOD Historical Data_
-
-## 2.62.0 - 2024-03-09
-
-### Changed
-
-- Optimized the calculation of the accounts table
-- Optimized the calculation of the portfolio holdings
-- Integrated dividend into the transaction point concept in the portfolio service
-- Removed the environment variable `WEB_AUTH_RP_ID`
-
-### Fixed
-
-- Fixed an issue in the calculation of the portfolio summary caused by future liabilities
-- Fixed an issue with removing a linked account from a (wealth) item activity
-
-## 2.61.1 - 2024-03-06
-
-### Fixed
-
-- Fixed an issue in the account value calculation caused by liabilities
-
-## 2.61.0 - 2024-03-04
-
-### Changed
-
-- Optimized the calculation of the portfolio summary
-
-### Fixed
-
-- Fixed the activities import (query parameter handling)
-
-## 2.60.0 - 2024-03-02
-
-### Added
-
-- Added support for the cryptocurrency _Uniswap_ (`UNI7083-USD`)
-
-### Changed
-
-- Improved the usability of the benchmarks in the markets overview
-- Integrated (wealth) items into the transaction point concept in the portfolio service
-- Refreshed the cryptocurrencies list
-
-### Fixed
-
-- Fixed a missing value in the activities table on mobile
-- Fixed a missing value on the public page
-- Displayed the button to fetch the current market price only if the activity is from today
-
-## 2.59.0 - 2024-02-29
-
-### Added
-
-- Added an index for `isExcluded` to the account database table
-- Extended the content of the _Self-Hosting_ section on the Frequently Asked Questions (FAQ) page
-
-### Changed
-
-- Improved the activities import by `isin` in the _Yahoo Finance_ service
-
-### Fixed
-
-- Fixed an issue with the exchange rate calculation of (wealth) items in accounts
-
-## 2.58.0 - 2024-02-27
-
-### Changed
-
-- Improved the handling of activities without account
-
-### Fixed
-
-- Fixed the query to filter activities of excluded accounts
-- Improved the asset profile validation in the activities import
-
-## 2.57.0 - 2024-02-25
-
-### Changed
-
-- Moved the break down of the performance into asset and currency on the analysis page from experimental to general availability
-- Restructured the `copy-assets` `Nx` target
-
-### Fixed
-
-- Changed the performances of the _Top 3_ and _Bottom 3_ performers on the analysis page to take the currency effects into account
-
-## 2.56.0 - 2024-02-24
-
-### Changed
-
-- Switched the performance calculations to take the currency effects into account
-- Removed the `isDefault` flag from the `Account` database schema
-- Exposed the database index of _Redis_ as an environment variable (`REDIS_DB`)
-- Improved the language localization for German (`de`)
-- Upgraded `prisma` from version `5.9.1` to `5.10.2`
-
-### Fixed
-
-- Added the missing default currency to the prepare currencies function in the exchange rate data service
-
-## 2.55.0 - 2024-02-22
-
-### Added
-
-- Added indexes for `alias`, `granteeUserId` and `userId` to the access database table
-- Added indexes for `currency`, `name` and `userId` to the account database table
-- Added indexes for `accountId`, `date` and `updatedAt` to the account balance database table
-- Added an index for `userId` to the auth device database table
-- Added indexes for `marketPrice` and `state` to the market data database table
-- Added indexes for `date`, `isDraft` and `userId` to the order database table
-- Added an index for `name` to the platform database table
-- Added indexes for `assetClass`, `currency`, `dataSource`, `isin`, `name` and `symbol` to the symbol profile database table
-- Added an index for `userId` to the subscription database table
-- Added an index for `name` to the tag database table
-- Added indexes for `accessToken`, `createdAt`, `provider`, `role` and `thirdPartyId` to the user database table
-
-### Changed
-
-- Improved the validation for `currency` in various endpoints
-- Harmonized the setting of a default locale in various components
-- Set the parser to `angular` in the `prettier` options
-
-## 2.54.0 - 2024-02-19
-
-### Added
-
-- Added an index for `id` to the account database table
-- Added indexes for `dataSource` and `date` to the market data database table
-- Added an index for `accountId` to the order database table
-
-## 2.53.1 - 2024-02-18
-
-### Added
-
-- Added an accounts tab to the position detail dialog
-- Added `INACTIVE` as a new user role
-
-### Changed
-
-- Improved the usability of the holdings table
-- Refactored the query to filter activities of excluded accounts
-- Eliminated the search request to get quotes in the _EOD Historical Data_ service
-- Improved the language localization for German (`de`)
-- Upgraded `ng-extract-i18n-merge` from version `2.9.1` to `2.10.0`
-
-## 2.52.0 - 2024-02-16
-
-### Added
-
-- Added a loading indicator to the dividend timeline on the analysis page
-- Added a loading indicator to the investment timeline on the analysis page
-- Added support for the cryptocurrency _Jupiter_ (`JUP29210-USD`)
-
-### Changed
-
-- Divided the content of the Frequently Asked Questions (FAQ) page into three sections: _General_, _Cloud (SaaS)_ and _Self-Hosting_
-
-### Fixed
-
-- Fixed an issue with the X-axis scale of the dividend timeline on the analysis page
-- Fixed an issue with the X-axis scale of the investment timeline on the analysis page
-
-## 2.51.0 - 2024-02-12
-
-### Changed
-
-- Improved the ordered list of the _Top 3_ and _Bottom 3_ performers on the analysis page in Safari
-- Replaced `import-sort` with `prettier-plugin-sort-imports`
-- Upgraded `eslint` dependencies
-- Upgraded `Nx` from version `17.2.8` to `18.0.4`
-
-### Fixed
-
-- Fixed the date conversion of the import of historical market data in the admin control panel
-
-## 2.50.0 - 2024-02-11
-
-### Added
-
-- Introduced a setting to disable the data gathering in the admin control
-
-### Changed
-
-- Harmonized the environment variables of various API keys
-- Upgraded `prisma` from version `5.8.1` to `5.9.1`
-
-### Todo
-
-- Rename the environment variable from `ALPHA_VANTAGE_API_KEY` to `API_KEY_ALPHA_VANTAGE`
-- Rename the environment variable from `BETTER_UPTIME_API_KEY` to `API_KEY_BETTER_UPTIME`
-- Rename the environment variable from `EOD_HISTORICAL_DATA_API_KEY` to `API_KEY_EOD_HISTORICAL_DATA`
-- Rename the environment variable from `FINANCIAL_MODELING_PREP_API_KEY` to `API_KEY_FINANCIAL_MODELING_PREP`
-- Rename the environment variable from `OPEN_FIGI_API_KEY` to `API_KEY_OPEN_FIGI`
-- Rename the environment variable from `RAPID_API_API_KEY` to `API_KEY_RAPID_API`
-
-## 2.49.0 - 2024-02-09
-
-### Added
-
-- Added a button to apply the active filters in the assistant
-
-### Changed
-
-- Moved the assistant from experimental to general availability
-- Improved the usability by reloading the content with a logo click on the home page
-- Upgraded `yahoo-finance2` from version `2.9.0` to `2.9.1`
-
-## 2.48.1 - 2024-02-06
-
-### Fixed
-
-- Added the missing data provider information to the _CoinGecko_ service
-
-## 2.48.0 - 2024-02-05
-
-### Added
-
-- Extended the assistant by an asset class selector (experimental)
-- Added the data provider information to the search endpoint
-
-### Changed
-
-- Improved the usability of the account selector in the assistant (experimental)
-- Improved the usability of the tag selector in the assistant (experimental)
-- Improved the error logs for a timeout in the data provider services
-- Refreshed the cryptocurrencies list
-- Upgraded `prettier` from version `3.2.4` to `3.2.5`
-
-## 2.47.0 - 2024-02-02
-
-### Changed
-
-- Improved the tag selector to only show used tags in the assistant (experimental)
-- Improved the language localization for German (`de`)
-- Upgraded `prettier` from version `3.2.1` to `3.2.4`
-
-### Fixed
-
-- Fixed a rendering issue caused by the date range selector in the assistant (experimental)
-- Fixed an issue with the currency conversion in the investment timeline
-- Fixed the export in the lazy-loaded activities table on the portfolio activities page (experimental)
-
-## 2.46.0 - 2024-01-28
-
-### Added
-
-- Added a button to reset the active filters in the assistant (experimental)
-
-### Changed
-
-- Migrated the portfolio allocations to work with the filters of the assistant (experimental)
-- Migrated the portfolio holdings to work with the filters of the assistant (experimental)
-
-## 2.45.0 - 2024-01-27
-
-### Added
-
-- Extended the assistant by an account selector (experimental)
-- Added support to grant private access with permissions (experimental)
-- Added `permissions` to the `Access` model
-
-### Changed
-
-- Migrated the tag selector to a form group in the assistant (experimental)
-- Formatted the name in the _EOD Historical Data_ service
-- Improved the language localization for German (`de`)
-
-### Fixed
-
-- Fixed the import for activities with `MANUAL` data source and type `FEE`, `INTEREST`, `ITEM` or `LIABILITY`
-- Removed holdings with incomplete data from the _Top 3_ and _Bottom 3_ performers on the analysis page
-
-## 2.44.0 - 2024-01-24
-
-### Fixed
-
-- Improved the validation for non-numeric results in the _EOD Historical Data_ service
-
-## 2.43.1 - 2024-01-23
-
-### Added
-
-- Extended the date range support by week to date (`WTD`) and month to date (`MTD`) in the assistant (experimental)
-- Added support for importing dividends from _EOD Historical Data_
-- Added `healthcheck` for the _Ghostfolio_ service to the `docker-compose` files (`docker-compose.yml` and `docker-compose.build.yml`)
-
-### Changed
-
-- Improved the usability of the link to manage the benchmarks in the benchmark comparator with an icon
-
-## 2.42.0 - 2024-01-21
-
-### Added
-
-- Added support to edit countries in the asset profile details dialog of the admin control
-- Added support to edit sectors in the asset profile details dialog of the admin control
-
-### Changed
-
-- Improved the handling of derived currencies
-- Improved the labels in the portfolio evolution chart and investment timeline on the analysis page
-- Improved the language localization for German (`de`)
-- Upgraded `prisma` from version `5.7.1` to `5.8.1`
-
-### Fixed
-
-- Fixed an issue in the performance calculation with the currency conversion of fees
-
-## 2.41.0 - 2024-01-16
-
-### Added
-
-- Added the holdings table to the account detail dialog
-- Validated the currency of the search results in the _EOD Historical Data_ service
-
-### Changed
-
-- Increased the timeout to load historical data in the data provider service
-- Improved the asset profile validation for `MANUAL` data source in the activities import
-
-## 2.40.0 - 2024-01-15
-
-### Changed
-
-- Increased the robustness of the exchange rates by always getting quotes in the exchange rate data service
-
-## 2.39.0 - 2024-01-14
-
-### Changed
-
-- Improved the alignment in the portfolio performance chart
-
-### Fixed
-
-- Fixed the currency in the error log of the exchange rate data service
-- Fixed an issue with the currency inconsistency in the _EOD Historical Data_ service (convert from `ZAR` to `ZAc`)
-
-## 2.38.0 - 2024-01-13
-
-### Added
-
-- Broken down the performance into asset and currency on the analysis page (experimental)
-- Added support for international formatted numbers in the scraper configuration
-- Added the attribute `locale` to the scraper configuration to parse the number
-
-### Changed
-
-- Improved the indicator for delayed market data in the client
-- Prepared the portfolio calculation for exchange rate effects
-- Upgraded `prettier` from version `3.1.1` to `3.2.1`
-
-## 2.37.0 - 2024-01-11
-
-### Changed
-
-- Improved the chart size in the asset profile details dialog of the admin control
-- Updated the `docker compose` instructions to _Compose V2_ in the documentation
-
-### Fixed
-
-- Fixed the hidden fifth tab on mobile
-
-## 2.36.0 - 2024-01-07
-
-### Added
-
-- Extended the assistant by a tag selector (experimental)
-- Added support to set a _CoinGecko_ Demo API key via environment variable (`API_KEY_COINGECKO_DEMO`)
-- Added support to set a _CoinGecko_ Pro API key via environment variable (`API_KEY_COINGECKO_PRO`)
-
-### Changed
-
-- Improved the language localization for German (`de`)
-- Removed the `AccountType` enum
-- Refreshed the cryptocurrencies list
-
-## 2.35.0 - 2024-01-06
-
-### Added
-
-- Added support to grant private access
-- Added a hint for _Time-Weighted Rate of Return_ (TWR) to the portfolio summary tab on the home page
-- Added support for REST APIs (`JSON`) via the scraper configuration
-- Enabled the _Redis_ authentication in the `docker-compose` files
-- Set up a git-hook to format the code before any commit
-
-### Changed
-
-- Improved the user interface of the access table to share the portfolio
-- Improved the style of the assistant (experimental)
-
-## 2.34.0 - 2024-01-02
-
-### Added
-
-- Extended the assistant by a date range selector (experimental)
-- Added a button to test the scraper configuration in the asset profile details dialog of the admin control
-
-### Changed
-
-- Improved the style of the _Top 3_ and _Bottom 3_ performers on the analysis page
-- Upgraded `Nx` from version `17.2.7` to `17.2.8`
-
-### Fixed
-
-- Improved the time-weighted performance calculation for `1D`
-- Improved the tabs on iOS (_Add to Home Screen_)
-
-## 2.33.0 - 2023-12-31
-
-### Added
-
-- Added support to edit the currency of asset profiles with `MANUAL` data source in the asset profile details dialog of the admin control panel
-- Added a hint for the community languages in the user settings
-
-### Changed
-
-- Changed the performance calculation to a time-weighted approach
-- Normalized the benchmark by currency in the benchmark comparator
-- Increased the timeout to load currencies in the exchange rate data service
-- Exposed the environment variable `REQUEST_TIMEOUT`
-- Used the `HasPermission` annotation in endpoints
-- Improved the language localization for German (`de`)
-- Upgraded `ng-extract-i18n-merge` from version `2.9.0` to `2.9.1`
-- Upgraded `Nx` from version `17.2.5` to `17.2.7`
-
-### Fixed
-
-- Improved the handling of derived currencies (`USX`)
-
-## 2.32.0 - 2023-12-26
-
-### Added
-
-- Added support to search for an asset profile by `id` as an administrator
+## Unreleased
 
 ### Changed
 
 - Set the select column of the lazy-loaded activities table to stick at the end (experimental)
-- Dropped the activity id in the activities import
-- Improved the validation of the currency management in the admin control panel
 - Improved the performance of the value redaction interceptor for the impersonation mode by eliminating `cloneDeep`
-- Modernized the `Nx` executors
-  - `@nx/eslint:lint`
-  - `@nx/webpack:webpack`
-- Upgraded `prettier` from version `3.1.0` to `3.1.1`
-- Upgraded `prisma` from version `5.7.0` to `5.7.1`
 
 ### Fixed
 
@@ -735,7 +117,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Handled reading items from missing transaction point while getting the position (`getPosition()`) in the portfolio service
+- Handled reading items from missing transaction point while getting the position (`getPosition()`) in portfolio service
 
 ## 2.24.0 - 2023-11-16
 
@@ -911,7 +293,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Changed the users table in the admin control panel to an `@angular/material` data table
-- Improved the style of the membership status
+- Improved the styling of the membership status
 
 ### Fixed
 
@@ -2086,7 +1468,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Improved the style in the admin control panel
+- Improved the styling in the admin control panel
 - Removed the _Google Play_ badge from the landing page
 - Upgraded `eslint` dependencies
 
@@ -2841,7 +2223,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - Simplified the initialization of the exchange rate service
 - Improved the orders query for `assetClass` with symbol profile overrides
-- Improved the style of the benchmarks in the markets overview
+- Improved the styling of the benchmarks in the markets overview
 
 ### Todo
 
@@ -3175,7 +2557,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed a style issue in the benchmark component on mobile
+- Fixed a styling issue in the benchmark component on mobile
 
 ## 1.152.0 - 26.05.2022
 
@@ -3506,7 +2888,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Fixed an issue with the user currency of the public page
-- Fixed an issue in the performance calculation with recent activities in the new calculation engine
+- Fixed an issue of the performance calculation with recent activities in the new calculation engine
 
 ## 1.127.0 - 16.03.2022
 
@@ -3782,7 +3164,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed the style in the footer row of the activities table
+- Fixed the styling in the footer row of the activities table
 
 ## 1.106.0 - 23.01.2022
 
@@ -4550,7 +3932,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved the wording for the _Restricted View_: _Presenter View_
-- Improved the style of the tables
+- Improved the styling of the tables
 - Ignored cash assets in the allocation chart by sector, continent and country
 
 ### Fixed
@@ -4753,8 +4135,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Improved the style of the current pricing plan
-- Improved the style of the transaction type badge
+- Improved the styling of the current pricing plan
+- Improved the styling of the transaction type badge
 - Set the public _Stripe_ key dynamically
 - Upgraded `angular-material-css-vars` from version `2.0.0` to `2.1.0`
 
@@ -5114,7 +4496,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Improved the users table style of the admin control panel
+- Improved the users table styling of the admin control panel
 - Improved the background colors in the dark mode
 
 ## 0.92.0 - 25.04.2021
@@ -5138,7 +4520,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Improved the style of the rules in the _X-ray_ section
+- Improved the styling of the rules in the _X-ray_ section
 
 ## 0.90.0 - 22.04.2021
 
@@ -5333,7 +4715,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Improved the alignment of the _Why Ghostfolio?_ section
-- Improved the style of the _Fear & Greed Index_ (market mood)
+- Improved the styling of the _Fear & Greed Index_ (market mood)
 
 ## 0.73.0 - 31.03.2021
 
@@ -5379,7 +4761,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Improved the style in the _X-ray_ section
+- Improved the styling in the _X-ray_ section
 
 ## 0.70.0 - 27.03.2021
 
@@ -5674,7 +5056,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Fixed
 
 - Only show relevant data in the position detail dialog
-- Improved the performance chart style in Safari
+- Improved the performance chart styling in Safari
 
 ## 0.40.0 - 01.03.2021
 

Dockerfile

@@ -13,8 +13,8 @@ COPY ./.yarnrc .yarnrc
 COPY ./prisma/schema.prisma prisma/schema.prisma
 
 RUN apt update && apt install -y \
-    g++ \
     git \
+    g++ \
     make \
     openssl \
     python3 \
@@ -52,12 +52,10 @@ RUN yarn database:generate-typings
 # Image to run, copy everything needed from builder
 FROM node:18-slim
 RUN apt update && apt install -y \
-    curl \
     openssl \
     && rm -rf /var/lib/apt/lists/*
 
 COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
-COPY ./docker/entrypoint.sh /ghostfolio/entrypoint.sh
 WORKDIR /ghostfolio/apps/api
 EXPOSE ${PORT:-3333}
-CMD [ "/ghostfolio/entrypoint.sh" ]
+CMD [ "yarn", "start:production" ]

README.md

@@ -7,7 +7,7 @@
 **Open Source Wealth Management Software**
 
 [**Ghostfol.io**](https://ghostfol.io) | [**Live Demo**](https://ghostfol.io/en/demo) | [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) | [**FAQ**](https://ghostfol.io/en/faq) |
-[**Blog**](https://ghostfol.io/en/blog) | [**Slack**](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) | [**X**](https://twitter.com/ghostfolio_)
+[**Blog**](https://ghostfol.io/en/blog) | [**Slack**](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) | [**Twitter**](https://twitter.com/ghostfolio_)
 
 [![Shield: Buy me a coffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-Support-yellow?logo=buymeacoffee)](https://www.buymeacoffee.com/ghostfolio)
 [![Shield: Contributions Welcome](https://img.shields.io/badge/Contributions-Welcome-orange.svg)](#contributing)
@@ -49,7 +49,7 @@ Ghostfolio is for you if you are...
 
 - ✅ Create, update and delete transactions
 - ✅ Multi account management
-- ✅ Portfolio performance: Time-weighted rate of return (TWR) for `Today`, `YTD`, `1Y`, `5Y`, `Max`
+- ✅ Portfolio performance for `Today`, `YTD`, `1Y`, `5Y`, `Max`
 - ✅ Various charts
 - ✅ Static analysis to identify potential risks in your portfolio
 - ✅ Import and export transactions
@@ -87,23 +87,19 @@ We provide official container images hosted on [Docker Hub](https://hub.docker.c
 
 ### Supported Environment Variables
 
-| Name                     | Default Value | Description                                                                                                                         |
-| ------------------------ | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
-| `ACCESS_TOKEN_SALT`      |               | A random string used as salt for access tokens                                                                                      |
-| `API_KEY_COINGECKO_DEMO` |               | The _CoinGecko_ Demo API key                                                                                                        |
-| `API_KEY_COINGECKO_PRO`  |               | The _CoinGecko_ Pro API                                                                                                             |
-| `DATABASE_URL`           |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` |
-| `HOST`                   | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                               |
-| `JWT_SECRET_KEY`         |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                    |
-| `PORT`                   | `3333`        | The port where the Ghostfolio application will run on                                                                               |
-| `POSTGRES_DB`            |               | The name of the _PostgreSQL_ database                                                                                               |
-| `POSTGRES_PASSWORD`      |               | The password of the _PostgreSQL_ database                                                                                           |
-| `POSTGRES_USER`          |               | The user of the _PostgreSQL_ database                                                                                               |
-| `REDIS_DB`               | `0`           | The database index of _Redis_                                                                                                       |
-| `REDIS_HOST`             |               | The host where _Redis_ is running                                                                                                   |
-| `REDIS_PASSWORD`         |               | The password of _Redis_                                                                                                             |
-| `REDIS_PORT`             |               | The port where _Redis_ is running                                                                                                   |
-| `REQUEST_TIMEOUT`        | `2000`        | The timeout of network requests to data providers in milliseconds                                                                   |
+| Name                | Default Value | Description                                                                                                                         |
+| ------------------- | ------------- | ----------------------------------------------------------------------------------------------------------------------------------- |
+| `ACCESS_TOKEN_SALT` |               | A random string used as salt for access tokens                                                                                      |
+| `DATABASE_URL`      |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer` |
+| `HOST`              | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                               |
+| `JWT_SECRET_KEY`    |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                    |
+| `PORT`              | `3333`        | The port where the Ghostfolio application will run on                                                                               |
+| `POSTGRES_DB`       |               | The name of the _PostgreSQL_ database                                                                                               |
+| `POSTGRES_PASSWORD` |               | The password of the _PostgreSQL_ database                                                                                           |
+| `POSTGRES_USER`     |               | The user of the _PostgreSQL_ database                                                                                               |
+| `REDIS_HOST`        |               | The host where _Redis_ is running                                                                                                   |
+| `REDIS_PASSWORD`    |               | The password of _Redis_                                                                                                             |
+| `REDIS_PORT`        |               | The port where _Redis_ is running                                                                                                   |
 
 ### Run with Docker Compose
 
@@ -119,7 +115,7 @@ We provide official container images hosted on [Docker Hub](https://hub.docker.c
 Run the following command to start the Docker images from [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio):
 
 ```bash
-docker compose --env-file ./.env -f docker/docker-compose.yml up -d
+docker-compose --env-file ./.env -f docker/docker-compose.yml up -d
 ```
 
 #### b. Build and run environment
@@ -127,8 +123,8 @@ docker compose --env-file ./.env -f docker/docker-compose.yml up -d
 Run the following commands to build and start the Docker images:
 
 ```bash
-docker compose --env-file ./.env -f docker/docker-compose.build.yml build
-docker compose --env-file ./.env -f docker/docker-compose.build.yml up -d
+docker-compose --env-file ./.env -f docker/docker-compose.build.yml build
+docker-compose --env-file ./.env -f docker/docker-compose.build.yml up -d
 ```
 
 #### Setup
@@ -139,12 +135,12 @@ docker compose --env-file ./.env -f docker/docker-compose.build.yml up -d
 #### Upgrade Version
 
 1. Increase the version of the `ghostfolio/ghostfolio` Docker image in `docker/docker-compose.yml`
-1. Run the following command to start the new Docker image: `docker compose --env-file ./.env -f docker/docker-compose.yml up -d`  
+1. Run the following command to start the new Docker image: `docker-compose --env-file ./.env -f docker/docker-compose.yml up -d`  
    At each start, the container will automatically apply the database schema migrations if needed.
 
 ### Home Server Systems (Community)
 
-Ghostfolio is available for various home server systems, including [CasaOS](https://github.com/bigbeartechworld/big-bear-casaos), [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).
+Ghostfolio is available for various home server systems, including [Runtipi](https://www.runtipi.io/docs/apps-available), [TrueCharts](https://truecharts.org/charts/stable/ghostfolio), [Umbrel](https://apps.umbrel.com/app/ghostfolio), and [Unraid](https://unraid.net/community/apps?q=ghostfolio).
 
 ## Development
 
@@ -154,14 +150,13 @@ Ghostfolio is available for various home server systems, including [CasaOS](http
 - [Node.js](https://nodejs.org/en/download) (version 18+)
 - [Yarn](https://yarnpkg.com/en/docs/install)
 - Create a local copy of this Git repository (clone)
-- Copy the file `.env.dev` to `.env` and populate it with your data (`cp .env.dev .env`)
+- Copy the file `.env.example` to `.env` and populate it with your data (`cp .env.example .env`)
 
 ### Setup
 
 1. Run `yarn install`
-1. Run `docker compose --env-file ./.env -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
+1. Run `docker-compose --env-file ./.env -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
 1. Run `yarn database:setup` to initialize the database schema
-1. Run `git config core.hooksPath ./git-hooks/` to setup git hooks
 1. Start the server and the client (see [_Development_](#Development))
 1. Open http://localhost:4200/en in your browser
 1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
@@ -170,7 +165,7 @@ Ghostfolio is available for various home server systems, including [CasaOS](http
 
 #### Debug
 
-Run `yarn watch:server` and click _Debug API_ in [Visual Studio Code](https://code.visualstudio.com)
+Run `yarn watch:server` and click _Launch Program_ in [Visual Studio Code](https://code.visualstudio.com)
 
 #### Serve
 
@@ -206,7 +201,7 @@ Set the header for each request as follows:
 "Authorization": "Bearer eyJh..."
 ```
 
-You can get the _Bearer Token_ via `POST http://localhost:3333/api/v1/auth/anonymous` (Body: `{ "accessToken": "<INSERT_SECURITY_TOKEN_OF_ACCOUNT>" }`)
+You can get the _Bearer Token_ via `POST http://localhost:3333/api/v1/auth/anonymous` (Body: `{ accessToken: <INSERT_SECURITY_TOKEN_OF_ACCOUNT> }`)
 
 Deprecated: `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>` or `curl -s http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>`.
 
@@ -281,12 +276,8 @@ Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Sl
 
 If you like to support this project, get [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) or [**Buy me a coffee**](https://www.buymeacoffee.com/ghostfolio).
 
-## Analytics
-
-![Alt](https://repobeats.axiom.co/api/embed/281a80b2d0c4af1162866c24c803f1f18e5ed60e.svg 'Repobeats analytics image')
-
 ## License
 
-© 2021 - 2024 [Ghostfolio](https://ghostfol.io)
+© 2021 - 2023 [Ghostfolio](https://ghostfol.io)
 
 Licensed under the [AGPLv3 License](https://www.gnu.org/licenses/agpl-3.0.html).

apps/api/jest.config.ts

@@ -13,6 +13,7 @@ export default {
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/apps/api',
+  testTimeout: 10000,
   testEnvironment: 'node',
   preset: '../../jest.preset.js'
 };

apps/api/project.json

@@ -7,15 +7,14 @@
   "generators": {},
   "targets": {
     "build": {
-      "executor": "@nx/webpack:webpack",
+      "executor": "@nrwl/webpack:webpack",
       "options": {
-        "compiler": "tsc",
-        "deleteOutputPath": false,
-        "main": "apps/api/src/main.ts",
         "outputPath": "dist/apps/api",
-        "sourceMap": true,
-        "target": "node",
+        "main": "apps/api/src/main.ts",
         "tsConfig": "apps/api/tsconfig.app.json",
+        "assets": ["apps/api/src/assets"],
+        "target": "node",
+        "compiler": "tsc",
         "webpackConfig": "apps/api/webpack.config.js"
       },
       "configurations": {
@@ -34,26 +33,6 @@
       },
       "outputs": ["{options.outputPath}"]
     },
-    "copy-assets": {
-      "executor": "nx:run-commands",
-      "options": {
-        "commands": [
-          {
-            "command": "shx rm -rf dist/apps/api"
-          },
-          {
-            "command": "shx mkdir -p dist/apps/api/assets/locales"
-          },
-          {
-            "command": "shx cp -r apps/api/src/assets/* dist/apps/api/assets"
-          },
-          {
-            "command": "shx cp -r apps/client/src/locales/* dist/apps/api/assets/locales"
-          }
-        ],
-        "parallel": false
-      }
-    },
     "serve": {
       "executor": "@nx/js:node",
       "options": {
@@ -61,7 +40,7 @@
       }
     },
     "lint": {
-      "executor": "@nx/eslint:lint",
+      "executor": "@nrwl/linter:eslint",
       "options": {
         "lintFilePatterns": ["apps/api/**/*.ts"]
       }

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

@@ -1,10 +1,6 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { Access } from '@ghostfolio/common/interfaces';
-import { permissions } from '@ghostfolio/common/permissions';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-
 import {
   Body,
   Controller,
@@ -28,12 +24,11 @@ import { CreateAccessDto } from './create-access.dto';
 export class AccessController {
   public constructor(
     private readonly accessService: AccessService,
-    private readonly configurationService: ConfigurationService,
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
   @Get()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getAllAccesses(): Promise<Access[]> {
     const accessesWithGranteeUser = await this.accessService.accesses({
       include: {
@@ -43,38 +38,32 @@ export class AccessController {
       where: { userId: this.request.user.id }
     });
 
-    return accessesWithGranteeUser.map(
-      ({ alias, GranteeUser, id, permissions }) => {
-        if (GranteeUser) {
-          return {
-            alias,
-            id,
-            permissions,
-            grantee: GranteeUser?.id,
-            type: 'PRIVATE'
-          };
-        }
-
+    return accessesWithGranteeUser.map((access) => {
+      if (access.GranteeUser) {
         return {
-          alias,
-          id,
-          permissions,
-          grantee: 'Public',
-          type: 'PUBLIC'
+          alias: access.alias,
+          grantee: access.GranteeUser?.id,
+          id: access.id,
+          type: 'RESTRICTED_VIEW'
         };
       }
-    );
+
+      return {
+        alias: access.alias,
+        grantee: 'Public',
+        id: access.id,
+        type: 'PUBLIC'
+      };
+    });
   }
 
-  @HasPermission(permissions.createAccess)
   @Post()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async createAccess(
     @Body() data: CreateAccessDto
   ): Promise<AccessModel> {
     if (
-      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-      this.request.user.subscription.type === 'Basic'
+      !hasPermission(this.request.user.permissions, permissions.createAccess)
     ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -82,30 +71,25 @@ export class AccessController {
       );
     }
 
-    try {
-      return this.accessService.createAccess({
-        alias: data.alias || undefined,
-        GranteeUser: data.granteeUserId
-          ? { connect: { id: data.granteeUserId } }
-          : undefined,
-        permissions: data.permissions,
-        User: { connect: { id: this.request.user.id } }
-      });
-    } catch {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.BAD_REQUEST),
-        StatusCodes.BAD_REQUEST
-      );
-    }
+    return this.accessService.createAccess({
+      alias: data.alias || undefined,
+      GranteeUser: data.granteeUserId
+        ? { connect: { id: data.granteeUserId } }
+        : undefined,
+      User: { connect: { id: this.request.user.id } }
+    });
   }
 
   @Delete(':id')
-  @HasPermission(permissions.deleteAccess)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteAccess(@Param('id') id: string): Promise<AccessModel> {
     const access = await this.accessService.access({ id });
 
-    if (!access || access.userId !== this.request.user.id) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.deleteAccess) ||
+      !access ||
+      access.userId !== this.request.user.id
+    ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
         StatusCodes.FORBIDDEN

apps/api/src/app/access/access.module.ts

@@ -1,6 +1,4 @@
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
-
 import { Module } from '@nestjs/common';
 
 import { AccessController } from './access.controller';
@@ -9,7 +7,7 @@ import { AccessService } from './access.service';
 @Module({
   controllers: [AccessController],
   exports: [AccessService],
-  imports: [ConfigurationModule, PrismaModule],
+  imports: [PrismaModule],
   providers: [AccessService]
 })
 export class AccessModule {}

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

@@ -1,6 +1,5 @@
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { AccessWithGranteeUser } from '@ghostfolio/common/types';
-
 import { Injectable } from '@nestjs/common';
 import { Access, Prisma } from '@prisma/client';
 

apps/api/src/app/access/create-access.dto.ts

@@ -1,5 +1,4 @@
-import { AccessPermission } from '@prisma/client';
-import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
+import { IsOptional, IsString } from 'class-validator';
 
 export class CreateAccessDto {
   @IsOptional()
@@ -7,10 +6,10 @@ export class CreateAccessDto {
   alias?: string;
 
   @IsOptional()
-  @IsUUID()
+  @IsString()
   granteeUserId?: string;
 
-  @IsEnum(AccessPermission, { each: true })
   @IsOptional()
-  permissions?: AccessPermission[];
+  @IsString()
+  type?: 'PUBLIC';
 }

apps/api/src/app/account-balance/account-balance.controller.ts

@@ -1,8 +1,5 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { permissions } from '@ghostfolio/common/permissions';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-
 import {
   Controller,
   Delete,
@@ -25,9 +22,8 @@ export class AccountBalanceController {
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
-  @HasPermission(permissions.deleteAccountBalance)
   @Delete(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteAccountBalance(
     @Param('id') id: string
   ): Promise<AccountBalance> {
@@ -35,7 +31,14 @@ export class AccountBalanceController {
       id
     });
 
-    if (!accountBalance || accountBalance.userId !== this.request.user.id) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.deleteAccountBalance
+      ) ||
+      !accountBalance ||
+      accountBalance.userId !== this.request.user.id
+    ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
         StatusCodes.FORBIDDEN

apps/api/src/app/account-balance/account-balance.module.ts

@@ -1,6 +1,5 @@
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
-
 import { Module } from '@nestjs/common';
 
 import { AccountBalanceController } from './account-balance.controller';

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

@@ -2,7 +2,6 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { AccountBalancesResponse, Filter } from '@ghostfolio/common/interfaces';
 import { UserWithSettings } from '@ghostfolio/common/types';
-
 import { Injectable } from '@nestjs/common';
 import { AccountBalance, Prisma } from '@prisma/client';
 

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

@@ -1,7 +1,5 @@
 import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
 import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
 import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
@@ -9,12 +7,11 @@ import {
   AccountBalancesResponse,
   Accounts
 } from '@ghostfolio/common/interfaces';
-import { permissions } from '@ghostfolio/common/permissions';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type {
   AccountWithValue,
   RequestWithUser
 } from '@ghostfolio/common/types';
-
 import {
   Body,
   Controller,
@@ -50,9 +47,17 @@ export class AccountController {
   ) {}
 
   @Delete(':id')
-  @HasPermission(permissions.deleteAccount)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteAccount(@Param('id') id: string): Promise<AccountModel> {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.deleteAccount)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const account = await this.accountService.accountWithOrders(
       {
         id_userId: {
@@ -63,7 +68,7 @@ export class AccountController {
       { Order: true }
     );
 
-    if (!account || account?.Order.length > 0) {
+    if (account?.isDefault || account?.Order.length > 0) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
         StatusCodes.FORBIDDEN
@@ -82,7 +87,7 @@ export class AccountController {
   }
 
   @Get()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(RedactValuesInResponseInterceptor)
   public async getAllAccounts(
     @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId
@@ -97,7 +102,7 @@ export class AccountController {
   }
 
   @Get(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(RedactValuesInResponseInterceptor)
   public async getAccountById(
     @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId,
@@ -117,7 +122,7 @@ export class AccountController {
   }
 
   @Get(':id/balances')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(RedactValuesInResponseInterceptor)
   public async getAccountBalancesById(
     @Param('id') id: string
@@ -128,12 +133,20 @@ export class AccountController {
     });
   }
 
-  @HasPermission(permissions.createAccount)
   @Post()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async createAccount(
     @Body() data: CreateAccountDto
   ): Promise<AccountModel> {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.createAccount)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     if (data.platformId) {
       const platformId = data.platformId;
       delete data.platformId;
@@ -159,12 +172,20 @@ export class AccountController {
     }
   }
 
-  @HasPermission(permissions.updateAccount)
   @Post('transfer-balance')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async transferAccountBalance(
     @Body() { accountIdFrom, accountIdTo, balance }: TransferBalanceDto
   ) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updateAccount)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const accountsOfUser = await this.accountService.getAccounts(
       this.request.user.id
     );
@@ -213,10 +234,18 @@ export class AccountController {
     });
   }
 
-  @HasPermission(permissions.updateAccount)
   @Put(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async update(@Param('id') id: string, @Body() data: UpdateAccountDto) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updateAccount)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const originalAccount = await this.accountService.account({
       id_userId: {
         id,

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

@@ -7,7 +7,6 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
-
 import { Module } from '@nestjs/common';
 
 import { AccountController } from './account.controller';

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

@@ -2,10 +2,9 @@ import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/accou
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { Filter } from '@ghostfolio/common/interfaces';
-
 import { Injectable } from '@nestjs/common';
 import { Account, Order, Platform, Prisma } from '@prisma/client';
-import { Big } from 'big.js';
+import Big from 'big.js';
 import { groupBy } from 'lodash';
 
 import { CashDetails } from './interfaces/cash-details.interface';
@@ -21,8 +20,10 @@ export class AccountService {
   public async account({
     id_userId
   }: Prisma.AccountWhereUniqueInput): Promise<Account | null> {
+    const { id, userId } = id_userId;
+
     const [account] = await this.accounts({
-      where: id_userId
+      where: { id, userId }
     });
 
     return account;

apps/api/src/app/account/create-account.dto.ts

@@ -1,7 +1,6 @@
 import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsBoolean,
-  IsISO4217CurrencyCode,
   IsNumber,
   IsOptional,
   IsString,
@@ -20,7 +19,7 @@ export class CreateAccountDto {
   )
   comment?: string;
 
-  @IsISO4217CurrencyCode()
+  @IsString()
   currency: string;
 
   @IsOptional()

apps/api/src/app/account/update-account.dto.ts

@@ -1,7 +1,6 @@
 import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsBoolean,
-  IsISO4217CurrencyCode,
   IsNumber,
   IsOptional,
   IsString,
@@ -20,7 +19,7 @@ export class UpdateAccountDto {
   )
   comment?: string;
 
-  @IsISO4217CurrencyCode()
+  @IsString()
   currency: string;
 
   @IsString()

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

@@ -1,30 +1,27 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
-import { ManualService } from '@ghostfolio/api/services/data-provider/manual/manual.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
 import {
-  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
-  DATA_GATHERING_QUEUE_PRIORITY_MEDIUM,
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
-import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
+import {
+  getAssetProfileIdentifier,
+  resetHours
+} from '@ghostfolio/common/helper';
 import {
   AdminData,
   AdminMarketData,
   AdminMarketDataDetails,
   EnhancedSymbolProfile
 } from '@ghostfolio/common/interfaces';
-import { permissions } from '@ghostfolio/common/permissions';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type {
   MarketDataPreset,
   RequestWithUser
 } from '@ghostfolio/common/types';
-
 import {
   Body,
   Controller,
@@ -32,7 +29,6 @@ import {
   Get,
   HttpException,
   Inject,
-  Logger,
   Param,
   Patch,
   Post,
@@ -58,29 +54,61 @@ export class AdminController {
     private readonly adminService: AdminService,
     private readonly apiService: ApiService,
     private readonly dataGatheringService: DataGatheringService,
-    private readonly manualService: ManualService,
     private readonly marketDataService: MarketDataService,
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
   @Get()
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getAdminData(): Promise<AdminData> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.adminService.get();
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('gather')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async gather7Days(): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     this.dataGatheringService.gather7Days();
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('gather/max')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async gatherMax(): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
 
     await this.dataGatheringService.addJobsToQueue(
@@ -93,8 +121,7 @@ export class AdminController {
           name: GATHER_ASSET_PROFILE_PROCESS,
           opts: {
             ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: getAssetProfileIdentifier({ dataSource, symbol }),
-            priority: DATA_GATHERING_QUEUE_PRIORITY_MEDIUM
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
           }
         };
       })
@@ -103,10 +130,21 @@ export class AdminController {
     this.dataGatheringService.gatherMax();
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('gather/profile-data')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async gatherProfileData(): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
 
     await this.dataGatheringService.addJobsToQueue(
@@ -119,21 +157,31 @@ export class AdminController {
           name: GATHER_ASSET_PROFILE_PROCESS,
           opts: {
             ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-            jobId: getAssetProfileIdentifier({ dataSource, symbol }),
-            priority: DATA_GATHERING_QUEUE_PRIORITY_MEDIUM
+            jobId: getAssetProfileIdentifier({ dataSource, symbol })
           }
         };
       })
     );
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('gather/profile-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async gatherProfileDataForSymbol(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     await this.dataGatheringService.addJobToQueue({
       data: {
         dataSource,
@@ -142,32 +190,53 @@ export class AdminController {
       name: GATHER_ASSET_PROFILE_PROCESS,
       opts: {
         ...GATHER_ASSET_PROFILE_PROCESS_OPTIONS,
-        jobId: getAssetProfileIdentifier({ dataSource, symbol }),
-        priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
+        jobId: getAssetProfileIdentifier({ dataSource, symbol })
       }
     });
   }
 
   @Post('gather/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  @HasPermission(permissions.accessAdminControl)
+  @UseGuards(AuthGuard('jwt'))
   public async gatherSymbol(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     this.dataGatheringService.gatherSymbol({ dataSource, symbol });
 
     return;
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('gather/:dataSource/:symbol/:dateString')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async gatherSymbolForDate(
     @Param('dataSource') dataSource: DataSource,
     @Param('dateString') dateString: string,
     @Param('symbol') symbol: string
   ): Promise<MarketData> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const date = parseISO(dateString);
 
     if (!isDate(date)) {
@@ -185,8 +254,7 @@ export class AdminController {
   }
 
   @Get('market-data')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getMarketData(
     @Query('assetSubClasses') filterByAssetSubClasses?: string,
     @Query('presetId') presetId?: MarketDataPreset,
@@ -196,6 +264,18 @@ export class AdminController {
     @Query('sortDirection') sortDirection?: Prisma.SortOrder,
     @Query('take') take?: number
   ): Promise<AdminMarketData> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const filters = this.apiService.buildFiltersFromQueryParams({
       filterByAssetSubClasses,
       filterBySearchQuery
@@ -212,53 +292,51 @@ export class AdminController {
   }
 
   @Get('market-data/:dataSource/:symbol')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getMarketDataBySymbol(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<AdminMarketDataDetails> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.adminService.getMarketDataBySymbol({ dataSource, symbol });
   }
 
-  @HasPermission(permissions.accessAdminControl)
-  @Post('market-data/:dataSource/:symbol/test')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  public async testMarketData(
-    @Body() data: { scraperConfiguration: string },
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<{ price: number }> {
-    try {
-      const scraperConfiguration = JSON.parse(data.scraperConfiguration);
-      const price = await this.manualService.test(scraperConfiguration);
-
-      if (price) {
-        return { price };
-      }
-
-      throw new Error('Could not parse the current market price');
-    } catch (error) {
-      Logger.error(error);
-
-      throw new HttpException(error.message, StatusCodes.BAD_REQUEST);
-    }
-  }
-
-  @HasPermission(permissions.accessAdminControl)
   @Post('market-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async updateMarketData(
     @Body() data: UpdateBulkMarketDataDto,
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const dataBulkUpdate: Prisma.MarketDataUpdateInput[] = data.marketData.map(
       ({ date, marketPrice }) => ({
         dataSource,
         marketPrice,
         symbol,
-        date: parseISO(date),
+        date: resetHours(parseISO(date)),
         state: 'CLOSE'
       })
     );
@@ -271,15 +349,26 @@ export class AdminController {
   /**
    * @deprecated
    */
-  @HasPermission(permissions.accessAdminControl)
   @Put('market-data/:dataSource/:symbol/:dateString')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async update(
     @Param('dataSource') dataSource: DataSource,
     @Param('dateString') dateString: string,
     @Param('symbol') symbol: string,
     @Body() data: UpdateMarketDataDto
   ) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const date = parseISO(dateString);
 
     return this.marketDataService.updateMarketData({
@@ -294,14 +383,24 @@ export class AdminController {
     });
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('profile-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   public async addProfileData(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<SymbolProfile | never> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
     return this.adminService.addAssetProfile({
       dataSource,
       symbol,
@@ -310,23 +409,45 @@ export class AdminController {
   }
 
   @Delete('profile-data/:dataSource/:symbol')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteProfileData(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.adminService.deleteProfileData({ dataSource, symbol });
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Patch('profile-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async patchAssetProfileData(
     @Body() assetProfileData: UpdateAssetProfileDto,
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ): Promise<EnhancedSymbolProfile> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.adminService.patchAssetProfileData({
       ...assetProfileData,
       dataSource,
@@ -334,13 +455,24 @@ export class AdminController {
     });
   }
 
-  @HasPermission(permissions.accessAdminControl)
   @Put('settings/:key')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async updateProperty(
     @Param('key') key: string,
     @Body() data: PropertyDto
   ) {
-    return this.adminService.putSetting(key, data.value);
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return await this.adminService.putSetting(key, data.value);
   }
 }

apps/api/src/app/admin/admin.module.ts

@@ -8,7 +8,6 @@ import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-da
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
-
 import { Module } from '@nestjs/common';
 
 import { AdminController } from './admin.controller';

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

@@ -22,10 +22,8 @@ import {
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import { MarketDataPreset } from '@ghostfolio/common/types';
-
 import { BadRequestException, Injectable } from '@nestjs/common';
 import {
-  AssetClass,
   AssetSubClass,
   DataSource,
   Prisma,
@@ -72,7 +70,7 @@ export class AdminService {
         );
       }
 
-      return this.symbolProfileService.add(
+      return await this.symbolProfileService.add(
         assetProfiles[symbol] as Prisma.SymbolProfileCreateInput
       );
     } catch (error) {
@@ -178,7 +176,6 @@ export class AdminService {
 
     if (searchQuery) {
       where.OR = [
-        { id: { mode: 'insensitive', startsWith: searchQuery } },
         { isin: { mode: 'insensitive', startsWith: searchQuery } },
         { name: { mode: 'insensitive', startsWith: searchQuery } },
         { symbol: { mode: 'insensitive', startsWith: searchQuery } }
@@ -213,7 +210,6 @@ export class AdminService {
           countries: true,
           currency: true,
           dataSource: true,
-          id: true,
           name: true,
           Order: {
             orderBy: [{ date: 'asc' }],
@@ -228,7 +224,7 @@ export class AdminService {
       this.prismaService.symbolProfile.count({ where })
     ]);
 
-    let marketData: AdminMarketDataItem[] = assetProfiles.map(
+    let marketData = assetProfiles.map(
       ({
         _count,
         assetClass,
@@ -237,7 +233,6 @@ export class AdminService {
         countries,
         currency,
         dataSource,
-        id,
         name,
         Order,
         sectors,
@@ -260,7 +255,6 @@ export class AdminService {
           currency,
           countriesCount,
           dataSource,
-          id,
           name,
           symbol,
           marketDataItemCount,
@@ -326,46 +320,22 @@ export class AdminService {
     assetClass,
     assetSubClass,
     comment,
-    countries,
-    currency,
     dataSource,
     name,
     scraperConfiguration,
-    sectors,
     symbol,
-    symbolMapping,
-    url
+    symbolMapping
   }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
-    const symbolProfileOverrides = {
-      assetClass: assetClass as AssetClass,
-      assetSubClass: assetSubClass as AssetSubClass,
-      name: name as string,
-      url: url as string
-    };
-
-    const updatedSymbolProfile: Prisma.SymbolProfileUpdateInput & UniqueAsset =
-      {
-        comment,
-        countries,
-        currency,
-        dataSource,
-        scraperConfiguration,
-        sectors,
-        symbol,
-        symbolMapping,
-        ...(dataSource === 'MANUAL'
-          ? { assetClass, assetSubClass, name, url }
-          : {
-              SymbolProfileOverrides: {
-                upsert: {
-                  create: symbolProfileOverrides,
-                  update: symbolProfileOverrides
-                }
-              }
-            })
-      };
-
-    await this.symbolProfileService.updateSymbolProfile(updatedSymbolProfile);
+    await this.symbolProfileService.updateSymbolProfile({
+      assetClass,
+      assetSubClass,
+      comment,
+      dataSource,
+      name,
+      scraperConfiguration,
+      symbol,
+      symbolMapping
+    });
 
     const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles([
       {
@@ -419,7 +389,6 @@ export class AdminService {
           assetClass: 'CASH',
           countriesCount: 0,
           currency: symbol.replace(DEFAULT_CURRENCY, ''),
-          id: undefined,
           name: symbol,
           sectorsCount: 0
         };
@@ -463,14 +432,13 @@ export class AdminService {
         },
         createdAt: true,
         id: true,
-        role: true,
         Subscription: true
       },
       take: 30
     });
 
     return usersWithAnalytics.map(
-      ({ _count, Analytics, createdAt, id, role, Subscription }) => {
+      ({ _count, Analytics, createdAt, id, Subscription }) => {
         const daysSinceRegistration =
           differenceInDays(new Date(), createdAt) + 1;
         const engagement = Analytics
@@ -480,17 +448,13 @@ export class AdminService {
         const subscription = this.configurationService.get(
           'ENABLE_FEATURE_SUBSCRIPTION'
         )
-          ? this.subscriptionService.getSubscription({
-              createdAt,
-              subscriptions: Subscription
-            })
+          ? this.subscriptionService.getSubscription(Subscription)
           : undefined;
 
         return {
           createdAt,
           engagement,
           id,
-          role,
           subscription,
           accountCount: _count.Account || 0,
           country: Analytics?.country,

apps/api/src/app/admin/queue/queue.controller.ts

@@ -1,56 +1,87 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { AdminJobs } from '@ghostfolio/common/interfaces';
-import { permissions } from '@ghostfolio/common/permissions';
-
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Controller,
   Delete,
   Get,
+  HttpException,
+  Inject,
   Param,
   Query,
   UseGuards
 } from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { JobStatus } from 'bull';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { QueueService } from './queue.service';
 
 @Controller('admin/queue')
 export class QueueController {
-  public constructor(private readonly queueService: QueueService) {}
+  public constructor(
+    private readonly queueService: QueueService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
 
   @Delete('job')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteJobs(
     @Query('status') filterByStatus?: string
   ): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
     return this.queueService.deleteJobs({ status });
   }
 
   @Get('job')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getJobs(
     @Query('status') filterByStatus?: string
   ): Promise<AdminJobs> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const status = <JobStatus[]>filterByStatus?.split(',') ?? undefined;
     return this.queueService.getJobs({ status });
   }
 
   @Delete('job/:id')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteJob(@Param('id') id: string): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.queueService.deleteJob(id);
   }
-
-  @Get('job/:id/execute')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  public async executeJob(@Param('id') id: string): Promise<void> {
-    return this.queueService.executeJob(id);
-  }
 }

apps/api/src/app/admin/queue/queue.module.ts

@@ -1,5 +1,4 @@
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
-
 import { Module } from '@nestjs/common';
 
 import { QueueController } from './queue.controller';

apps/api/src/app/admin/queue/queue.service.ts

@@ -3,7 +3,6 @@ import {
   QUEUE_JOB_STATUS_LIST
 } from '@ghostfolio/common/config';
 import { AdminJobs } from '@ghostfolio/common/interfaces';
-
 import { InjectQueue } from '@nestjs/bull';
 import { Injectable } from '@nestjs/common';
 import { JobStatus, Queue } from 'bull';
@@ -32,10 +31,6 @@ export class QueueService {
     }
   }
 
-  public async executeJob(aId: string) {
-    return (await this.dataGatheringQueue.getJob(aId))?.promote();
-  }
-
   public async getJobs({
     limit = 1000,
     status = QUEUE_JOB_STATUS_LIST
@@ -58,7 +53,6 @@ export class QueueService {
             finishedOn: job.finishedOn,
             id: job.id,
             name: job.name,
-            opts: job.opts,
             stacktrace: job.stacktrace,
             state: await job.getState(),
             timestamp: job.timestamp

apps/api/src/app/admin/update-asset-profile.dto.ts

@@ -1,13 +1,5 @@
 import { AssetClass, AssetSubClass, Prisma } from '@prisma/client';
-import {
-  IsArray,
-  IsEnum,
-  IsISO4217CurrencyCode,
-  IsObject,
-  IsOptional,
-  IsString,
-  IsUrl
-} from 'class-validator';
+import { IsEnum, IsObject, IsOptional, IsString } from 'class-validator';
 
 export class UpdateAssetProfileDto {
   @IsEnum(AssetClass, { each: true })
@@ -22,14 +14,6 @@ export class UpdateAssetProfileDto {
   @IsOptional()
   comment?: string;
 
-  @IsArray()
-  @IsOptional()
-  countries?: Prisma.InputJsonArray;
-
-  @IsISO4217CurrencyCode()
-  @IsOptional()
-  currency?: string;
-
   @IsString()
   @IsOptional()
   name?: string;
@@ -38,20 +22,9 @@ export class UpdateAssetProfileDto {
   @IsOptional()
   scraperConfiguration?: Prisma.InputJsonObject;
 
-  @IsArray()
-  @IsOptional()
-  sectors?: Prisma.InputJsonArray;
-
   @IsObject()
   @IsOptional()
   symbolMapping?: {
     [dataProvider: string]: string;
   };
-
-  @IsOptional()
-  @IsUrl({
-    protocols: ['https'],
-    require_protocol: true
-  })
-  url?: string;
 }

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

@@ -1,5 +1,4 @@
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-
 import { Controller } from '@nestjs/common';
 
 @Controller()

apps/api/src/app/app.module.ts

@@ -1,23 +1,22 @@
+import { join } from 'path';
+
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { CronService } from '@ghostfolio/api/services/cron.service';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
-import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { TwitterBotModule } from '@ghostfolio/api/services/twitter-bot/twitter-bot.module';
 import {
   DEFAULT_LANGUAGE_CODE,
   SUPPORTED_LANGUAGE_CODES
 } from '@ghostfolio/common/config';
-
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { StatusCodes } from 'http-status-codes';
-import { join } from 'path';
 
 import { AccessModule } from './access/access.module';
 import { AccountModule } from './account/account.module';
@@ -53,7 +52,6 @@ import { UserModule } from './user/user.module';
     BenchmarkModule,
     BullModule.forRoot({
       redis: {
-        db: parseInt(process.env.REDIS_DB ?? '0', 10),
         host: process.env.REDIS_HOST,
         port: parseInt(process.env.REDIS_PORT ?? '6379', 10),
         password: process.env.REDIS_PASSWORD
@@ -75,7 +73,6 @@ import { UserModule } from './user/user.module';
     PlatformModule,
     PortfolioModule,
     PrismaModule,
-    PropertyModule,
     RedisCacheModule,
     ScheduleModule.forRoot(),
     ServeStaticModule.forRoot({

apps/api/src/app/auth-device/auth-device.controller.ts

@@ -1,19 +1,40 @@
 import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { permissions } from '@ghostfolio/common/permissions';
-
-import { Controller, Delete, Param, UseGuards } from '@nestjs/common';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import {
+  Controller,
+  Delete,
+  HttpException,
+  Inject,
+  Param,
+  UseGuards
+} from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 @Controller('auth-device')
 export class AuthDeviceController {
-  public constructor(private readonly authDeviceService: AuthDeviceService) {}
+  public constructor(
+    private readonly authDeviceService: AuthDeviceService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
 
   @Delete(':id')
-  @HasPermission(permissions.deleteAuthDevice)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteAuthDevice(@Param('id') id: string): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.deleteAuthDevice
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     await this.authDeviceService.deleteAuthDevice({ id });
   }
 }

apps/api/src/app/auth-device/auth-device.module.ts

@@ -2,7 +2,6 @@ import { AuthDeviceController } from '@ghostfolio/api/app/auth-device/auth-devic
 import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
-
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 

apps/api/src/app/auth-device/auth-device.service.ts

@@ -1,6 +1,5 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
-
 import { Injectable } from '@nestjs/common';
 import { AuthDevice, Prisma } from '@prisma/client';
 

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

@@ -1,9 +1,7 @@
 import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
 import { OAuthResponse } from '@ghostfolio/common/interfaces';
-
 import {
   Body,
   Controller,
@@ -120,13 +118,13 @@ export class AuthController {
   }
 
   @Get('webauthn/generate-registration-options')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async generateRegistrationOptions() {
     return this.webAuthService.generateRegistrationOptions();
   }
 
   @Post('webauthn/verify-attestation')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async verifyAttestation(
     @Body() body: { deviceName: string; credential: AttestationCredentialJSON }
   ) {

apps/api/src/app/auth/auth.module.ts

@@ -5,7 +5,6 @@ import { UserModule } from '@ghostfolio/api/app/user/user.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
-
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 

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

@@ -1,7 +1,6 @@
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Provider } from '@prisma/client';

apps/api/src/app/auth/google.strategy.ts

@@ -1,5 +1,4 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
-
 import { Injectable, Logger } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { Provider } from '@prisma/client';

apps/api/src/app/auth/interfaces/interfaces.ts

@@ -1,5 +1,4 @@
 import { AuthDeviceDto } from '@ghostfolio/api/app/auth-device/auth-device.dto';
-
 import { Provider } from '@prisma/client';
 
 export interface AuthDeviceDialogParams {

apps/api/src/app/auth/jwt.strategy.ts

@@ -2,7 +2,6 @@ import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { HEADER_KEY_TIMEZONE } from '@ghostfolio/common/config';
-
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import * as countriesAndTimezones from 'countries-and-timezones';

apps/api/src/app/auth/web-auth.service.ts

@@ -3,7 +3,6 @@ import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.s
 import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-
 import {
   Inject,
   Injectable,
@@ -41,7 +40,7 @@ export class WebAuthService {
   ) {}
 
   get rpID() {
-    return new URL(this.configurationService.get('ROOT_URL')).hostname;
+    return this.configurationService.get('WEB_AUTH_RP_ID');
   }
 
   get expectedOrigin() {

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

@@ -1,6 +1,3 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import type {
@@ -8,9 +5,8 @@ import type {
   BenchmarkResponse,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
-import { permissions } from '@ghostfolio/common/permissions';
-import type { DateRange, RequestWithUser } from '@ghostfolio/common/types';
-
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
@@ -20,7 +16,6 @@ import {
   Inject,
   Param,
   Post,
-  Query,
   UseGuards,
   UseInterceptors
 } from '@nestjs/common';
@@ -38,10 +33,21 @@ export class BenchmarkController {
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
-  @HasPermission(permissions.accessAdminControl)
   @Post()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async addBenchmark(@Body() { dataSource, symbol }: UniqueAsset) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     try {
       const benchmark = await this.benchmarkService.addBenchmark({
         dataSource,
@@ -65,12 +71,23 @@ export class BenchmarkController {
   }
 
   @Delete(':dataSource/:symbol')
-  @HasPermission(permissions.accessAdminControl)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteBenchmark(
     @Param('dataSource') dataSource: DataSource,
     @Param('symbol') symbol: string
   ) {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     try {
       const benchmark = await this.benchmarkService.deleteBenchmark({
         dataSource,
@@ -103,26 +120,19 @@ export class BenchmarkController {
   }
 
   @Get(':dataSource/:symbol/:startDateString')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   public async getBenchmarkMarketDataBySymbol(
     @Param('dataSource') dataSource: DataSource,
     @Param('startDateString') startDateString: string,
-    @Param('symbol') symbol: string,
-    @Query('range') dateRange: DateRange = 'max'
+    @Param('symbol') symbol: string
   ): Promise<BenchmarkMarketDataDetails> {
-    const { endDate, startDate } = getInterval(
-      dateRange,
-      new Date(startDateString)
-    );
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
+    const startDate = new Date(startDateString);
 
     return this.benchmarkService.getMarketDataBySymbol({
       dataSource,
-      endDate,
       startDate,
-      symbol,
-      userCurrency
+      symbol
     });
   }
 }

apps/api/src/app/benchmark/benchmark.module.ts

@@ -2,12 +2,10 @@ import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.mo
 import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
-
 import { Module } from '@nestjs/common';
 
 import { BenchmarkController } from './benchmark.controller';
@@ -19,7 +17,6 @@ import { BenchmarkService } from './benchmark.service';
   imports: [
     ConfigurationModule,
     DataProviderModule,
-    ExchangeRateDataModule,
     MarketDataModule,
     PrismaModule,
     PropertyModule,

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

@@ -11,7 +11,6 @@ describe('BenchmarkService', () => {
       null,
       null,
       null,
-      null,
       null
     );
   });

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

@@ -1,7 +1,6 @@
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
@@ -12,9 +11,7 @@ import {
 } from '@ghostfolio/common/config';
 import {
   DATE_FORMAT,
-  calculateBenchmarkTrend,
-  parseDate,
-  resetHours
+  calculateBenchmarkTrend
 } from '@ghostfolio/common/helper';
 import {
   Benchmark,
@@ -24,18 +21,11 @@ import {
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
 import { BenchmarkTrend } from '@ghostfolio/common/types';
-
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } from '@nestjs/common';
 import { SymbolProfile } from '@prisma/client';
-import { Big } from 'big.js';
-import {
-  differenceInDays,
-  eachDayOfInterval,
-  format,
-  isSameDay,
-  subDays
-} from 'date-fns';
-import { isNumber, last, uniqBy } from 'lodash';
+import Big from 'big.js';
+import { format, subDays } from 'date-fns';
+import { uniqBy } from 'lodash';
 import ms from 'ms';
 
 @Injectable()
@@ -44,7 +34,6 @@ export class BenchmarkService {
 
   public constructor(
     private readonly dataProviderService: DataProviderService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly marketDataService: MarketDataService,
     private readonly prismaService: PrismaService,
     private readonly propertyService: PropertyService,
@@ -117,9 +106,7 @@ export class BenchmarkService {
     const quotes = await this.dataProviderService.getQuotes({
       items: benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
         return { dataSource, symbol };
-      }),
-      requestTimeout: ms('30 seconds'),
-      useCache: false
+      })
     });
 
     for (const { dataSource, symbol } of benchmarkAssetProfiles) {
@@ -172,7 +159,7 @@ export class BenchmarkService {
       await this.redisCacheService.set(
         this.CACHE_KEY_BENCHMARKS,
         JSON.stringify(benchmarks),
-        ms('2 hours') / 1000
+        ms('4 hours') / 1000
       );
     }
 
@@ -215,28 +202,9 @@ export class BenchmarkService {
 
   public async getMarketDataBySymbol({
     dataSource,
-    endDate = new Date(),
     startDate,
-    symbol,
-    userCurrency
-  }: {
-    endDate?: Date;
-    startDate: Date;
-    userCurrency: string;
-  } & UniqueAsset): Promise<BenchmarkMarketDataDetails> {
-    const marketData: { date: string; value: number }[] = [];
-
-    const days = differenceInDays(endDate, startDate) + 1;
-    const dates = eachDayOfInterval(
-      {
-        start: startDate,
-        end: endDate
-      },
-      { step: Math.round(days / Math.min(days, MAX_CHART_ITEMS)) }
-    ).map((date) => {
-      return resetHours(date);
-    });
-
+    symbol
+  }: { startDate: Date } & UniqueAsset): Promise<BenchmarkMarketDataDetails> {
     const [currentSymbolItem, marketDataItems] = await Promise.all([
       this.symbolService.get({
         dataGatheringItem: {
@@ -252,92 +220,50 @@ export class BenchmarkService {
           dataSource,
           symbol,
           date: {
-            in: dates
+            gte: startDate
           }
         }
       })
     ]);
 
-    const exchangeRates =
-      await this.exchangeRateDataService.getExchangeRatesByCurrency({
-        startDate,
-        currencies: [currentSymbolItem.currency],
-        targetCurrency: userCurrency
-      });
-
-    const exchangeRateAtStartDate =
-      exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
-        format(startDate, DATE_FORMAT)
-      ];
-
-    const marketPriceAtStartDate = marketDataItems?.find(({ date }) => {
-      return isSameDay(date, startDate);
-    })?.marketPrice;
-
-    if (!marketPriceAtStartDate) {
-      Logger.error(
-        `No historical market data has been found for ${symbol} (${dataSource}) at ${format(
-          startDate,
-          DATE_FORMAT
-        )}`,
-        'BenchmarkService'
-      );
-
-      return { marketData };
-    }
-
-    for (let marketDataItem of marketDataItems) {
-      const exchangeRate =
-        exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
-          format(marketDataItem.date, DATE_FORMAT)
-        ];
-
-      const exchangeRateFactor =
-        isNumber(exchangeRateAtStartDate) && isNumber(exchangeRate)
-          ? exchangeRate / exchangeRateAtStartDate
-          : 1;
-
-      marketData.push({
-        date: format(marketDataItem.date, DATE_FORMAT),
-        value:
-          marketPriceAtStartDate === 0
-            ? 0
-            : this.calculateChangeInPercentage(
-                marketPriceAtStartDate,
-                marketDataItem.marketPrice * exchangeRateFactor
-              ) * 100
-      });
-    }
-
-    const includesEndDate = isSameDay(
-      parseDate(last(marketData).date),
-      endDate
+    const step = Math.round(
+      marketDataItems.length / Math.min(marketDataItems.length, MAX_CHART_ITEMS)
     );
 
-    if (currentSymbolItem?.marketPrice && !includesEndDate) {
-      const exchangeRate =
-        exchangeRates[`${currentSymbolItem.currency}${userCurrency}`]?.[
-          format(endDate, DATE_FORMAT)
-        ];
+    const marketPriceAtStartDate = marketDataItems?.[0]?.marketPrice ?? 0;
+    const response = {
+      marketData: [
+        ...marketDataItems
+          .filter((marketDataItem, index) => {
+            return index % step === 0;
+          })
+          .map((marketDataItem) => {
+            return {
+              date: format(marketDataItem.date, DATE_FORMAT),
+              value:
+                marketPriceAtStartDate === 0
+                  ? 0
+                  : this.calculateChangeInPercentage(
+                      marketPriceAtStartDate,
+                      marketDataItem.marketPrice
+                    ) * 100
+            };
+          })
+      ]
+    };
 
-      const exchangeRateFactor =
-        isNumber(exchangeRateAtStartDate) && isNumber(exchangeRate)
-          ? exchangeRate / exchangeRateAtStartDate
-          : 1;
-
-      marketData.push({
-        date: format(endDate, DATE_FORMAT),
+    if (currentSymbolItem?.marketPrice) {
+      response.marketData.push({
+        date: format(new Date(), DATE_FORMAT),
         value:
           this.calculateChangeInPercentage(
             marketPriceAtStartDate,
-            currentSymbolItem.marketPrice * exchangeRateFactor
+            currentSymbolItem.marketPrice
           ) * 100
       });
     }
 
-    return {
-      marketData
-    };
+    return response;
   }
 
   public async addBenchmark({

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

@@ -1,19 +1,39 @@
 import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { permissions } from '@ghostfolio/common/permissions';
-
-import { Controller, Post, UseGuards } from '@nestjs/common';
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import {
+  Controller,
+  HttpException,
+  Inject,
+  Post,
+  UseGuards
+} from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 @Controller('cache')
 export class CacheController {
-  public constructor(private readonly redisCacheService: RedisCacheService) {}
+  public constructor(
+    private readonly redisCacheService: RedisCacheService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
 
-  @HasPermission(permissions.accessAdminControl)
   @Post('flush')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async flushCache(): Promise<void> {
+    if (
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.accessAdminControl
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.redisCacheService.reset();
   }
 }

apps/api/src/app/cache/cache.module.ts

@@ -5,7 +5,6 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
-
 import { Module } from '@nestjs/common';
 
 import { CacheController } from './cache.controller';

apps/api/src/app/exchange-rate/exchange-rate.controller.ts

@@ -1,6 +1,4 @@
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { IDataProviderHistoricalResponse } from '@ghostfolio/api/services/interfaces/interfaces';
-
 import {
   Controller,
   Get,
@@ -21,7 +19,7 @@ export class ExchangeRateController {
   ) {}
 
   @Get(':symbol/:dateString')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getExchangeRate(
     @Param('dateString') dateString: string,
     @Param('symbol') symbol: string

apps/api/src/app/exchange-rate/exchange-rate.module.ts

@@ -1,5 +1,4 @@
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
-
 import { Module } from '@nestjs/common';
 
 import { ExchangeRateController } from './exchange-rate.controller';

apps/api/src/app/exchange-rate/exchange-rate.service.ts

@@ -1,5 +1,4 @@
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-
 import { Injectable } from '@nestjs/common';
 
 @Injectable()

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

@@ -1,8 +1,5 @@
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { Export } from '@ghostfolio/common/interfaces';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-
 import { Controller, Get, Inject, Query, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
@@ -12,28 +9,17 @@ import { ExportService } from './export.service';
 @Controller('export')
 export class ExportController {
   public constructor(
-    private readonly apiService: ApiService,
     private readonly exportService: ExportService,
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
   @Get()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async export(
-    @Query('accounts') filterByAccounts?: string,
-    @Query('activityIds') activityIds?: string[],
-    @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('tags') filterByTags?: string
+    @Query('activityIds') activityIds?: string[]
   ): Promise<Export> {
-    const filters = this.apiService.buildFiltersFromQueryParams({
-      filterByAccounts,
-      filterByAssetClasses,
-      filterByTags
-    });
-
     return this.exportService.export({
       activityIds,
-      filters,
       userCurrency: this.request.user.Settings.settings.baseCurrency,
       userId: this.request.user.id
     });

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

@@ -1,11 +1,9 @@
 import { AccountModule } from '@ghostfolio/api/app/account/account.module';
 import { OrderModule } from '@ghostfolio/api/app/order/order.module';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ApiModule } from '@ghostfolio/api/services/api/api.module';
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering/data-gathering.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-
 import { Module } from '@nestjs/common';
 
 import { ExportController } from './export.controller';
@@ -14,7 +12,6 @@ import { ExportService } from './export.service';
 @Module({
   imports: [
     AccountModule,
-    ApiModule,
     ConfigurationModule,
     DataGatheringModule,
     DataProviderModule,

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

@@ -1,8 +1,7 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { environment } from '@ghostfolio/api/environments/environment';
-import { Filter, Export } from '@ghostfolio/common/interfaces';
-
+import { Export } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
@@ -14,12 +13,10 @@ export class ExportService {
 
   public async export({
     activityIds,
-    filters,
     userCurrency,
     userId
   }: {
     activityIds?: string[];
-    filters?: Filter[];
     userCurrency: string;
     userId: string;
   }): Promise<Export> {
@@ -45,7 +42,6 @@ export class ExportService {
     );
 
     let { activities } = await this.orderService.getOrders({
-      filters,
       userCurrency,
       userId,
       includeDrafts: true,
@@ -95,10 +91,7 @@ export class ExportService {
                 : SymbolProfile.symbol
           };
         }
-      ),
-      user: {
-        settings: { currency: userCurrency }
-      }
+      )
     };
   }
 }

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

@@ -1,5 +1,4 @@
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-
 import {
   Controller,
   Get,

apps/api/src/app/health/health.module.ts

@@ -1,7 +1,6 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { DataEnhancerModule } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.module';
 import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-
 import { Module } from '@nestjs/common';
 
 import { HealthController } from './health.controller';

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

@@ -1,6 +1,5 @@
 import { DataEnhancerService } from '@ghostfolio/api/services/data-provider/data-enhancer/data-enhancer.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-
 import { Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
 

apps/api/src/app/import/import-data.dto.ts

@@ -1,6 +1,5 @@
 import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
 import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
-
 import { Type } from 'class-transformer';
 import { IsArray, IsOptional, ValidateNested } from 'class-validator';
 

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

@@ -1,12 +1,9 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { ImportResponse } from '@ghostfolio/common/interfaces';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
 import type { RequestWithUser } from '@ghostfolio/common/types';
-
 import {
   Body,
   Controller,
@@ -37,18 +34,19 @@ export class ImportController {
   ) {}
 
   @Post()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
-  @HasPermission(permissions.createOrder)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async import(
     @Body() importData: ImportDataDto,
-    @Query('dryRun') isDryRunParam = 'false'
+    @Query('dryRun') isDryRun?: boolean
   ): Promise<ImportResponse> {
-    const isDryRun = isDryRunParam === 'true';
-
     if (
-      !hasPermission(this.request.user.permissions, permissions.createAccount)
+      !hasPermission(
+        this.request.user.permissions,
+        permissions.createAccount
+      ) ||
+      !hasPermission(this.request.user.permissions, permissions.createOrder)
     ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -67,13 +65,16 @@ export class ImportController {
       maxActivitiesToImport = Number.MAX_SAFE_INTEGER;
     }
 
+    const userCurrency = this.request.user.Settings.settings.baseCurrency;
+
     try {
       const activities = await this.importService.import({
         isDryRun,
         maxActivitiesToImport,
+        userCurrency,
         accountsDto: importData.accounts ?? [],
         activitiesDto: importData.activities,
-        user: this.request.user
+        userId: this.request.user.id
       });
 
       return { activities };
@@ -91,7 +92,7 @@ export class ImportController {
   }
 
   @Get('dividends/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async gatherDividends(

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

@@ -10,7 +10,6 @@ import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-
 import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
-
 import { Module } from '@nestjs/common';
 
 import { ImportController } from './import.controller';

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

@@ -13,10 +13,6 @@ import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/da
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
-import {
-  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
-  DATA_GATHERING_QUEUE_PRIORITY_MEDIUM
-} from '@ghostfolio/common/config';
 import {
   DATE_FORMAT,
   getAssetProfileIdentifier,
@@ -25,13 +21,11 @@ import {
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
 import {
   AccountWithPlatform,
-  OrderWithAccount,
-  UserWithSettings
+  OrderWithAccount
 } from '@ghostfolio/common/types';
-
 import { Injectable } from '@nestjs/common';
 import { DataSource, Prisma, SymbolProfile } from '@prisma/client';
-import { Big } from 'big.js';
+import Big from 'big.js';
 import { endOfToday, format, isAfter, isSameSecond, parseISO } from 'date-fns';
 import { uniqBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
@@ -116,13 +110,12 @@ export class ImportService {
           accountId: Account?.id,
           accountUserId: undefined,
           comment: undefined,
-          currency: undefined,
           createdAt: undefined,
           fee: 0,
           feeInBaseCurrency: 0,
           id: assetProfile.id,
           isDraft: false,
-          SymbolProfile: assetProfile,
+          SymbolProfile: <SymbolProfile>(<unknown>assetProfile),
           symbolProfileId: assetProfile.id,
           type: 'DIVIDEND',
           unitPrice: marketPrice,
@@ -145,16 +138,17 @@ export class ImportService {
     activitiesDto,
     isDryRun = false,
     maxActivitiesToImport,
-    user
+    userCurrency,
+    userId
   }: {
     accountsDto: Partial<CreateAccountDto>[];
     activitiesDto: Partial<CreateOrderDto>[];
     isDryRun?: boolean;
     maxActivitiesToImport: number;
-    user: UserWithSettings;
+    userCurrency: string;
+    userId: string;
   }): Promise<Activity[]> {
     const accountIdMapping: { [oldAccountId: string]: string } = {};
-    const userCurrency = user.Settings.settings.baseCurrency;
 
     if (!isDryRun && accountsDto?.length) {
       const [existingAccounts, existingPlatforms] = await Promise.all([
@@ -177,7 +171,7 @@ export class ImportService {
         );
 
         // If there is no account or if the account belongs to a different user then create a new account
-        if (!accountWithSameId || accountWithSameId.userId !== user.id) {
+        if (!accountWithSameId || accountWithSameId.userId !== userId) {
           let oldAccountId: string;
           const platformId = account.platformId;
 
@@ -190,7 +184,7 @@ export class ImportService {
 
           let accountObject: Prisma.AccountCreateInput = {
             ...account,
-            User: { connect: { id: user.id } }
+            User: { connect: { id: userId } }
           };
 
           if (
@@ -206,7 +200,7 @@ export class ImportService {
 
           const newAccount = await this.accountService.createAccount(
             accountObject,
-            user.id
+            userId
           );
 
           // Store the new to old account ID mappings for updating activities
@@ -237,17 +231,16 @@ export class ImportService {
 
     const assetProfiles = await this.validateActivities({
       activitiesDto,
-      maxActivitiesToImport,
-      user
+      maxActivitiesToImport
     });
 
     const activitiesExtendedWithErrors = await this.extendActivitiesWithErrors({
       activitiesDto,
       userCurrency,
-      userId: user.id
+      userId
     });
 
-    const accounts = (await this.accountService.getAccounts(user.id)).map(
+    const accounts = (await this.accountService.getAccounts(userId)).map(
       ({ id, name }) => {
         return { id, name };
       }
@@ -266,7 +259,6 @@ export class ImportService {
       {
         accountId,
         comment,
-        currency,
         date,
         error,
         fee,
@@ -291,6 +283,7 @@ export class ImportService {
         assetSubClass,
         countries,
         createdAt,
+        currency,
         dataSource,
         figi,
         figiComposite,
@@ -347,12 +340,12 @@ export class ImportService {
       if (isDryRun) {
         order = {
           comment,
-          currency,
           date,
           fee,
           quantity,
           type,
           unitPrice,
+          userId,
           accountId: validatedAccount?.id,
           accountUserId: undefined,
           createdAt: new Date(),
@@ -363,6 +356,7 @@ export class ImportService {
             assetSubClass,
             countries,
             createdAt,
+            currency,
             dataSource,
             figi,
             figiComposite,
@@ -376,13 +370,11 @@ export class ImportService {
             symbolMapping,
             updatedAt,
             url,
-            currency: assetProfile.currency,
             comment: assetProfile.comment
           },
           Account: validatedAccount,
           symbolProfileId: undefined,
-          updatedAt: new Date(),
-          userId: user.id
+          updatedAt: new Date()
         };
       } else {
         if (error) {
@@ -396,13 +388,14 @@ export class ImportService {
           quantity,
           type,
           unitPrice,
+          userId,
           accountId: validatedAccount?.id,
           SymbolProfile: {
             connectOrCreate: {
               create: {
+                currency,
                 dataSource,
-                symbol,
-                currency: assetProfile.currency
+                symbol
               },
               where: {
                 dataSource_symbol: {
@@ -413,8 +406,7 @@ export class ImportService {
             }
           },
           updateAccountBalance: false,
-          User: { connect: { id: user.id } },
-          userId: user.id
+          User: { connect: { id: userId } }
         });
       }
 
@@ -426,14 +418,14 @@ export class ImportService {
         value,
         feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
           fee,
-          assetProfile.currency,
+          currency,
           userCurrency
         ),
         // @ts-ignore
         SymbolProfile: assetProfile,
         valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
           value,
-          assetProfile.currency,
+          currency,
           userCurrency
         )
       });
@@ -452,16 +444,15 @@ export class ImportService {
         });
       });
 
-      this.dataGatheringService.gatherSymbols({
-        dataGatheringItems: uniqueActivities.map(({ date, SymbolProfile }) => {
+      this.dataGatheringService.gatherSymbols(
+        uniqueActivities.map(({ date, SymbolProfile }) => {
           return {
             date,
             dataSource: SymbolProfile.dataSource,
             symbol: SymbolProfile.symbol
           };
-        }),
-        priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
-      });
+        })
+      );
     }
 
     return activities;
@@ -528,14 +519,22 @@ export class ImportService {
             currency,
             dataSource,
             symbol,
-            activitiesCount: undefined,
-            assetClass: undefined,
-            assetSubClass: undefined,
-            countries: undefined,
+            assetClass: null,
+            assetSubClass: null,
+            comment: null,
+            countries: null,
             createdAt: undefined,
+            figi: null,
+            figiComposite: null,
+            figiShareClass: null,
             id: undefined,
-            sectors: undefined,
-            updatedAt: undefined
+            isin: null,
+            name: null,
+            scraperConfiguration: null,
+            sectors: null,
+            symbolMapping: null,
+            updatedAt: undefined,
+            url: null
           }
         };
       }
@@ -554,12 +553,10 @@ export class ImportService {
 
   private async validateActivities({
     activitiesDto,
-    maxActivitiesToImport,
-    user
+    maxActivitiesToImport
   }: {
     activitiesDto: Partial<CreateOrderDto>[];
     maxActivitiesToImport: number;
-    user: UserWithSettings;
   }) {
     if (activitiesDto?.length > maxActivitiesToImport) {
       throw new Error(`Too many activities (${maxActivitiesToImport} at most)`);
@@ -569,53 +566,46 @@ export class ImportService {
       [assetProfileIdentifier: string]: Partial<SymbolProfile>;
     } = {};
 
+    const uniqueActivitiesDto = uniqBy(
+      activitiesDto,
+      ({ dataSource, symbol }) => {
+        return getAssetProfileIdentifier({ dataSource, symbol });
+      }
+    );
+
     for (const [
       index,
-      { currency, dataSource, symbol, type }
-    ] of activitiesDto.entries()) {
+      { currency, dataSource, symbol }
+    ] of uniqueActivitiesDto.entries()) {
       if (!this.configurationService.get('DATA_SOURCES').includes(dataSource)) {
         throw new Error(
           `activities.${index}.dataSource ("${dataSource}") is not valid`
         );
       }
 
-      if (
-        this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-        user.subscription.type === 'Basic'
-      ) {
-        const dataProvider = this.dataProviderService.getDataProvider(
-          DataSource[dataSource]
-        );
+      if (dataSource !== 'MANUAL') {
+        const assetProfile = (
+          await this.dataProviderService.getAssetProfiles([
+            { dataSource, symbol }
+          ])
+        )?.[symbol];
 
-        if (dataProvider.getDataProviderInfo().isPremium) {
+        if (!assetProfile?.name) {
           throw new Error(
-            `activities.${index}.dataSource ("${dataSource}") is not valid`
+            `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
           );
         }
-      }
 
-      if (!assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })]) {
-        const assetProfile = {
-          currency,
-          ...(
-            await this.dataProviderService.getAssetProfiles([
-              { dataSource, symbol }
-            ])
-          )?.[symbol]
-        };
-
-        if (type === 'BUY' || type === 'DIVIDEND' || type === 'SELL') {
-          if (!assetProfile?.name) {
-            throw new Error(
-              `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
-            );
-          }
-
-          if (assetProfile.currency !== currency) {
-            throw new Error(
-              `activities.${index}.currency ("${currency}") does not match with currency of ${assetProfile.symbol} ("${assetProfile.currency}")`
-            );
-          }
+        if (
+          assetProfile.currency !== currency &&
+          !this.exchangeRateDataService.hasCurrencyPair(
+            currency,
+            assetProfile.currency
+          )
+        ) {
+          throw new Error(
+            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}" and no exchange rate is available from "${currency}" to "${assetProfile.currency}"`
+          );
         }
 
         assetProfiles[getAssetProfileIdentifier({ dataSource, symbol })] =

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

@@ -1,6 +1,5 @@
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { InfoItem } from '@ghostfolio/common/interfaces';
-
 import { Controller, Get, UseInterceptors } from '@nestjs/common';
 
 import { InfoService } from './info.service';

apps/api/src/app/info/info.module.ts

@@ -10,7 +10,6 @@ import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
 import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
-
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 

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

@@ -8,6 +8,7 @@ import { PropertyService } from '@ghostfolio/api/services/property/property.serv
 import { TagService } from '@ghostfolio/api/services/tag/tag.service';
 import {
   DEFAULT_CURRENCY,
+  DEFAULT_REQUEST_TIMEOUT,
   PROPERTY_BETTER_UPTIME_MONITOR_ID,
   PROPERTY_COUNTRIES_OF_SUBSCRIBERS,
   PROPERTY_DEMO_USER_ID,
@@ -28,7 +29,6 @@ import {
 } from '@ghostfolio/common/interfaces';
 import { permissions } from '@ghostfolio/common/permissions';
 import { SubscriptionOffer } from '@ghostfolio/common/types';
-
 import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import * as cheerio from 'cheerio';
@@ -60,6 +60,10 @@ export class InfoService {
 
     const globalPermissions: string[] = [];
 
+    if (this.configurationService.get('ENABLE_FEATURE_BLOG')) {
+      globalPermissions.push(permissions.enableBlog);
+    }
+
     if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
       if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
         info.fearAndGreedDataSource = encodeDataSource(
@@ -158,7 +162,7 @@ export class InfoService {
 
       setTimeout(() => {
         abortController.abort();
-      }, this.configurationService.get('REQUEST_TIMEOUT'));
+      }, DEFAULT_REQUEST_TIMEOUT);
 
       const { pull_count } = await got(
         `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
@@ -183,7 +187,7 @@ export class InfoService {
 
       setTimeout(() => {
         abortController.abort();
-      }, this.configurationService.get('REQUEST_TIMEOUT'));
+      }, DEFAULT_REQUEST_TIMEOUT);
 
       const { body } = await got('https://github.com/ghostfolio/ghostfolio', {
         // @ts-ignore
@@ -192,11 +196,11 @@ export class InfoService {
 
       const $ = cheerio.load(body);
 
-      return extractNumberFromString({
-        value: $(
+      return extractNumberFromString(
+        $(
           `a[href="/ghostfolio/ghostfolio/graphs/contributors"] .Counter`
         ).text()
-      });
+      );
     } catch (error) {
       Logger.error(error, 'InfoService - GitHub');
 
@@ -210,7 +214,7 @@ export class InfoService {
 
       setTimeout(() => {
         abortController.abort();
-      }, this.configurationService.get('REQUEST_TIMEOUT'));
+      }, DEFAULT_REQUEST_TIMEOUT);
 
       const { stargazers_count } = await got(
         `https://api.github.com/repos/ghostfolio/ghostfolio`,
@@ -338,7 +342,7 @@ export class InfoService {
 
         setTimeout(() => {
           abortController.abort();
-        }, this.configurationService.get('REQUEST_TIMEOUT'));
+        }, DEFAULT_REQUEST_TIMEOUT);
 
         const { data } = await got(
           `https://uptime.betterstack.com/api/v2/monitors/${monitorId}/sla?from=${format(
@@ -348,7 +352,7 @@ export class InfoService {
           {
             headers: {
               Authorization: `Bearer ${this.configurationService.get(
-                'API_KEY_BETTER_UPTIME'
+                'BETTER_UPTIME_API_KEY'
               )}`
             },
             // @ts-ignore

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

@@ -1,5 +1,4 @@
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-
 import {
   Controller,
   Get,

apps/api/src/app/logo/logo.module.ts

@@ -1,6 +1,5 @@
 import { ConfigurationModule } from '@ghostfolio/api/services/configuration/configuration.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
-
 import { Module } from '@nestjs/common';
 
 import { LogoController } from './logo.controller';

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

@@ -1,7 +1,6 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
+import { DEFAULT_REQUEST_TIMEOUT } from '@ghostfolio/common/config';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
-
 import { HttpException, Injectable } from '@nestjs/common';
 import { DataSource } from '@prisma/client';
 import got from 'got';
@@ -10,7 +9,6 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 @Injectable()
 export class LogoService {
   public constructor(
-    private readonly configurationService: ConfigurationService,
     private readonly symbolProfileService: SymbolProfileService
   ) {}
 
@@ -48,7 +46,7 @@ export class LogoService {
 
     setTimeout(() => {
       abortController.abort();
-    }, this.configurationService.get('REQUEST_TIMEOUT'));
+    }, DEFAULT_REQUEST_TIMEOUT);
 
     return got(
       `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,

apps/api/src/app/order/create-order.dto.ts

@@ -10,7 +10,6 @@ import {
   IsArray,
   IsBoolean,
   IsEnum,
-  IsISO4217CurrencyCode,
   IsISO8601,
   IsNumber,
   IsOptional,
@@ -39,13 +38,9 @@ export class CreateOrderDto {
   )
   comment?: string;
 
-  @IsISO4217CurrencyCode()
+  @IsString()
   currency: string;
 
-  @IsISO4217CurrencyCode()
-  @IsOptional()
-  customCurrency?: string;
-
   @IsOptional()
   @IsEnum(DataSource, { each: true })
   dataSource?: DataSource;

apps/api/src/app/order/interfaces/activities.interface.ts

@@ -1,19 +1,13 @@
-import { EnhancedSymbolProfile } from '@ghostfolio/common/interfaces';
-import { AccountWithPlatform } from '@ghostfolio/common/types';
-
-import { Order, Tag } from '@prisma/client';
+import { OrderWithAccount } from '@ghostfolio/common/types';
 
 export interface Activities {
   activities: Activity[];
   count: number;
 }
 
-export interface Activity extends Order {
-  Account?: AccountWithPlatform;
+export interface Activity extends OrderWithAccount {
   error?: ActivityError;
   feeInBaseCurrency: number;
-  SymbolProfile?: EnhancedSymbolProfile;
-  tags?: Tag[];
   updateAccountBalance?: boolean;
   value: number;
   valueInBaseCurrency: number;

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

@@ -1,19 +1,12 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { getInterval } from '@ghostfolio/api/helper/portfolio.helper';
 import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
 import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
 import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
 import { ApiService } from '@ghostfolio/api/services/api/api.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering/data-gathering.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation/impersonation.service';
-import {
-  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
-  HEADER_KEY_IMPERSONATION
-} from '@ghostfolio/common/config';
+import { HEADER_KEY_IMPERSONATION } from '@ghostfolio/common/config';
 import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { DateRange, RequestWithUser } from '@ghostfolio/common/types';
-
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
@@ -51,16 +44,24 @@ export class OrderController {
   ) {}
 
   @Delete()
-  @HasPermission(permissions.deleteOrder)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteOrders(): Promise<number> {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.deleteOrder)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.orderService.deleteOrders({
       userId: this.request.user.id
     });
   }
 
   @Delete(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
     const order = await this.orderService.order({ id });
 
@@ -81,14 +82,13 @@ export class OrderController {
   }
 
   @Get()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(RedactValuesInResponseInterceptor)
   @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async getAllOrders(
     @Headers(HEADER_KEY_IMPERSONATION.toLowerCase()) impersonationId,
     @Query('accounts') filterByAccounts?: string,
     @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('range') dateRange: DateRange = 'max',
     @Query('skip') skip?: number,
     @Query('sortColumn') sortColumn?: string,
     @Query('sortDirection') sortDirection?: Prisma.SortOrder,
@@ -101,18 +101,14 @@ export class OrderController {
       filterByTags
     });
 
-    const { endDate, startDate } = getInterval(dateRange);
-
     const impersonationUserId =
       await this.impersonationService.validateImpersonationId(impersonationId);
     const userCurrency = this.request.user.Settings.settings.baseCurrency;
 
     const { activities, count } = await this.orderService.getOrders({
-      endDate,
       filters,
       sortColumn,
       sortDirection,
-      startDate,
       userCurrency,
       includeDrafts: true,
       skip: isNaN(skip) ? undefined : skip,
@@ -124,18 +120,17 @@ export class OrderController {
     return { activities, count };
   }
 
-  @HasPermission(permissions.createOrder)
   @Post()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   public async createOrder(@Body() data: CreateOrderDto): Promise<OrderModel> {
-    const currency = data.currency;
-    const customCurrency = data.customCurrency;
-
-    if (customCurrency) {
-      data.currency = customCurrency;
-
-      delete data.customCurrency;
+    if (
+      !hasPermission(this.request.user.permissions, permissions.createOrder)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
     }
 
     const order = await this.orderService.createOrder({
@@ -144,7 +139,7 @@ export class OrderController {
       SymbolProfile: {
         connectOrCreate: {
           create: {
-            currency,
+            currency: data.currency,
             dataSource: data.dataSource,
             symbol: data.symbol
           },
@@ -163,31 +158,31 @@ export class OrderController {
     if (data.dataSource && !order.isDraft) {
       // Gather symbol data in the background, if data source is set
       // (not MANUAL) and not draft
-      this.dataGatheringService.gatherSymbols({
-        dataGatheringItems: [
-          {
-            dataSource: data.dataSource,
-            date: order.date,
-            symbol: data.symbol
-          }
-        ],
-        priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
-      });
+      this.dataGatheringService.gatherSymbols([
+        {
+          dataSource: data.dataSource,
+          date: order.date,
+          symbol: data.symbol
+        }
+      ]);
     }
 
     return order;
   }
 
-  @HasPermission(permissions.updateOrder)
   @Put(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   @UseInterceptors(TransformDataSourceInRequestInterceptor)
   public async update(@Param('id') id: string, @Body() data: UpdateOrderDto) {
     const originalOrder = await this.orderService.order({
       id
     });
 
-    if (!originalOrder || originalOrder.userId !== this.request.user.id) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updateOrder) ||
+      !originalOrder ||
+      originalOrder.userId !== this.request.user.id
+    ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
         StatusCodes.FORBIDDEN
@@ -197,16 +192,8 @@ export class OrderController {
     const date = parseISO(data.date);
 
     const accountId = data.accountId;
-    const customCurrency = data.customCurrency;
-
     delete data.accountId;
 
-    if (customCurrency) {
-      data.currency = customCurrency;
-
-      delete data.customCurrency;
-    }
-
     return this.orderService.updateOrder({
       data: {
         ...data,

apps/api/src/app/order/order.module.ts

@@ -11,7 +11,6 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-d
 import { ImpersonationModule } from '@ghostfolio/api/services/impersonation/impersonation.module';
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
 import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module';
-
 import { Module } from '@nestjs/common';
 
 import { OrderController } from './order.controller';

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

@@ -4,14 +4,12 @@ import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile/symbol-profile.service';
 import {
-  DATA_GATHERING_QUEUE_PRIORITY_HIGH,
   GATHER_ASSET_PROFILE_PROCESS,
   GATHER_ASSET_PROFILE_PROCESS_OPTIONS
 } from '@ghostfolio/common/config';
 import { getAssetProfileIdentifier } from '@ghostfolio/common/helper';
-import { Filter, UniqueAsset } from '@ghostfolio/common/interfaces';
+import { Filter } from '@ghostfolio/common/interfaces';
 import { OrderWithAccount } from '@ghostfolio/common/types';
-
 import { Injectable } from '@nestjs/common';
 import {
   AssetClass,
@@ -20,14 +18,13 @@ import {
   Order,
   Prisma,
   Tag,
-  Type as ActivityType
+  Type as TypeOfOrder
 } from '@prisma/client';
-import { Big } from 'big.js';
+import Big from 'big.js';
 import { endOfToday, isAfter } from 'date-fns';
-import { groupBy, uniqBy } from 'lodash';
+import { groupBy } from 'lodash';
 import { v4 as uuidv4 } from 'uuid';
 
-import { CreateOrderDto } from './create-order.dto';
 import { Activities } from './interfaces/activities.interface';
 
 @Injectable()
@@ -67,13 +64,20 @@ export class OrderService {
     }
 
     const accountId = data.accountId;
+    let currency = data.currency;
     const tags = data.tags ?? [];
     const updateAccountBalance = data.updateAccountBalance ?? false;
     const userId = data.userId;
 
-    if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(data.type)) {
+    if (
+      data.type === 'FEE' ||
+      data.type === 'INTEREST' ||
+      data.type === 'ITEM' ||
+      data.type === 'LIABILITY'
+    ) {
       const assetClass = data.assetClass;
       const assetSubClass = data.assetSubClass;
+      currency = data.SymbolProfile.connectOrCreate.create.currency;
       const dataSource: DataSource = 'MANUAL';
       const id = uuidv4();
       const name = data.SymbolProfile.connectOrCreate.create.symbol;
@@ -81,6 +85,7 @@ export class OrderService {
       data.id = id;
       data.SymbolProfile.connectOrCreate.create.assetClass = assetClass;
       data.SymbolProfile.connectOrCreate.create.assetSubClass = assetSubClass;
+      data.SymbolProfile.connectOrCreate.create.currency = currency;
       data.SymbolProfile.connectOrCreate.create.dataSource = dataSource;
       data.SymbolProfile.connectOrCreate.create.name = name;
       data.SymbolProfile.connectOrCreate.create.symbol = id;
@@ -102,8 +107,7 @@ export class OrderService {
           jobId: getAssetProfileIdentifier({
             dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
             symbol: data.SymbolProfile.connectOrCreate.create.symbol
-          }),
-          priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
+          })
         }
       });
     }
@@ -116,6 +120,7 @@ export class OrderService {
       delete data.comment;
     }
 
+    delete data.currency;
     delete data.dataSource;
     delete data.symbol;
     delete data.tags;
@@ -124,9 +129,13 @@ export class OrderService {
 
     const orderData: Prisma.OrderCreateInput = data;
 
-    const isDraft = ['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(data.type)
-      ? false
-      : isAfter(data.date as Date, endOfToday());
+    const isDraft =
+      data.type === 'FEE' ||
+      data.type === 'INTEREST' ||
+      data.type === 'ITEM' ||
+      data.type === 'LIABILITY'
+        ? false
+        : isAfter(data.date as Date, endOfToday());
 
     const order = await this.prismaService.order.create({
       data: {
@@ -147,15 +156,15 @@ export class OrderService {
         .plus(data.fee)
         .toNumber();
 
-      if (['BUY', 'FEE'].includes(data.type)) {
+      if (data.type === 'BUY') {
         amount = new Big(amount).mul(-1).toNumber();
       }
 
       await this.accountService.updateAccountBalance({
         accountId,
         amount,
+        currency,
         userId,
-        currency: data.SymbolProfile.connectOrCreate.create.currency,
         date: data.date as Date
       });
     }
@@ -170,7 +179,12 @@ export class OrderService {
       where
     });
 
-    if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(order.type)) {
+    if (
+      order.type === 'FEE' ||
+      order.type === 'INTEREST' ||
+      order.type === 'ITEM' ||
+      order.type === 'LIABILITY'
+    ) {
       await this.symbolProfileService.deleteById(order.symbolProfileId);
     }
 
@@ -185,40 +199,25 @@ export class OrderService {
     return count;
   }
 
-  public async getLatestOrder({ dataSource, symbol }: UniqueAsset) {
-    return this.prismaService.order.findFirst({
-      orderBy: {
-        date: 'desc'
-      },
-      where: {
-        SymbolProfile: { dataSource, symbol }
-      }
-    });
-  }
-
   public async getOrders({
-    endDate,
     filters,
     includeDrafts = false,
     skip,
     sortColumn,
     sortDirection,
-    startDate,
     take = Number.MAX_SAFE_INTEGER,
     types,
     userCurrency,
     userId,
     withExcludedAccounts = false
   }: {
-    endDate?: Date;
     filters?: Filter[];
     includeDrafts?: boolean;
     skip?: number;
     sortColumn?: string;
     sortDirection?: Prisma.SortOrder;
-    startDate?: Date;
     take?: number;
-    types?: ActivityType[];
+    types?: TypeOfOrder[];
     userCurrency: string;
     userId: string;
     withExcludedAccounts?: boolean;
@@ -228,18 +227,6 @@ export class OrderService {
     ];
     const where: Prisma.OrderWhereInput = { userId };
 
-    if (endDate || startDate) {
-      where.AND = [];
-
-      if (endDate) {
-        where.AND.push({ date: { lte: endDate } });
-      }
-
-      if (startDate) {
-        where.AND.push({ date: { gt: startDate } });
-      }
-    }
-
     const {
       ACCOUNT: filtersByAccount,
       ASSET_CLASS: filtersByAssetClass,
@@ -304,14 +291,13 @@ export class OrderService {
     }
 
     if (types) {
-      where.type = { in: types };
-    }
-
-    if (withExcludedAccounts === false) {
-      where.OR = [
-        { Account: null },
-        { Account: { NOT: { isExcluded: true } } }
-      ];
+      where.OR = types.map((type) => {
+        return {
+          type: {
+            equals: type
+          }
+        };
+      });
     }
 
     const [orders, count] = await Promise.all([
@@ -335,52 +321,32 @@ export class OrderService {
       this.prismaService.order.count({ where })
     ]);
 
-    const uniqueAssets = uniqBy(
-      orders.map(({ SymbolProfile }) => {
-        return {
-          dataSource: SymbolProfile.dataSource,
-          symbol: SymbolProfile.symbol
-        };
-      }),
-      ({ dataSource, symbol }) => {
-        return getAssetProfileIdentifier({
-          dataSource,
-          symbol
-        });
-      }
-    );
-
-    const assetProfiles =
-      await this.symbolProfileService.getSymbolProfiles(uniqueAssets);
-
-    const activities = orders.map((order) => {
-      const assetProfile = assetProfiles.find(({ dataSource, symbol }) => {
+    const activities = orders
+      .filter((order) => {
         return (
-          dataSource === order.SymbolProfile.dataSource &&
-          symbol === order.SymbolProfile.symbol
+          withExcludedAccounts ||
+          !order.Account ||
+          order.Account?.isExcluded === false
         );
-      });
+      })
+      .map((order) => {
+        const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
 
-      const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
-
-      return {
-        ...order,
-        value,
-        // TODO: Use exchange rate of date
-        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
-          order.fee,
-          order.SymbolProfile.currency,
-          userCurrency
-        ),
-        SymbolProfile: assetProfile,
-        // TODO: Use exchange rate of date
-        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
+        return {
+          ...order,
           value,
-          order.SymbolProfile.currency,
-          userCurrency
-        )
-      };
-    });
+          feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
+            order.fee,
+            order.SymbolProfile.currency,
+            userCurrency
+          ),
+          valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
+            value,
+            order.SymbolProfile.currency,
+            userCurrency
+          )
+        };
+      });
 
     return { activities, count };
   }
@@ -404,10 +370,13 @@ export class OrderService {
       dataSource?: DataSource;
       symbol?: string;
       tags?: Tag[];
-      type?: ActivityType;
     };
     where: Prisma.OrderWhereUniqueInput;
   }): Promise<Order> {
+    if (data.Account.connect.id_userId.id === null) {
+      delete data.Account;
+    }
+
     if (!data.comment) {
       data.comment = null;
     }
@@ -416,12 +385,13 @@ export class OrderService {
 
     let isDraft = false;
 
-    if (['FEE', 'INTEREST', 'ITEM', 'LIABILITY'].includes(data.type)) {
+    if (
+      data.type === 'FEE' ||
+      data.type === 'INTEREST' ||
+      data.type === 'ITEM' ||
+      data.type === 'LIABILITY'
+    ) {
       delete data.SymbolProfile.connect;
-
-      if (data.Account?.connect?.id_userId?.id === null) {
-        data.Account = { disconnect: true };
-      }
     } else {
       delete data.SymbolProfile.update;
 
@@ -429,22 +399,19 @@ export class OrderService {
 
       if (!isDraft) {
         // Gather symbol data of order in the background, if not draft
-        this.dataGatheringService.gatherSymbols({
-          dataGatheringItems: [
-            {
-              dataSource:
-                data.SymbolProfile.connect.dataSource_symbol.dataSource,
-              date: <Date>data.date,
-              symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
-            }
-          ],
-          priority: DATA_GATHERING_QUEUE_PRIORITY_HIGH
-        });
+        this.dataGatheringService.gatherSymbols([
+          {
+            dataSource: data.SymbolProfile.connect.dataSource_symbol.dataSource,
+            date: <Date>data.date,
+            symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
+          }
+        ]);
       }
     }
 
     delete data.assetClass;
     delete data.assetSubClass;
+    delete data.currency;
     delete data.dataSource;
     delete data.symbol;
     delete data.tags;

apps/api/src/app/order/update-order.dto.ts

@@ -9,7 +9,6 @@ import { Transform, TransformFnParams } from 'class-transformer';
 import {
   IsArray,
   IsEnum,
-  IsISO4217CurrencyCode,
   IsISO8601,
   IsNumber,
   IsOptional,
@@ -38,13 +37,9 @@ export class UpdateOrderDto {
   )
   comment?: string;
 
-  @IsISO4217CurrencyCode()
+  @IsString()
   currency: string;
 
-  @IsISO4217CurrencyCode()
-  @IsOptional()
-  customCurrency?: string;
-
   @IsString()
   dataSource: DataSource;
 

apps/api/src/app/platform/create-platform.dto.ts

@@ -1,12 +1,9 @@
-import { IsString, IsUrl } from 'class-validator';
+import { IsString } from 'class-validator';
 
 export class CreatePlatformDto {
   @IsString()
   name: string;
 
-  @IsUrl({
-    protocols: ['https'],
-    require_protocol: true
-  })
+  @IsString()
   url: string;
 }

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

@@ -1,18 +1,18 @@
-import { HasPermission } from '@ghostfolio/api/decorators/has-permission.decorator';
-import { HasPermissionGuard } from '@ghostfolio/api/guards/has-permission.guard';
-import { permissions } from '@ghostfolio/common/permissions';
-
+import { hasPermission, permissions } from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
   Delete,
   Get,
   HttpException,
+  Inject,
   Param,
   Post,
   Put,
   UseGuards
 } from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { Platform } from '@prisma/client';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
@@ -23,30 +23,49 @@ import { UpdatePlatformDto } from './update-platform.dto';
 
 @Controller('platform')
 export class PlatformController {
-  public constructor(private readonly platformService: PlatformService) {}
+  public constructor(
+    private readonly platformService: PlatformService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
 
   @Get()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async getPlatforms() {
     return this.platformService.getPlatformsWithAccountCount();
   }
 
-  @HasPermission(permissions.createPlatform)
   @Post()
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async createPlatform(
     @Body() data: CreatePlatformDto
   ): Promise<Platform> {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.createPlatform)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     return this.platformService.createPlatform(data);
   }
 
-  @HasPermission(permissions.updatePlatform)
   @Put(':id')
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async updatePlatform(
     @Param('id') id: string,
     @Body() data: UpdatePlatformDto
   ) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.updatePlatform)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const originalPlatform = await this.platformService.getPlatform({
       id
     });
@@ -69,9 +88,17 @@ export class PlatformController {
   }
 
   @Delete(':id')
-  @HasPermission(permissions.deletePlatform)
-  @UseGuards(AuthGuard('jwt'), HasPermissionGuard)
+  @UseGuards(AuthGuard('jwt'))
   public async deletePlatform(@Param('id') id: string) {
+    if (
+      !hasPermission(this.request.user.permissions, permissions.deletePlatform)
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
     const originalPlatform = await this.platformService.getPlatform({
       id
     });

apps/api/src/app/platform/platform.module.ts

@@ -1,5 +1,4 @@
 import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module';
-
 import { Module } from '@nestjs/common';
 
 import { PlatformController } from './platform.controller';

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

@@ -1,5 +1,4 @@
 import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
-
 import { Injectable } from '@nestjs/common';
 import { Platform, Prisma } from '@prisma/client';
 

apps/api/src/app/platform/update-platform.dto.ts

@@ -1,4 +1,4 @@
-import { IsString, IsUrl } from 'class-validator';
+import { IsString } from 'class-validator';
 
 export class UpdatePlatformDto {
   @IsString()
@@ -7,9 +7,6 @@ export class UpdatePlatformDto {
   @IsString()
   name: string;
 
-  @IsUrl({
-    protocols: ['https'],
-    require_protocol: true
-  })
+  @IsString()
   url: string;
 }

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

@@ -1,37 +0,0 @@
-import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator';
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
-import {
-  SymbolMetrics,
-  TimelinePosition,
-  UniqueAsset
-} from '@ghostfolio/common/interfaces';
-
-export class MWRPortfolioCalculator extends PortfolioCalculator {
-  protected calculateOverallPerformance(
-    positions: TimelinePosition[]
-  ): CurrentPositions {
-    throw new Error('Method not implemented.');
-  }
-
-  protected getSymbolMetrics({
-    dataSource,
-    end,
-    exchangeRates,
-    isChartMode = false,
-    marketSymbolMap,
-    start,
-    step = 1,
-    symbol
-  }: {
-    end: Date;
-    exchangeRates: { [dateString: string]: number };
-    isChartMode?: boolean;
-    marketSymbolMap: {
-      [date: string]: { [symbol: string]: Big };
-    };
-    start: Date;
-    step?: number;
-  } & UniqueAsset): SymbolMetrics {
-    throw new Error('Method not implemented.');
-  }
-}

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

@@ -1,26 +0,0 @@
-export const activityDummyData = {
-  accountId: undefined,
-  accountUserId: undefined,
-  comment: undefined,
-  createdAt: new Date(),
-  currency: undefined,
-  feeInBaseCurrency: undefined,
-  id: undefined,
-  isDraft: false,
-  symbolProfileId: undefined,
-  updatedAt: new Date(),
-  userId: undefined,
-  value: undefined,
-  valueInBaseCurrency: undefined
-};
-
-export const symbolProfileDummyData = {
-  activitiesCount: undefined,
-  assetClass: undefined,
-  assetSubClass: undefined,
-  countries: [],
-  createdAt: undefined,
-  id: undefined,
-  sectors: [],
-  updatedAt: undefined
-};

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

@@ -1,51 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-
-import { Injectable } from '@nestjs/common';
-
-import { MWRPortfolioCalculator } from './mwr/portfolio-calculator';
-import { PortfolioCalculator } from './portfolio-calculator';
-import { TWRPortfolioCalculator } from './twr/portfolio-calculator';
-
-export enum PerformanceCalculationType {
-  MWR = 'MWR', // Money-Weighted Rate of Return
-  TWR = 'TWR' // Time-Weighted Rate of Return
-}
-
-@Injectable()
-export class PortfolioCalculatorFactory {
-  public constructor(
-    private readonly currentRateService: CurrentRateService,
-    private readonly exchangeRateDataService: ExchangeRateDataService
-  ) {}
-
-  public createCalculator({
-    activities,
-    calculationType,
-    currency
-  }: {
-    activities: Activity[];
-    calculationType: PerformanceCalculationType;
-    currency: string;
-  }): PortfolioCalculator {
-    switch (calculationType) {
-      case PerformanceCalculationType.MWR:
-        return new MWRPortfolioCalculator({
-          activities,
-          currency,
-          currentRateService: this.currentRateService,
-          exchangeRateDataService: this.exchangeRateDataService
-        });
-      case PerformanceCalculationType.TWR:
-        return new TWRPortfolioCalculator({
-          activities,
-          currency,
-          currentRateService: this.currentRateService,
-          exchangeRateDataService: this.exchangeRateDataService
-        });
-      default:
-        throw new Error('Invalid calculation type');
-    }
-  }
-}

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

@@ -1,807 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
-import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';
-import { TransactionPointSymbol } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point-symbol.interface';
-import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';
-import {
-  getFactor,
-  getInterval
-} from '@ghostfolio/api/helper/portfolio.helper';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
-import { MAX_CHART_ITEMS } from '@ghostfolio/common/config';
-import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';
-import {
-  DataProviderInfo,
-  HistoricalDataItem,
-  InvestmentItem,
-  ResponseError,
-  SymbolMetrics,
-  TimelinePosition,
-  UniqueAsset
-} from '@ghostfolio/common/interfaces';
-import { DateRange, GroupBy } from '@ghostfolio/common/types';
-
-import { Big } from 'big.js';
-import {
-  differenceInDays,
-  eachDayOfInterval,
-  endOfDay,
-  format,
-  isBefore,
-  isSameDay,
-  max,
-  subDays
-} from 'date-fns';
-import { last, uniq, uniqBy } from 'lodash';
-
-export abstract class PortfolioCalculator {
-  protected static readonly ENABLE_LOGGING = false;
-
-  protected orders: PortfolioOrder[];
-
-  private currency: string;
-  private currentRateService: CurrentRateService;
-  private dataProviderInfos: DataProviderInfo[];
-  private exchangeRateDataService: ExchangeRateDataService;
-  private transactionPoints: TransactionPoint[];
-
-  public constructor({
-    activities,
-    currency,
-    currentRateService,
-    exchangeRateDataService
-  }: {
-    activities: Activity[];
-    currency: string;
-    currentRateService: CurrentRateService;
-    exchangeRateDataService: ExchangeRateDataService;
-  }) {
-    this.currency = currency;
-    this.currentRateService = currentRateService;
-    this.exchangeRateDataService = exchangeRateDataService;
-    this.orders = activities.map(
-      ({ date, fee, quantity, SymbolProfile, tags = [], type, unitPrice }) => {
-        return {
-          SymbolProfile,
-          tags,
-          type,
-          date: format(date, DATE_FORMAT),
-          fee: new Big(fee),
-          quantity: new Big(quantity),
-          unitPrice: new Big(unitPrice)
-        };
-      }
-    );
-
-    this.orders.sort((a, b) => {
-      return a.date?.localeCompare(b.date);
-    });
-
-    this.computeTransactionPoints();
-  }
-
-  protected abstract calculateOverallPerformance(
-    positions: TimelinePosition[]
-  ): CurrentPositions;
-
-  public async getChart({
-    dateRange = 'max',
-    withDataDecimation = true
-  }: {
-    dateRange?: DateRange;
-    withDataDecimation?: boolean;
-  }): Promise<HistoricalDataItem[]> {
-    if (this.getTransactionPoints().length === 0) {
-      return [];
-    }
-
-    const { endDate, startDate } = getInterval(dateRange, this.getStartDate());
-
-    const daysInMarket = differenceInDays(endDate, startDate) + 1;
-    const step = withDataDecimation
-      ? Math.round(daysInMarket / Math.min(daysInMarket, MAX_CHART_ITEMS))
-      : 1;
-
-    return this.getChartData({
-      step,
-      end: endDate,
-      start: startDate
-    });
-  }
-
-  public async getChartData({
-    end = new Date(Date.now()),
-    start,
-    step = 1
-  }: {
-    end?: Date;
-    start: Date;
-    step?: number;
-  }): Promise<HistoricalDataItem[]> {
-    const symbols: { [symbol: string]: boolean } = {};
-
-    const transactionPointsBeforeEndDate =
-      this.transactionPoints?.filter((transactionPoint) => {
-        return isBefore(parseDate(transactionPoint.date), end);
-      }) ?? [];
-
-    const currencies: { [symbol: string]: string } = {};
-    const dataGatheringItems: IDataGatheringItem[] = [];
-    const firstIndex = transactionPointsBeforeEndDate.length;
-
-    let dates = eachDayOfInterval({ start, end }, { step }).map((date) => {
-      return resetHours(date);
-    });
-
-    const includesEndDate = isSameDay(last(dates), end);
-
-    if (!includesEndDate) {
-      dates.push(resetHours(end));
-    }
-
-    if (transactionPointsBeforeEndDate.length > 0) {
-      for (const {
-        currency,
-        dataSource,
-        symbol
-      } of transactionPointsBeforeEndDate[firstIndex - 1].items) {
-        dataGatheringItems.push({
-          dataSource,
-          symbol
-        });
-        currencies[symbol] = currency;
-        symbols[symbol] = true;
-      }
-    }
-
-    const { dataProviderInfos, values: marketSymbols } =
-      await this.currentRateService.getValues({
-        dataGatheringItems,
-        dateQuery: {
-          in: dates
-        }
-      });
-
-    this.dataProviderInfos = dataProviderInfos;
-
-    const marketSymbolMap: {
-      [date: string]: { [symbol: string]: Big };
-    } = {};
-
-    let exchangeRatesByCurrency =
-      await this.exchangeRateDataService.getExchangeRatesByCurrency({
-        currencies: uniq(Object.values(currencies)),
-        endDate: endOfDay(end),
-        startDate: this.getStartDate(),
-        targetCurrency: this.currency
-      });
-
-    for (const marketSymbol of marketSymbols) {
-      const dateString = format(marketSymbol.date, DATE_FORMAT);
-      if (!marketSymbolMap[dateString]) {
-        marketSymbolMap[dateString] = {};
-      }
-      if (marketSymbol.marketPrice) {
-        marketSymbolMap[dateString][marketSymbol.symbol] = new Big(
-          marketSymbol.marketPrice
-        );
-      }
-    }
-
-    const accumulatedValuesByDate: {
-      [date: string]: {
-        investmentValueWithCurrencyEffect: Big;
-        totalCurrentValue: Big;
-        totalCurrentValueWithCurrencyEffect: Big;
-        totalInvestmentValue: Big;
-        totalInvestmentValueWithCurrencyEffect: Big;
-        totalNetPerformanceValue: Big;
-        totalNetPerformanceValueWithCurrencyEffect: Big;
-        totalTimeWeightedInvestmentValue: Big;
-        totalTimeWeightedInvestmentValueWithCurrencyEffect: Big;
-      };
-    } = {};
-
-    const valuesBySymbol: {
-      [symbol: string]: {
-        currentValues: { [date: string]: Big };
-        currentValuesWithCurrencyEffect: { [date: string]: Big };
-        investmentValuesAccumulated: { [date: string]: Big };
-        investmentValuesAccumulatedWithCurrencyEffect: { [date: string]: Big };
-        investmentValuesWithCurrencyEffect: { [date: string]: Big };
-        netPerformanceValues: { [date: string]: Big };
-        netPerformanceValuesWithCurrencyEffect: { [date: string]: Big };
-        timeWeightedInvestmentValues: { [date: string]: Big };
-        timeWeightedInvestmentValuesWithCurrencyEffect: { [date: string]: Big };
-      };
-    } = {};
-
-    for (const symbol of Object.keys(symbols)) {
-      const {
-        currentValues,
-        currentValuesWithCurrencyEffect,
-        investmentValuesAccumulated,
-        investmentValuesAccumulatedWithCurrencyEffect,
-        investmentValuesWithCurrencyEffect,
-        netPerformanceValues,
-        netPerformanceValuesWithCurrencyEffect,
-        timeWeightedInvestmentValues,
-        timeWeightedInvestmentValuesWithCurrencyEffect
-      } = this.getSymbolMetrics({
-        end,
-        marketSymbolMap,
-        start,
-        step,
-        symbol,
-        dataSource: null,
-        exchangeRates:
-          exchangeRatesByCurrency[`${currencies[symbol]}${this.currency}`],
-        isChartMode: true
-      });
-
-      valuesBySymbol[symbol] = {
-        currentValues,
-        currentValuesWithCurrencyEffect,
-        investmentValuesAccumulated,
-        investmentValuesAccumulatedWithCurrencyEffect,
-        investmentValuesWithCurrencyEffect,
-        netPerformanceValues,
-        netPerformanceValuesWithCurrencyEffect,
-        timeWeightedInvestmentValues,
-        timeWeightedInvestmentValuesWithCurrencyEffect
-      };
-    }
-
-    for (const currentDate of dates) {
-      const dateString = format(currentDate, DATE_FORMAT);
-
-      for (const symbol of Object.keys(valuesBySymbol)) {
-        const symbolValues = valuesBySymbol[symbol];
-
-        const currentValue =
-          symbolValues.currentValues?.[dateString] ?? new Big(0);
-
-        const currentValueWithCurrencyEffect =
-          symbolValues.currentValuesWithCurrencyEffect?.[dateString] ??
-          new Big(0);
-
-        const investmentValueAccumulated =
-          symbolValues.investmentValuesAccumulated?.[dateString] ?? new Big(0);
-
-        const investmentValueAccumulatedWithCurrencyEffect =
-          symbolValues.investmentValuesAccumulatedWithCurrencyEffect?.[
-            dateString
-          ] ?? new Big(0);
-
-        const investmentValueWithCurrencyEffect =
-          symbolValues.investmentValuesWithCurrencyEffect?.[dateString] ??
-          new Big(0);
-
-        const netPerformanceValue =
-          symbolValues.netPerformanceValues?.[dateString] ?? new Big(0);
-
-        const netPerformanceValueWithCurrencyEffect =
-          symbolValues.netPerformanceValuesWithCurrencyEffect?.[dateString] ??
-          new Big(0);
-
-        const timeWeightedInvestmentValue =
-          symbolValues.timeWeightedInvestmentValues?.[dateString] ?? new Big(0);
-
-        const timeWeightedInvestmentValueWithCurrencyEffect =
-          symbolValues.timeWeightedInvestmentValuesWithCurrencyEffect?.[
-            dateString
-          ] ?? new Big(0);
-
-        accumulatedValuesByDate[dateString] = {
-          investmentValueWithCurrencyEffect: (
-            accumulatedValuesByDate[dateString]
-              ?.investmentValueWithCurrencyEffect ?? new Big(0)
-          ).add(investmentValueWithCurrencyEffect),
-          totalCurrentValue: (
-            accumulatedValuesByDate[dateString]?.totalCurrentValue ?? new Big(0)
-          ).add(currentValue),
-          totalCurrentValueWithCurrencyEffect: (
-            accumulatedValuesByDate[dateString]
-              ?.totalCurrentValueWithCurrencyEffect ?? new Big(0)
-          ).add(currentValueWithCurrencyEffect),
-          totalInvestmentValue: (
-            accumulatedValuesByDate[dateString]?.totalInvestmentValue ??
-            new Big(0)
-          ).add(investmentValueAccumulated),
-          totalInvestmentValueWithCurrencyEffect: (
-            accumulatedValuesByDate[dateString]
-              ?.totalInvestmentValueWithCurrencyEffect ?? new Big(0)
-          ).add(investmentValueAccumulatedWithCurrencyEffect),
-          totalNetPerformanceValue: (
-            accumulatedValuesByDate[dateString]?.totalNetPerformanceValue ??
-            new Big(0)
-          ).add(netPerformanceValue),
-          totalNetPerformanceValueWithCurrencyEffect: (
-            accumulatedValuesByDate[dateString]
-              ?.totalNetPerformanceValueWithCurrencyEffect ?? new Big(0)
-          ).add(netPerformanceValueWithCurrencyEffect),
-          totalTimeWeightedInvestmentValue: (
-            accumulatedValuesByDate[dateString]
-              ?.totalTimeWeightedInvestmentValue ?? new Big(0)
-          ).add(timeWeightedInvestmentValue),
-          totalTimeWeightedInvestmentValueWithCurrencyEffect: (
-            accumulatedValuesByDate[dateString]
-              ?.totalTimeWeightedInvestmentValueWithCurrencyEffect ?? new Big(0)
-          ).add(timeWeightedInvestmentValueWithCurrencyEffect)
-        };
-      }
-    }
-
-    return Object.entries(accumulatedValuesByDate).map(([date, values]) => {
-      const {
-        investmentValueWithCurrencyEffect,
-        totalCurrentValue,
-        totalCurrentValueWithCurrencyEffect,
-        totalInvestmentValue,
-        totalInvestmentValueWithCurrencyEffect,
-        totalNetPerformanceValue,
-        totalNetPerformanceValueWithCurrencyEffect,
-        totalTimeWeightedInvestmentValue,
-        totalTimeWeightedInvestmentValueWithCurrencyEffect
-      } = values;
-
-      const netPerformanceInPercentage = totalTimeWeightedInvestmentValue.eq(0)
-        ? 0
-        : totalNetPerformanceValue
-            .div(totalTimeWeightedInvestmentValue)
-            .mul(100)
-            .toNumber();
-
-      const netPerformanceInPercentageWithCurrencyEffect =
-        totalTimeWeightedInvestmentValueWithCurrencyEffect.eq(0)
-          ? 0
-          : totalNetPerformanceValueWithCurrencyEffect
-              .div(totalTimeWeightedInvestmentValueWithCurrencyEffect)
-              .mul(100)
-              .toNumber();
-
-      return {
-        date,
-        netPerformanceInPercentage,
-        netPerformanceInPercentageWithCurrencyEffect,
-        investmentValueWithCurrencyEffect:
-          investmentValueWithCurrencyEffect.toNumber(),
-        netPerformance: totalNetPerformanceValue.toNumber(),
-        netPerformanceWithCurrencyEffect:
-          totalNetPerformanceValueWithCurrencyEffect.toNumber(),
-        totalInvestment: totalInvestmentValue.toNumber(),
-        totalInvestmentValueWithCurrencyEffect:
-          totalInvestmentValueWithCurrencyEffect.toNumber(),
-        value: totalCurrentValue.toNumber(),
-        valueWithCurrencyEffect: totalCurrentValueWithCurrencyEffect.toNumber()
-      };
-    });
-  }
-
-  public async getCurrentPositions(
-    start: Date,
-    end?: Date
-  ): Promise<CurrentPositions> {
-    const lastTransactionPoint = last(this.transactionPoints);
-
-    let endDate = end;
-
-    if (!endDate) {
-      endDate = new Date(Date.now());
-
-      if (lastTransactionPoint) {
-        endDate = max([endDate, parseDate(lastTransactionPoint.date)]);
-      }
-    }
-
-    const transactionPoints = this.transactionPoints?.filter(({ date }) => {
-      return isBefore(parseDate(date), endDate);
-    });
-
-    if (!transactionPoints.length) {
-      return {
-        currentValueInBaseCurrency: new Big(0),
-        grossPerformance: new Big(0),
-        grossPerformancePercentage: new Big(0),
-        grossPerformancePercentageWithCurrencyEffect: new Big(0),
-        grossPerformanceWithCurrencyEffect: new Big(0),
-        hasErrors: false,
-        netPerformance: new Big(0),
-        netPerformancePercentage: new Big(0),
-        netPerformancePercentageWithCurrencyEffect: new Big(0),
-        netPerformanceWithCurrencyEffect: new Big(0),
-        positions: [],
-        totalInvestment: new Big(0),
-        totalInvestmentWithCurrencyEffect: new Big(0)
-      };
-    }
-
-    const currencies: { [symbol: string]: string } = {};
-    const dataGatheringItems: IDataGatheringItem[] = [];
-    let dates: Date[] = [];
-    let firstIndex = transactionPoints.length;
-    let firstTransactionPoint: TransactionPoint = null;
-
-    dates.push(resetHours(start));
-
-    for (const { currency, dataSource, symbol } of transactionPoints[
-      firstIndex - 1
-    ].items) {
-      dataGatheringItems.push({
-        dataSource,
-        symbol
-      });
-
-      currencies[symbol] = currency;
-    }
-
-    for (let i = 0; i < transactionPoints.length; i++) {
-      if (
-        !isBefore(parseDate(transactionPoints[i].date), start) &&
-        firstTransactionPoint === null
-      ) {
-        firstTransactionPoint = transactionPoints[i];
-        firstIndex = i;
-      }
-
-      if (firstTransactionPoint !== null) {
-        dates.push(resetHours(parseDate(transactionPoints[i].date)));
-      }
-    }
-
-    dates.push(resetHours(endDate));
-
-    // Add dates of last week for fallback
-    dates.push(subDays(resetHours(new Date()), 7));
-    dates.push(subDays(resetHours(new Date()), 6));
-    dates.push(subDays(resetHours(new Date()), 5));
-    dates.push(subDays(resetHours(new Date()), 4));
-    dates.push(subDays(resetHours(new Date()), 3));
-    dates.push(subDays(resetHours(new Date()), 2));
-    dates.push(subDays(resetHours(new Date()), 1));
-    dates.push(resetHours(new Date()));
-
-    dates = uniq(
-      dates.map((date) => {
-        return date.getTime();
-      })
-    )
-      .map((timestamp) => {
-        return new Date(timestamp);
-      })
-      .sort((a, b) => {
-        return a.getTime() - b.getTime();
-      });
-
-    let exchangeRatesByCurrency =
-      await this.exchangeRateDataService.getExchangeRatesByCurrency({
-        currencies: uniq(Object.values(currencies)),
-        endDate: endOfDay(endDate),
-        startDate: this.getStartDate(),
-        targetCurrency: this.currency
-      });
-
-    const {
-      dataProviderInfos,
-      errors: currentRateErrors,
-      values: marketSymbols
-    } = await this.currentRateService.getValues({
-      dataGatheringItems,
-      dateQuery: {
-        in: dates
-      }
-    });
-
-    this.dataProviderInfos = dataProviderInfos;
-
-    const marketSymbolMap: {
-      [date: string]: { [symbol: string]: Big };
-    } = {};
-
-    for (const marketSymbol of marketSymbols) {
-      const date = format(marketSymbol.date, DATE_FORMAT);
-
-      if (!marketSymbolMap[date]) {
-        marketSymbolMap[date] = {};
-      }
-
-      if (marketSymbol.marketPrice) {
-        marketSymbolMap[date][marketSymbol.symbol] = new Big(
-          marketSymbol.marketPrice
-        );
-      }
-    }
-
-    const endDateString = format(endDate, DATE_FORMAT);
-
-    if (firstIndex > 0) {
-      firstIndex--;
-    }
-
-    const positions: TimelinePosition[] = [];
-    let hasAnySymbolMetricsErrors = false;
-
-    const errors: ResponseError['errors'] = [];
-
-    for (const item of lastTransactionPoint.items) {
-      const marketPriceInBaseCurrency = (
-        marketSymbolMap[endDateString]?.[item.symbol] ?? item.averagePrice
-      ).mul(
-        exchangeRatesByCurrency[`${item.currency}${this.currency}`]?.[
-          endDateString
-        ]
-      );
-
-      const {
-        grossPerformance,
-        grossPerformancePercentage,
-        grossPerformancePercentageWithCurrencyEffect,
-        grossPerformanceWithCurrencyEffect,
-        hasErrors,
-        netPerformance,
-        netPerformancePercentage,
-        netPerformancePercentageWithCurrencyEffect,
-        netPerformanceWithCurrencyEffect,
-        timeWeightedInvestment,
-        timeWeightedInvestmentWithCurrencyEffect,
-        totalDividend,
-        totalDividendInBaseCurrency,
-        totalInvestment,
-        totalInvestmentWithCurrencyEffect
-      } = this.getSymbolMetrics({
-        marketSymbolMap,
-        start,
-        dataSource: item.dataSource,
-        end: endDate,
-        exchangeRates:
-          exchangeRatesByCurrency[`${item.currency}${this.currency}`],
-        symbol: item.symbol
-      });
-
-      hasAnySymbolMetricsErrors = hasAnySymbolMetricsErrors || hasErrors;
-
-      positions.push({
-        dividend: totalDividend,
-        dividendInBaseCurrency: totalDividendInBaseCurrency,
-        timeWeightedInvestment,
-        timeWeightedInvestmentWithCurrencyEffect,
-        averagePrice: item.averagePrice,
-        currency: item.currency,
-        dataSource: item.dataSource,
-        fee: item.fee,
-        firstBuyDate: item.firstBuyDate,
-        grossPerformance: !hasErrors ? grossPerformance ?? null : null,
-        grossPerformancePercentage: !hasErrors
-          ? grossPerformancePercentage ?? null
-          : null,
-        grossPerformancePercentageWithCurrencyEffect: !hasErrors
-          ? grossPerformancePercentageWithCurrencyEffect ?? null
-          : null,
-        grossPerformanceWithCurrencyEffect: !hasErrors
-          ? grossPerformanceWithCurrencyEffect ?? null
-          : null,
-        investment: totalInvestment,
-        investmentWithCurrencyEffect: totalInvestmentWithCurrencyEffect,
-        marketPrice:
-          marketSymbolMap[endDateString]?.[item.symbol]?.toNumber() ?? null,
-        marketPriceInBaseCurrency:
-          marketPriceInBaseCurrency?.toNumber() ?? null,
-        netPerformance: !hasErrors ? netPerformance ?? null : null,
-        netPerformancePercentage: !hasErrors
-          ? netPerformancePercentage ?? null
-          : null,
-        netPerformancePercentageWithCurrencyEffect: !hasErrors
-          ? netPerformancePercentageWithCurrencyEffect ?? null
-          : null,
-        netPerformanceWithCurrencyEffect: !hasErrors
-          ? netPerformanceWithCurrencyEffect ?? null
-          : null,
-        quantity: item.quantity,
-        symbol: item.symbol,
-        tags: item.tags,
-        transactionCount: item.transactionCount,
-        valueInBaseCurrency: new Big(marketPriceInBaseCurrency).mul(
-          item.quantity
-        )
-      });
-
-      if (
-        (hasErrors ||
-          currentRateErrors.find(({ dataSource, symbol }) => {
-            return dataSource === item.dataSource && symbol === item.symbol;
-          })) &&
-        item.investment.gt(0)
-      ) {
-        errors.push({ dataSource: item.dataSource, symbol: item.symbol });
-      }
-    }
-
-    const overall = this.calculateOverallPerformance(positions);
-
-    return {
-      ...overall,
-      errors,
-      positions,
-      hasErrors: hasAnySymbolMetricsErrors || overall.hasErrors
-    };
-  }
-
-  public getDataProviderInfos() {
-    return this.dataProviderInfos;
-  }
-
-  public getInvestments(): { date: string; investment: Big }[] {
-    if (this.transactionPoints.length === 0) {
-      return [];
-    }
-
-    return this.transactionPoints.map((transactionPoint) => {
-      return {
-        date: transactionPoint.date,
-        investment: transactionPoint.items.reduce(
-          (investment, transactionPointSymbol) =>
-            investment.plus(transactionPointSymbol.investment),
-          new Big(0)
-        )
-      };
-    });
-  }
-
-  public getInvestmentsByGroup({
-    data,
-    groupBy
-  }: {
-    data: HistoricalDataItem[];
-    groupBy: GroupBy;
-  }): InvestmentItem[] {
-    const groupedData: { [dateGroup: string]: Big } = {};
-
-    for (const { date, investmentValueWithCurrencyEffect } of data) {
-      const dateGroup =
-        groupBy === 'month' ? date.substring(0, 7) : date.substring(0, 4);
-      groupedData[dateGroup] = (groupedData[dateGroup] ?? new Big(0)).plus(
-        investmentValueWithCurrencyEffect
-      );
-    }
-
-    return Object.keys(groupedData).map((dateGroup) => ({
-      date: groupBy === 'month' ? `${dateGroup}-01` : `${dateGroup}-01-01`,
-      investment: groupedData[dateGroup].toNumber()
-    }));
-  }
-
-  public getStartDate() {
-    return this.transactionPoints.length > 0
-      ? parseDate(this.transactionPoints[0].date)
-      : new Date();
-  }
-
-  protected abstract getSymbolMetrics({
-    dataSource,
-    end,
-    exchangeRates,
-    isChartMode,
-    marketSymbolMap,
-    start,
-    step,
-    symbol
-  }: {
-    end: Date;
-    exchangeRates: { [dateString: string]: number };
-    isChartMode?: boolean;
-    marketSymbolMap: {
-      [date: string]: { [symbol: string]: Big };
-    };
-    start: Date;
-    step?: number;
-  } & UniqueAsset): SymbolMetrics;
-
-  public getTransactionPoints() {
-    return this.transactionPoints;
-  }
-
-  private computeTransactionPoints() {
-    this.transactionPoints = [];
-    const symbols: { [symbol: string]: TransactionPointSymbol } = {};
-
-    let lastDate: string = null;
-    let lastTransactionPoint: TransactionPoint = null;
-
-    for (const {
-      fee,
-      date,
-      quantity,
-      SymbolProfile,
-      tags,
-      type,
-      unitPrice
-    } of this.orders) {
-      let currentTransactionPointItem: TransactionPointSymbol;
-      const oldAccumulatedSymbol = symbols[SymbolProfile.symbol];
-
-      const factor = getFactor(type);
-
-      if (oldAccumulatedSymbol) {
-        let investment = oldAccumulatedSymbol.investment;
-
-        const newQuantity = quantity
-          .mul(factor)
-          .plus(oldAccumulatedSymbol.quantity);
-
-        if (type === 'BUY') {
-          investment = oldAccumulatedSymbol.investment.plus(
-            quantity.mul(unitPrice)
-          );
-        } else if (type === 'SELL') {
-          investment = oldAccumulatedSymbol.investment.minus(
-            quantity.mul(oldAccumulatedSymbol.averagePrice)
-          );
-        }
-
-        currentTransactionPointItem = {
-          investment,
-          averagePrice: newQuantity.gt(0)
-            ? investment.div(newQuantity)
-            : new Big(0),
-          currency: SymbolProfile.currency,
-          dataSource: SymbolProfile.dataSource,
-          dividend: new Big(0),
-          fee: oldAccumulatedSymbol.fee.plus(fee),
-          firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
-          quantity: newQuantity,
-          symbol: SymbolProfile.symbol,
-          tags: oldAccumulatedSymbol.tags.concat(tags),
-          transactionCount: oldAccumulatedSymbol.transactionCount + 1
-        };
-      } else {
-        currentTransactionPointItem = {
-          fee,
-          tags,
-          averagePrice: unitPrice,
-          currency: SymbolProfile.currency,
-          dataSource: SymbolProfile.dataSource,
-          dividend: new Big(0),
-          firstBuyDate: date,
-          investment: unitPrice.mul(quantity).mul(factor),
-          quantity: quantity.mul(factor),
-          symbol: SymbolProfile.symbol,
-          transactionCount: 1
-        };
-      }
-
-      currentTransactionPointItem.tags = uniqBy(
-        currentTransactionPointItem.tags,
-        'id'
-      );
-
-      symbols[SymbolProfile.symbol] = currentTransactionPointItem;
-
-      const items = lastTransactionPoint?.items ?? [];
-
-      const newItems = items.filter(({ symbol }) => {
-        return symbol !== SymbolProfile.symbol;
-      });
-
-      newItems.push(currentTransactionPointItem);
-
-      newItems.sort((a, b) => {
-        return a.symbol?.localeCompare(b.symbol);
-      });
-
-      if (lastDate !== date || lastTransactionPoint === null) {
-        lastTransactionPoint = {
-          date,
-          items: newItems
-        };
-
-        this.transactionPoints.push(lastTransactionPoint);
-      } else {
-        lastTransactionPoint.items = newItems;
-      }
-
-      lastDate = date;
-    }
-  }
-}

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

@@ -1,191 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PortfolioCalculatorFactory,
-  PerformanceCalculationType
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with BALN.SW buy and sell in two activities', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-22'),
-          fee: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Bâloise Holding AG',
-            symbol: 'BALN.SW'
-          },
-          type: 'BUY',
-          unitPrice: 142.9
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-30'),
-          fee: 1.65,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Bâloise Holding AG',
-            symbol: 'BALN.SW'
-          },
-          type: 'SELL',
-          unitPrice: 136.6
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-30'),
-          fee: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Bâloise Holding AG',
-            symbol: 'BALN.SW'
-          },
-          type: 'SELL',
-          unitPrice: 136.6
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2021-12-18').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2021-11-22')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2021-11-22')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('0'),
-        errors: [],
-        grossPerformance: new Big('-12.6'),
-        grossPerformancePercentage: new Big('-0.04408677396780965649'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '-0.04408677396780965649'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('-12.6'),
-        hasErrors: false,
-        netPerformance: new Big('-15.8'),
-        netPerformancePercentage: new Big('-0.05528341497550734703'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '-0.05528341497550734703'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('-15.8'),
-        positions: [
-          {
-            averagePrice: new Big('0'),
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('3.2'),
-            firstBuyDate: '2021-11-22',
-            grossPerformance: new Big('-12.6'),
-            grossPerformancePercentage: new Big('-0.04408677396780965649'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '-0.04408677396780965649'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big('-12.6'),
-            investment: new Big('0'),
-            investmentWithCurrencyEffect: new Big('0'),
-            netPerformance: new Big('-15.8'),
-            netPerformancePercentage: new Big('-0.05528341497550734703'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '-0.05528341497550734703'
-            ),
-            netPerformanceWithCurrencyEffect: new Big('-15.8'),
-            marketPrice: 148.9,
-            marketPriceInBaseCurrency: 148.9,
-            quantity: new Big('0'),
-            symbol: 'BALN.SW',
-            tags: [],
-            timeWeightedInvestment: new Big('285.80000000000000396627'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big(
-              '285.80000000000000396627'
-            ),
-            transactionCount: 3,
-            valueInBaseCurrency: new Big('0')
-          }
-        ],
-        totalInvestment: new Big('0'),
-        totalInvestmentWithCurrencyEffect: new Big('0')
-      });
-
-      expect(investments).toEqual([
-        { date: '2021-11-22', investment: new Big('285.8') },
-        { date: '2021-11-30', investment: new Big('0') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2021-11-01', investment: 0 },
-        { date: '2021-12-01', investment: 0 }
-      ]);
-    });
-  });
-});

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

@@ -1,174 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PerformanceCalculationType,
-  PortfolioCalculatorFactory
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with BALN.SW buy and sell', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-22'),
-          fee: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Bâloise Holding AG',
-            symbol: 'BALN.SW'
-          },
-          type: 'BUY',
-          unitPrice: 142.9
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-30'),
-          fee: 1.65,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Bâloise Holding AG',
-            symbol: 'BALN.SW'
-          },
-          type: 'SELL',
-          unitPrice: 136.6
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2021-12-18').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2021-11-22')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2021-11-22')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('0'),
-        errors: [],
-        grossPerformance: new Big('-12.6'),
-        grossPerformancePercentage: new Big('-0.0440867739678096571'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '-0.0440867739678096571'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('-12.6'),
-        hasErrors: false,
-        netPerformance: new Big('-15.8'),
-        netPerformancePercentage: new Big('-0.0552834149755073478'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '-0.0552834149755073478'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('-15.8'),
-        positions: [
-          {
-            averagePrice: new Big('0'),
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('3.2'),
-            firstBuyDate: '2021-11-22',
-            grossPerformance: new Big('-12.6'),
-            grossPerformancePercentage: new Big('-0.0440867739678096571'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '-0.0440867739678096571'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big('-12.6'),
-            investment: new Big('0'),
-            investmentWithCurrencyEffect: new Big('0'),
-            netPerformance: new Big('-15.8'),
-            netPerformancePercentage: new Big('-0.0552834149755073478'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '-0.0552834149755073478'
-            ),
-            netPerformanceWithCurrencyEffect: new Big('-15.8'),
-            marketPrice: 148.9,
-            marketPriceInBaseCurrency: 148.9,
-            quantity: new Big('0'),
-            symbol: 'BALN.SW',
-            tags: [],
-            timeWeightedInvestment: new Big('285.8'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big('285.8'),
-            transactionCount: 2,
-            valueInBaseCurrency: new Big('0')
-          }
-        ],
-        totalInvestment: new Big('0'),
-        totalInvestmentWithCurrencyEffect: new Big('0')
-      });
-
-      expect(investments).toEqual([
-        { date: '2021-11-22', investment: new Big('285.8') },
-        { date: '2021-11-30', investment: new Big('0') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2021-11-01', investment: 0 },
-        { date: '2021-12-01', investment: 0 }
-      ]);
-    });
-  });
-});

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

@@ -1,158 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PortfolioCalculatorFactory,
-  PerformanceCalculationType
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with BALN.SW buy', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-30'),
-          fee: 1.55,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Bâloise Holding AG',
-            symbol: 'BALN.SW'
-          },
-          type: 'BUY',
-          unitPrice: 136.6
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2021-12-18').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2021-11-30')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2021-11-30')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('297.8'),
-        errors: [],
-        grossPerformance: new Big('24.6'),
-        grossPerformancePercentage: new Big('0.09004392386530014641'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '0.09004392386530014641'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('24.6'),
-        hasErrors: false,
-        netPerformance: new Big('23.05'),
-        netPerformancePercentage: new Big('0.08437042459736456808'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '0.08437042459736456808'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('23.05'),
-        positions: [
-          {
-            averagePrice: new Big('136.6'),
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('1.55'),
-            firstBuyDate: '2021-11-30',
-            grossPerformance: new Big('24.6'),
-            grossPerformancePercentage: new Big('0.09004392386530014641'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '0.09004392386530014641'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big('24.6'),
-            investment: new Big('273.2'),
-            investmentWithCurrencyEffect: new Big('273.2'),
-            netPerformance: new Big('23.05'),
-            netPerformancePercentage: new Big('0.08437042459736456808'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '0.08437042459736456808'
-            ),
-            netPerformanceWithCurrencyEffect: new Big('23.05'),
-            marketPrice: 148.9,
-            marketPriceInBaseCurrency: 148.9,
-            quantity: new Big('2'),
-            symbol: 'BALN.SW',
-            tags: [],
-            timeWeightedInvestment: new Big('273.2'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big('273.2'),
-            transactionCount: 1,
-            valueInBaseCurrency: new Big('297.8')
-          }
-        ],
-        totalInvestment: new Big('273.2'),
-        totalInvestmentWithCurrencyEffect: new Big('273.2')
-      });
-
-      expect(investments).toEqual([
-        { date: '2021-11-30', investment: new Big('273.2') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2021-11-01', investment: 273.2 },
-        { date: '2021-12-01', investment: 0 }
-      ]);
-    });
-  });
-});

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

@@ -1,228 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PortfolioCalculatorFactory,
-  PerformanceCalculationType
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-jest.mock(
-  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
-  () => {
-    return {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ExchangeRateDataService: jest.fn().mockImplementation(() => {
-        return ExchangeRateDataServiceMock;
-      })
-    };
-  }
-);
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with BTCUSD buy and sell partially', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2015-01-01'),
-          fee: 0,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            name: 'Bitcoin USD',
-            symbol: 'BTCUSD'
-          },
-          type: 'BUY',
-          unitPrice: 320.43
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2017-12-31'),
-          fee: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            name: 'Bitcoin USD',
-            symbol: 'BTCUSD'
-          },
-          type: 'SELL',
-          unitPrice: 14156.4
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2018-01-01').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2015-01-01')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2015-01-01')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('13298.425356'),
-        errors: [],
-        grossPerformance: new Big('27172.74'),
-        grossPerformancePercentage: new Big('42.41978276196153750666'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '41.6401219622042072686'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('26516.208701400000064086'),
-        hasErrors: false,
-        netPerformance: new Big('27172.74'),
-        netPerformancePercentage: new Big('42.41978276196153750666'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '41.6401219622042072686'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('26516.208701400000064086'),
-        positions: [
-          {
-            averagePrice: new Big('320.43'),
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('0'),
-            firstBuyDate: '2015-01-01',
-            grossPerformance: new Big('27172.74'),
-            grossPerformancePercentage: new Big('42.41978276196153750666'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '41.6401219622042072686'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big(
-              '26516.208701400000064086'
-            ),
-            investment: new Big('320.43'),
-            investmentWithCurrencyEffect: new Big('318.542667299999967957'),
-            marketPrice: 13657.2,
-            marketPriceInBaseCurrency: 13298.425356,
-            netPerformance: new Big('27172.74'),
-            netPerformancePercentage: new Big('42.41978276196153750666'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '41.6401219622042072686'
-            ),
-            netPerformanceWithCurrencyEffect: new Big(
-              '26516.208701400000064086'
-            ),
-            quantity: new Big('1'),
-            symbol: 'BTCUSD',
-            tags: [],
-            timeWeightedInvestment: new Big('640.56763686131386861314'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big(
-              '636.79469348020066587024'
-            ),
-            transactionCount: 2,
-            valueInBaseCurrency: new Big('13298.425356')
-          }
-        ],
-        totalInvestment: new Big('320.43'),
-        totalInvestmentWithCurrencyEffect: new Big('318.542667299999967957')
-      });
-
-      expect(investments).toEqual([
-        { date: '2015-01-01', investment: new Big('640.86') },
-        { date: '2017-12-31', investment: new Big('320.43') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2015-01-01', investment: 637.0853345999999 },
-        { date: '2015-02-01', investment: 0 },
-        { date: '2015-03-01', investment: 0 },
-        { date: '2015-04-01', investment: 0 },
-        { date: '2015-05-01', investment: 0 },
-        { date: '2015-06-01', investment: 0 },
-        { date: '2015-07-01', investment: 0 },
-        { date: '2015-08-01', investment: 0 },
-        { date: '2015-09-01', investment: 0 },
-        { date: '2015-10-01', investment: 0 },
-        { date: '2015-11-01', investment: 0 },
-        { date: '2015-12-01', investment: 0 },
-        { date: '2016-01-01', investment: 0 },
-        { date: '2016-02-01', investment: 0 },
-        { date: '2016-03-01', investment: 0 },
-        { date: '2016-04-01', investment: 0 },
-        { date: '2016-05-01', investment: 0 },
-        { date: '2016-06-01', investment: 0 },
-        { date: '2016-07-01', investment: 0 },
-        { date: '2016-08-01', investment: 0 },
-        { date: '2016-09-01', investment: 0 },
-        { date: '2016-10-01', investment: 0 },
-        { date: '2016-11-01', investment: 0 },
-        { date: '2016-12-01', investment: 0 },
-        { date: '2017-01-01', investment: 0 },
-        { date: '2017-02-01', investment: 0 },
-        { date: '2017-03-01', investment: 0 },
-        { date: '2017-04-01', investment: 0 },
-        { date: '2017-05-01', investment: 0 },
-        { date: '2017-06-01', investment: 0 },
-        { date: '2017-07-01', investment: 0 },
-        { date: '2017-08-01', investment: 0 },
-        { date: '2017-09-01', investment: 0 },
-        { date: '2017-10-01', investment: 0 },
-        { date: '2017-11-01', investment: 0 },
-        { date: '2017-12-01', investment: -318.54266729999995 },
-        { date: '2018-01-01', investment: 0 }
-      ]);
-    });
-  });
-});

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

@@ -1,194 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PortfolioCalculatorFactory,
-  PerformanceCalculationType
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-jest.mock(
-  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
-  () => {
-    return {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ExchangeRateDataService: jest.fn().mockImplementation(() => {
-        return ExchangeRateDataServiceMock;
-      })
-    };
-  }
-);
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with GOOGL buy', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2023-01-03'),
-          fee: 1,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            name: 'Alphabet Inc.',
-            symbol: 'GOOGL'
-          },
-          type: 'BUY',
-          unitPrice: 89.12
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2023-07-10').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2023-01-03')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2023-01-03')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('103.10483'),
-        errors: [],
-        grossPerformance: new Big('27.33'),
-        grossPerformancePercentage: new Big('0.3066651705565529623'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '0.25235044599563974109'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('20.775774'),
-        hasErrors: false,
-        netPerformance: new Big('26.33'),
-        netPerformancePercentage: new Big('0.29544434470377019749'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '0.24112962014285697628'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('19.851974'),
-        positions: [
-          {
-            averagePrice: new Big('89.12'),
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('1'),
-            firstBuyDate: '2023-01-03',
-            grossPerformance: new Big('27.33'),
-            grossPerformancePercentage: new Big('0.3066651705565529623'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '0.25235044599563974109'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big('20.775774'),
-            investment: new Big('89.12'),
-            investmentWithCurrencyEffect: new Big('82.329056'),
-            netPerformance: new Big('26.33'),
-            netPerformancePercentage: new Big('0.29544434470377019749'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '0.24112962014285697628'
-            ),
-            netPerformanceWithCurrencyEffect: new Big('19.851974'),
-            marketPrice: 116.45,
-            marketPriceInBaseCurrency: 103.10483,
-            quantity: new Big('1'),
-            symbol: 'GOOGL',
-            tags: [],
-            timeWeightedInvestment: new Big('89.12'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big('82.329056'),
-            transactionCount: 1,
-            valueInBaseCurrency: new Big('103.10483')
-          }
-        ],
-        totalInvestment: new Big('89.12'),
-        totalInvestmentWithCurrencyEffect: new Big('82.329056')
-      });
-
-      expect(investments).toEqual([
-        { date: '2023-01-03', investment: new Big('89.12') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2023-01-01', investment: 82.329056 },
-        {
-          date: '2023-02-01',
-          investment: 0
-        },
-        {
-          date: '2023-03-01',
-          investment: 0
-        },
-        {
-          date: '2023-04-01',
-          investment: 0
-        },
-        {
-          date: '2023-05-01',
-          investment: 0
-        },
-        {
-          date: '2023-06-01',
-          investment: 0
-        },
-        {
-          date: '2023-07-01',
-          investment: 0
-        }
-      ]);
-    });
-  });
-});

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

@@ -1,138 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PerformanceCalculationType,
-  PortfolioCalculatorFactory
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { ExchangeRateDataServiceMock } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service.mock';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-jest.mock(
-  '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service',
-  () => {
-    return {
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      ExchangeRateDataService: jest.fn().mockImplementation(() => {
-        return ExchangeRateDataServiceMock;
-      })
-    };
-  }
-);
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with MSFT buy', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2021-09-16'),
-          fee: 19,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            name: 'Microsoft Inc.',
-            symbol: 'MSFT'
-          },
-          type: 'BUY',
-          unitPrice: 298.58
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2021-11-16'),
-          fee: 0,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            name: 'Microsoft Inc.',
-            symbol: 'MSFT'
-          },
-          type: 'DIVIDEND',
-          unitPrice: 0.62
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'USD'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2023-07-10').getTime());
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2023-07-10')
-      );
-
-      spy.mockRestore();
-
-      expect(currentPositions).toMatchObject({
-        errors: [],
-        hasErrors: false,
-        positions: [
-          {
-            averagePrice: new Big('298.58'),
-            currency: 'USD',
-            dataSource: 'YAHOO',
-            dividend: new Big('0.62'),
-            dividendInBaseCurrency: new Big('0.62'),
-            fee: new Big('19'),
-            firstBuyDate: '2021-09-16',
-            investment: new Big('298.58'),
-            investmentWithCurrencyEffect: new Big('298.58'),
-            marketPrice: 331.83,
-            marketPriceInBaseCurrency: 331.83,
-            quantity: new Big('1'),
-            symbol: 'MSFT',
-            tags: [],
-            transactionCount: 2
-          }
-        ],
-        totalInvestment: new Big('298.58'),
-        totalInvestmentWithCurrencyEffect: new Big('298.58')
-      });
-    });
-  });
-});

apps/api/src/app/portfolio/calculator/twr/portfolio-calculator-no-orders.spec.ts

@@ -1,92 +0,0 @@
-import {
-  PerformanceCalculationType,
-  PortfolioCalculatorFactory
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-import { subDays } from 'date-fns';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it('with no orders', async () => {
-      const portfolioCalculator = factory.createCalculator({
-        activities: [],
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2021-12-18').getTime());
-
-      const start = subDays(new Date(Date.now()), 10);
-
-      const chartData = await portfolioCalculator.getChartData({ start });
-
-      const currentPositions =
-        await portfolioCalculator.getCurrentPositions(start);
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big(0),
-        grossPerformance: new Big(0),
-        grossPerformancePercentage: new Big(0),
-        grossPerformancePercentageWithCurrencyEffect: new Big(0),
-        grossPerformanceWithCurrencyEffect: new Big(0),
-        hasErrors: false,
-        netPerformance: new Big(0),
-        netPerformancePercentage: new Big(0),
-        netPerformancePercentageWithCurrencyEffect: new Big(0),
-        netPerformanceWithCurrencyEffect: new Big(0),
-        positions: [],
-        totalInvestment: new Big(0),
-        totalInvestmentWithCurrencyEffect: new Big(0)
-      });
-
-      expect(investments).toEqual([]);
-
-      expect(investmentsByMonth).toEqual([]);
-    });
-  });
-});

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

@@ -1,175 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PerformanceCalculationType,
-  PortfolioCalculatorFactory
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with NOVN.SW buy and sell partially', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2022-03-07'),
-          fee: 1.3,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Novartis AG',
-            symbol: 'NOVN.SW'
-          },
-          type: 'BUY',
-          unitPrice: 75.8
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2022-04-08'),
-          fee: 2.95,
-          quantity: 1,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Novartis AG',
-            symbol: 'NOVN.SW'
-          },
-          type: 'SELL',
-          unitPrice: 85.73
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2022-04-11').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2022-03-07')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2022-03-07')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('87.8'),
-        errors: [],
-        grossPerformance: new Big('21.93'),
-        grossPerformancePercentage: new Big('0.15113417083448194384'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '0.15113417083448194384'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('21.93'),
-        hasErrors: false,
-        netPerformance: new Big('17.68'),
-        netPerformancePercentage: new Big('0.12184460284330327256'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '0.12184460284330327256'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('17.68'),
-        positions: [
-          {
-            averagePrice: new Big('75.80'),
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('4.25'),
-            firstBuyDate: '2022-03-07',
-            grossPerformance: new Big('21.93'),
-            grossPerformancePercentage: new Big('0.15113417083448194384'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '0.15113417083448194384'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big('21.93'),
-            investment: new Big('75.80'),
-            investmentWithCurrencyEffect: new Big('75.80'),
-            netPerformance: new Big('17.68'),
-            netPerformancePercentage: new Big('0.12184460284330327256'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '0.12184460284330327256'
-            ),
-            netPerformanceWithCurrencyEffect: new Big('17.68'),
-            marketPrice: 87.8,
-            marketPriceInBaseCurrency: 87.8,
-            quantity: new Big('1'),
-            symbol: 'NOVN.SW',
-            tags: [],
-            timeWeightedInvestment: new Big('145.10285714285714285714'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big(
-              '145.10285714285714285714'
-            ),
-            transactionCount: 2,
-            valueInBaseCurrency: new Big('87.8')
-          }
-        ],
-        totalInvestment: new Big('75.80'),
-        totalInvestmentWithCurrencyEffect: new Big('75.80')
-      });
-
-      expect(investments).toEqual([
-        { date: '2022-03-07', investment: new Big('151.6') },
-        { date: '2022-04-08', investment: new Big('75.8') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2022-03-01', investment: 151.6 },
-        { date: '2022-04-01', investment: -75.8 }
-      ]);
-    });
-  });
-});

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

@@ -1,200 +0,0 @@
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import {
-  activityDummyData,
-  symbolProfileDummyData
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator-test-utils';
-import {
-  PerformanceCalculationType,
-  PortfolioCalculatorFactory
-} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { CurrentRateServiceMock } from '@ghostfolio/api/app/portfolio/current-rate.service.mock';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-import { parseDate } from '@ghostfolio/common/helper';
-
-import { Big } from 'big.js';
-
-jest.mock('@ghostfolio/api/app/portfolio/current-rate.service', () => {
-  return {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    CurrentRateService: jest.fn().mockImplementation(() => {
-      return CurrentRateServiceMock;
-    })
-  };
-});
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  describe('get current positions', () => {
-    it.only('with NOVN.SW buy and sell', async () => {
-      const activities: Activity[] = [
-        {
-          ...activityDummyData,
-          date: new Date('2022-03-07'),
-          fee: 0,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Novartis AG',
-            symbol: 'NOVN.SW'
-          },
-          type: 'BUY',
-          unitPrice: 75.8
-        },
-        {
-          ...activityDummyData,
-          date: new Date('2022-04-08'),
-          fee: 0,
-          quantity: 2,
-          SymbolProfile: {
-            ...symbolProfileDummyData,
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            name: 'Novartis AG',
-            symbol: 'NOVN.SW'
-          },
-          type: 'SELL',
-          unitPrice: 85.73
-        }
-      ];
-
-      const portfolioCalculator = factory.createCalculator({
-        activities,
-        calculationType: PerformanceCalculationType.TWR,
-        currency: 'CHF'
-      });
-
-      const spy = jest
-        .spyOn(Date, 'now')
-        .mockImplementation(() => parseDate('2022-04-11').getTime());
-
-      const chartData = await portfolioCalculator.getChartData({
-        start: parseDate('2022-03-07')
-      });
-
-      const currentPositions = await portfolioCalculator.getCurrentPositions(
-        parseDate('2022-03-07')
-      );
-
-      const investments = portfolioCalculator.getInvestments();
-
-      const investmentsByMonth = portfolioCalculator.getInvestmentsByGroup({
-        data: chartData,
-        groupBy: 'month'
-      });
-
-      spy.mockRestore();
-
-      expect(chartData[0]).toEqual({
-        date: '2022-03-07',
-        investmentValueWithCurrencyEffect: 151.6,
-        netPerformance: 0,
-        netPerformanceInPercentage: 0,
-        netPerformanceInPercentageWithCurrencyEffect: 0,
-        netPerformanceWithCurrencyEffect: 0,
-        totalInvestment: 151.6,
-        totalInvestmentValueWithCurrencyEffect: 151.6,
-        value: 151.6,
-        valueWithCurrencyEffect: 151.6
-      });
-
-      expect(chartData[chartData.length - 1]).toEqual({
-        date: '2022-04-11',
-        investmentValueWithCurrencyEffect: 0,
-        netPerformance: 19.86,
-        netPerformanceInPercentage: 13.100263852242744,
-        netPerformanceInPercentageWithCurrencyEffect: 13.100263852242744,
-        netPerformanceWithCurrencyEffect: 19.86,
-        totalInvestment: 0,
-        totalInvestmentValueWithCurrencyEffect: 0,
-        value: 0,
-        valueWithCurrencyEffect: 0
-      });
-
-      expect(currentPositions).toEqual({
-        currentValueInBaseCurrency: new Big('0'),
-        errors: [],
-        grossPerformance: new Big('19.86'),
-        grossPerformancePercentage: new Big('0.13100263852242744063'),
-        grossPerformancePercentageWithCurrencyEffect: new Big(
-          '0.13100263852242744063'
-        ),
-        grossPerformanceWithCurrencyEffect: new Big('19.86'),
-        hasErrors: false,
-        netPerformance: new Big('19.86'),
-        netPerformancePercentage: new Big('0.13100263852242744063'),
-        netPerformancePercentageWithCurrencyEffect: new Big(
-          '0.13100263852242744063'
-        ),
-        netPerformanceWithCurrencyEffect: new Big('19.86'),
-        positions: [
-          {
-            averagePrice: new Big('0'),
-            currency: 'CHF',
-            dataSource: 'YAHOO',
-            dividend: new Big('0'),
-            dividendInBaseCurrency: new Big('0'),
-            fee: new Big('0'),
-            firstBuyDate: '2022-03-07',
-            grossPerformance: new Big('19.86'),
-            grossPerformancePercentage: new Big('0.13100263852242744063'),
-            grossPerformancePercentageWithCurrencyEffect: new Big(
-              '0.13100263852242744063'
-            ),
-            grossPerformanceWithCurrencyEffect: new Big('19.86'),
-            investment: new Big('0'),
-            investmentWithCurrencyEffect: new Big('0'),
-            netPerformance: new Big('19.86'),
-            netPerformancePercentage: new Big('0.13100263852242744063'),
-            netPerformancePercentageWithCurrencyEffect: new Big(
-              '0.13100263852242744063'
-            ),
-            netPerformanceWithCurrencyEffect: new Big('19.86'),
-            marketPrice: 87.8,
-            marketPriceInBaseCurrency: 87.8,
-            quantity: new Big('0'),
-            symbol: 'NOVN.SW',
-            tags: [],
-            timeWeightedInvestment: new Big('151.6'),
-            timeWeightedInvestmentWithCurrencyEffect: new Big('151.6'),
-            transactionCount: 2,
-            valueInBaseCurrency: new Big('0')
-          }
-        ],
-        totalInvestment: new Big('0'),
-        totalInvestmentWithCurrencyEffect: new Big('0')
-      });
-
-      expect(investments).toEqual([
-        { date: '2022-03-07', investment: new Big('151.6') },
-        { date: '2022-04-08', investment: new Big('0') }
-      ]);
-
-      expect(investmentsByMonth).toEqual([
-        { date: '2022-03-01', investment: 151.6 },
-        { date: '2022-04-01', investment: -151.6 }
-      ]);
-    });
-  });
-});

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

@@ -1,27 +0,0 @@
-import { PortfolioCalculatorFactory } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
-import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
-
-describe('PortfolioCalculator', () => {
-  let currentRateService: CurrentRateService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let factory: PortfolioCalculatorFactory;
-
-  beforeEach(() => {
-    currentRateService = new CurrentRateService(null, null, null, null);
-
-    exchangeRateDataService = new ExchangeRateDataService(
-      null,
-      null,
-      null,
-      null
-    );
-
-    factory = new PortfolioCalculatorFactory(
-      currentRateService,
-      exchangeRateDataService
-    );
-  });
-
-  test.skip('Skip empty test', () => 1);
-});

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

@@ -1,840 +0,0 @@
-import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator';
-import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
-import { PortfolioOrderItem } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order-item.interface';
-import { getFactor } from '@ghostfolio/api/helper/portfolio.helper';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import {
-  SymbolMetrics,
-  TimelinePosition,
-  UniqueAsset
-} from '@ghostfolio/common/interfaces';
-
-import { Logger } from '@nestjs/common';
-import { Big } from 'big.js';
-import {
-  addDays,
-  addMilliseconds,
-  differenceInDays,
-  format,
-  isBefore
-} from 'date-fns';
-import { cloneDeep, first, last, sortBy } from 'lodash';
-
-export class TWRPortfolioCalculator extends PortfolioCalculator {
-  protected calculateOverallPerformance(
-    positions: TimelinePosition[]
-  ): CurrentPositions {
-    let currentValueInBaseCurrency = new Big(0);
-    let grossPerformance = new Big(0);
-    let grossPerformanceWithCurrencyEffect = new Big(0);
-    let hasErrors = false;
-    let netPerformance = new Big(0);
-    let netPerformanceWithCurrencyEffect = new Big(0);
-    let totalInvestment = new Big(0);
-    let totalInvestmentWithCurrencyEffect = new Big(0);
-    let totalTimeWeightedInvestment = new Big(0);
-    let totalTimeWeightedInvestmentWithCurrencyEffect = new Big(0);
-
-    for (const currentPosition of positions) {
-      if (currentPosition.valueInBaseCurrency) {
-        currentValueInBaseCurrency = currentValueInBaseCurrency.plus(
-          currentPosition.valueInBaseCurrency
-        );
-      } else {
-        hasErrors = true;
-      }
-
-      if (currentPosition.investment) {
-        totalInvestment = totalInvestment.plus(currentPosition.investment);
-
-        totalInvestmentWithCurrencyEffect =
-          totalInvestmentWithCurrencyEffect.plus(
-            currentPosition.investmentWithCurrencyEffect
-          );
-      } else {
-        hasErrors = true;
-      }
-
-      if (currentPosition.grossPerformance) {
-        grossPerformance = grossPerformance.plus(
-          currentPosition.grossPerformance
-        );
-
-        grossPerformanceWithCurrencyEffect =
-          grossPerformanceWithCurrencyEffect.plus(
-            currentPosition.grossPerformanceWithCurrencyEffect
-          );
-
-        netPerformance = netPerformance.plus(currentPosition.netPerformance);
-
-        netPerformanceWithCurrencyEffect =
-          netPerformanceWithCurrencyEffect.plus(
-            currentPosition.netPerformanceWithCurrencyEffect
-          );
-      } else if (!currentPosition.quantity.eq(0)) {
-        hasErrors = true;
-      }
-
-      if (currentPosition.timeWeightedInvestment) {
-        totalTimeWeightedInvestment = totalTimeWeightedInvestment.plus(
-          currentPosition.timeWeightedInvestment
-        );
-
-        totalTimeWeightedInvestmentWithCurrencyEffect =
-          totalTimeWeightedInvestmentWithCurrencyEffect.plus(
-            currentPosition.timeWeightedInvestmentWithCurrencyEffect
-          );
-      } else if (!currentPosition.quantity.eq(0)) {
-        Logger.warn(
-          `Missing historical market data for ${currentPosition.symbol} (${currentPosition.dataSource})`,
-          'PortfolioCalculator'
-        );
-
-        hasErrors = true;
-      }
-    }
-
-    return {
-      currentValueInBaseCurrency,
-      grossPerformance,
-      grossPerformanceWithCurrencyEffect,
-      hasErrors,
-      netPerformance,
-      netPerformanceWithCurrencyEffect,
-      totalInvestment,
-      totalInvestmentWithCurrencyEffect,
-      netPerformancePercentage: totalTimeWeightedInvestment.eq(0)
-        ? new Big(0)
-        : netPerformance.div(totalTimeWeightedInvestment),
-      netPerformancePercentageWithCurrencyEffect:
-        totalTimeWeightedInvestmentWithCurrencyEffect.eq(0)
-          ? new Big(0)
-          : netPerformanceWithCurrencyEffect.div(
-              totalTimeWeightedInvestmentWithCurrencyEffect
-            ),
-      grossPerformancePercentage: totalTimeWeightedInvestment.eq(0)
-        ? new Big(0)
-        : grossPerformance.div(totalTimeWeightedInvestment),
-      grossPerformancePercentageWithCurrencyEffect:
-        totalTimeWeightedInvestmentWithCurrencyEffect.eq(0)
-          ? new Big(0)
-          : grossPerformanceWithCurrencyEffect.div(
-              totalTimeWeightedInvestmentWithCurrencyEffect
-            ),
-      positions
-    };
-  }
-
-  protected getSymbolMetrics({
-    dataSource,
-    end,
-    exchangeRates,
-    isChartMode = false,
-    marketSymbolMap,
-    start,
-    step = 1,
-    symbol
-  }: {
-    end: Date;
-    exchangeRates: { [dateString: string]: number };
-    isChartMode?: boolean;
-    marketSymbolMap: {
-      [date: string]: { [symbol: string]: Big };
-    };
-    start: Date;
-    step?: number;
-  } & UniqueAsset): SymbolMetrics {
-    const currentExchangeRate = exchangeRates[format(new Date(), DATE_FORMAT)];
-    const currentValues: { [date: string]: Big } = {};
-    const currentValuesWithCurrencyEffect: { [date: string]: Big } = {};
-    let fees = new Big(0);
-    let feesAtStartDate = new Big(0);
-    let feesAtStartDateWithCurrencyEffect = new Big(0);
-    let feesWithCurrencyEffect = new Big(0);
-    let grossPerformance = new Big(0);
-    let grossPerformanceWithCurrencyEffect = new Big(0);
-    let grossPerformanceAtStartDate = new Big(0);
-    let grossPerformanceAtStartDateWithCurrencyEffect = new Big(0);
-    let grossPerformanceFromSells = new Big(0);
-    let grossPerformanceFromSellsWithCurrencyEffect = new Big(0);
-    let initialValue: Big;
-    let initialValueWithCurrencyEffect: Big;
-    let investmentAtStartDate: Big;
-    let investmentAtStartDateWithCurrencyEffect: Big;
-    const investmentValuesAccumulated: { [date: string]: Big } = {};
-    const investmentValuesAccumulatedWithCurrencyEffect: {
-      [date: string]: Big;
-    } = {};
-    const investmentValuesWithCurrencyEffect: { [date: string]: Big } = {};
-    let lastAveragePrice = new Big(0);
-    let lastAveragePriceWithCurrencyEffect = new Big(0);
-    const netPerformanceValues: { [date: string]: Big } = {};
-    const netPerformanceValuesWithCurrencyEffect: { [date: string]: Big } = {};
-    const timeWeightedInvestmentValues: { [date: string]: Big } = {};
-
-    const timeWeightedInvestmentValuesWithCurrencyEffect: {
-      [date: string]: Big;
-    } = {};
-
-    let totalDividend = new Big(0);
-    let totalDividendInBaseCurrency = new Big(0);
-    let totalInvestment = new Big(0);
-    let totalInvestmentFromBuyTransactions = new Big(0);
-    let totalInvestmentFromBuyTransactionsWithCurrencyEffect = new Big(0);
-    let totalInvestmentWithCurrencyEffect = new Big(0);
-    let totalQuantityFromBuyTransactions = new Big(0);
-    let totalUnits = new Big(0);
-    let valueAtStartDate: Big;
-    let valueAtStartDateWithCurrencyEffect: Big;
-
-    // Clone orders to keep the original values in this.orders
-    let orders: PortfolioOrderItem[] = cloneDeep(this.orders).filter(
-      ({ SymbolProfile }) => {
-        return SymbolProfile.symbol === symbol;
-      }
-    );
-
-    if (orders.length <= 0) {
-      return {
-        currentValues: {},
-        currentValuesWithCurrencyEffect: {},
-        grossPerformance: new Big(0),
-        grossPerformancePercentage: new Big(0),
-        grossPerformancePercentageWithCurrencyEffect: new Big(0),
-        grossPerformanceWithCurrencyEffect: new Big(0),
-        hasErrors: false,
-        initialValue: new Big(0),
-        initialValueWithCurrencyEffect: new Big(0),
-        investmentValuesAccumulated: {},
-        investmentValuesAccumulatedWithCurrencyEffect: {},
-        investmentValuesWithCurrencyEffect: {},
-        netPerformance: new Big(0),
-        netPerformancePercentage: new Big(0),
-        netPerformancePercentageWithCurrencyEffect: new Big(0),
-        netPerformanceValues: {},
-        netPerformanceValuesWithCurrencyEffect: {},
-        netPerformanceWithCurrencyEffect: new Big(0),
-        timeWeightedInvestment: new Big(0),
-        timeWeightedInvestmentValues: {},
-        timeWeightedInvestmentValuesWithCurrencyEffect: {},
-        timeWeightedInvestmentWithCurrencyEffect: new Big(0),
-        totalDividend: new Big(0),
-        totalDividendInBaseCurrency: new Big(0),
-        totalInvestment: new Big(0),
-        totalInvestmentWithCurrencyEffect: new Big(0)
-      };
-    }
-
-    const dateOfFirstTransaction = new Date(first(orders).date);
-
-    const unitPriceAtStartDate =
-      marketSymbolMap[format(start, DATE_FORMAT)]?.[symbol];
-
-    const unitPriceAtEndDate =
-      marketSymbolMap[format(end, DATE_FORMAT)]?.[symbol];
-
-    if (
-      !unitPriceAtEndDate ||
-      (!unitPriceAtStartDate && isBefore(dateOfFirstTransaction, start))
-    ) {
-      return {
-        currentValues: {},
-        currentValuesWithCurrencyEffect: {},
-        grossPerformance: new Big(0),
-        grossPerformancePercentage: new Big(0),
-        grossPerformancePercentageWithCurrencyEffect: new Big(0),
-        grossPerformanceWithCurrencyEffect: new Big(0),
-        hasErrors: true,
-        initialValue: new Big(0),
-        initialValueWithCurrencyEffect: new Big(0),
-        investmentValuesAccumulated: {},
-        investmentValuesAccumulatedWithCurrencyEffect: {},
-        investmentValuesWithCurrencyEffect: {},
-        netPerformance: new Big(0),
-        netPerformancePercentage: new Big(0),
-        netPerformancePercentageWithCurrencyEffect: new Big(0),
-        netPerformanceValues: {},
-        netPerformanceValuesWithCurrencyEffect: {},
-        netPerformanceWithCurrencyEffect: new Big(0),
-        timeWeightedInvestment: new Big(0),
-        timeWeightedInvestmentValues: {},
-        timeWeightedInvestmentValuesWithCurrencyEffect: {},
-        timeWeightedInvestmentWithCurrencyEffect: new Big(0),
-        totalDividend: new Big(0),
-        totalDividendInBaseCurrency: new Big(0),
-        totalInvestment: new Big(0),
-        totalInvestmentWithCurrencyEffect: new Big(0)
-      };
-    }
-
-    // Add a synthetic order at the start and the end date
-    orders.push({
-      date: format(start, DATE_FORMAT),
-      fee: new Big(0),
-      feeInBaseCurrency: new Big(0),
-      itemType: 'start',
-      quantity: new Big(0),
-      SymbolProfile: {
-        dataSource,
-        symbol
-      },
-      type: 'BUY',
-      unitPrice: unitPriceAtStartDate
-    });
-
-    orders.push({
-      date: format(end, DATE_FORMAT),
-      fee: new Big(0),
-      feeInBaseCurrency: new Big(0),
-      itemType: 'end',
-      SymbolProfile: {
-        dataSource,
-        symbol
-      },
-      quantity: new Big(0),
-      type: 'BUY',
-      unitPrice: unitPriceAtEndDate
-    });
-
-    let day = start;
-    let lastUnitPrice: Big;
-
-    if (isChartMode) {
-      const datesWithOrders = {};
-
-      for (const order of orders) {
-        datesWithOrders[order.date] = true;
-      }
-
-      while (isBefore(day, end)) {
-        const hasDate = datesWithOrders[format(day, DATE_FORMAT)];
-
-        if (!hasDate) {
-          orders.push({
-            date: format(day, DATE_FORMAT),
-            fee: new Big(0),
-            feeInBaseCurrency: new Big(0),
-            quantity: new Big(0),
-            SymbolProfile: {
-              dataSource,
-              symbol
-            },
-            type: 'BUY',
-            unitPrice:
-              marketSymbolMap[format(day, DATE_FORMAT)]?.[symbol] ??
-              lastUnitPrice
-          });
-        }
-
-        lastUnitPrice = last(orders).unitPrice;
-
-        day = addDays(day, step);
-      }
-    }
-
-    // Sort orders so that the start and end placeholder order are at the correct
-    // position
-    orders = sortBy(orders, ({ date, itemType }) => {
-      let sortIndex = new Date(date);
-
-      if (itemType === 'end') {
-        sortIndex = addMilliseconds(sortIndex, 1);
-      } else if (itemType === 'start') {
-        sortIndex = addMilliseconds(sortIndex, -1);
-      }
-
-      return sortIndex.getTime();
-    });
-
-    const indexOfStartOrder = orders.findIndex(({ itemType }) => {
-      return itemType === 'start';
-    });
-
-    const indexOfEndOrder = orders.findIndex(({ itemType }) => {
-      return itemType === 'end';
-    });
-
-    let totalInvestmentDays = 0;
-    let sumOfTimeWeightedInvestments = new Big(0);
-    let sumOfTimeWeightedInvestmentsWithCurrencyEffect = new Big(0);
-
-    for (let i = 0; i < orders.length; i += 1) {
-      const order = orders[i];
-
-      if (PortfolioCalculator.ENABLE_LOGGING) {
-        console.log();
-        console.log();
-        console.log(i + 1, order.type, order.itemType);
-      }
-
-      const exchangeRateAtOrderDate = exchangeRates[order.date];
-
-      if (order.itemType === 'start') {
-        // Take the unit price of the order as the market price if there are no
-        // orders of this symbol before the start date
-        order.unitPrice =
-          indexOfStartOrder === 0
-            ? orders[i + 1]?.unitPrice
-            : unitPriceAtStartDate;
-      }
-
-      if (order.fee) {
-        order.feeInBaseCurrency = order.fee.mul(currentExchangeRate ?? 1);
-        order.feeInBaseCurrencyWithCurrencyEffect = order.fee.mul(
-          exchangeRateAtOrderDate ?? 1
-        );
-      }
-
-      if (order.unitPrice) {
-        order.unitPriceInBaseCurrency = order.unitPrice.mul(
-          currentExchangeRate ?? 1
-        );
-
-        order.unitPriceInBaseCurrencyWithCurrencyEffect = order.unitPrice.mul(
-          exchangeRateAtOrderDate ?? 1
-        );
-      }
-
-      const valueOfInvestmentBeforeTransaction = totalUnits.mul(
-        order.unitPriceInBaseCurrency
-      );
-
-      const valueOfInvestmentBeforeTransactionWithCurrencyEffect =
-        totalUnits.mul(order.unitPriceInBaseCurrencyWithCurrencyEffect);
-
-      if (!investmentAtStartDate && i >= indexOfStartOrder) {
-        investmentAtStartDate = totalInvestment ?? new Big(0);
-
-        investmentAtStartDateWithCurrencyEffect =
-          totalInvestmentWithCurrencyEffect ?? new Big(0);
-
-        valueAtStartDate = valueOfInvestmentBeforeTransaction;
-
-        valueAtStartDateWithCurrencyEffect =
-          valueOfInvestmentBeforeTransactionWithCurrencyEffect;
-      }
-
-      let transactionInvestment = new Big(0);
-      let transactionInvestmentWithCurrencyEffect = new Big(0);
-
-      if (order.type === 'BUY') {
-        transactionInvestment = order.quantity
-          .mul(order.unitPriceInBaseCurrency)
-          .mul(getFactor(order.type));
-
-        transactionInvestmentWithCurrencyEffect = order.quantity
-          .mul(order.unitPriceInBaseCurrencyWithCurrencyEffect)
-          .mul(getFactor(order.type));
-
-        totalQuantityFromBuyTransactions =
-          totalQuantityFromBuyTransactions.plus(order.quantity);
-
-        totalInvestmentFromBuyTransactions =
-          totalInvestmentFromBuyTransactions.plus(transactionInvestment);
-
-        totalInvestmentFromBuyTransactionsWithCurrencyEffect =
-          totalInvestmentFromBuyTransactionsWithCurrencyEffect.plus(
-            transactionInvestmentWithCurrencyEffect
-          );
-      } else if (order.type === 'SELL') {
-        if (totalUnits.gt(0)) {
-          transactionInvestment = totalInvestment
-            .div(totalUnits)
-            .mul(order.quantity)
-            .mul(getFactor(order.type));
-          transactionInvestmentWithCurrencyEffect =
-            totalInvestmentWithCurrencyEffect
-              .div(totalUnits)
-              .mul(order.quantity)
-              .mul(getFactor(order.type));
-        }
-      }
-
-      if (PortfolioCalculator.ENABLE_LOGGING) {
-        console.log('totalInvestment', totalInvestment.toNumber());
-
-        console.log(
-          'totalInvestmentWithCurrencyEffect',
-          totalInvestmentWithCurrencyEffect.toNumber()
-        );
-
-        console.log('order.quantity', order.quantity.toNumber());
-        console.log('transactionInvestment', transactionInvestment.toNumber());
-
-        console.log(
-          'transactionInvestmentWithCurrencyEffect',
-          transactionInvestmentWithCurrencyEffect.toNumber()
-        );
-      }
-
-      const totalInvestmentBeforeTransaction = totalInvestment;
-
-      const totalInvestmentBeforeTransactionWithCurrencyEffect =
-        totalInvestmentWithCurrencyEffect;
-
-      totalInvestment = totalInvestment.plus(transactionInvestment);
-
-      totalInvestmentWithCurrencyEffect =
-        totalInvestmentWithCurrencyEffect.plus(
-          transactionInvestmentWithCurrencyEffect
-        );
-
-      if (i >= indexOfStartOrder && !initialValue) {
-        if (
-          i === indexOfStartOrder &&
-          !valueOfInvestmentBeforeTransaction.eq(0)
-        ) {
-          initialValue = valueOfInvestmentBeforeTransaction;
-
-          initialValueWithCurrencyEffect =
-            valueOfInvestmentBeforeTransactionWithCurrencyEffect;
-        } else if (transactionInvestment.gt(0)) {
-          initialValue = transactionInvestment;
-
-          initialValueWithCurrencyEffect =
-            transactionInvestmentWithCurrencyEffect;
-        }
-      }
-
-      fees = fees.plus(order.feeInBaseCurrency ?? 0);
-
-      feesWithCurrencyEffect = feesWithCurrencyEffect.plus(
-        order.feeInBaseCurrencyWithCurrencyEffect ?? 0
-      );
-
-      totalUnits = totalUnits.plus(order.quantity.mul(getFactor(order.type)));
-
-      if (order.type === 'DIVIDEND') {
-        const dividend = order.quantity.mul(order.unitPrice);
-
-        totalDividend = totalDividend.plus(dividend);
-        totalDividendInBaseCurrency = totalDividendInBaseCurrency.plus(
-          dividend.mul(exchangeRateAtOrderDate ?? 1)
-        );
-      }
-
-      const valueOfInvestment = totalUnits.mul(order.unitPriceInBaseCurrency);
-
-      const valueOfInvestmentWithCurrencyEffect = totalUnits.mul(
-        order.unitPriceInBaseCurrencyWithCurrencyEffect
-      );
-
-      const grossPerformanceFromSell =
-        order.type === 'SELL'
-          ? order.unitPriceInBaseCurrency
-              .minus(lastAveragePrice)
-              .mul(order.quantity)
-          : new Big(0);
-
-      const grossPerformanceFromSellWithCurrencyEffect =
-        order.type === 'SELL'
-          ? order.unitPriceInBaseCurrencyWithCurrencyEffect
-              .minus(lastAveragePriceWithCurrencyEffect)
-              .mul(order.quantity)
-          : new Big(0);
-
-      grossPerformanceFromSells = grossPerformanceFromSells.plus(
-        grossPerformanceFromSell
-      );
-
-      grossPerformanceFromSellsWithCurrencyEffect =
-        grossPerformanceFromSellsWithCurrencyEffect.plus(
-          grossPerformanceFromSellWithCurrencyEffect
-        );
-
-      lastAveragePrice = totalQuantityFromBuyTransactions.eq(0)
-        ? new Big(0)
-        : totalInvestmentFromBuyTransactions.div(
-            totalQuantityFromBuyTransactions
-          );
-
-      lastAveragePriceWithCurrencyEffect = totalQuantityFromBuyTransactions.eq(
-        0
-      )
-        ? new Big(0)
-        : totalInvestmentFromBuyTransactionsWithCurrencyEffect.div(
-            totalQuantityFromBuyTransactions
-          );
-
-      if (PortfolioCalculator.ENABLE_LOGGING) {
-        console.log(
-          'grossPerformanceFromSells',
-          grossPerformanceFromSells.toNumber()
-        );
-        console.log(
-          'grossPerformanceFromSellWithCurrencyEffect',
-          grossPerformanceFromSellWithCurrencyEffect.toNumber()
-        );
-      }
-
-      const newGrossPerformance = valueOfInvestment
-        .minus(totalInvestment)
-        .plus(grossPerformanceFromSells);
-
-      const newGrossPerformanceWithCurrencyEffect =
-        valueOfInvestmentWithCurrencyEffect
-          .minus(totalInvestmentWithCurrencyEffect)
-          .plus(grossPerformanceFromSellsWithCurrencyEffect);
-
-      grossPerformance = newGrossPerformance;
-
-      grossPerformanceWithCurrencyEffect =
-        newGrossPerformanceWithCurrencyEffect;
-
-      if (order.itemType === 'start') {
-        feesAtStartDate = fees;
-        feesAtStartDateWithCurrencyEffect = feesWithCurrencyEffect;
-        grossPerformanceAtStartDate = grossPerformance;
-
-        grossPerformanceAtStartDateWithCurrencyEffect =
-          grossPerformanceWithCurrencyEffect;
-      }
-
-      if (i > indexOfStartOrder && ['BUY', 'SELL'].includes(order.type)) {
-        // Only consider periods with an investment for the calculation of
-        // the time weighted investment
-        if (valueOfInvestmentBeforeTransaction.gt(0)) {
-          // Calculate the number of days since the previous order
-          const orderDate = new Date(order.date);
-          const previousOrderDate = new Date(orders[i - 1].date);
-
-          let daysSinceLastOrder = differenceInDays(
-            orderDate,
-            previousOrderDate
-          );
-          if (daysSinceLastOrder <= 0) {
-            // The time between two activities on the same day is unknown
-            // -> Set it to the smallest floating point number greater than 0
-            daysSinceLastOrder = Number.EPSILON;
-          }
-
-          // Sum up the total investment days since the start date to calculate
-          // the time weighted investment
-          totalInvestmentDays += daysSinceLastOrder;
-
-          sumOfTimeWeightedInvestments = sumOfTimeWeightedInvestments.add(
-            valueAtStartDate
-              .minus(investmentAtStartDate)
-              .plus(totalInvestmentBeforeTransaction)
-              .mul(daysSinceLastOrder)
-          );
-
-          sumOfTimeWeightedInvestmentsWithCurrencyEffect =
-            sumOfTimeWeightedInvestmentsWithCurrencyEffect.add(
-              valueAtStartDateWithCurrencyEffect
-                .minus(investmentAtStartDateWithCurrencyEffect)
-                .plus(totalInvestmentBeforeTransactionWithCurrencyEffect)
-                .mul(daysSinceLastOrder)
-            );
-        }
-
-        if (isChartMode) {
-          currentValues[order.date] = valueOfInvestment;
-
-          currentValuesWithCurrencyEffect[order.date] =
-            valueOfInvestmentWithCurrencyEffect;
-
-          netPerformanceValues[order.date] = grossPerformance
-            .minus(grossPerformanceAtStartDate)
-            .minus(fees.minus(feesAtStartDate));
-
-          netPerformanceValuesWithCurrencyEffect[order.date] =
-            grossPerformanceWithCurrencyEffect
-              .minus(grossPerformanceAtStartDateWithCurrencyEffect)
-              .minus(
-                feesWithCurrencyEffect.minus(feesAtStartDateWithCurrencyEffect)
-              );
-
-          investmentValuesAccumulated[order.date] = totalInvestment;
-
-          investmentValuesAccumulatedWithCurrencyEffect[order.date] =
-            totalInvestmentWithCurrencyEffect;
-
-          investmentValuesWithCurrencyEffect[order.date] = (
-            investmentValuesWithCurrencyEffect[order.date] ?? new Big(0)
-          ).add(transactionInvestmentWithCurrencyEffect);
-
-          timeWeightedInvestmentValues[order.date] =
-            totalInvestmentDays > 0
-              ? sumOfTimeWeightedInvestments.div(totalInvestmentDays)
-              : new Big(0);
-
-          timeWeightedInvestmentValuesWithCurrencyEffect[order.date] =
-            totalInvestmentDays > 0
-              ? sumOfTimeWeightedInvestmentsWithCurrencyEffect.div(
-                  totalInvestmentDays
-                )
-              : new Big(0);
-        }
-      }
-
-      if (PortfolioCalculator.ENABLE_LOGGING) {
-        console.log('totalInvestment', totalInvestment.toNumber());
-
-        console.log(
-          'totalInvestmentWithCurrencyEffect',
-          totalInvestmentWithCurrencyEffect.toNumber()
-        );
-
-        console.log(
-          'totalGrossPerformance',
-          grossPerformance.minus(grossPerformanceAtStartDate).toNumber()
-        );
-
-        console.log(
-          'totalGrossPerformanceWithCurrencyEffect',
-          grossPerformanceWithCurrencyEffect
-            .minus(grossPerformanceAtStartDateWithCurrencyEffect)
-            .toNumber()
-        );
-      }
-
-      if (i === indexOfEndOrder) {
-        break;
-      }
-    }
-
-    const totalGrossPerformance = grossPerformance.minus(
-      grossPerformanceAtStartDate
-    );
-
-    const totalGrossPerformanceWithCurrencyEffect =
-      grossPerformanceWithCurrencyEffect.minus(
-        grossPerformanceAtStartDateWithCurrencyEffect
-      );
-
-    const totalNetPerformance = grossPerformance
-      .minus(grossPerformanceAtStartDate)
-      .minus(fees.minus(feesAtStartDate));
-
-    const totalNetPerformanceWithCurrencyEffect =
-      grossPerformanceWithCurrencyEffect
-        .minus(grossPerformanceAtStartDateWithCurrencyEffect)
-        .minus(feesWithCurrencyEffect.minus(feesAtStartDateWithCurrencyEffect));
-
-    const timeWeightedAverageInvestmentBetweenStartAndEndDate =
-      totalInvestmentDays > 0
-        ? sumOfTimeWeightedInvestments.div(totalInvestmentDays)
-        : new Big(0);
-
-    const timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect =
-      totalInvestmentDays > 0
-        ? sumOfTimeWeightedInvestmentsWithCurrencyEffect.div(
-            totalInvestmentDays
-          )
-        : new Big(0);
-
-    const grossPerformancePercentage =
-      timeWeightedAverageInvestmentBetweenStartAndEndDate.gt(0)
-        ? totalGrossPerformance.div(
-            timeWeightedAverageInvestmentBetweenStartAndEndDate
-          )
-        : new Big(0);
-
-    const grossPerformancePercentageWithCurrencyEffect =
-      timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect.gt(
-        0
-      )
-        ? totalGrossPerformanceWithCurrencyEffect.div(
-            timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect
-          )
-        : new Big(0);
-
-    const feesPerUnit = totalUnits.gt(0)
-      ? fees.minus(feesAtStartDate).div(totalUnits)
-      : new Big(0);
-
-    const feesPerUnitWithCurrencyEffect = totalUnits.gt(0)
-      ? feesWithCurrencyEffect
-          .minus(feesAtStartDateWithCurrencyEffect)
-          .div(totalUnits)
-      : new Big(0);
-
-    const netPerformancePercentage =
-      timeWeightedAverageInvestmentBetweenStartAndEndDate.gt(0)
-        ? totalNetPerformance.div(
-            timeWeightedAverageInvestmentBetweenStartAndEndDate
-          )
-        : new Big(0);
-
-    const netPerformancePercentageWithCurrencyEffect =
-      timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect.gt(
-        0
-      )
-        ? totalNetPerformanceWithCurrencyEffect.div(
-            timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect
-          )
-        : new Big(0);
-
-    if (PortfolioCalculator.ENABLE_LOGGING) {
-      console.log(
-        `
-        ${symbol}
-        Unit price: ${orders[indexOfStartOrder].unitPrice.toFixed(
-          2
-        )} -> ${unitPriceAtEndDate.toFixed(2)}
-        Total investment: ${totalInvestment.toFixed(2)}
-        Total investment with currency effect: ${totalInvestmentWithCurrencyEffect.toFixed(
-          2
-        )}
-        Time weighted investment: ${timeWeightedAverageInvestmentBetweenStartAndEndDate.toFixed(
-          2
-        )}
-        Time weighted investment with currency effect: ${timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect.toFixed(
-          2
-        )}
-        Total dividend: ${totalDividend.toFixed(2)}
-        Gross performance: ${totalGrossPerformance.toFixed(
-          2
-        )} / ${grossPerformancePercentage.mul(100).toFixed(2)}%
-        Gross performance with currency effect: ${totalGrossPerformanceWithCurrencyEffect.toFixed(
-          2
-        )} / ${grossPerformancePercentageWithCurrencyEffect
-          .mul(100)
-          .toFixed(2)}%
-        Fees per unit: ${feesPerUnit.toFixed(2)}
-        Fees per unit with currency effect: ${feesPerUnitWithCurrencyEffect.toFixed(
-          2
-        )}
-        Net performance: ${totalNetPerformance.toFixed(
-          2
-        )} / ${netPerformancePercentage.mul(100).toFixed(2)}%
-        Net performance with currency effect: ${totalNetPerformanceWithCurrencyEffect.toFixed(
-          2
-        )} / ${netPerformancePercentageWithCurrencyEffect.mul(100).toFixed(2)}%`
-      );
-    }
-
-    return {
-      currentValues,
-      currentValuesWithCurrencyEffect,
-      grossPerformancePercentage,
-      grossPerformancePercentageWithCurrencyEffect,
-      initialValue,
-      initialValueWithCurrencyEffect,
-      investmentValuesAccumulated,
-      investmentValuesAccumulatedWithCurrencyEffect,
-      investmentValuesWithCurrencyEffect,
-      netPerformancePercentage,
-      netPerformancePercentageWithCurrencyEffect,
-      netPerformanceValues,
-      netPerformanceValuesWithCurrencyEffect,
-      timeWeightedInvestmentValues,
-      timeWeightedInvestmentValuesWithCurrencyEffect,
-      totalDividend,
-      totalDividendInBaseCurrency,
-      totalInvestment,
-      totalInvestmentWithCurrencyEffect,
-      grossPerformance: totalGrossPerformance,
-      grossPerformanceWithCurrencyEffect:
-        totalGrossPerformanceWithCurrencyEffect,
-      hasErrors: totalUnits.gt(0) && (!initialValue || !unitPriceAtEndDate),
-      netPerformance: totalNetPerformance,
-      netPerformanceWithCurrencyEffect: totalNetPerformanceWithCurrencyEffect,
-      timeWeightedInvestment:
-        timeWeightedAverageInvestmentBetweenStartAndEndDate,
-      timeWeightedInvestmentWithCurrencyEffect:
-        timeWeightedAverageInvestmentBetweenStartAndEndDateWithCurrencyEffect
-    };
-  }
-}

apps/api/src/app/portfolio/current-rate.service.mock.ts

@@ -1,5 +1,4 @@
 import { parseDate, resetHours } from '@ghostfolio/common/helper';
-
 import { addDays, endOfDay, isBefore, isSameDay } from 'date-fns';
 
 import { GetValueObject } from './interfaces/get-value-object.interface';
@@ -34,26 +33,6 @@ function mockGetValue(symbol: string, date: Date) {
 
       return { marketPrice: 0 };
 
-    case 'GOOGL':
-      if (isSameDay(parseDate('2023-01-03'), date)) {
-        return { marketPrice: 89.12 };
-      } else if (isSameDay(parseDate('2023-07-10'), date)) {
-        return { marketPrice: 116.45 };
-      }
-
-      return { marketPrice: 0 };
-
-    case 'MSFT':
-      if (isSameDay(parseDate('2021-09-16'), date)) {
-        return { marketPrice: 89.12 };
-      } else if (isSameDay(parseDate('2021-11-16'), date)) {
-        return { marketPrice: 339.51 };
-      } else if (isSameDay(parseDate('2023-07-10'), date)) {
-        return { marketPrice: 331.83 };
-      }
-
-      return { marketPrice: 0 };
-
     case 'NOVN.SW':
       if (isSameDay(parseDate('2022-04-11'), date)) {
         return { marketPrice: 87.8 };
@@ -83,8 +62,10 @@ export const CurrentRateServiceMock = {
           values.push({
             date,
             dataSource: dataGatheringItem.dataSource,
-            marketPrice: mockGetValue(dataGatheringItem.symbol, date)
-              .marketPrice,
+            marketPriceInBaseCurrency: mockGetValue(
+              dataGatheringItem.symbol,
+              date
+            ).marketPrice,
             symbol: dataGatheringItem.symbol
           });
         }
@@ -95,8 +76,10 @@ export const CurrentRateServiceMock = {
           values.push({
             date,
             dataSource: dataGatheringItem.dataSource,
-            marketPrice: mockGetValue(dataGatheringItem.symbol, date)
-              .marketPrice,
+            marketPriceInBaseCurrency: mockGetValue(
+              dataGatheringItem.symbol,
+              date
+            ).marketPrice,
             symbol: dataGatheringItem.symbol
           });
         }

apps/api/src/app/portfolio/current-rate.service.spec.ts

@@ -1,8 +1,8 @@
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { UniqueAsset } from '@ghostfolio/common/interfaces';
-
 import { DataSource, MarketData } from '@prisma/client';
 
 import { CurrentRateService } from './current-rate.service';
@@ -67,8 +67,7 @@ jest.mock(
           initialize: () => Promise.resolve(),
           toCurrency: (value: number) => {
             return 1 * value;
-          },
-          getExchangeRates: () => Promise.resolve()
+          }
         };
       })
     };
@@ -88,6 +87,7 @@ jest.mock('@ghostfolio/api/services/property/property.service', () => {
 describe('CurrentRateService', () => {
   let currentRateService: CurrentRateService;
   let dataProviderService: DataProviderService;
+  let exchangeRateDataService: ExchangeRateDataService;
   let marketDataService: MarketDataService;
   let propertyService: PropertyService;
 
@@ -102,25 +102,33 @@ describe('CurrentRateService', () => {
       propertyService,
       null
     );
-
+    exchangeRateDataService = new ExchangeRateDataService(
+      null,
+      null,
+      null,
+      null
+    );
     marketDataService = new MarketDataService(null);
 
+    await exchangeRateDataService.initialize();
+
     currentRateService = new CurrentRateService(
       dataProviderService,
-      marketDataService,
-      null,
-      null
+      exchangeRateDataService,
+      marketDataService
     );
   });
 
   it('getValues', async () => {
     expect(
       await currentRateService.getValues({
+        currencies: { AMZN: 'USD' },
         dataGatheringItems: [{ dataSource: DataSource.YAHOO, symbol: 'AMZN' }],
         dateQuery: {
           lt: new Date(Date.UTC(2020, 0, 2, 0, 0, 0)),
           gte: new Date(Date.UTC(2020, 0, 1, 0, 0, 0))
-        }
+        },
+        userCurrency: 'CHF'
       })
     ).toMatchObject<GetValuesObject>({
       dataProviderInfos: [],
@@ -129,7 +137,7 @@ describe('CurrentRateService', () => {
         {
           dataSource: 'YAHOO',
           date: undefined,
-          marketPrice: 1841.823902,
+          marketPriceInBaseCurrency: 1841.823902,
           symbol: 'AMZN'
         }
       ]

apps/api/src/app/portfolio/current-rate.service.ts

@@ -1,5 +1,5 @@
-import { OrderService } from '@ghostfolio/api/app/order/order.service';
 import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data/exchange-rate-data.service';
 import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
 import { resetHours } from '@ghostfolio/common/helper';
 import {
@@ -7,10 +7,7 @@ import {
   ResponseError,
   UniqueAsset
 } from '@ghostfolio/common/interfaces';
-import type { RequestWithUser } from '@ghostfolio/common/types';
-
-import { Inject, Injectable } from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
+import { Injectable } from '@nestjs/common';
 import { isBefore, isToday } from 'date-fns';
 import { flatten, isEmpty, uniqBy } from 'lodash';
 
@@ -22,19 +19,18 @@ import { GetValuesParams } from './interfaces/get-values-params.interface';
 export class CurrentRateService {
   public constructor(
     private readonly dataProviderService: DataProviderService,
-    private readonly marketDataService: MarketDataService,
-    private readonly orderService: OrderService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    private readonly exchangeRateDataService: ExchangeRateDataService,
+    private readonly marketDataService: MarketDataService
   ) {}
 
-  // TODO: Pass user instead of using this.request.user
   public async getValues({
+    currencies,
     dataGatheringItems,
-    dateQuery
+    dateQuery,
+    userCurrency
   }: GetValuesParams): Promise<GetValuesObject> {
     const dataProviderInfos: DataProviderInfo[] = [];
-
-    const includesToday =
+    const includeToday =
       (!dateQuery.lt || isBefore(new Date(), dateQuery.lt)) &&
       (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
       (!dateQuery.in || this.containsToday(dateQuery.in));
@@ -43,13 +39,12 @@ export class CurrentRateService {
     const quoteErrors: ResponseError['errors'] = [];
     const today = resetHours(new Date());
 
-    if (includesToday) {
+    if (includeToday) {
       promises.push(
         this.dataProviderService
-          .getQuotes({ items: dataGatheringItems, user: this.request?.user })
+          .getQuotes({ items: dataGatheringItems })
           .then((dataResultProvider) => {
             const result: GetValueObject[] = [];
-
             for (const dataGatheringItem of dataGatheringItems) {
               if (
                 dataResultProvider?.[dataGatheringItem.symbol]?.dataProviderInfo
@@ -63,8 +58,13 @@ export class CurrentRateService {
                 result.push({
                   dataSource: dataGatheringItem.dataSource,
                   date: today,
-                  marketPrice:
-                    dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice,
+                  marketPriceInBaseCurrency:
+                    this.exchangeRateDataService.toCurrency(
+                      dataResultProvider?.[dataGatheringItem.symbol]
+                        ?.marketPrice,
+                      dataResultProvider?.[dataGatheringItem.symbol]?.currency,
+                      userCurrency
+                    ),
                   symbol: dataGatheringItem.symbol
                 });
               } else {
@@ -97,8 +97,13 @@ export class CurrentRateService {
             return {
               dataSource,
               date,
-              marketPrice,
-              symbol
+              symbol,
+              marketPriceInBaseCurrency:
+                this.exchangeRateDataService.toCurrency(
+                  marketPrice,
+                  currencies[symbol],
+                  userCurrency
+                )
             };
           });
         })
@@ -123,17 +128,11 @@ export class CurrentRateService {
           });
 
           if (!value) {
-            // Fallback to unit price of latest activity
-            const latestActivity = await this.orderService.getLatestOrder({
-              dataSource,
-              symbol
-            });
-
             value = {
               dataSource,
               symbol,
               date: today,
-              marketPrice: latestActivity?.unitPrice ?? 0
+              marketPriceInBaseCurrency: 0
             };
 
             response.values.push(value);
@@ -141,7 +140,10 @@ export class CurrentRateService {
 
           const [latestValue] = response.values
             .filter((currentValue) => {
-              return currentValue.symbol === symbol && currentValue.marketPrice;
+              return (
+                currentValue.symbol === symbol &&
+                currentValue.marketPriceInBaseCurrency
+              );
             })
             .sort((a, b) => {
               if (a.date < b.date) {
@@ -155,7 +157,8 @@ export class CurrentRateService {
               return 0;
             });
 
-          value.marketPrice = latestValue.marketPrice;
+          value.marketPriceInBaseCurrency =
+            latestValue.marketPriceInBaseCurrency;
         } catch {}
       }
     }

apps/api/src/app/portfolio/interfaces/current-positions.interface.ts

@@ -1,20 +1,13 @@
 import { ResponseError, TimelinePosition } from '@ghostfolio/common/interfaces';
-
-import { Big } from 'big.js';
+import Big from 'big.js';
 
 export interface CurrentPositions extends ResponseError {
-  currentValueInBaseCurrency: Big;
-  grossPerformance: Big;
-  grossPerformanceWithCurrencyEffect: Big;
-  grossPerformancePercentage: Big;
-  grossPerformancePercentageWithCurrencyEffect: Big;
-  netAnnualizedPerformance?: Big;
-  netAnnualizedPerformanceWithCurrencyEffect?: Big;
-  netPerformance: Big;
-  netPerformanceWithCurrencyEffect: Big;
-  netPerformancePercentage: Big;
-  netPerformancePercentageWithCurrencyEffect: Big;
   positions: TimelinePosition[];
+  grossPerformance: Big;
+  grossPerformancePercentage: Big;
+  netAnnualizedPerformance?: Big;
+  netPerformance: Big;
+  netPerformancePercentage: Big;
+  currentValue: Big;
   totalInvestment: Big;
-  totalInvestmentWithCurrencyEffect: Big;
 }

apps/api/src/app/portfolio/interfaces/get-value-object.interface.ts

@@ -2,5 +2,5 @@ import { UniqueAsset } from '@ghostfolio/common/interfaces';
 
 export interface GetValueObject extends UniqueAsset {
   date: Date;
-  marketPrice: number;
+  marketPriceInBaseCurrency: number;
 }

apps/api/src/app/portfolio/interfaces/get-values-params.interface.ts

@@ -3,6 +3,8 @@ import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfac
 import { DateQuery } from './date-query.interface';
 
 export interface GetValuesParams {
+  currencies: { [symbol: string]: string };
   dataGatheringItems: IDataGatheringItem[];
   dateQuery: DateQuery;
+  userCurrency: string;
 }

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

@@ -0,0 +1,5 @@
+import { PortfolioOrder } from './portfolio-order.interface';
+
+export interface PortfolioOrderItem extends PortfolioOrder {
+  itemType?: '' | 'start' | 'end';
+}

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

@@ -1,11 +0,0 @@
-import { Big } from 'big.js';
-
-import { PortfolioOrder } from './portfolio-order.interface';
-
-export interface PortfolioOrderItem extends PortfolioOrder {
-  feeInBaseCurrency?: Big;
-  feeInBaseCurrencyWithCurrencyEffect?: Big;
-  itemType?: 'end' | 'start';
-  unitPriceInBaseCurrency?: Big;
-  unitPriceInBaseCurrencyWithCurrencyEffect?: Big;
-}