Release 0.93.0

.env

@@ -5,12 +5,12 @@ REDIS_HOST=localhost
 REDIS_PORT=6379
 
 # POSTGRES
-POSTGRES_DB=ghostfolio-db
 POSTGRES_USER=user
 POSTGRES_PASSWORD=password
+POSTGRES_DB=ghostfolio-db
 
 ACCESS_TOKEN_SALT=GHOSTFOLIO
 ALPHA_VANTAGE_API_KEY=
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer
+DATABASE_URL=postgresql://user:password@localhost:5432/ghostfolio-db?sslmode=prefer
 JWT_SECRET_KEY=123456
 PORT=3333

.eslintrc.json

@@ -44,7 +44,7 @@
           }
         ],
         "@typescript-eslint/member-ordering": "error",
-        "@typescript-eslint/naming-convention": "off",
+        "@typescript-eslint/naming-convention": "error",
         "@typescript-eslint/no-empty-function": "off",
         "@typescript-eslint/no-empty-interface": "error",
         "@typescript-eslint/no-inferrable-types": [

.storybook/main.js

@@ -1,11 +0,0 @@
-module.exports = {
-  stories: [],
-  addons: ['@storybook/addon-essentials']
-  // uncomment the property below if you want to apply some webpack config globally
-  // webpackFinal: async (config, { configType }) => {
-  //   // Make whatever fine-grained changes you need that should apply to all storybook configs
-
-  //   // Return the altered config
-  //   return config;
-  // },
-};

.storybook/tsconfig.json

@@ -1,10 +0,0 @@
-{
-  "extends": "../tsconfig.base.json",
-  "exclude": [
-    "../**/*.spec.js",
-    "../**/*.spec.ts",
-    "../**/*.spec.tsx",
-    "../**/*.spec.jsx"
-  ],
-  "include": ["../**/*"]
-}

.travis.yml

@@ -1,11 +0,0 @@
-language: node_js
-git:
-  depth: false
-node_js:
-  - 14
-before_script:
-  - yarn
-script:
-  - yarn format:check
-  - yarn test
-  - yarn build:all

CHANGELOG.md

@@ -5,661 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## 1.48.0 - 07.09.2021
-
-### Added
-
-- Added the attribute `precision` in the value component
-
-### Fixed
-
-- Hid the performance in the _Presenter View_
-
-## 1.47.1 - 06.09.2021
-
-### Fixed
-
-- Fixed the search functionality for cryptocurrency symbols
-
-## 1.46.0 - 05.09.2021
-
-### Added
-
-- Extended the statistics section on the about page by the _GitHub_ contributors count
-- Set up _Storybook_
-  - Added a story for the logo component
-  - Added a story for the no transactions info component
-  - Added a story for the trend indicator component
-  - Added a story for the value component
-
-### Changed
-
-- Switched from gross to net performance
-- Restructured the portfolio summary tab on the home page (fees and net performance)
-
-## 1.45.0 - 04.09.2021
-
-### Added
-
-- Added a link below the holdings to manage the transactions
-- Added the allocation chart by symbol
-
-### Changed
-
-- Restructured the allocations page
-- Upgraded `angular` from version `12.0.4` to `12.2.4`
-- Upgraded `@angular/cdk` and `@angular/material` from version `12.0.6` to `12.2.4`
-- Upgraded `Nx` from version `12.5.4` to `12.8.0`
-- Upgraded `prisma` from version `2.24.1` to `2.30.2`
-
-### Fixed
-
-- Fixed the value formatting for integers (transactions count)
-
-## 1.44.0 - 30.08.2021
-
-### Changed
-
-- Extended the sub classification of assets by cash
-- Upgraded `svgmap` from version `2.1.1` to `2.6.0`
-
-### Fixed
-
-- Filtered out positions without any quantity in the positions table
-- Improved the symbol lookup: allow saving with valid symbol in create or edit transaction dialog
-
-## 1.43.0 - 24.08.2021
-
-### Added
-
-- Extended the data management of symbol profile data by countries (automated for stocks)
-- Added a fallback for initially loading currencies if historical data is not yet available
-
-## 1.42.0 - 22.08.2021
-
-### Added
-
-- Added the subscription type to the users table of the admin control panel
-- Introduced the sub classification of assets
-
-### Todo
-
-- Apply data migration (`yarn database:push`)
-
-## 1.41.0 - 21.08.2021
-
-### Added
-
-- Added a link to the system status page
-
-### Changed
-
-- Improved the wording for the _Restricted View_: _Presenter View_
-- Improved the styling of the tables
-- Ignored cash assets in the allocation chart by sector, continent and country
-
-### Fixed
-
-- Fixed an issue in the allocation chart by account (wrong calculation)
-- Fixed an issue in the allocation chart by account (missing cash accounts)
-
-## 1.40.0 - 19.08.2021
-
-### Changed
-
-- Improved the fault tolerance of the portfolio details endpoint
-
-### Fixed
-
-- Fixed the node engine version mismatch in `package.json`
-- Fixed an issue on the buy date in the position detail dialog
-- Fixed an issue with the currency inconsistency in the _Yahoo Finance_ service (convert from `GBp` to `GBP`)
-
-## 1.39.0 - 16.08.2021
-
-### Added
-
-- Added an option to hide absolute values like performances and quantities (_Restricted View_)
-
-### Changed
-
-- Restructured the allocations page
-
-### Fixed
-
-- Fixed an issue with the performance in the portfolio summary tab on the home page (impersonation mode)
-- Fixed various values in the impersonation mode which have not been nullified
-
-### Removed
-
-- Removed the current net performance
-- Removed the read foreign portfolio permission
-
-### Todo
-
-- Apply data migration (`yarn database:push`)
-
-## 1.38.0 - 14.08.2021
-
-### Added
-
-- Added the overview menu item on mobile
-
-### Changed
-
-- Refactored the exchange rate service
-- Improved the users table in the admin control panel
-
-## 1.37.0 - 13.08.2021
-
-### Added
-
-- Added the calculated net worth to the portfolio summary tab on the home page
-- Added the calculated time in market to the portfolio summary tab on the home page
-
-### Changed
-
-- Improved the usability of the tabs on the home page
-- Restructured the portfolio summary tab on the home page
-- Upgraded `angular-material-css-vars` from version `2.1.0` to `2.1.2`
-
-### Fixed
-
-- Fixed the position detail chart if there are missing historical data around the first buy date
-- Fixed the snack bar background color in dark mode
-- Fixed the search functionality for symbols (filter for supported currencies)
-
-## 1.36.0 - 09.08.2021
-
-### Changed
-
-- Improved the data gathering handling on server restart
-- Respected the cash balance on the allocations page
-- Eliminated the name from the scraper configuration
-
-### Fixed
-
-- Fixed hidden cryptocurrency holdings
-
-## 1.35.0 - 08.08.2021
-
-### Changed
-
-- Hid the pagination of tabs
-- Improved the classification of assets
-- Improved the support for future transactions (drafts)
-- Optimized the accounts table for mobile
-- Upgraded `chart.js` from version `3.3.2` to `3.5.0`
-
-### Fixed
-
-- Added a fallback if the exchange rate service has not been initialized correctly
-
-### Todo
-
-- Apply data migration (`yarn database:push`)
-
-## 1.34.0 - 07.08.2021
-
-### Changed
-
-- Restructured the page hierarchy
-
-### Fixed
-
-- Fixed an issue with the currency conversion of the market price in the position detail dialog
-- Fixed the chart and missing data of positions from the past in the position detail dialog
-
-## 1.33.0 - 05.08.2021
-
-### Fixed
-
-- Fixed an issue of a division by zero in the portfolio calculations
-- Fixed an issue with the currency conversion in the position detail dialog
-
-## 1.32.0 - 04.08.2021
-
-### Added
-
-- Added the name to the position detail dialog when opened from the transactions table
-- Added a screenshot to the blog posts
-
-### Fixed
-
-- Fixed the missing market state in the positions tab
-- Fixed the chart of positions with differing currency from user
-
-## 1.31.1 - 01.08.2021
-
-### Fixed
-
-- Fixed an issue with the currency conversion in the portfolio calculations
-
-## 1.31.0 - 01.08.2021
-
-### Added
-
-- Added more data points to the chart
-
-### Changed
-
-- Rewritten the core engine for the portfolio calculations
-  - Switched to [Time-Weighted Rate of Return](https://www.investopedia.com/terms/t/time-weightedror.asp) (TWR) for the performance calculation
-  - Improved the performance of the portfolio calculations
-
-## 1.30.0 - 31.07.2021
-
-### Added
-
-- Added the date range component to the positions tab
-- Added a blog
-
-## 1.29.0 - 26.07.2021
-
-### Changed
-
-- Introduced tabs on the home page
-- Changed the menu icon if the menu is open on mobile
-
-## 1.28.0 - 24.07.2021
-
-### Added
-
-- Extended the data management by symbol profile data
-- Added a currency attribute to the symbol profile model
-- Added a positions button on the home page which scrolls into the view
-
-### Changed
-
-- Improved the style of the active page in the navigation on desktop
-- Removed the footer for users
-- Extended the _Zen Mode_ by positions
-- Improved the _Create Account_ message in the _Live Demo_
-
-## 1.27.0 - 18.07.2021
-
-### Changed
-
-- Improved the onboarding
-  - Flow of creating a new account
-  - Info message to add the first transaction
-
-### Fixed
-
-- Fixed the chart on the landing page
-- Fixed the url to the _Fear & Greed Index_ on the resources page
-
-## 1.26.0 - 17.07.2021
-
-### Added
-
-- Added the import functionality for transactions
-- Added the `robots.txt` file
-
-### Changed
-
-- 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`
-
-### Fixed
-
-- Fixed the warn color (button) of the theme
-
-## 1.25.0 - 11.07.2021
-
-### Added
-
-- Added the export functionality for transactions
-
-### Changed
-
-- Respected the cash balance on the analysis page
-- Improved the settings selectors on the account page
-- Harmonized the slogan to "Open Source Wealth Management Software"
-
-### Fixed
-
-- Fixed rendering of currency and platform in dialogs (account and transaction)
-- Fixed an issue in the calculation of the average buy prices in the position detail chart
-
-## 1.24.0 - 07.07.2021
-
-### Added
-
-- Added the total value in the create or edit transaction dialog
-- Added a balance attribute to the account model
-- Calculated the total balance (cash)
-
-### Changed
-
-- Upgraded `@angular/cdk` and `@angular/material` from version `11.0.4` to `12.0.6`
-- Upgraded `@nestjs` dependencies
-- Upgraded `angular-material-css-vars` from version `1.2.0` to `2.0.0`
-- Upgraded `Nx` from version `12.3.6` to `12.5.4`
-
-## 1.23.1 - 03.07.2021
-
-### Fixed
-
-- Fixed the investment chart (drafts)
-
-## 1.23.0 - 03.07.2021
-
-### Added
-
-- Added support for future transactions (drafts)
-
-## 1.22.0 - 25.06.2021
-
-### Added
-
-- Set the user id in the _Stripe_ callback
-
-## 1.21.0 - 22.06.2021
-
-### Changed
-
-- Changed _Stripe_ mode from `subscription` to `payment`
-
-### Fixed
-
-- Fixed the base currency on the pricing page
-
-## 1.20.0 - 21.06.2021
-
-### Added
-
-- Set up _Stripe_ for subscriptions
-
-### Changed
-
-- Improved the style of the _Ghostfolio in Numbers_ section
-
-## 1.19.0 - 17.06.2021
-
-### Added
-
-- Added a _Ghostfolio in Numbers_ section to the about page
-
-## 1.18.0 - 16.06.2021
-
-### Changed
-
-- Improved the pie chart: Investments by sector
-- Improved the onboarding for TWA by redirecting to the account registration page
-
-## 1.17.0 - 15.06.2021
-
-### Changed
-
-- Improved the error page of the sign in with fingerprint
-- Disable the sign in with fingerprint selector for the demo user
-- Upgraded `angular` from version `11.2.4` to `12.0.4`
-- Upgraded `angular-material-css-vars` from version `1.1.2` to `1.2.0`
-- Upgraded `chart.js` from version `3.2.1` to `3.3.2`
-- Upgraded `date-fns` from version `2.19.0` to `2.22.1`
-- Upgraded `eslint` and `prettier` dependencies
-- Upgraded `ngx-device-detector` from version `2.0.6` to `2.1.1`
-- Upgraded `ngx-markdown` from version `11.1.2` to `12.0.1`
-
-## 1.16.0 - 14.06.2021
-
-### Changed
-
-- Improved the sign in with fingerprint
-
-## 1.15.0 - 14.06.2021
-
-### Added
-
-- Added a counter column to the transactions table
-- Added a label to indicate the default account in the accounts table
-- Added an option to limit the items in pie charts
-- Added sign in with fingerprint
-
-### Changed
-
-- Cleaned up the analysis page with an unused chart module
-- Improved the cell alignment in the users table of the admin control panel
-
-### Fixed
-
-- Fixed the last activity column of users in the admin control panel
-
-## 1.14.0 - 09.06.2021
-
-### Added
-
-- Added a connect or create symbol profile model logic on creating a new transaction
-
-### Changed
-
-- Improved the global heat map to visualize investments by country
-
-## 1.13.0 - 08.06.2021
-
-### Added
-
-- Added a global heat map to visualize investments by country
-
-## 1.12.0 - 06.06.2021
-
-### Added
-
-- Added a symbol profile model with additional data
-- Added new pie charts: Investments by continent and country
-
-## 1.11.0 - 05.06.2021
-
-### Added
-
-- Added a dedicated page for the account registration
-- Rendered the average buy prices in the position detail chart (useful for recurring transactions)
-- Introduced the initial prisma migration
-
-### Changed
-
-- Changed the buttons to links (`<a>`) on the tools page
-- Upgraded `prisma` from version `2.20.1` to `2.24.1`
-
-## 1.10.1 - 02.06.2021
-
-### Fixed
-
-- Fixed an optional type in the user interface
-
-## 1.10.0 - 02.06.2021
-
-### Changed
-
-- Moved the tools to a sub path (`/tools`)
-- Extended the pricing page and aligned with the subscription model
-
-## 1.9.0 - 01.06.2021
-
-### Added
-
-- Added the year labels to the investment chart on the x-axis
-
-### Changed
-
-- Respected the data source attribute of the transactions model in the data management for historical data
-- Prettified the generic scraper symbols in the transaction filtering component
-- Changed to the strict mode of distance formatting between two given dates
-
-### Fixed
-
-- Fixed the sorting in various tables
-- Made the order of the rules in the _X-ray_ section consistent
-
-## 1.8.0 - 24.05.2021
-
-### Added
-
-- Added a section for _Analysis_, _X-ray_ and upcoming tools
-
-### Changed
-
-- Introduced a user service implemented as an observable store (single source of truth for state)
-
-### Fixed
-
-- Fixed the performance chart by considering the investment
-- Fixed missing header of public pages (_About_, _Pricing_, _Resources_)
-
-## 1.7.0 - 22.05.2021
-
-### Changed
-
-- Hid footer on mobile (except on landing page)
-
-### Fixed
-
-- Fixed the internal navigation of the _Zen Mode_ in combination with a query parameter
-
-## 1.6.0 - 22.05.2021
-
-### Added
-
-- Added an index in the users table of the admin control panel
-
-### Changed
-
-- Improved the alignment in the users table of the admin control panel
-
-## 1.5.0 - 22.05.2021
-
-### Added
-
-- Added _Zen Mode_: the distraction-free view
-
-## 1.4.0 - 20.05.2021
-
-### Added
-
-- Added filtering by year in the transaction filtering component
-
-### Changed
-
-- Renamed _Ghostfolio Account_ to _My Ghostfolio_
-- Hid unknown exchange in the position overview
-- Disable the base currency selector for the demo user
-- Refactored the portfolio unit tests to work without database
-- Refactored the search functionality of the data management (aligned with data source)
-- Renamed shared helper to `@ghostfolio/common/helper`
-- Moved shared interfaces to `@ghostfolio/common/interfaces`
-- Moved shared types to `@ghostfolio/common/types`
-
-## 1.3.0 - 15.05.2021
-
-### Changed
-
-- Refactored the active menu item state by parsing the current url
-- Used a desaturated background color for unknown types in pie charts
-- Renamed the columns _Initial Share_ and _Current Share_ to _Initial Allocation_ and _Current Allocation_ in the positions table
-
-### Fixed
-
-- Fixed the link to the pricing page
-
-## 1.2.1 - 14.05.2021
-
-### Changed
-
-- Updated the sitemap
-
-## 1.2.0 - 14.05.2021
-
-### Changed
-
-- Harmonized the style of various tables
-- Keep the color per type when switching between _Initial_ and _Current_ in pie charts
-- Upgraded `chart.js` from version `3.0.2` to `3.2.1`
-- Moved the pricing section to a dedicated page
-- Improved the style of the transaction filtering component
-
-### Fixed
-
-- Fixed the tooltips when switching between _Initial_ and _Current_ in pie charts
-
-## 1.1.0 - 11.05.2021
-
-### Added
-
-- Added a button to fetch the current market price in the create or edit transaction dialog
-
-### Changed
-
-- Improved the transaction filtering with multi filter support
-
-### Fixed
-
-- Fixed the filtering by account name in the transactions table
-- Fixed the active menu item state when a modal has opened
-
-## 1.0.0 - 05.05.2021
-
-### Added
-
-- Added the functionality to clone a transaction
-- Added a _Google Play_ badge on the landing page
-
-### Changed
-
-- Changed to maskable icons
-
-## 0.99.0 - 03.05.2021
-
-### Added
-
-- Added support for deleting users in the admin control panel
-
-### Changed
-
-- Eliminated the platform attribute from the transaction model
-
-## 0.98.0 - 02.05.2021
-
-### Added
-
-- Added the logic to create and update accounts
-
-## 0.97.0 - 01.05.2021
-
-### Added
-
-- Added an account page as a preparation for the multi accounts support
-
-## 0.96.0 - 30.04.2021
-
-### Added
-
-- Added the absolute change to the position detail dialog
-- Added the number of transactions to the position detail dialog
-
-### Changed
-
-- Harmonized the slogan to "Open Source Portfolio Tracker"
-
-## 0.95.0 - 28.04.2021
-
-### Added
-
-- Added a data source attribute to the transactions model
-
-## 0.94.0 - 27.04.2021
-
-### Added
-
-- Added the generic scraper symbols to the symbol lookup results
-
 ## 0.93.0 - 26.04.2021
 
 ### Changed
 
-- Improved the users table styling of the admin control panel
+- Improved the user table styling of the admin control panel
 - Improved the background colors in the dark mode
 
 ## 0.92.0 - 25.04.2021
@@ -667,7 +17,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - Prepared further for multi accounts support: store account for new transactions
-- Added a horizontal scrollbar to the users table of the admin control panel
+- Added a horizontal scrollbar to the user table of the admin control panel
 
 ### Fixed
 
@@ -694,7 +44,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
-- Improved the users table of the admin control panel
+- Improved the user table of the admin control panel
 
 ## 0.89.0 - 21.04.2021
 
@@ -725,7 +75,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Fixed
 
-- Fixed an issue in the users table of the admin control panel with missing data
+- Fixed an issue in the user table of the admin control panel with missing data
 
 ## 0.86.1 - 18.04.2021
 
@@ -740,7 +90,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Changed the about page for the new license
 - Optimized the data management for historical data
 - Optimized the exchange rate service
-- Improved the users table of the admin control panel
+- Improved the user table of the admin control panel
 
 ### Fixed
 

README.md

@@ -1,40 +1,19 @@
 <div align="center">
-  <a href="https://ghostfol.io">
-    <img
-      alt="Ghostfolio Logo"
-      src="https://avatars.githubusercontent.com/u/82473144?s=200"
-      width="100"
-    />
-  </a>
-
   <h1>Ghostfolio</h1>
   <p>
-    <strong>Open Source Wealth Management Software made for Humans</strong>
+    <strong>Open Source Portfolio Tracker</strong>
   </p>
   <p>
-    <a href="https://ghostfol.io"><strong>Live Demo</strong></a> | <a href="https://ghostfol.io/pricing"><strong>Ghostfolio Premium</strong></a> | <a href="https://ghostfol.io/en/blog/2021/07/hello-ghostfolio"><strong>Blog</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
+    <a href="https://ghostfol.io"><strong>Live Demo</strong></a>
   </p>
   <p>
-    <a href="#contributing">
-      <img src="https://img.shields.io/badge/contributions-welcome-orange.svg"/></a>
-    <a href="https://travis-ci.com/github/ghostfolio/ghostfolio" rel="nofollow">
-      <img src="https://travis-ci.com/ghostfolio/ghostfolio.svg?branch=main" alt="Build Status"/></a>
     <a href="https://www.gnu.org/licenses/agpl-3.0" rel="nofollow">
-      <img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg" alt="License: AGPL v3"/></a>
+      <img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg" alt="License: AGPL v3">
+    </a>
   </p>
 </div>
 
-**Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of their wealth like stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions.
-
-<div align="center">
-  <img src="./apps/client/src/assets/images/screenshot.png" width="300">
-</div>
-
-## Ghostfolio Premium
-
-Our official **[Ghostfolio Premium](https://ghostfol.io/pricing)** cloud offering is the easiest way to get started. Due to the time it saves, this will be the best option for most people. The revenue is used for covering the hosting costs.
-
-If you prefer to run Ghostfolio on your own infrastructure, please find the source code and further instructions here on _GitHub_.
+**Ghostfolio** is an open source portfolio tracker. The software empowers busy folks to have a sharp look of their financial assets and to make solid, data-driven investment decisions by evaluating automated static portfolio analysis rules.
 
 ## Why Ghostfolio?
 
@@ -61,13 +40,10 @@ Ghostfolio is for you if you are...
 ## Features
 
 - ✅ Create, update and delete transactions
-- ✅ Multi account management
-- ✅ Portfolio performance: Time-weighted rate of return (TWR) for `Today`, `YTD`, `1Y`, `5Y`, `Max`
+- ✅ Portfolio performance (`Today`, `YTD`, `1Y`, `5Y`, `Max`)
 - ✅ Various charts
 - ✅ Static analysis to identify potential risks in your portfolio
 - ✅ Dark Mode
-- ✅ Zen Mode
-- ✅ Mobile-first design
 
 ## Technology Stack
 
@@ -75,11 +51,11 @@ Ghostfolio is a modern web application written in [TypeScript](https://www.types
 
 ### Backend
 
-The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://www.postgresql.org) as a database together with [Prisma](https://www.prisma.io) and [Redis](https://redis.io) for caching.
+The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://www.postgresql.org) as a database and [Redis](https://redis.io) for caching.
 
 ### Frontend
 
-The frontend is built with [Angular](https://angular.io) and uses [Angular Material](https://material.angular.io) with utility classes from [Bootstrap](https://getbootstrap.com).
+The frontend is built with [Angular](https://angular.io).
 
 ## Getting Started
 
@@ -92,44 +68,33 @@ The frontend is built with [Angular](https://angular.io) and uses [Angular Mater
 ### Setup
 
 1. Run `yarn install`
-1. Run `cd docker`
-1. Run `docker compose up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
-1. Run `cd -` to go back to the project root directory
-1. Run `yarn setup:database` to initialize the database schema and populate your database with (example) data
-1. Start server and client (see [_Development_](#Development))
-1. Login as _Admin_ with the following _Security Token_: `ae76872ae8f3419c6d6f64bf51888ecbcc703927a342d815fafe486acdb938da07d0cf44fca211a0be74a423238f535362d390a41e81e633a9ce668a6e31cdf9`
-1. Go to the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
-1. Click _Sign out_ and check out the _Live Demo_
+2. Run `cd docker`
+3. Run `docker compose build`
+4. Run `docker compose up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
+5. Run `cd -` to go back to the project root directory
+6. Run `yarn setup:database` to initialize the database schema and populate your database with (example) data
+7. Start server and client (see _Development_)
+8. Login as _Admin_ with the following _Security Token_: `ae76872ae8f3419c6d6f64bf51888ecbcc703927a342d815fafe486acdb938da07d0cf44fca211a0be74a423238f535362d390a41e81e633a9ce668a6e31cdf9`
+9. Go to the _Admin Control Panel_ and press _Gather All Data_ to fetch historical data
+10. Press _Sign out_ and check out the _Live Demo_
 
 ## Development
 
-Please make sure you have completed the instructions from [_Setup_](#Setup).
+Please make sure you have completed the instructions from _Setup_
 
 ### Start server
 
-<ol type="a">
-  <li>Debug: Run <code>yarn watch:server</code> and click "Launch Program" in <i>Visual Studio Code</i></li>
-  <li>Serve: Run <code>yarn start:server</code></li>
-</ol>
+- Debug: Run `yarn watch:server` and click "Launch Program" in _Visual Studio Code_
+- Serve: Run `yarn start:server`
 
 ### Start client
 
-Run `yarn start:client`
-
-### Start _Storybook_
-
-Run `yarn start:storybook`
+- Run `yarn start:client`
 
 ## Testing
 
 Run `yarn test`
 
-## Contributing
-
-Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.
-
-Not sure what to work on? We have got some ideas. Please tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_) or send an e-mail to hi@ghostfol.io. We would love to hear from you.
-
 ## License
 
 © 2021 [Ghostfolio](https://ghostfol.io)

angular.json

@@ -6,16 +6,13 @@
   "defaultProject": "api",
   "schematics": {
     "@nrwl/angular:application": {
-      "linter": "eslint",
       "unitTestRunner": "jest",
       "e2eTestRunner": "cypress"
     },
     "@nrwl/angular:library": {
-      "linter": "eslint",
       "unitTestRunner": "jest"
     },
-    "@nrwl/nest": {},
-    "@nrwl/angular:component": {}
+    "@nrwl/nest": {}
   },
   "projects": {
     "api": {
@@ -89,6 +86,7 @@
             "main": "apps/client/src/main.ts",
             "polyfills": "apps/client/src/polyfills.ts",
             "tsConfig": "apps/client/tsconfig.app.json",
+            "aot": true,
             "assets": [
               "apps/client/src/assets",
               {
@@ -106,11 +104,6 @@
                 "input": "",
                 "output": "./"
               },
-              {
-                "glob": "robots.txt",
-                "input": "apps/client/src/assets",
-                "output": "./"
-              },
               {
                 "glob": "sitemap.xml",
                 "input": "apps/client/src/assets",
@@ -128,13 +121,7 @@
               }
             ],
             "styles": ["apps/client/src/styles.scss"],
-            "scripts": ["node_modules/marked/lib/marked.js"],
-            "vendorChunk": true,
-            "extractLicenses": false,
-            "buildOptimizer": false,
-            "sourceMap": true,
-            "optimization": false,
-            "namedChunks": true
+            "scripts": ["node_modules/marked/lib/marked.js"]
           },
           "configurations": {
             "production": {
@@ -165,8 +152,7 @@
               ]
             }
           },
-          "outputs": ["{options.outputPath}"],
-          "defaultConfiguration": ""
+          "outputs": ["{options.outputPath}"]
         },
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
@@ -222,110 +208,26 @@
         }
       }
     },
-    "common": {
-      "root": "libs/common",
-      "sourceRoot": "libs/common/src",
+    "helper": {
+      "root": "libs/helper",
+      "sourceRoot": "libs/helper/src",
       "projectType": "library",
       "architect": {
         "lint": {
           "builder": "@nrwl/linter:eslint",
           "options": {
-            "lintFilePatterns": ["libs/common/**/*.ts"]
+            "lintFilePatterns": ["libs/helper/**/*.ts"]
           }
         },
         "test": {
           "builder": "@nrwl/jest:jest",
-          "outputs": ["coverage/libs/common"],
+          "outputs": ["coverage/libs/helper"],
           "options": {
-            "jestConfig": "libs/common/jest.config.js",
+            "jestConfig": "libs/helper/jest.config.js",
             "passWithNoTests": true
           }
         }
       }
-    },
-    "ui": {
-      "projectType": "library",
-      "schematics": {
-        "@schematics/angular:component": {
-          "style": "scss"
-        }
-      },
-      "root": "libs/ui",
-      "sourceRoot": "libs/ui/src",
-      "prefix": "gf",
-      "architect": {
-        "test": {
-          "builder": "@nrwl/jest:jest",
-          "outputs": ["coverage/libs/ui"],
-          "options": {
-            "jestConfig": "libs/ui/jest.config.js",
-            "passWithNoTests": true
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["libs/ui/src/**/*.ts", "libs/ui/src/**/*.html"]
-          }
-        },
-        "storybook": {
-          "builder": "@nrwl/storybook:storybook",
-          "options": {
-            "uiFramework": "@storybook/angular",
-            "port": 4400,
-            "config": {
-              "configFolder": "libs/ui/.storybook"
-            }
-          },
-          "configurations": {
-            "ci": {
-              "quiet": true
-            }
-          }
-        },
-        "build-storybook": {
-          "builder": "@nrwl/storybook:build",
-          "outputs": ["{options.outputPath}"],
-          "options": {
-            "uiFramework": "@storybook/angular",
-            "outputPath": "dist/storybook/ui",
-            "config": {
-              "configFolder": "libs/ui/.storybook"
-            }
-          },
-          "configurations": {
-            "ci": {
-              "quiet": true
-            }
-          }
-        }
-      }
-    },
-    "ui-e2e": {
-      "root": "apps/ui-e2e",
-      "sourceRoot": "apps/ui-e2e/src",
-      "projectType": "application",
-      "architect": {
-        "e2e": {
-          "builder": "@nrwl/cypress:cypress",
-          "options": {
-            "cypressConfig": "apps/ui-e2e/cypress.json",
-            "devServerTarget": "ui:storybook",
-            "tsConfig": "apps/ui-e2e/tsconfig.json"
-          },
-          "configurations": {
-            "ci": {
-              "devServerTarget": "ui:storybook:ci"
-            }
-          }
-        },
-        "lint": {
-          "builder": "@nrwl/linter:eslint",
-          "options": {
-            "lintFilePatterns": ["apps/ui-e2e/**/*.{js,ts}"]
-          }
-        }
-      }
     }
   }
 }

apps/api/jest.config.js

@@ -11,6 +11,5 @@ module.exports = {
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/apps/api',
-  testTimeout: 10000,
-  testEnvironment: 'node'
+  testTimeout: 10000
 };

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

@@ -1,10 +1,10 @@
-import { Access } from '@ghostfolio/common/interfaces';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 
 import { AccessService } from './access.service';
+import { Access } from './interfaces/access.interface';
 
 @Controller('access')
 export class AccessController {

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

@@ -1,11 +1,12 @@
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { AccessWithGranteeUser } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
 import { Prisma } from '@prisma/client';
 
+import { AccessWithGranteeUser } from './interfaces/access-with-grantee-user.type';
+
 @Injectable()
 export class AccessService {
-  public constructor(private readonly prismaService: PrismaService) {}
+  public constructor(private prisma: PrismaService) {}
 
   public async accesses(params: {
     include?: Prisma.AccessInclude;
@@ -17,7 +18,7 @@ export class AccessService {
   }): Promise<AccessWithGranteeUser[]> {
     const { include, skip, take, cursor, where, orderBy } = params;
 
-    return this.prismaService.access.findMany({
+    return this.prisma.access.findMany({
       cursor,
       include,
       orderBy,

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

@@ -1,240 +0,0 @@
-import { UserService } from '@ghostfolio/api/app/user/user.service';
-import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.helper';
-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import {
-  getPermissions,
-  hasPermission,
-  permissions
-} from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Headers,
-  HttpException,
-  Inject,
-  Param,
-  Post,
-  Put,
-  UseGuards
-} from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
-import { AuthGuard } from '@nestjs/passport';
-import { Account as AccountModel } from '@prisma/client';
-import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-
-import { AccountService } from './account.service';
-import { CreateAccountDto } from './create-account.dto';
-import { UpdateAccountDto } from './update-account.dto';
-
-@Controller('account')
-export class AccountController {
-  public constructor(
-    private readonly accountService: AccountService,
-    private readonly impersonationService: ImpersonationService,
-    @Inject(REQUEST) private readonly request: RequestWithUser,
-    private readonly userService: UserService
-  ) {}
-
-  @Delete(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteAccount(@Param('id') id: string): Promise<AccountModel> {
-    if (
-      !hasPermission(
-        getPermissions(this.request.user.role),
-        permissions.deleteAccount
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const account = await this.accountService.accountWithOrders(
-      {
-        id_userId: {
-          id,
-          userId: this.request.user.id
-        }
-      },
-      { Order: true }
-    );
-
-    if (account?.isDefault || account?.Order.length > 0) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.accountService.deleteAccount(
-      {
-        id_userId: {
-          id,
-          userId: this.request.user.id
-        }
-      },
-      this.request.user.id
-    );
-  }
-
-  @Get()
-  @UseGuards(AuthGuard('jwt'))
-  public async getAllAccounts(
-    @Headers('impersonation-id') impersonationId
-  ): Promise<AccountModel[]> {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(
-        impersonationId,
-        this.request.user.id
-      );
-
-    let accounts = await this.accountService.getAccounts(
-      impersonationUserId || this.request.user.id
-    );
-
-    if (
-      impersonationUserId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      accounts = nullifyValuesInObjects(accounts, [
-        'balance',
-        'fee',
-        'quantity',
-        'unitPrice'
-      ]);
-    }
-
-    return accounts;
-  }
-
-  @Get(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async getAccountById(@Param('id') id: string): Promise<AccountModel> {
-    return this.accountService.account({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
-    });
-  }
-
-  @Post()
-  @UseGuards(AuthGuard('jwt'))
-  public async createAccount(
-    @Body() data: CreateAccountDto
-  ): Promise<AccountModel> {
-    if (
-      !hasPermission(
-        getPermissions(this.request.user.role),
-        permissions.createAccount
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    if (data.platformId) {
-      const platformId = data.platformId;
-      delete data.platformId;
-
-      return this.accountService.createAccount(
-        {
-          ...data,
-          Platform: { connect: { id: platformId } },
-          User: { connect: { id: this.request.user.id } }
-        },
-        this.request.user.id
-      );
-    } else {
-      delete data.platformId;
-
-      return this.accountService.createAccount(
-        {
-          ...data,
-          User: { connect: { id: this.request.user.id } }
-        },
-        this.request.user.id
-      );
-    }
-  }
-
-  @Put(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async update(@Param('id') id: string, @Body() data: UpdateAccountDto) {
-    if (
-      !hasPermission(
-        getPermissions(this.request.user.role),
-        permissions.updateAccount
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const originalAccount = await this.accountService.account({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
-    });
-
-    if (!originalAccount) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    if (data.platformId) {
-      const platformId = data.platformId;
-      delete data.platformId;
-
-      return this.accountService.updateAccount(
-        {
-          data: {
-            ...data,
-            Platform: { connect: { id: platformId } },
-            User: { connect: { id: this.request.user.id } }
-          },
-          where: {
-            id_userId: {
-              id,
-              userId: this.request.user.id
-            }
-          }
-        },
-        this.request.user.id
-      );
-    } else {
-      // platformId is null, remove it
-      delete data.platformId;
-
-      return this.accountService.updateAccount(
-        {
-          data: {
-            ...data,
-            Platform: originalAccount.platformId
-              ? { disconnect: true }
-              : undefined,
-            User: { connect: { id: this.request.user.id } }
-          },
-          where: {
-            id_userId: {
-              id,
-              userId: this.request.user.id
-            }
-          }
-        },
-        this.request.user.id
-      );
-    }
-  }
-}

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

@@ -1,26 +0,0 @@
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { UserModule } from '@ghostfolio/api/app/user/user.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { Module } from '@nestjs/common';
-
-import { AccountController } from './account.controller';
-import { AccountService } from './account.service';
-
-@Module({
-  imports: [
-    ConfigurationModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
-    ImpersonationModule,
-    RedisCacheModule,
-    PrismaModule,
-    UserModule
-  ],
-  controllers: [AccountController],
-  providers: [AccountService]
-})
-export class AccountModule {}

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

@@ -1,130 +0,0 @@
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Injectable } from '@nestjs/common';
-import { Account, Currency, Order, Platform, Prisma } from '@prisma/client';
-
-import { CashDetails } from './interfaces/cash-details.interface';
-
-@Injectable()
-export class AccountService {
-  public constructor(
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService
-  ) {}
-
-  public async account(
-    accountWhereUniqueInput: Prisma.AccountWhereUniqueInput
-  ): Promise<Account | null> {
-    return this.prismaService.account.findUnique({
-      where: accountWhereUniqueInput
-    });
-  }
-
-  public async accountWithOrders(
-    accountWhereUniqueInput: Prisma.AccountWhereUniqueInput,
-    accountInclude: Prisma.AccountInclude
-  ): Promise<
-    Account & {
-      Order?: Order[];
-    }
-  > {
-    return this.prismaService.account.findUnique({
-      include: accountInclude,
-      where: accountWhereUniqueInput
-    });
-  }
-
-  public async accounts(params: {
-    include?: Prisma.AccountInclude;
-    skip?: number;
-    take?: number;
-    cursor?: Prisma.AccountWhereUniqueInput;
-    where?: Prisma.AccountWhereInput;
-    orderBy?: Prisma.AccountOrderByInput;
-  }): Promise<
-    (Account & {
-      Order?: Order[];
-      Platform?: Platform;
-    })[]
-  > {
-    const { include, skip, take, cursor, where, orderBy } = params;
-
-    return this.prismaService.account.findMany({
-      cursor,
-      include,
-      orderBy,
-      skip,
-      take,
-      where
-    });
-  }
-
-  public async createAccount(
-    data: Prisma.AccountCreateInput,
-    aUserId: string
-  ): Promise<Account> {
-    return this.prismaService.account.create({
-      data
-    });
-  }
-
-  public async deleteAccount(
-    where: Prisma.AccountWhereUniqueInput,
-    aUserId: string
-  ): Promise<Account> {
-    return this.prismaService.account.delete({
-      where
-    });
-  }
-
-  public async getAccounts(aUserId: string) {
-    const accounts = await this.accounts({
-      include: { Order: true, Platform: true },
-      orderBy: { name: 'asc' },
-      where: { userId: aUserId }
-    });
-
-    return accounts.map((account) => {
-      const result = { ...account, transactionCount: account.Order.length };
-
-      delete result.Order;
-
-      return result;
-    });
-  }
-
-  public async getCashDetails(
-    aUserId: string,
-    aCurrency: Currency
-  ): Promise<CashDetails> {
-    let totalCashBalance = 0;
-
-    const accounts = await this.accounts({
-      where: { userId: aUserId }
-    });
-
-    accounts.forEach((account) => {
-      totalCashBalance += this.exchangeRateDataService.toCurrency(
-        account.balance,
-        account.currency,
-        aCurrency
-      );
-    });
-
-    return { accounts, balance: totalCashBalance };
-  }
-
-  public async updateAccount(
-    params: {
-      where: Prisma.AccountWhereUniqueInput;
-      data: Prisma.AccountUpdateInput;
-    },
-    aUserId: string
-  ): Promise<Account> {
-    const { data, where } = params;
-    return this.prismaService.account.update({
-      data,
-      where
-    });
-  }
-}

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

@@ -1,20 +0,0 @@
-import { AccountType, Currency } from '@prisma/client';
-import { IsNumber, IsString, ValidateIf } from 'class-validator';
-
-export class CreateAccountDto {
-  @IsString()
-  accountType: AccountType;
-
-  @IsNumber()
-  balance: number;
-
-  @IsString()
-  currency: Currency;
-
-  @IsString()
-  name: string;
-
-  @IsString()
-  @ValidateIf((object, value) => value !== null)
-  platformId: string | null;
-}

apps/api/src/app/account/interfaces/cash-details.interface.ts

@@ -1,6 +0,0 @@
-import { Account } from '@prisma/client';
-
-export interface CashDetails {
-  accounts: Account[];
-  balance: number;
-}

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

@@ -1,23 +0,0 @@
-import { AccountType, Currency } from '@prisma/client';
-import { IsNumber, IsString, ValidateIf } from 'class-validator';
-
-export class UpdateAccountDto {
-  @IsString()
-  accountType: AccountType;
-
-  @IsNumber()
-  balance: number;
-
-  @IsString()
-  currency: Currency;
-
-  @IsString()
-  id: string;
-
-  @IsString()
-  name: string;
-
-  @IsString()
-  @ValidateIf((object, value) => value !== null)
-  platformId: string | null;
-}

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

@@ -1,11 +1,6 @@
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { AdminData } from '@ghostfolio/common/interfaces';
-import {
-  getPermissions,
-  hasPermission,
-  permissions
-} from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper';
 import {
   Controller,
   Get,
@@ -19,6 +14,7 @@ import { AuthGuard } from '@nestjs/passport';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { AdminService } from './admin.service';
+import { AdminData } from './interfaces/admin-data.interface';
 
 @Controller('admin')
 export class AdminController {
@@ -61,29 +57,8 @@ export class AdminController {
       );
     }
 
-    await this.dataGatheringService.gatherProfileData();
     this.dataGatheringService.gatherMax();
 
     return;
   }
-
-  @Post('gather/profile-data')
-  @UseGuards(AuthGuard('jwt'))
-  public async gatherProfileData(): Promise<void> {
-    if (
-      !hasPermission(
-        getPermissions(this.request.user.role),
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    this.dataGatheringService.gatherProfileData();
-
-    return;
-  }
 }

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

@@ -1,25 +1,31 @@
-import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 
 import { AdminController } from './admin.controller';
 import { AdminService } from './admin.service';
 
 @Module({
-  imports: [
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
-    PrismaModule,
-    SubscriptionModule
-  ],
+  imports: [],
   controllers: [AdminController],
-  providers: [AdminService],
-  exports: [AdminService]
+  providers: [
+    AdminService,
+    AlphaVantageService,
+    ConfigurationService,
+    DataGatheringService,
+    DataProviderService,
+    ExchangeRateDataService,
+    GhostfolioScraperApiService,
+    PrismaService,
+    RakutenRapidApiService,
+    YahooFinanceService
+  ]
 })
 export class AdminModule {}

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

@@ -1,21 +1,15 @@
-import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { AdminData } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
 import { Currency } from '@prisma/client';
-import { differenceInDays } from 'date-fns';
+
+import { AdminData } from './interfaces/admin-data.interface';
 
 @Injectable()
 export class AdminService {
   public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly dataGatheringService: DataGatheringService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService,
-    private readonly subscriptionService: SubscriptionService
+    private exchangeRateDataService: ExchangeRateDataService,
+    private prisma: PrismaService
   ) {}
 
   public async get(): Promise<AdminData> {
@@ -68,22 +62,24 @@ export class AdminService {
         }
       ],
       lastDataGathering: await this.getLastDataGathering(),
-      transactionCount: await this.prismaService.order.count(),
-      userCount: await this.prismaService.user.count(),
+      transactionCount: await this.prisma.order.count(),
+      userCount: await this.prisma.user.count(),
       users: await this.getUsersWithAnalytics()
     };
   }
 
   private async getLastDataGathering() {
-    const lastDataGathering =
-      await this.dataGatheringService.getLastDataGathering();
+    const lastDataGathering = await this.prisma.property.findUnique({
+      where: { key: 'LAST_DATA_GATHERING' }
+    });
 
-    if (lastDataGathering) {
-      return lastDataGathering;
+    if (lastDataGathering?.value) {
+      return new Date(lastDataGathering.value);
     }
 
-    const dataGatheringInProgress =
-      await this.dataGatheringService.getIsInProgress();
+    const dataGatheringInProgress = await this.prisma.property.findUnique({
+      where: { key: 'LOCKED_DATA_GATHERING' }
+    });
 
     if (dataGatheringInProgress) {
       return 'IN_PROGRESS';
@@ -92,8 +88,8 @@ export class AdminService {
     return null;
   }
 
-  private async getUsersWithAnalytics(): Promise<AdminData['users']> {
-    const usersWithAnalytics = await this.prismaService.user.findMany({
+  private async getUsersWithAnalytics() {
+    return await this.prisma.user.findMany({
       orderBy: {
         Analytics: {
           updatedAt: 'desc'
@@ -111,40 +107,14 @@ export class AdminService {
           }
         },
         createdAt: true,
-        id: true,
-        Subscription: true
+        id: true
       },
-      take: 30,
+      take: 20,
       where: {
         NOT: {
           Analytics: null
         }
       }
     });
-
-    return usersWithAnalytics.map(
-      ({ _count, alias, Analytics, createdAt, id, Subscription }) => {
-        const daysSinceRegistration =
-          differenceInDays(new Date(), createdAt) + 1;
-        const engagement = Analytics.activityCount / daysSinceRegistration;
-
-        const subscription = this.configurationService.get(
-          'ENABLE_FEATURE_SUBSCRIPTION'
-        )
-          ? this.subscriptionService.getSubscription(Subscription)
-          : undefined;
-
-        return {
-          alias,
-          createdAt,
-          engagement,
-          id,
-          subscription,
-          accountCount: _count.Account || 0,
-          lastActivity: Analytics.updatedAt,
-          transactionCount: _count.Order || 0
-        };
-      }
-    );
   }
 }

apps/api/src/app/admin/interfaces/admin-data.interface.ts

@@ -4,12 +4,12 @@ export interface AdminData {
   transactionCount: number;
   userCount: number;
   users: {
-    accountCount: number;
     alias: string;
     createdAt: Date;
-    engagement: number;
+    Analytics: {
+      activityCount: number;
+      updatedAt: Date;
+    };
     id: string;
-    lastActivity: Date;
-    transactionCount: number;
   }[];
 }

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

@@ -1,12 +1,12 @@
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { Controller } from '@nestjs/common';
 
+import { PrismaService } from '../services/prisma.service';
 import { RedisCacheService } from './redis-cache/redis-cache.service';
 
 @Controller()
 export class AppController {
   public constructor(
-    private readonly dataGatheringService: DataGatheringService,
+    private prisma: PrismaService,
     private readonly redisCacheService: RedisCacheService
   ) {
     this.initialize();
@@ -15,12 +15,17 @@ export class AppController {
   private async initialize() {
     this.redisCacheService.reset();
 
-    const isDataGatheringInProgress =
-      await this.dataGatheringService.getIsInProgress();
+    const isDataGatheringLocked = await this.prisma.property.findUnique({
+      where: { key: 'LOCKED_DATA_GATHERING' }
+    });
 
-    if (isDataGatheringInProgress) {
-      // Prepare for automatical data gathering, if hung up in progress state
-      await this.dataGatheringService.reset();
+    if (!isDataGatheringLocked) {
+      // Prepare for automatical data gather if not locked
+      await this.prisma.property.deleteMany({
+        where: {
+          OR: [{ key: 'LAST_DATA_GATHERING' }, { key: 'LOCKED_DATA_GATHERING' }]
+        }
+      });
     }
   }
 }

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

@@ -1,31 +1,30 @@
 import { join } from 'path';
 
-import { AuthDeviceModule } from '@ghostfolio/api/app/auth-device/auth-device.module';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { CronService } from '@ghostfolio/api/services/cron.service';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
 
+import { ConfigurationService } from '../services/configuration.service';
+import { CronService } from '../services/cron.service';
+import { DataGatheringService } from '../services/data-gathering.service';
+import { DataProviderService } from '../services/data-provider.service';
+import { AlphaVantageService } from '../services/data-provider/alpha-vantage/alpha-vantage.service';
+import { GhostfolioScraperApiService } from '../services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { RakutenRapidApiService } from '../services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { YahooFinanceService } from '../services/data-provider/yahoo-finance/yahoo-finance.service';
+import { ExchangeRateDataService } from '../services/exchange-rate-data.service';
+import { PrismaService } from '../services/prisma.service';
 import { AccessModule } from './access/access.module';
-import { AccountModule } from './account/account.module';
 import { AdminModule } from './admin/admin.module';
 import { AppController } from './app.controller';
 import { AuthModule } from './auth/auth.module';
 import { CacheModule } from './cache/cache.module';
 import { ExperimentalModule } from './experimental/experimental.module';
-import { ExportModule } from './export/export.module';
-import { ImportModule } from './import/import.module';
 import { InfoModule } from './info/info.module';
 import { OrderModule } from './order/order.module';
 import { PortfolioModule } from './portfolio/portfolio.module';
-import { SubscriptionModule } from './subscription/subscription.module';
+import { RedisCacheModule } from './redis-cache/redis-cache.module';
 import { SymbolModule } from './symbol/symbol.module';
 import { UserModule } from './user/user.module';
 
@@ -33,22 +32,13 @@ import { UserModule } from './user/user.module';
   imports: [
     AdminModule,
     AccessModule,
-    AccountModule,
-    AuthDeviceModule,
     AuthModule,
     CacheModule,
     ConfigModule.forRoot(),
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
     ExperimentalModule,
-    ExportModule,
-    ImportModule,
     InfoModule,
     OrderModule,
     PortfolioModule,
-    PrismaModule,
     RedisCacheModule,
     ScheduleModule.forRoot(),
     ServeStaticModule.forRoot({
@@ -65,11 +55,21 @@ import { UserModule } from './user/user.module';
       rootPath: join(__dirname, '..', 'client'),
       exclude: ['/api*']
     }),
-    SubscriptionModule,
     SymbolModule,
     UserModule
   ],
   controllers: [AppController],
-  providers: [CronService]
+  providers: [
+    AlphaVantageService,
+    ConfigurationService,
+    CronService,
+    DataGatheringService,
+    DataProviderService,
+    ExchangeRateDataService,
+    GhostfolioScraperApiService,
+    PrismaService,
+    RakutenRapidApiService,
+    YahooFinanceService
+  ]
 })
 export class AppModule {}

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

@@ -1,44 +0,0 @@
-import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
-import {
-  getPermissions,
-  hasPermission,
-  permissions
-} from '@ghostfolio/common/permissions';
-import { 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,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  @Delete(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteAuthDevice(@Param('id') id: string): Promise<void> {
-    if (
-      !hasPermission(
-        getPermissions(this.request.user.role),
-        permissions.deleteAuthDevice
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    await this.authDeviceService.deleteAuthDevice({ id });
-  }
-}

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

@@ -1,4 +0,0 @@
-export interface AuthDeviceDto {
-  createdAt: string;
-  id: string;
-}

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

@@ -1,18 +0,0 @@
-import { AuthDeviceController } from '@ghostfolio/api/app/auth-device/auth-device.controller';
-import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Module } from '@nestjs/common';
-import { JwtModule } from '@nestjs/jwt';
-
-@Module({
-  controllers: [AuthDeviceController],
-  imports: [
-    JwtModule.register({
-      secret: process.env.JWT_SECRET_KEY,
-      signOptions: { expiresIn: '180 days' }
-    })
-  ],
-  providers: [AuthDeviceService, ConfigurationService, PrismaService]
-})
-export class AuthDeviceModule {}

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

@@ -1,65 +0,0 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Injectable } from '@nestjs/common';
-import { AuthDevice, Prisma } from '@prisma/client';
-
-@Injectable()
-export class AuthDeviceService {
-  public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly prismaService: PrismaService
-  ) {}
-
-  public async authDevice(
-    where: Prisma.AuthDeviceWhereUniqueInput
-  ): Promise<AuthDevice | null> {
-    return this.prismaService.authDevice.findUnique({
-      where
-    });
-  }
-
-  public async authDevices(params: {
-    skip?: number;
-    take?: number;
-    cursor?: Prisma.AuthDeviceWhereUniqueInput;
-    where?: Prisma.AuthDeviceWhereInput;
-    orderBy?: Prisma.AuthDeviceOrderByInput;
-  }): Promise<AuthDevice[]> {
-    const { skip, take, cursor, where, orderBy } = params;
-    return this.prismaService.authDevice.findMany({
-      skip,
-      take,
-      cursor,
-      where,
-      orderBy
-    });
-  }
-
-  public async createAuthDevice(
-    data: Prisma.AuthDeviceCreateInput
-  ): Promise<AuthDevice> {
-    return this.prismaService.authDevice.create({
-      data
-    });
-  }
-
-  public async updateAuthDevice(params: {
-    data: Prisma.AuthDeviceUpdateInput;
-    where: Prisma.AuthDeviceWhereUniqueInput;
-  }): Promise<AuthDevice> {
-    const { data, where } = params;
-
-    return this.prismaService.authDevice.update({
-      data,
-      where
-    });
-  }
-
-  public async deleteAuthDevice(
-    where: Prisma.AuthDeviceWhereUniqueInput
-  ): Promise<AuthDevice> {
-    return this.prismaService.authDevice.delete({
-      where
-    });
-  }
-}

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

@@ -1,12 +1,9 @@
-import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import {
-  Body,
   Controller,
   Get,
   HttpException,
   Param,
-  Post,
   Req,
   Res,
   UseGuards
@@ -15,17 +12,12 @@ import { AuthGuard } from '@nestjs/passport';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { AuthService } from './auth.service';
-import {
-  AssertionCredentialJSON,
-  AttestationCredentialJSON
-} from './interfaces/simplewebauthn';
 
 @Controller('auth')
 export class AuthController {
   public constructor(
     private readonly authService: AuthService,
-    private readonly configurationService: ConfigurationService,
-    private readonly webAuthService: WebAuthService
+    private readonly configurationService: ConfigurationService
   ) {}
 
   @Get('anonymous/:accessToken')
@@ -61,44 +53,4 @@ export class AuthController {
       res.redirect(`${this.configurationService.get('ROOT_URL')}/auth`);
     }
   }
-
-  @Get('webauthn/generate-attestation-options')
-  @UseGuards(AuthGuard('jwt'))
-  public async generateAttestationOptions() {
-    return this.webAuthService.generateAttestationOptions();
-  }
-
-  @Post('webauthn/verify-attestation')
-  @UseGuards(AuthGuard('jwt'))
-  public async verifyAttestation(
-    @Body() body: { deviceName: string; credential: AttestationCredentialJSON }
-  ) {
-    return this.webAuthService.verifyAttestation(
-      body.deviceName,
-      body.credential
-    );
-  }
-
-  @Post('webauthn/generate-assertion-options')
-  public async generateAssertionOptions(@Body() body: { deviceId: string }) {
-    return this.webAuthService.generateAssertionOptions(body.deviceId);
-  }
-
-  @Post('webauthn/verify-assertion')
-  public async verifyAssertion(
-    @Body() body: { deviceId: string; credential: AssertionCredentialJSON }
-  ) {
-    try {
-      const authToken = await this.webAuthService.verifyAssertion(
-        body.deviceId,
-        body.credential
-      );
-      return { authToken };
-    } catch {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-  }
 }

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

@@ -1,12 +1,9 @@
-import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
-import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';
-import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
-import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 
+import { UserService } from '../user/user.service';
 import { AuthController } from './auth.controller';
 import { AuthService } from './auth.service';
 import { GoogleStrategy } from './google.strategy';
@@ -18,18 +15,15 @@ import { JwtStrategy } from './jwt.strategy';
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '180 days' }
-    }),
-    SubscriptionModule
+    })
   ],
   providers: [
-    AuthDeviceService,
     AuthService,
     ConfigurationService,
     GoogleStrategy,
     JwtStrategy,
     PrismaService,
-    UserService,
-    WebAuthService
+    UserService
   ]
 })
 export class AuthModule {}

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

@@ -1,8 +1,8 @@
-import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 
+import { UserService } from '../user/user.service';
 import { ValidateOAuthLoginParams } from './interfaces/interfaces';
 
 @Injectable()

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

@@ -1,10 +1,5 @@
-import { AuthDeviceDto } from '@ghostfolio/api/app/auth-device/auth-device.dto';
 import { Provider } from '@prisma/client';
 
-export interface AuthDeviceDialogParams {
-  authDevice: AuthDeviceDto;
-}
-
 export interface ValidateOAuthLoginParams {
   provider: Provider;
   thirdPartyId: string;

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

@@ -1,226 +0,0 @@
-export interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
-  readonly authenticatorData: ArrayBuffer;
-  readonly signature: ArrayBuffer;
-  readonly userHandle: ArrayBuffer | null;
-}
-export interface AuthenticatorAttestationResponse
-  extends AuthenticatorResponse {
-  readonly attestationObject: ArrayBuffer;
-}
-export interface AuthenticationExtensionsClientInputs {
-  appid?: string;
-  appidExclude?: string;
-  credProps?: boolean;
-  uvm?: boolean;
-}
-export interface AuthenticationExtensionsClientOutputs {
-  appid?: boolean;
-  credProps?: CredentialPropertiesOutput;
-  uvm?: UvmEntries;
-}
-export interface AuthenticatorSelectionCriteria {
-  authenticatorAttachment?: AuthenticatorAttachment;
-  requireResidentKey?: boolean;
-  residentKey?: ResidentKeyRequirement;
-  userVerification?: UserVerificationRequirement;
-}
-export interface PublicKeyCredential extends Credential {
-  readonly rawId: ArrayBuffer;
-  readonly response: AuthenticatorResponse;
-  getClientExtensionResults(): AuthenticationExtensionsClientOutputs;
-}
-export interface PublicKeyCredentialCreationOptions {
-  attestation?: AttestationConveyancePreference;
-  authenticatorSelection?: AuthenticatorSelectionCriteria;
-  challenge: BufferSource;
-  excludeCredentials?: PublicKeyCredentialDescriptor[];
-  extensions?: AuthenticationExtensionsClientInputs;
-  pubKeyCredParams: PublicKeyCredentialParameters[];
-  rp: PublicKeyCredentialRpEntity;
-  timeout?: number;
-  user: PublicKeyCredentialUserEntity;
-}
-export interface PublicKeyCredentialDescriptor {
-  id: BufferSource;
-  transports?: AuthenticatorTransport[];
-  type: PublicKeyCredentialType;
-}
-export interface PublicKeyCredentialParameters {
-  alg: COSEAlgorithmIdentifier;
-  type: PublicKeyCredentialType;
-}
-export interface PublicKeyCredentialRequestOptions {
-  allowCredentials?: PublicKeyCredentialDescriptor[];
-  challenge: BufferSource;
-  extensions?: AuthenticationExtensionsClientInputs;
-  rpId?: string;
-  timeout?: number;
-  userVerification?: UserVerificationRequirement;
-}
-export interface PublicKeyCredentialUserEntity
-  extends PublicKeyCredentialEntity {
-  displayName: string;
-  id: BufferSource;
-}
-export interface AuthenticatorResponse {
-  readonly clientDataJSON: ArrayBuffer;
-}
-export interface CredentialPropertiesOutput {
-  rk?: boolean;
-}
-export interface Credential {
-  readonly id: string;
-  readonly type: string;
-}
-export interface PublicKeyCredentialRpEntity extends PublicKeyCredentialEntity {
-  id?: string;
-}
-export interface PublicKeyCredentialEntity {
-  name: string;
-}
-export declare type AttestationConveyancePreference =
-  | 'direct'
-  | 'enterprise'
-  | 'indirect'
-  | 'none';
-export declare type AuthenticatorTransport = 'ble' | 'internal' | 'nfc' | 'usb';
-export declare type COSEAlgorithmIdentifier = number;
-export declare type UserVerificationRequirement =
-  | 'discouraged'
-  | 'preferred'
-  | 'required';
-export declare type UvmEntries = UvmEntry[];
-export declare type AuthenticatorAttachment = 'cross-platform' | 'platform';
-export declare type ResidentKeyRequirement =
-  | 'discouraged'
-  | 'preferred'
-  | 'required';
-export declare type BufferSource = ArrayBufferView | ArrayBuffer;
-export declare type PublicKeyCredentialType = 'public-key';
-export declare type UvmEntry = number[];
-
-export interface PublicKeyCredentialCreationOptionsJSON
-  extends Omit<
-    PublicKeyCredentialCreationOptions,
-    'challenge' | 'user' | 'excludeCredentials'
-  > {
-  user: PublicKeyCredentialUserEntityJSON;
-  challenge: Base64URLString;
-  excludeCredentials: PublicKeyCredentialDescriptorJSON[];
-  extensions?: AuthenticationExtensionsClientInputs;
-}
-/**
- * A variant of PublicKeyCredentialRequestOptions suitable for JSON transmission to the browser to
- * (eventually) get passed into navigator.credentials.get(...) in the browser.
- */
-export interface PublicKeyCredentialRequestOptionsJSON
-  extends Omit<
-    PublicKeyCredentialRequestOptions,
-    'challenge' | 'allowCredentials'
-  > {
-  challenge: Base64URLString;
-  allowCredentials?: PublicKeyCredentialDescriptorJSON[];
-  extensions?: AuthenticationExtensionsClientInputs;
-}
-export interface PublicKeyCredentialDescriptorJSON
-  extends Omit<PublicKeyCredentialDescriptor, 'id'> {
-  id: Base64URLString;
-}
-export interface PublicKeyCredentialUserEntityJSON
-  extends Omit<PublicKeyCredentialUserEntity, 'id'> {
-  id: string;
-}
-/**
- * The value returned from navigator.credentials.create()
- */
-export interface AttestationCredential extends PublicKeyCredential {
-  response: AuthenticatorAttestationResponseFuture;
-}
-/**
- * A slightly-modified AttestationCredential to simplify working with ArrayBuffers that
- * are Base64URL-encoded in the browser so that they can be sent as JSON to the server.
- */
-export interface AttestationCredentialJSON
-  extends Omit<
-    AttestationCredential,
-    'response' | 'rawId' | 'getClientExtensionResults'
-  > {
-  rawId: Base64URLString;
-  response: AuthenticatorAttestationResponseJSON;
-  clientExtensionResults: AuthenticationExtensionsClientOutputs;
-  transports?: AuthenticatorTransport[];
-}
-/**
- * The value returned from navigator.credentials.get()
- */
-export interface AssertionCredential extends PublicKeyCredential {
-  response: AuthenticatorAssertionResponse;
-}
-/**
- * A slightly-modified AssertionCredential to simplify working with ArrayBuffers that
- * are Base64URL-encoded in the browser so that they can be sent as JSON to the server.
- */
-export interface AssertionCredentialJSON
-  extends Omit<
-    AssertionCredential,
-    'response' | 'rawId' | 'getClientExtensionResults'
-  > {
-  rawId: Base64URLString;
-  response: AuthenticatorAssertionResponseJSON;
-  clientExtensionResults: AuthenticationExtensionsClientOutputs;
-}
-/**
- * A slightly-modified AuthenticatorAttestationResponse to simplify working with ArrayBuffers that
- * are Base64URL-encoded in the browser so that they can be sent as JSON to the server.
- */
-export interface AuthenticatorAttestationResponseJSON
-  extends Omit<
-    AuthenticatorAttestationResponseFuture,
-    'clientDataJSON' | 'attestationObject'
-  > {
-  clientDataJSON: Base64URLString;
-  attestationObject: Base64URLString;
-}
-/**
- * A slightly-modified AuthenticatorAssertionResponse to simplify working with ArrayBuffers that
- * are Base64URL-encoded in the browser so that they can be sent as JSON to the server.
- */
-export interface AuthenticatorAssertionResponseJSON
-  extends Omit<
-    AuthenticatorAssertionResponse,
-    'authenticatorData' | 'clientDataJSON' | 'signature' | 'userHandle'
-  > {
-  authenticatorData: Base64URLString;
-  clientDataJSON: Base64URLString;
-  signature: Base64URLString;
-  userHandle?: string;
-}
-/**
- * A WebAuthn-compatible device and the information needed to verify assertions by it
- */
-export declare type AuthenticatorDevice = {
-  credentialPublicKey: Buffer;
-  credentialID: Buffer;
-  counter: number;
-  transports?: AuthenticatorTransport[];
-};
-/**
- * An attempt to communicate that this isn't just any string, but a Base64URL-encoded string
- */
-export declare type Base64URLString = string;
-/**
- * AuthenticatorAttestationResponse in TypeScript's DOM lib is outdated (up through v3.9.7).
- * Maintain an augmented version here so we can implement additional properties as the WebAuthn
- * spec evolves.
- *
- * See https://www.w3.org/TR/webauthn-2/#iface-authenticatorattestationresponse
- *
- * Properties marked optional are not supported in all browsers.
- */
-export interface AuthenticatorAttestationResponseFuture
-  extends AuthenticatorAttestationResponse {
-  getTransports?: () => AuthenticatorTransport[];
-  getAuthenticatorData?: () => ArrayBuffer;
-  getPublicKey?: () => ArrayBuffer;
-  getPublicKeyAlgorithm?: () => COSEAlgorithmIdentifier[];
-}

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

@@ -1,15 +1,16 @@
-import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { ExtractJwt, Strategy } from 'passport-jwt';
 
+import { UserService } from '../user/user.service';
+
 @Injectable()
 export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
   public constructor(
     readonly configurationService: ConfigurationService,
-    private readonly prismaService: PrismaService,
+    private prisma: PrismaService,
     private readonly userService: UserService
   ) {
     super({
@@ -23,7 +24,7 @@ export class JwtStrategy extends PassportStrategy(Strategy, 'jwt') {
       const user = await this.userService.user({ id });
 
       if (user) {
-        await this.prismaService.analytics.upsert({
+        await this.prisma.analytics.upsert({
           create: { User: { connect: { id: user.id } } },
           update: { activityCount: { increment: 1 }, updatedAt: new Date() },
           where: { userId: user.id }

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

@@ -1,216 +0,0 @@
-import { AuthDeviceDto } from '@ghostfolio/api/app/auth-device/auth-device.dto';
-import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
-import { UserService } from '@ghostfolio/api/app/user/user.service';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Inject,
-  Injectable,
-  InternalServerErrorException
-} from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
-import { JwtService } from '@nestjs/jwt';
-import {
-  GenerateAssertionOptionsOpts,
-  GenerateAttestationOptionsOpts,
-  VerifiedAssertion,
-  VerifiedAttestation,
-  VerifyAssertionResponseOpts,
-  VerifyAttestationResponseOpts,
-  generateAssertionOptions,
-  generateAttestationOptions,
-  verifyAssertionResponse,
-  verifyAttestationResponse
-} from '@simplewebauthn/server';
-
-import {
-  AssertionCredentialJSON,
-  AttestationCredentialJSON
-} from './interfaces/simplewebauthn';
-
-@Injectable()
-export class WebAuthService {
-  public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly deviceService: AuthDeviceService,
-    private readonly jwtService: JwtService,
-    private readonly userService: UserService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  get rpID() {
-    return this.configurationService.get('WEB_AUTH_RP_ID');
-  }
-
-  get expectedOrigin() {
-    return this.configurationService.get('ROOT_URL');
-  }
-
-  public async generateAttestationOptions() {
-    const user = this.request.user;
-
-    const opts: GenerateAttestationOptionsOpts = {
-      rpName: 'Ghostfolio',
-      rpID: this.rpID,
-      userID: user.id,
-      userName: user.alias,
-      timeout: 60000,
-      attestationType: 'indirect',
-      authenticatorSelection: {
-        authenticatorAttachment: 'platform',
-        requireResidentKey: false,
-        userVerification: 'required'
-      }
-    };
-
-    const options = generateAttestationOptions(opts);
-
-    await this.userService.updateUser({
-      data: {
-        authChallenge: options.challenge
-      },
-      where: {
-        id: user.id
-      }
-    });
-
-    return options;
-  }
-
-  public async verifyAttestation(
-    deviceName: string,
-    credential: AttestationCredentialJSON
-  ): Promise<AuthDeviceDto> {
-    const user = this.request.user;
-    const expectedChallenge = user.authChallenge;
-
-    let verification: VerifiedAttestation;
-    try {
-      const opts: VerifyAttestationResponseOpts = {
-        credential,
-        expectedChallenge,
-        expectedOrigin: this.expectedOrigin,
-        expectedRPID: this.rpID
-      };
-      verification = await verifyAttestationResponse(opts);
-    } catch (error) {
-      console.error(error);
-      throw new InternalServerErrorException(error.message);
-    }
-
-    const { verified, attestationInfo } = verification;
-
-    const devices = await this.deviceService.authDevices({
-      where: { userId: user.id }
-    });
-    if (verified && attestationInfo) {
-      const { credentialPublicKey, credentialID, counter } = attestationInfo;
-
-      let existingDevice = devices.find(
-        (device) => device.credentialId === credentialID
-      );
-
-      if (!existingDevice) {
-        /**
-         * Add the returned device to the user's list of devices
-         */
-        existingDevice = await this.deviceService.createAuthDevice({
-          credentialPublicKey,
-          credentialId: credentialID,
-          counter,
-          User: { connect: { id: user.id } }
-        });
-      }
-
-      return {
-        createdAt: existingDevice.createdAt.toISOString(),
-        id: existingDevice.id
-      };
-    }
-
-    throw new InternalServerErrorException('An unknown error occurred');
-  }
-
-  public async generateAssertionOptions(deviceId: string) {
-    const device = await this.deviceService.authDevice({ id: deviceId });
-
-    if (!device) {
-      throw new Error('Device not found');
-    }
-
-    const opts: GenerateAssertionOptionsOpts = {
-      timeout: 60000,
-      allowCredentials: [
-        {
-          id: device.credentialId,
-          type: 'public-key',
-          transports: ['internal']
-        }
-      ],
-      userVerification: 'preferred',
-      rpID: this.rpID
-    };
-
-    const options = generateAssertionOptions(opts);
-
-    await this.userService.updateUser({
-      data: {
-        authChallenge: options.challenge
-      },
-      where: {
-        id: device.userId
-      }
-    });
-
-    return options;
-  }
-
-  public async verifyAssertion(
-    deviceId: string,
-    credential: AssertionCredentialJSON
-  ) {
-    const device = await this.deviceService.authDevice({ id: deviceId });
-
-    if (!device) {
-      throw new Error('Device not found');
-    }
-
-    const user = await this.userService.user({ id: device.userId });
-
-    let verification: VerifiedAssertion;
-    try {
-      const opts: VerifyAssertionResponseOpts = {
-        credential,
-        expectedChallenge: `${user.authChallenge}`,
-        expectedOrigin: this.expectedOrigin,
-        expectedRPID: this.rpID,
-        authenticator: {
-          credentialID: device.credentialId,
-          credentialPublicKey: device.credentialPublicKey,
-          counter: device.counter
-        }
-      };
-      verification = verifyAssertionResponse(opts);
-    } catch (error) {
-      console.error(error);
-      throw new InternalServerErrorException({ error: error.message });
-    }
-
-    const { verified, assertionInfo } = verification;
-
-    if (verified) {
-      device.counter = assertionInfo.newCounter;
-
-      await this.deviceService.updateAuthDevice({
-        data: device,
-        where: { id: device.id }
-      });
-
-      return this.jwtService.sign({
-        id: user.id
-      });
-    }
-
-    throw new Error();
-  }
-}

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

@@ -1,10 +1,11 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
-import { RequestWithUser } from '@ghostfolio/common/types';
-import { Controller, Inject, Post, UseGuards } from '@nestjs/common';
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
+import { Controller, Inject, Param, Post, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 
+import { RedisCacheService } from '../redis-cache/redis-cache.service';
+import { CacheService } from './cache.service';
+
 @Controller('cache')
 export class CacheController {
   public constructor(
@@ -20,6 +21,6 @@ export class CacheController {
   public async flushCache(): Promise<void> {
     this.redisCacheService.reset();
 
-    return this.cacheService.flush();
+    return this.cacheService.flush(this.request.user.id);
   }
 }

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

@@ -1,30 +1,13 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
-import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
-import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 
+import { RedisCacheModule } from '../redis-cache/redis-cache.module';
 import { CacheController } from './cache.controller';
+import { CacheService } from './cache.service';
 
 @Module({
   imports: [RedisCacheModule],
   controllers: [CacheController],
-  providers: [
-    AlphaVantageService,
-    CacheService,
-    ConfigurationService,
-    DataGatheringService,
-    DataProviderService,
-    GhostfolioScraperApiService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
+  providers: [CacheService, PrismaService]
 })
 export class CacheModule {}

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

@@ -1,14 +1,16 @@
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class CacheService {
-  public constructor(
-    private readonly dataGaterhingService: DataGatheringService
-  ) {}
+  public constructor(private prisma: PrismaService) {}
 
-  public async flush(): Promise<void> {
-    await this.dataGaterhingService.reset();
+  public async flush(aUserId: string): Promise<void> {
+    await this.prisma.property.deleteMany({
+      where: {
+        OR: [{ key: 'LAST_DATA_GATHERING' }, { key: 'LOCKED_DATA_GATHERING' }]
+      }
+    });
 
     return;
   }

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

@@ -1,7 +1,9 @@
-import { baseCurrency, benchmarks } from '@ghostfolio/common/config';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import { isApiTokenAuthorized } from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
+import {
+  baseCurrency,
+  benchmarks,
+  isApiTokenAuthorized
+} from '@ghostfolio/helper';
 import {
   Body,
   Controller,
@@ -38,9 +40,7 @@ export class ExperimentalController {
       );
     }
 
-    return benchmarks.map(({ symbol }) => {
-      return symbol;
-    });
+    return benchmarks;
   }
 
   @Get('benchmarks/:symbol')
@@ -66,4 +66,26 @@ export class ExperimentalController {
 
     return marketData;
   }
+
+  @Post('value/:dateString?')
+  public async getValue(
+    @Body() orders: CreateOrderDto[],
+    @Headers('Authorization') apiToken: string,
+    @Param('dateString') dateString: string
+  ): Promise<Data> {
+    if (!isApiTokenAuthorized(apiToken)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    let date = new Date();
+
+    if (dateString) {
+      date = parse(dateString, 'yyyy-MM-dd', new Date());
+    }
+
+    return this.experimentalService.getValue(orders, date, baseCurrency);
+  }
 }

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

@@ -1,23 +1,31 @@
-import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { RulesService } from '@ghostfolio/api/services/rules.service';
 import { Module } from '@nestjs/common';
 
 import { ExperimentalController } from './experimental.controller';
 import { ExperimentalService } from './experimental.service';
 
 @Module({
-  imports: [
-    ConfigurationModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
-    RedisCacheModule,
-    PrismaModule
-  ],
+  imports: [],
   controllers: [ExperimentalController],
-  providers: [AccountService, ExperimentalService]
+  providers: [
+    AlphaVantageService,
+    ConfigurationService,
+    DataProviderService,
+    ExchangeRateDataService,
+    ExperimentalService,
+    GhostfolioScraperApiService,
+    PrismaService,
+    RakutenRapidApiService,
+    RulesService,
+    YahooFinanceService
+  ]
 })
 export class ExperimentalModule {}

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

@@ -1,23 +1,64 @@
-import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
+import { Portfolio } from '@ghostfolio/api/models/portfolio';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { RulesService } from '@ghostfolio/api/services/rules.service';
 import { Injectable } from '@nestjs/common';
+import { Currency, Type } from '@prisma/client';
+import { parseISO } from 'date-fns';
+
+import { OrderWithPlatform } from '../order/interfaces/order-with-platform.type';
+import { CreateOrderDto } from './create-order.dto';
+import { Data } from './interfaces/data.interface';
 
 @Injectable()
 export class ExperimentalService {
   public constructor(
-    private readonly accountService: AccountService,
     private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService
+    private prisma: PrismaService,
+    private readonly rulesService: RulesService
   ) {}
 
   public async getBenchmark(aSymbol: string) {
-    return this.prismaService.marketData.findMany({
+    return this.prisma.marketData.findMany({
       orderBy: { date: 'asc' },
       select: { date: true, marketPrice: true },
       where: { symbol: aSymbol }
     });
   }
+
+  public async getValue(
+    aOrders: CreateOrderDto[],
+    aDate: Date,
+    aBaseCurrency: Currency
+  ): Promise<Data> {
+    const ordersWithPlatform: OrderWithPlatform[] = aOrders.map((order) => {
+      return {
+        ...order,
+        accountId: undefined,
+        accountUserId: undefined,
+        createdAt: new Date(),
+        date: parseISO(order.date),
+        fee: 0,
+        id: undefined,
+        platformId: undefined,
+        type: Type.BUY,
+        updatedAt: undefined,
+        userId: undefined
+      };
+    });
+
+    const portfolio = new Portfolio(
+      this.dataProviderService,
+      this.exchangeRateDataService,
+      this.rulesService
+    );
+    await portfolio.setOrders(ordersWithPlatform);
+
+    return {
+      currency: aBaseCurrency,
+      value: portfolio.getValue(aDate)
+    };
+  }
 }

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

@@ -1,23 +0,0 @@
-import { Export } from '@ghostfolio/common/interfaces';
-import { RequestWithUser } from '@ghostfolio/common/types';
-import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
-import { AuthGuard } from '@nestjs/passport';
-
-import { ExportService } from './export.service';
-
-@Controller('export')
-export class ExportController {
-  public constructor(
-    private readonly exportService: ExportService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  @Get()
-  @UseGuards(AuthGuard('jwt'))
-  public async export(): Promise<Export> {
-    return await this.exportService.export({
-      userId: this.request.user.id
-    });
-  }
-}

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

@@ -1,23 +0,0 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { Module } from '@nestjs/common';
-
-import { ExportController } from './export.controller';
-import { ExportService } from './export.service';
-
-@Module({
-  imports: [
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    PrismaModule,
-    RedisCacheModule
-  ],
-  controllers: [ExportController],
-  providers: [CacheService, ExportService]
-})
-export class ExportModule {}

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

@@ -1,31 +0,0 @@
-import { environment } from '@ghostfolio/api/environments/environment';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Export } from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class ExportService {
-  public constructor(private readonly prismaService: PrismaService) {}
-
-  public async export({ userId }: { userId: string }): Promise<Export> {
-    const orders = await this.prismaService.order.findMany({
-      orderBy: { date: 'desc' },
-      select: {
-        currency: true,
-        dataSource: true,
-        date: true,
-        fee: true,
-        quantity: true,
-        symbol: true,
-        type: true,
-        unitPrice: true
-      },
-      where: { userId }
-    });
-
-    return {
-      meta: { date: new Date().toISOString(), version: environment.version },
-      orders
-    };
-  }
-}

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

@@ -1,7 +0,0 @@
-import { Order } from '@prisma/client';
-import { IsArray } from 'class-validator';
-
-export class ImportDataDto {
-  @IsArray()
-  orders: Partial<Order>[];
-}

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

@@ -1,50 +0,0 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Body,
-  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';
-
-import { ImportDataDto } from './import-data.dto';
-import { ImportService } from './import.service';
-
-@Controller('import')
-export class ImportController {
-  public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly importService: ImportService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  @Post()
-  @UseGuards(AuthGuard('jwt'))
-  public async import(@Body() importData: ImportDataDto): Promise<void> {
-    if (!this.configurationService.get('ENABLE_FEATURE_IMPORT')) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    try {
-      return await this.importService.import({
-        orders: importData.orders,
-        userId: this.request.user.id
-      });
-    } catch (error) {
-      console.error(error);
-
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.BAD_REQUEST),
-        StatusCodes.BAD_REQUEST
-      );
-    }
-  }
-}

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

@@ -1,24 +0,0 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
-import { OrderService } from '@ghostfolio/api/app/order/order.service';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { Module } from '@nestjs/common';
-
-import { ImportController } from './import.controller';
-import { ImportService } from './import.service';
-
-@Module({
-  imports: [
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    PrismaModule,
-    RedisCacheModule
-  ],
-  controllers: [ImportController],
-  providers: [CacheService, ImportService, OrderService]
-})
-export class ImportModule {}

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

@@ -1,40 +0,0 @@
-import { OrderService } from '@ghostfolio/api/app/order/order.service';
-import { Injectable } from '@nestjs/common';
-import { Order } from '@prisma/client';
-import { parseISO } from 'date-fns';
-
-@Injectable()
-export class ImportService {
-  public constructor(private readonly orderService: OrderService) {}
-
-  public async import({
-    orders,
-    userId
-  }: {
-    orders: Partial<Order>[];
-    userId: string;
-  }): Promise<void> {
-    for (const {
-      currency,
-      dataSource,
-      date,
-      fee,
-      quantity,
-      symbol,
-      type,
-      unitPrice
-    } of orders) {
-      await this.orderService.createOrder({
-        currency,
-        dataSource,
-        fee,
-        quantity,
-        symbol,
-        type,
-        unitPrice,
-        date: parseISO(<string>(<unknown>date)),
-        User: { connect: { id: userId } }
-      });
-    }
-  }
-}

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

@@ -1,7 +1,7 @@
-import { InfoItem } from '@ghostfolio/common/interfaces';
 import { Controller, Get } from '@nestjs/common';
 
 import { InfoService } from './info.service';
+import { InfoItem } from './interfaces/info-item.interface';
 
 @Controller('info')
 export class InfoController {

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

@@ -1,10 +1,4 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
-import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
-import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
@@ -20,16 +14,6 @@ import { InfoService } from './info.service';
     })
   ],
   controllers: [InfoController],
-  providers: [
-    AlphaVantageService,
-    ConfigurationService,
-    DataGatheringService,
-    DataProviderService,
-    GhostfolioScraperApiService,
-    InfoService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
+  providers: [ConfigurationService, InfoService, PrismaService]
 })
 export class InfoModule {}

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

@@ -1,14 +1,11 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { InfoItem } from '@ghostfolio/common/interfaces';
-import { Subscription } from '@ghostfolio/common/interfaces/subscription.interface';
-import { permissions } from '@ghostfolio/common/permissions';
+import { permissions } from '@ghostfolio/helper';
 import { Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { Currency } from '@prisma/client';
-import * as bent from 'bent';
-import { subDays } from 'date-fns';
+
+import { InfoItem } from './interfaces/info-item.interface';
 
 @Injectable()
 export class InfoService {
@@ -16,122 +13,35 @@ export class InfoService {
 
   public constructor(
     private readonly configurationService: ConfigurationService,
-    private readonly dataGatheringService: DataGatheringService,
-    private readonly jwtService: JwtService,
-    private readonly prismaService: PrismaService
+    private jwtService: JwtService,
+    private prisma: PrismaService
   ) {}
 
   public async get(): Promise<InfoItem> {
-    const info: Partial<InfoItem> = {};
-    const platforms = await this.prismaService.platform.findMany({
+    const platforms = await this.prisma.platform.findMany({
       orderBy: { name: 'asc' },
       select: { id: true, name: true }
     });
 
     const globalPermissions: string[] = [];
 
-    if (this.configurationService.get('ENABLE_FEATURE_BLOG')) {
-      globalPermissions.push(permissions.enableBlog);
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_IMPORT')) {
-      globalPermissions.push(permissions.enableImport);
-    }
-
     if (this.configurationService.get('ENABLE_FEATURE_SOCIAL_LOGIN')) {
       globalPermissions.push(permissions.enableSocialLogin);
     }
 
-    if (this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {
-      globalPermissions.push(permissions.enableStatistics);
-    }
-
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
       globalPermissions.push(permissions.enableSubscription);
-
-      info.stripePublicKey = this.configurationService.get('STRIPE_PUBLIC_KEY');
     }
 
     return {
-      ...info,
       globalPermissions,
       platforms,
       currencies: Object.values(Currency),
       demoAuthToken: this.getDemoAuthToken(),
-      lastDataGathering: await this.getLastDataGathering(),
-      statistics: await this.getStatistics(),
-      subscriptions: await this.getSubscriptions()
+      lastDataGathering: await this.getLastDataGathering()
     };
   }
 
-  private async countActiveUsers(aDays: number) {
-    return await this.prismaService.user.count({
-      orderBy: {
-        Analytics: {
-          updatedAt: 'desc'
-        }
-      },
-      where: {
-        AND: [
-          {
-            NOT: {
-              Analytics: null
-            }
-          },
-          {
-            Analytics: {
-              updatedAt: {
-                gt: subDays(new Date(), aDays)
-              }
-            }
-          }
-        ]
-      }
-    });
-  }
-
-  private async countGitHubContributors(): Promise<number> {
-    try {
-      const get = bent(
-        `https://api.github.com/repos/ghostfolio/ghostfolio/contributors`,
-        'GET',
-        'json',
-        200,
-        {
-          'User-Agent': 'request'
-        }
-      );
-
-      const contributors = await get();
-      return contributors?.length;
-    } catch (error) {
-      console.error(error);
-
-      return undefined;
-    }
-  }
-
-  private async countGitHubStargazers(): Promise<number> {
-    try {
-      const get = bent(
-        `https://api.github.com/repos/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
-        {
-          'User-Agent': 'request'
-        }
-      );
-
-      const { stargazers_count } = await get();
-      return stargazers_count;
-    } catch (error) {
-      console.error(error);
-
-      return undefined;
-    }
-  }
-
   private getDemoAuthToken() {
     return this.jwtService.sign({
       id: InfoService.DEMO_USER_ID
@@ -139,43 +49,10 @@ export class InfoService {
   }
 
   private async getLastDataGathering() {
-    const lastDataGathering =
-      await this.dataGatheringService.getLastDataGathering();
-
-    return lastDataGathering ?? null;
-  }
-
-  private async getStatistics() {
-    if (!this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {
-      return undefined;
-    }
-
-    const activeUsers1d = await this.countActiveUsers(1);
-    const activeUsers30d = await this.countActiveUsers(30);
-    const gitHubContributors = await this.countGitHubContributors();
-    const gitHubStargazers = await this.countGitHubStargazers();
-
-    return {
-      activeUsers1d,
-      activeUsers30d,
-      gitHubContributors,
-      gitHubStargazers
-    };
-  }
-
-  private async getSubscriptions(): Promise<Subscription[]> {
-    if (!this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      return undefined;
-    }
-
-    const stripeConfig = await this.prismaService.property.findUnique({
-      where: { key: 'STRIPE_CONFIG' }
+    const lastDataGathering = await this.prisma.property.findUnique({
+      where: { key: 'LAST_DATA_GATHERING' }
     });
 
-    if (stripeConfig) {
-      return [JSON.parse(stripeConfig.value)];
-    }
-
-    return [];
+    return lastDataGathering?.value ? new Date(lastDataGathering.value) : null;
   }
 }

apps/api/src/app/info/interfaces/info-item.interface.ts

@@ -1,8 +1,5 @@
 import { Currency } from '@prisma/client';
 
-import { Statistics } from './statistics.interface';
-import { Subscription } from './subscription.interface';
-
 export interface InfoItem {
   currencies: Currency[];
   demoAuthToken: string;
@@ -13,7 +10,4 @@ export interface InfoItem {
     type: string;
   };
   platforms: { id: string; name: string }[];
-  statistics: Statistics;
-  stripePublicKey?: string;
-  subscriptions: Subscription[];
 }

apps/api/src/app/interfaces/request-with-user.type.ts

@@ -1,3 +1,3 @@
-import { UserWithSettings } from '@ghostfolio/common/interfaces';
+import { UserWithSettings } from './user-with-settings';
 
 export type RequestWithUser = Request & { user: UserWithSettings };

apps/api/src/app/interfaces/user-with-settings.ts

@@ -0,0 +1,6 @@
+import { Account, Settings, User } from '@prisma/client';
+
+export type UserWithSettings = User & {
+  Account: Account[];
+  Settings: Settings;
+};

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

@@ -1,5 +1,5 @@
-import { Currency, DataSource, Type } from '@prisma/client';
-import { IsISO8601, IsNumber, IsString } from 'class-validator';
+import { Currency, Type } from '@prisma/client';
+import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
 
 export class CreateOrderDto {
   @IsString()
@@ -8,15 +8,16 @@ export class CreateOrderDto {
   @IsString()
   currency: Currency;
 
-  @IsString()
-  dataSource: DataSource;
-
   @IsISO8601()
   date: string;
 
   @IsNumber()
   fee: number;
 
+  @IsString()
+  @ValidateIf((object, value) => value !== null)
+  platformId: string | null;
+
   @IsNumber()
   quantity: number;
 

apps/api/src/app/order/interfaces/order-with-platform.type.ts

@@ -0,0 +1,3 @@
+import { Order, Platform } from '@prisma/client';
+
+export type OrderWithPlatform = Order & { Platform?: Platform };

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

@@ -1,12 +1,7 @@
-import { UserService } from '@ghostfolio/api/app/user/user.service';
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.helper';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import {
-  getPermissions,
-  hasPermission,
-  permissions
-} from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper';
 import {
   Body,
   Controller,
@@ -35,8 +30,7 @@ export class OrderController {
   public constructor(
     private readonly impersonationService: ImpersonationService,
     private readonly orderService: OrderService,
-    @Inject(REQUEST) private readonly request: RequestWithUser,
-    private readonly userService: UserService
+    @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
   @Delete(':id')
@@ -54,12 +48,15 @@ export class OrderController {
       );
     }
 
-    return this.orderService.deleteOrder({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
-    });
+    return this.orderService.deleteOrder(
+      {
+        id_userId: {
+          id,
+          userId: this.request.user.id
+        }
+      },
+      this.request.user.id
+    );
   }
 
   @Get()
@@ -67,32 +64,25 @@ export class OrderController {
   public async getAllOrders(
     @Headers('impersonation-id') impersonationId
   ): Promise<OrderModel[]> {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(
-        impersonationId,
-        this.request.user.id
-      );
+    const impersonationUserId = await this.impersonationService.validateImpersonationId(
+      impersonationId,
+      this.request.user.id
+    );
 
     let orders = await this.orderService.orders({
       include: {
-        Account: {
-          include: {
-            Platform: true
-          }
-        },
-        SymbolProfile: {
-          select: {
-            name: true
-          }
-        }
+        Platform: true
       },
       orderBy: { date: 'desc' },
       where: { userId: impersonationUserId || this.request.user.id }
     });
 
     if (
-      impersonationUserId ||
-      this.userService.isRestrictedView(this.request.user)
+      impersonationUserId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
     ) {
       orders = nullifyValuesInObjects(orders, ['fee', 'quantity', 'unitPrice']);
     }
@@ -131,30 +121,41 @@ export class OrderController {
     const accountId = data.accountId;
     delete data.accountId;
 
-    return this.orderService.createOrder({
-      ...data,
-      Account: {
-        connect: {
-          id_userId: { id: accountId, userId: this.request.user.id }
-        }
-      },
-      date,
-      SymbolProfile: {
-        connectOrCreate: {
-          where: {
-            dataSource_symbol: {
-              dataSource: data.dataSource,
-              symbol: data.symbol
+    if (data.platformId) {
+      const platformId = data.platformId;
+      delete data.platformId;
+
+      return this.orderService.createOrder(
+        {
+          ...data,
+          date,
+          Account: {
+            connect: {
+              id_userId: { id: accountId, userId: this.request.user.id }
             }
           },
-          create: {
-            dataSource: data.dataSource,
-            symbol: data.symbol
-          }
-        }
-      },
-      User: { connect: { id: this.request.user.id } }
-    });
+          Platform: { connect: { id: platformId } },
+          User: { connect: { id: this.request.user.id } }
+        },
+        this.request.user.id
+      );
+    } else {
+      delete data.platformId;
+
+      return this.orderService.createOrder(
+        {
+          ...data,
+          date,
+          Account: {
+            connect: {
+              id_userId: { id: accountId, userId: this.request.user.id }
+            }
+          },
+          User: { connect: { id: this.request.user.id } }
+        },
+        this.request.user.id
+      );
+    }
   }
 
   @Put(':id')
@@ -179,35 +180,65 @@ export class OrderController {
       }
     });
 
-    if (!originalOrder) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
     const date = parseISO(data.date);
 
     const accountId = data.accountId;
     delete data.accountId;
 
-    return this.orderService.updateOrder({
-      data: {
-        ...data,
-        date,
-        Account: {
-          connect: {
-            id_userId: { id: accountId, userId: this.request.user.id }
+    if (data.platformId) {
+      const platformId = data.platformId;
+      delete data.platformId;
+
+      return this.orderService.updateOrder(
+        {
+          data: {
+            ...data,
+            date,
+            Account: {
+              connect: {
+                id_userId: { id: accountId, userId: this.request.user.id }
+              }
+            },
+            Platform: { connect: { id: platformId } },
+            User: { connect: { id: this.request.user.id } }
+          },
+          where: {
+            id_userId: {
+              id,
+              userId: this.request.user.id
+            }
           }
         },
-        User: { connect: { id: this.request.user.id } }
-      },
-      where: {
-        id_userId: {
-          id,
-          userId: this.request.user.id
-        }
-      }
-    });
+        this.request.user.id
+      );
+    } else {
+      // platformId is null, remove it
+      delete data.platformId;
+
+      return this.orderService.updateOrder(
+        {
+          data: {
+            ...data,
+            date,
+            Account: {
+              connect: {
+                id_userId: { id: accountId, userId: this.request.user.id }
+              }
+            },
+            Platform: originalOrder.platformId
+              ? { disconnect: true }
+              : undefined,
+            User: { connect: { id: this.request.user.id } }
+          },
+          where: {
+            id_userId: {
+              id,
+              userId: this.request.user.id
+            }
+          }
+        },
+        this.request.user.id
+      );
+    }
   }
 }

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

@@ -1,28 +1,34 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { UserModule } from '@ghostfolio/api/app/user/user.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 
+import { CacheService } from '../cache/cache.service';
+import { RedisCacheModule } from '../redis-cache/redis-cache.module';
 import { OrderController } from './order.controller';
 import { OrderService } from './order.service';
 
 @Module({
-  imports: [
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ImpersonationModule,
-    PrismaModule,
-    RedisCacheModule,
-    UserModule
-  ],
+  imports: [RedisCacheModule],
   controllers: [OrderController],
-  providers: [CacheService, OrderService],
-  exports: [OrderService]
+  providers: [
+    AlphaVantageService,
+    CacheService,
+    ConfigurationService,
+    DataGatheringService,
+    DataProviderService,
+    GhostfolioScraperApiService,
+    ImpersonationService,
+    OrderService,
+    PrismaService,
+    RakutenRapidApiService,
+    YahooFinanceService
+  ]
 })
 export class OrderModule {}

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

@@ -1,23 +1,25 @@
-import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { OrderWithAccount } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
-import { DataSource, Order, Prisma } from '@prisma/client';
-import { endOfToday, isAfter } from 'date-fns';
+import { Order, Prisma } from '@prisma/client';
+
+import { CacheService } from '../cache/cache.service';
+import { RedisCacheService } from '../redis-cache/redis-cache.service';
+import { OrderWithPlatform } from './interfaces/order-with-platform.type';
 
 @Injectable()
 export class OrderService {
   public constructor(
     private readonly cacheService: CacheService,
     private readonly dataGatheringService: DataGatheringService,
-    private readonly prismaService: PrismaService
+    private readonly redisCacheService: RedisCacheService,
+    private prisma: PrismaService
   ) {}
 
   public async order(
     orderWhereUniqueInput: Prisma.OrderWhereUniqueInput
   ): Promise<Order | null> {
-    return this.prismaService.order.findUnique({
+    return this.prisma.order.findUnique({
       where: orderWhereUniqueInput
     });
   }
@@ -29,10 +31,10 @@ export class OrderService {
     cursor?: Prisma.OrderWhereUniqueInput;
     where?: Prisma.OrderWhereInput;
     orderBy?: Prisma.OrderOrderByInput;
-  }): Promise<OrderWithAccount[]> {
+  }): Promise<OrderWithPlatform[]> {
     const { include, skip, take, cursor, where, orderBy } = params;
 
-    return this.prismaService.order.findMany({
+    return this.prisma.order.findMany({
       cursor,
       include,
       orderBy,
@@ -42,91 +44,61 @@ export class OrderService {
     });
   }
 
-  public async createOrder(data: Prisma.OrderCreateInput): Promise<Order> {
-    const isDraft = isAfter(data.date as Date, endOfToday());
+  public async createOrder(
+    data: Prisma.OrderCreateInput,
+    aUserId: string
+  ): Promise<Order> {
+    this.redisCacheService.remove(`${aUserId}.portfolio`);
 
-    if (!isDraft) {
-      // Gather symbol data of order in the background, if not draft
-      this.dataGatheringService.gatherSymbols([
-        {
-          dataSource: data.dataSource,
-          date: <Date>data.date,
-          symbol: data.symbol
-        }
-      ]);
-    }
-
-    this.dataGatheringService.gatherProfileData([data.symbol]);
-
-    await this.cacheService.flush();
-
-    return this.prismaService.order.create({
-      data: {
-        ...data,
-        isDraft
+    // Gather symbol data of order in the background
+    this.dataGatheringService.gatherSymbols([
+      {
+        date: <Date>data.date,
+        symbol: data.symbol
       }
+    ]);
+
+    await this.cacheService.flush(aUserId);
+
+    return this.prisma.order.create({
+      data
     });
   }
 
   public async deleteOrder(
-    where: Prisma.OrderWhereUniqueInput
+    where: Prisma.OrderWhereUniqueInput,
+    aUserId: string
   ): Promise<Order> {
-    return this.prismaService.order.delete({
+    this.redisCacheService.remove(`${aUserId}.portfolio`);
+
+    return this.prisma.order.delete({
       where
     });
   }
 
-  public getOrders({
-    includeDrafts = false,
-    userId
-  }: {
-    includeDrafts?: boolean;
-    userId: string;
-  }) {
-    const where: Prisma.OrderWhereInput = { userId };
-
-    if (includeDrafts === false) {
-      where.isDraft = false;
-    }
-
-    return this.orders({
-      where,
-      include: {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        Account: true,
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        SymbolProfile: true
-      },
-      orderBy: { date: 'asc' }
-    });
-  }
-
-  public async updateOrder(params: {
-    where: Prisma.OrderWhereUniqueInput;
-    data: Prisma.OrderUpdateInput;
-  }): Promise<Order> {
+  public async updateOrder(
+    params: {
+      where: Prisma.OrderWhereUniqueInput;
+      data: Prisma.OrderUpdateInput;
+    },
+    aUserId: string
+  ): Promise<Order> {
     const { data, where } = params;
 
-    const isDraft = isAfter(data.date as Date, endOfToday());
+    this.redisCacheService.remove(`${aUserId}.portfolio`);
 
-    if (!isDraft) {
-      // Gather symbol data of order in the background, if not draft
-      this.dataGatheringService.gatherSymbols([
-        {
-          dataSource: <DataSource>data.dataSource,
-          date: <Date>data.date,
-          symbol: <string>data.symbol
-        }
-      ]);
-    }
+    // Gather symbol data of order in the background
+    this.dataGatheringService.gatherSymbols([
+      {
+        date: <Date>data.date,
+        symbol: <string>data.symbol
+      }
+    ]);
 
-    await this.cacheService.flush();
+    await this.cacheService.flush(aUserId);
 
-    return this.prismaService.order.update({
-      data: {
-        ...data,
-        isDraft
-      },
+    return this.prisma.order.update({
+      data,
       where
     });
   }

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

@@ -1,4 +1,4 @@
-import { Currency, DataSource, Type } from '@prisma/client';
+import { Currency, Type } from '@prisma/client';
 import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
 
 export class UpdateOrderDto {
@@ -8,15 +8,16 @@ export class UpdateOrderDto {
   @IsString()
   currency: Currency;
 
-  @IsString()
-  dataSource: DataSource;
-
   @IsISO8601()
   date: string;
 
   @IsNumber()
   fee: number;
 
+  @IsString()
+  @ValidateIf((object, value) => value !== null)
+  platformId: string | null;
+
   @IsString()
   id: string;
 

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

@@ -1,129 +0,0 @@
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { Currency, MarketData } from '@prisma/client';
-
-import { CurrentRateService } from './current-rate.service';
-import { MarketDataService } from './market-data.service';
-
-jest.mock('./market-data.service', () => {
-  return {
-    MarketDataService: jest.fn().mockImplementation(() => {
-      return {
-        get: (date: Date, symbol: string) => {
-          return Promise.resolve<MarketData>({
-            date,
-            symbol,
-            createdAt: date,
-            id: 'aefcbe3a-ee10-4c4f-9f2d-8ffad7b05584',
-            marketPrice: 1847.839966
-          });
-        },
-        getRange: ({
-          dateRangeEnd,
-          dateRangeStart,
-          symbols
-        }: {
-          dateRangeEnd: Date;
-          dateRangeStart: Date;
-          symbols: string[];
-        }) => {
-          return Promise.resolve<MarketData[]>([
-            {
-              createdAt: dateRangeStart,
-              date: dateRangeStart,
-              id: '8fa48fde-f397-4b0d-adbc-fb940e830e6d',
-              marketPrice: 1841.823902,
-              symbol: symbols[0]
-            },
-            {
-              createdAt: dateRangeEnd,
-              date: dateRangeEnd,
-              id: '082d6893-df27-4c91-8a5d-092e84315b56',
-              marketPrice: 1847.839966,
-              symbol: symbols[0]
-            }
-          ]);
-        }
-      };
-    })
-  };
-});
-
-jest.mock('@ghostfolio/api/services/exchange-rate-data.service', () => {
-  return {
-    ExchangeRateDataService: jest.fn().mockImplementation(() => {
-      return {
-        initialize: () => Promise.resolve(),
-        toCurrency: (value: number) => {
-          return 1 * value;
-        }
-      };
-    })
-  };
-});
-
-describe('CurrentRateService', () => {
-  let currentRateService: CurrentRateService;
-  let dataProviderService: DataProviderService;
-  let exchangeRateDataService: ExchangeRateDataService;
-  let marketDataService: MarketDataService;
-
-  beforeAll(async () => {
-    dataProviderService = new DataProviderService(
-      null,
-      null,
-      null,
-      null,
-      null,
-      null
-    );
-    exchangeRateDataService = new ExchangeRateDataService(null);
-    marketDataService = new MarketDataService(null);
-
-    await exchangeRateDataService.initialize();
-
-    currentRateService = new CurrentRateService(
-      dataProviderService,
-      exchangeRateDataService,
-      marketDataService
-    );
-  });
-
-  it('getValue', async () => {
-    expect(
-      await currentRateService.getValue({
-        currency: Currency.USD,
-        date: new Date(Date.UTC(2020, 0, 1, 0, 0, 0)),
-        symbol: 'AMZN',
-        userCurrency: Currency.CHF
-      })
-    ).toMatchObject({
-      marketPrice: 1847.839966
-    });
-  });
-
-  it('getValues', async () => {
-    expect(
-      await currentRateService.getValues({
-        currencies: { AMZN: Currency.USD },
-        dateQuery: {
-          lt: new Date(Date.UTC(2020, 0, 2, 0, 0, 0)),
-          gte: new Date(Date.UTC(2020, 0, 1, 0, 0, 0))
-        },
-        symbols: ['AMZN'],
-        userCurrency: Currency.CHF
-      })
-    ).toMatchObject([
-      {
-        date: undefined,
-        marketPrice: 1841.823902,
-        symbol: 'AMZN'
-      },
-      {
-        date: undefined,
-        marketPrice: 1847.839966,
-        symbol: 'AMZN'
-      }
-    ]);
-  });
-});

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

@@ -1,128 +0,0 @@
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { resetHours } from '@ghostfolio/common/helper';
-import { Injectable } from '@nestjs/common';
-import { isBefore, isToday } from 'date-fns';
-import { flatten } from 'lodash';
-
-import { GetValueObject } from './interfaces/get-value-object.interface';
-import { GetValueParams } from './interfaces/get-value-params.interface';
-import { GetValuesParams } from './interfaces/get-values-params.interface';
-import { MarketDataService } from './market-data.service';
-
-@Injectable()
-export class CurrentRateService {
-  public constructor(
-    private readonly dataProviderService: DataProviderService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly marketDataService: MarketDataService
-  ) {}
-
-  public async getValue({
-    currency,
-    date,
-    symbol,
-    userCurrency
-  }: GetValueParams): Promise<GetValueObject> {
-    if (isToday(date)) {
-      const dataProviderResult = await this.dataProviderService.get([symbol]);
-      return {
-        date: resetHours(date),
-        marketPrice: dataProviderResult?.[symbol]?.marketPrice ?? 0,
-        symbol: symbol
-      };
-    }
-
-    const marketData = await this.marketDataService.get({
-      date,
-      symbol
-    });
-
-    if (marketData) {
-      return {
-        date: marketData.date,
-        marketPrice: this.exchangeRateDataService.toCurrency(
-          marketData.marketPrice,
-          currency,
-          userCurrency
-        ),
-        symbol: marketData.symbol
-      };
-    }
-
-    throw new Error(`Value not found for ${symbol} at ${resetHours(date)}`);
-  }
-
-  public async getValues({
-    currencies,
-    dateQuery,
-    symbols,
-    userCurrency
-  }: GetValuesParams): Promise<GetValueObject[]> {
-    const includeToday =
-      (!dateQuery.lt || isBefore(new Date(), dateQuery.lt)) &&
-      (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
-      (!dateQuery.in || this.containsToday(dateQuery.in));
-
-    const promises: Promise<
-      {
-        date: Date;
-        marketPrice: number;
-        symbol: string;
-      }[]
-    >[] = [];
-
-    if (includeToday) {
-      const today = resetHours(new Date());
-      promises.push(
-        this.dataProviderService.get(symbols).then((dataResultProvider) => {
-          const result = [];
-          for (const symbol of symbols) {
-            result.push({
-              symbol,
-              date: today,
-              marketPrice: this.exchangeRateDataService.toCurrency(
-                dataResultProvider?.[symbol]?.marketPrice ?? 0,
-                dataResultProvider?.[symbol]?.currency,
-                userCurrency
-              )
-            });
-          }
-          return result;
-        })
-      );
-    }
-
-    promises.push(
-      this.marketDataService
-        .getRange({
-          dateQuery,
-          symbols
-        })
-        .then((data) => {
-          return data.map((marketDataItem) => {
-            return {
-              date: marketDataItem.date,
-              marketPrice: this.exchangeRateDataService.toCurrency(
-                marketDataItem.marketPrice,
-                currencies[marketDataItem.symbol],
-                userCurrency
-              ),
-              symbol: marketDataItem.symbol
-            };
-          });
-        })
-    );
-
-    return flatten(await Promise.all(promises));
-  }
-
-  private containsToday(dates: Date[]): boolean {
-    for (const date of dates) {
-      if (isToday(date)) {
-        return true;
-      }
-    }
-    return false;
-  }
-}

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

@@ -1,13 +0,0 @@
-import { TimelinePosition } from '@ghostfolio/common/interfaces';
-import Big from 'big.js';
-
-export interface CurrentPositions {
-  hasErrors: boolean;
-  positions: TimelinePosition[];
-  grossPerformance: Big;
-  grossPerformancePercentage: Big;
-  netPerformance: Big;
-  netPerformancePercentage: Big;
-  currentValue: Big;
-  totalInvestment: Big;
-}

apps/api/src/app/portfolio/interfaces/date-query.interface.ts

@@ -1,5 +0,0 @@
-export interface DateQuery {
-  gte?: Date;
-  in?: Date[];
-  lt?: Date;
-}

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

@@ -1,5 +0,0 @@
-export interface GetValueObject {
-  date: Date;
-  marketPrice: number;
-  symbol: string;
-}

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

@@ -1,8 +0,0 @@
-import { Currency } from '@prisma/client';
-
-export interface GetValueParams {
-  currency: Currency;
-  date: Date;
-  symbol: string;
-  userCurrency: Currency;
-}

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

@@ -1,10 +0,0 @@
-import { Currency } from '@prisma/client';
-
-import { DateQuery } from './date-query.interface';
-
-export interface GetValuesParams {
-  currencies: { [symbol: string]: Currency };
-  dateQuery: DateQuery;
-  symbols: string[];
-  userCurrency: Currency;
-}

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

@@ -0,0 +1,19 @@
+import { Currency } from '@prisma/client';
+
+export interface PortfolioItem {
+  date: string;
+  grossPerformancePercent: number;
+  investment: number;
+  positions: { [symbol: string]: Position };
+  value: number;
+}
+
+export interface Position {
+  averagePrice: number;
+  currency: Currency;
+  firstBuyDate: string;
+  investment: number;
+  investmentInOriginalCurrency?: number;
+  marketPrice?: number;
+  quantity: number;
+}

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

@@ -1,14 +0,0 @@
-import { OrderType } from '@ghostfolio/api/models/order-type';
-import { Currency } from '@prisma/client';
-import Big from 'big.js';
-
-export interface PortfolioOrder {
-  currency: Currency;
-  date: string;
-  fee: Big;
-  name: string;
-  quantity: Big;
-  symbol: string;
-  type: OrderType;
-  unitPrice: Big;
-}

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

@@ -1,5 +1,4 @@
 export interface PortfolioOverview {
-  cash: number;
   committedFunds: number;
   fees: number;
   ordersCount: number;

apps/api/src/app/portfolio/interfaces/portfolio-position-detail.interface.ts

@@ -1,8 +1,6 @@
-import { Currency } from '@prisma/client';
-
 export interface PortfolioPositionDetail {
   averagePrice: number;
-  currency: Currency;
+  currency: string;
   firstBuyDate: string;
   grossPerformance: number;
   grossPerformancePercent: number;
@@ -11,11 +9,8 @@ export interface PortfolioPositionDetail {
   marketPrice: number;
   maxPrice: number;
   minPrice: number;
-  netPerformance: number;
-  netPerformancePercent: number;
   quantity: number;
   symbol: string;
-  transactionCount: number;
 }
 
 export interface HistoricalDataItem {

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

@@ -0,0 +1,26 @@
+import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces';
+import { Currency } from '@prisma/client';
+
+export interface PortfolioPosition {
+  currency: Currency;
+  exchange?: string;
+  grossPerformance: number;
+  grossPerformancePercent: number;
+  industry?: string;
+  investment: number;
+  marketChange?: number;
+  marketChangePercent?: number;
+  marketPrice: number;
+  marketState: MarketState;
+  name: string;
+  platforms: {
+    [name: string]: { current: number; original: number };
+  };
+  quantity: number;
+  sector?: string;
+  shareCurrent: number;
+  shareInvestment: number;
+  symbol: string;
+  type?: string;
+  url?: string;
+}

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

@@ -1,5 +0,0 @@
-import { Position } from '@ghostfolio/common/interfaces';
-
-export interface PortfolioPositions {
-  positions: Position[];
-}

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

@@ -1,3 +1,7 @@
+export interface PortfolioReport {
+  rules: { [group: string]: PortfolioReportRule[] };
+}
+
 export interface PortfolioReportRule {
   evaluation: string;
   name: string;

apps/api/src/app/portfolio/interfaces/timeline-period.interface.ts

@@ -1,9 +0,0 @@
-import Big from 'big.js';
-
-export interface TimelinePeriod {
-  date: string;
-  grossPerformance: Big;
-  investment: Big;
-  netPerformance: Big;
-  value: Big;
-}

apps/api/src/app/portfolio/interfaces/timeline-specification.interface.ts

@@ -1,6 +0,0 @@
-export type Accuracy = 'day' | 'month' | 'year';
-
-export interface TimelineSpecification {
-  accuracy: Accuracy;
-  start: string;
-}

apps/api/src/app/portfolio/interfaces/transaction-point-symbol.interface.ts

@@ -1,12 +0,0 @@
-import { Currency } from '@prisma/client';
-import Big from 'big.js';
-
-export interface TransactionPointSymbol {
-  currency: Currency;
-  fee: Big;
-  firstBuyDate: string;
-  investment: Big;
-  quantity: Big;
-  symbol: string;
-  transactionCount: number;
-}

apps/api/src/app/portfolio/interfaces/transaction-point.interface.ts

@@ -1,6 +0,0 @@
-import { TransactionPointSymbol } from './transaction-point-symbol.interface';
-
-export interface TransactionPoint {
-  date: string;
-  items: TransactionPointSymbol[];
-}

apps/api/src/app/portfolio/market-data.service.ts

@@ -1,51 +0,0 @@
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { resetHours } from '@ghostfolio/common/helper';
-import { Injectable } from '@nestjs/common';
-import { MarketData } from '@prisma/client';
-
-import { DateQuery } from './interfaces/date-query.interface';
-
-@Injectable()
-export class MarketDataService {
-  public constructor(private readonly prismaService: PrismaService) {}
-
-  public async get({
-    date,
-    symbol
-  }: {
-    date: Date;
-    symbol: string;
-  }): Promise<MarketData> {
-    return await this.prismaService.marketData.findFirst({
-      where: {
-        symbol,
-        date: resetHours(date)
-      }
-    });
-  }
-
-  public async getRange({
-    dateQuery,
-    symbols
-  }: {
-    dateQuery: DateQuery;
-    symbols: string[];
-  }): Promise<MarketData[]> {
-    return await this.prismaService.marketData.findMany({
-      orderBy: [
-        {
-          date: 'asc'
-        },
-        {
-          symbol: 'asc'
-        }
-      ],
-      where: {
-        date: dateQuery,
-        symbol: {
-          in: symbols
-        }
-      }
-    });
-  }
-}

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

@@ -1,602 +0,0 @@
-import { OrderType } from '@ghostfolio/api/models/order-type';
-import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';
-import { TimelinePosition } from '@ghostfolio/common/interfaces';
-import { Currency } from '@prisma/client';
-import Big from 'big.js';
-import {
-  addDays,
-  addMonths,
-  addYears,
-  endOfDay,
-  format,
-  isAfter,
-  isBefore,
-  max,
-  min
-} from 'date-fns';
-import { flatten } from 'lodash';
-
-import { CurrentRateService } from './current-rate.service';
-import { CurrentPositions } from './interfaces/current-positions.interface';
-import { GetValueObject } from './interfaces/get-value-object.interface';
-import { PortfolioOrder } from './interfaces/portfolio-order.interface';
-import { TimelinePeriod } from './interfaces/timeline-period.interface';
-import {
-  Accuracy,
-  TimelineSpecification
-} from './interfaces/timeline-specification.interface';
-import { TransactionPointSymbol } from './interfaces/transaction-point-symbol.interface';
-import { TransactionPoint } from './interfaces/transaction-point.interface';
-
-export class PortfolioCalculator {
-  private transactionPoints: TransactionPoint[];
-
-  public constructor(
-    private currentRateService: CurrentRateService,
-    private currency: Currency
-  ) {}
-
-  public computeTransactionPoints(orders: PortfolioOrder[]) {
-    orders.sort((a, b) => a.date.localeCompare(b.date));
-
-    this.transactionPoints = [];
-    const symbols: { [symbol: string]: TransactionPointSymbol } = {};
-
-    let lastDate: string = null;
-    let lastTransactionPoint: TransactionPoint = null;
-    for (const order of orders) {
-      const currentDate = order.date;
-
-      let currentTransactionPointItem: TransactionPointSymbol;
-      const oldAccumulatedSymbol = symbols[order.symbol];
-
-      const factor = this.getFactor(order.type);
-      const unitPrice = new Big(order.unitPrice);
-      if (oldAccumulatedSymbol) {
-        const newQuantity = order.quantity
-          .mul(factor)
-          .plus(oldAccumulatedSymbol.quantity);
-        currentTransactionPointItem = {
-          currency: order.currency,
-          fee: order.fee.plus(oldAccumulatedSymbol.fee),
-          firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
-          investment: newQuantity.eq(0)
-            ? new Big(0)
-            : unitPrice
-                .mul(order.quantity)
-                .mul(factor)
-                .add(oldAccumulatedSymbol.investment),
-          quantity: newQuantity,
-          symbol: order.symbol,
-          transactionCount: oldAccumulatedSymbol.transactionCount + 1
-        };
-      } else {
-        currentTransactionPointItem = {
-          currency: order.currency,
-          fee: order.fee,
-          firstBuyDate: order.date,
-          investment: unitPrice.mul(order.quantity).mul(factor),
-          quantity: order.quantity.mul(factor),
-          symbol: order.symbol,
-          transactionCount: 1
-        };
-      }
-
-      symbols[order.symbol] = currentTransactionPointItem;
-
-      const items = lastTransactionPoint?.items ?? [];
-      const newItems = items.filter(
-        (transactionPointItem) => transactionPointItem.symbol !== order.symbol
-      );
-      newItems.push(currentTransactionPointItem);
-      newItems.sort((a, b) => a.symbol.localeCompare(b.symbol));
-      if (lastDate !== currentDate || lastTransactionPoint === null) {
-        lastTransactionPoint = {
-          date: currentDate,
-          items: newItems
-        };
-        this.transactionPoints.push(lastTransactionPoint);
-      } else {
-        lastTransactionPoint.items = newItems;
-      }
-      lastDate = currentDate;
-    }
-  }
-
-  public getTransactionPoints(): TransactionPoint[] {
-    return this.transactionPoints;
-  }
-
-  public setTransactionPoints(transactionPoints: TransactionPoint[]) {
-    this.transactionPoints = transactionPoints;
-  }
-
-  public async getCurrentPositions(start: Date): Promise<CurrentPositions> {
-    if (!this.transactionPoints?.length) {
-      return {
-        currentValue: new Big(0),
-        hasErrors: false,
-        grossPerformance: new Big(0),
-        grossPerformancePercentage: new Big(0),
-        netPerformance: new Big(0),
-        netPerformancePercentage: new Big(0),
-        positions: [],
-        totalInvestment: new Big(0)
-      };
-    }
-
-    const lastTransactionPoint =
-      this.transactionPoints[this.transactionPoints.length - 1];
-
-    // use Date.now() to use the mock for today
-    const today = new Date(Date.now());
-
-    let firstTransactionPoint: TransactionPoint = null;
-    let firstIndex = this.transactionPoints.length;
-    const dates = [];
-    const symbols = new Set<string>();
-    const currencies: { [symbol: string]: Currency } = {};
-
-    dates.push(resetHours(start));
-    for (const item of this.transactionPoints[firstIndex - 1].items) {
-      symbols.add(item.symbol);
-      currencies[item.symbol] = item.currency;
-    }
-    for (let i = 0; i < this.transactionPoints.length; i++) {
-      if (
-        !isBefore(parseDate(this.transactionPoints[i].date), start) &&
-        firstTransactionPoint === null
-      ) {
-        firstTransactionPoint = this.transactionPoints[i];
-        firstIndex = i;
-      }
-      if (firstTransactionPoint !== null) {
-        dates.push(resetHours(parseDate(this.transactionPoints[i].date)));
-      }
-    }
-
-    dates.push(resetHours(today));
-
-    const marketSymbols = await this.currentRateService.getValues({
-      currencies,
-      dateQuery: {
-        in: dates
-      },
-      symbols: Array.from(symbols),
-      userCurrency: this.currency
-    });
-
-    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
-        );
-      }
-    }
-
-    let hasErrors = false;
-    const startString = format(start, DATE_FORMAT);
-
-    const holdingPeriodReturns: { [symbol: string]: Big } = {};
-    const netHoldingPeriodReturns: { [symbol: string]: Big } = {};
-    const grossPerformance: { [symbol: string]: Big } = {};
-    const netPerformance: { [symbol: string]: Big } = {};
-    const todayString = format(today, DATE_FORMAT);
-
-    if (firstIndex > 0) {
-      firstIndex--;
-    }
-    const invalidSymbols = [];
-    const lastInvestments: { [symbol: string]: Big } = {};
-    const lastQuantities: { [symbol: string]: Big } = {};
-    const lastFees: { [symbol: string]: Big } = {};
-    const initialValues: { [symbol: string]: Big } = {};
-
-    for (let i = firstIndex; i < this.transactionPoints.length; i++) {
-      const currentDate =
-        i === firstIndex ? startString : this.transactionPoints[i].date;
-      const nextDate =
-        i + 1 < this.transactionPoints.length
-          ? this.transactionPoints[i + 1].date
-          : todayString;
-
-      const items = this.transactionPoints[i].items;
-      for (const item of items) {
-        if (!marketSymbolMap[nextDate]?.[item.symbol]) {
-          invalidSymbols.push(item.symbol);
-          hasErrors = true;
-          console.error(
-            `Missing value for symbol ${item.symbol} at ${nextDate}`
-          );
-          continue;
-        }
-        let lastInvestment: Big = new Big(0);
-        let lastQuantity: Big = item.quantity;
-        if (lastInvestments[item.symbol] && lastQuantities[item.symbol]) {
-          lastInvestment = item.investment.minus(lastInvestments[item.symbol]);
-          lastQuantity = lastQuantities[item.symbol];
-        }
-
-        const itemValue = marketSymbolMap[currentDate]?.[item.symbol];
-        let initialValue = itemValue?.mul(lastQuantity);
-        let investedValue = itemValue?.mul(item.quantity);
-        const isFirstOrderAndIsStartBeforeCurrentDate =
-          i === firstIndex &&
-          isBefore(parseDate(this.transactionPoints[i].date), start);
-        const lastFee: Big = lastFees[item.symbol] ?? new Big(0);
-        const fee = isFirstOrderAndIsStartBeforeCurrentDate
-          ? new Big(0)
-          : item.fee.minus(lastFee);
-        if (!isAfter(parseDate(currentDate), parseDate(item.firstBuyDate))) {
-          initialValue = item.investment;
-          investedValue = item.investment;
-        }
-        if (i === firstIndex || !initialValues[item.symbol]) {
-          initialValues[item.symbol] = initialValue;
-        }
-        if (!item.quantity.eq(0)) {
-          if (!initialValue) {
-            invalidSymbols.push(item.symbol);
-            hasErrors = true;
-            console.error(
-              `Missing value for symbol ${item.symbol} at ${currentDate}`
-            );
-            continue;
-          }
-
-          const cashFlow = lastInvestment;
-          const endValue = marketSymbolMap[nextDate][item.symbol].mul(
-            item.quantity
-          );
-
-          const holdingPeriodReturn = endValue.div(initialValue.plus(cashFlow));
-          holdingPeriodReturns[item.symbol] = (
-            holdingPeriodReturns[item.symbol] ?? new Big(1)
-          ).mul(holdingPeriodReturn);
-          grossPerformance[item.symbol] = (
-            grossPerformance[item.symbol] ?? new Big(0)
-          ).plus(endValue.minus(investedValue));
-
-          const netHoldingPeriodReturn = endValue.div(
-            initialValue.plus(cashFlow).plus(fee)
-          );
-          netHoldingPeriodReturns[item.symbol] = (
-            netHoldingPeriodReturns[item.symbol] ?? new Big(1)
-          ).mul(netHoldingPeriodReturn);
-          netPerformance[item.symbol] = (
-            netPerformance[item.symbol] ?? new Big(0)
-          ).plus(endValue.minus(investedValue).minus(fee));
-        }
-        lastInvestments[item.symbol] = item.investment;
-        lastQuantities[item.symbol] = item.quantity;
-        lastFees[item.symbol] = item.fee;
-      }
-    }
-
-    const positions: TimelinePosition[] = [];
-
-    for (const item of lastTransactionPoint.items) {
-      const marketValue = marketSymbolMap[todayString]?.[item.symbol];
-      const isValid = invalidSymbols.indexOf(item.symbol) === -1;
-      positions.push({
-        averagePrice: item.quantity.eq(0)
-          ? new Big(0)
-          : item.investment.div(item.quantity),
-        currency: item.currency,
-        firstBuyDate: item.firstBuyDate,
-        grossPerformance: isValid
-          ? grossPerformance[item.symbol] ?? null
-          : null,
-        grossPerformancePercentage:
-          isValid && holdingPeriodReturns[item.symbol]
-            ? holdingPeriodReturns[item.symbol].minus(1)
-            : null,
-        investment: item.investment,
-        marketPrice: marketValue?.toNumber() ?? null,
-        netPerformance: isValid ? netPerformance[item.symbol] ?? null : null,
-        netPerformancePercentage:
-          isValid && netHoldingPeriodReturns[item.symbol]
-            ? netHoldingPeriodReturns[item.symbol].minus(1)
-            : null,
-        quantity: item.quantity,
-        symbol: item.symbol,
-        transactionCount: item.transactionCount
-      });
-    }
-    const overall = this.calculateOverallPerformance(positions, initialValues);
-
-    return {
-      ...overall,
-      positions,
-      hasErrors: hasErrors || overall.hasErrors
-    };
-  }
-
-  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.add(transactionPointSymbol.investment),
-          new Big(0)
-        )
-      };
-    });
-  }
-
-  public async calculateTimeline(
-    timelineSpecification: TimelineSpecification[],
-    endDate: string
-  ): Promise<TimelinePeriod[]> {
-    if (timelineSpecification.length === 0) {
-      return [];
-    }
-
-    const startDate = timelineSpecification[0].start;
-    const start = parseDate(startDate);
-    const end = parseDate(endDate);
-
-    const timelinePeriodPromises: Promise<TimelinePeriod[]>[] = [];
-    let i = 0;
-    let j = -1;
-    for (
-      let currentDate = start;
-      !isAfter(currentDate, end);
-      currentDate = this.addToDate(
-        currentDate,
-        timelineSpecification[i].accuracy
-      )
-    ) {
-      if (this.isNextItemActive(timelineSpecification, currentDate, i)) {
-        i++;
-      }
-      while (
-        j + 1 < this.transactionPoints.length &&
-        !isAfter(parseDate(this.transactionPoints[j + 1].date), currentDate)
-      ) {
-        j++;
-      }
-
-      let periodEndDate = currentDate;
-      if (timelineSpecification[i].accuracy === 'day') {
-        let nextEndDate = end;
-        if (j + 1 < this.transactionPoints.length) {
-          nextEndDate = parseDate(this.transactionPoints[j + 1].date);
-        }
-        periodEndDate = min([
-          addMonths(currentDate, 3),
-          max([currentDate, nextEndDate])
-        ]);
-      }
-      const timePeriodForDates = this.getTimePeriodForDate(
-        j,
-        currentDate,
-        endOfDay(periodEndDate)
-      );
-      currentDate = periodEndDate;
-      if (timePeriodForDates != null) {
-        timelinePeriodPromises.push(timePeriodForDates);
-      }
-    }
-
-    const timelinePeriods: TimelinePeriod[][] = await Promise.all(
-      timelinePeriodPromises
-    );
-
-    return flatten(timelinePeriods);
-  }
-
-  private calculateOverallPerformance(
-    positions: TimelinePosition[],
-    initialValues: { [p: string]: Big }
-  ) {
-    let hasErrors = false;
-    let currentValue = new Big(0);
-    let totalInvestment = new Big(0);
-    let grossPerformance = new Big(0);
-    let grossPerformancePercentage = new Big(0);
-    let netPerformance = new Big(0);
-    let netPerformancePercentage = new Big(0);
-    let completeInitialValue = new Big(0);
-    for (const currentPosition of positions) {
-      if (currentPosition.marketPrice) {
-        currentValue = currentValue.add(
-          new Big(currentPosition.marketPrice).mul(currentPosition.quantity)
-        );
-      } else {
-        hasErrors = true;
-      }
-      totalInvestment = totalInvestment.add(currentPosition.investment);
-      if (currentPosition.grossPerformance) {
-        grossPerformance = grossPerformance.plus(
-          currentPosition.grossPerformance
-        );
-        netPerformance = netPerformance.plus(currentPosition.netPerformance);
-      } else if (!currentPosition.quantity.eq(0)) {
-        hasErrors = true;
-      }
-
-      if (
-        currentPosition.grossPerformancePercentage &&
-        initialValues[currentPosition.symbol]
-      ) {
-        const currentInitialValue = initialValues[currentPosition.symbol];
-        completeInitialValue = completeInitialValue.plus(currentInitialValue);
-        grossPerformancePercentage = grossPerformancePercentage.plus(
-          currentPosition.grossPerformancePercentage.mul(currentInitialValue)
-        );
-        netPerformancePercentage = netPerformancePercentage.plus(
-          currentPosition.netPerformancePercentage.mul(currentInitialValue)
-        );
-      } else if (!currentPosition.quantity.eq(0)) {
-        console.error(
-          `Initial value is missing for symbol ${currentPosition.symbol}`
-        );
-        hasErrors = true;
-      }
-    }
-
-    if (!completeInitialValue.eq(0)) {
-      grossPerformancePercentage =
-        grossPerformancePercentage.div(completeInitialValue);
-      netPerformancePercentage =
-        netPerformancePercentage.div(completeInitialValue);
-    }
-
-    return {
-      currentValue,
-      grossPerformance,
-      grossPerformancePercentage,
-      hasErrors,
-      netPerformance,
-      netPerformancePercentage,
-      totalInvestment
-    };
-  }
-
-  private async getTimePeriodForDate(
-    j: number,
-    startDate: Date,
-    endDate: Date
-  ): Promise<TimelinePeriod[]> {
-    let investment: Big = new Big(0);
-    let fees: Big = new Big(0);
-
-    const marketSymbolMap: {
-      [date: string]: { [symbol: string]: Big };
-    } = {};
-    if (j >= 0) {
-      const currencies: { [name: string]: Currency } = {};
-      const symbols: string[] = [];
-
-      for (const item of this.transactionPoints[j].items) {
-        currencies[item.symbol] = item.currency;
-        symbols.push(item.symbol);
-        investment = investment.add(item.investment);
-        fees = fees.add(item.fee);
-      }
-
-      let marketSymbols: GetValueObject[] = [];
-      if (symbols.length > 0) {
-        try {
-          marketSymbols = await this.currentRateService.getValues({
-            dateQuery: {
-              gte: startDate,
-              lt: endOfDay(endDate)
-            },
-            symbols,
-            currencies,
-            userCurrency: this.currency
-          });
-        } catch (error) {
-          console.error(
-            `Failed to fetch info for date ${startDate} with exception`,
-            error
-          );
-          return null;
-        }
-      }
-
-      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 results: TimelinePeriod[] = [];
-    for (
-      let currentDate = startDate;
-      isBefore(currentDate, endDate);
-      currentDate = addDays(currentDate, 1)
-    ) {
-      let value = new Big(0);
-      const currentDateAsString = format(currentDate, DATE_FORMAT);
-      let invalid = false;
-      if (j >= 0) {
-        for (const item of this.transactionPoints[j].items) {
-          if (
-            !marketSymbolMap[currentDateAsString]?.hasOwnProperty(item.symbol)
-          ) {
-            invalid = true;
-            break;
-          }
-          value = value.add(
-            item.quantity.mul(marketSymbolMap[currentDateAsString][item.symbol])
-          );
-        }
-      }
-      if (!invalid) {
-        const grossPerformance = value.minus(investment);
-        const result = {
-          grossPerformance,
-          investment,
-          value,
-          date: currentDateAsString,
-          netPerformance: grossPerformance.minus(fees)
-        };
-        results.push(result);
-      }
-    }
-
-    return results;
-  }
-
-  private getFactor(type: OrderType) {
-    let factor: number;
-
-    switch (type) {
-      case OrderType.Buy:
-        factor = 1;
-        break;
-      case OrderType.Sell:
-        factor = -1;
-        break;
-      default:
-        factor = 0;
-        break;
-    }
-
-    return factor;
-  }
-
-  private addToDate(date: Date, accuracy: Accuracy): Date {
-    switch (accuracy) {
-      case 'day':
-        return addDays(date, 1);
-      case 'month':
-        return addMonths(date, 1);
-      case 'year':
-        return addYears(date, 1);
-    }
-  }
-
-  private isNextItemActive(
-    timelineSpecification: TimelineSpecification[],
-    currentDate: Date,
-    i: number
-  ) {
-    return (
-      i + 1 < timelineSpecification.length &&
-      !isBefore(currentDate, parseDate(timelineSpecification[i + 1].start))
-    );
-  }
-}

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

@@ -1,17 +1,10 @@
-import { UserService } from '@ghostfolio/api/app/user/user.service';
 import {
   hasNotDefinedValuesInObject,
   nullifyValuesInObject
 } from '@ghostfolio/api/helper/object.helper';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import {
-  PortfolioDetails,
-  PortfolioPerformance,
-  PortfolioReport,
-  PortfolioSummary
-} from '@ghostfolio/common/interfaces';
-import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
+import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper';
 import {
   Controller,
   Get,
@@ -28,47 +21,60 @@ import { AuthGuard } from '@nestjs/passport';
 import { Response } from 'express';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
+import { RequestWithUser } from '../interfaces/request-with-user.type';
+import { PortfolioItem } from './interfaces/portfolio-item.interface';
+import { PortfolioOverview } from './interfaces/portfolio-overview.interface';
+import { PortfolioPerformance } from './interfaces/portfolio-performance.interface';
 import {
   HistoricalDataItem,
   PortfolioPositionDetail
 } from './interfaces/portfolio-position-detail.interface';
-import { PortfolioPositions } from './interfaces/portfolio-positions.interface';
+import { PortfolioPosition } from './interfaces/portfolio-position.interface';
+import { PortfolioReport } from './interfaces/portfolio-report.interface';
 import { PortfolioService } from './portfolio.service';
 
 @Controller('portfolio')
 export class PortfolioController {
   public constructor(
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser,
-    private readonly userService: UserService
+    private readonly impersonationService: ImpersonationService,
+    private portfolioService: PortfolioService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
-  @Get('investments')
+  @Get()
   @UseGuards(AuthGuard('jwt'))
   public async findAll(
     @Headers('impersonation-id') impersonationId
-  ): Promise<InvestmentItem[]> {
-    let investments = await this.portfolioService.getInvestments(
-      impersonationId
-    );
+  ): Promise<PortfolioItem[]> {
+    let portfolio = await this.portfolioService.findAll(impersonationId);
 
     if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
+      impersonationId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
     ) {
-      const maxInvestment = investments.reduce(
-        (investment, item) => Math.max(investment, item.investment),
-        1
-      );
+      portfolio = portfolio.map((portfolioItem) => {
+        Object.keys(portfolioItem.positions).forEach((symbol) => {
+          portfolioItem.positions[symbol].investment =
+            portfolioItem.positions[symbol].investment > 0 ? 1 : 0;
+          portfolioItem.positions[symbol].investmentInOriginalCurrency =
+            portfolioItem.positions[symbol].investmentInOriginalCurrency > 0
+              ? 1
+              : 0;
+          portfolioItem.positions[symbol].quantity =
+            portfolioItem.positions[symbol].quantity > 0 ? 1 : 0;
+        });
 
-      investments = investments.map((item) => ({
-        date: item.date,
-        investment: item.investment / maxInvestment
-      }));
+        portfolioItem.investment = null;
+
+        return portfolioItem;
+      });
     }
 
-    return investments;
+    return portfolio;
   }
 
   @Get('chart')
@@ -96,8 +102,11 @@ export class PortfolioController {
     }
 
     if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
+      impersonationId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
     ) {
       let maxValue = 0;
 
@@ -124,25 +133,44 @@ export class PortfolioController {
     @Headers('impersonation-id') impersonationId,
     @Query('range') range,
     @Res() res: Response
-  ): Promise<PortfolioDetails> {
-    const { accounts, holdings, hasErrors } =
-      await this.portfolioService.getDetails(impersonationId, range);
+  ): Promise<{ [symbol: string]: PortfolioPosition }> {
+    let details: { [symbol: string]: PortfolioPosition } = {};
 
-    if (hasErrors || hasNotDefinedValuesInObject(holdings)) {
+    const impersonationUserId = await this.impersonationService.validateImpersonationId(
+      impersonationId,
+      this.request.user.id
+    );
+
+    const portfolio = await this.portfolioService.createPortfolio(
+      impersonationUserId || this.request.user.id
+    );
+
+    try {
+      details = await portfolio.getDetails(range);
+    } catch (error) {
+      console.error(error);
+
+      res.status(StatusCodes.ACCEPTED);
+    }
+
+    if (hasNotDefinedValuesInObject(details)) {
       res.status(StatusCodes.ACCEPTED);
     }
 
     if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
+      impersonationId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
     ) {
-      const totalInvestment = Object.values(holdings)
+      const totalInvestment = Object.values(details)
         .map((portfolioPosition) => {
           return portfolioPosition.investment;
         })
         .reduce((a, b) => a + b, 0);
 
-      const totalValue = Object.values(holdings)
+      const totalValue = Object.values(details)
         .map((portfolioPosition) => {
           return this.exchangeRateDataService.toCurrency(
             portfolioPosition.quantity * portfolioPosition.marketPrice,
@@ -152,21 +180,49 @@ export class PortfolioController {
         })
         .reduce((a, b) => a + b, 0);
 
-      for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
+      for (const [symbol, portfolioPosition] of Object.entries(details)) {
         portfolioPosition.grossPerformance = null;
         portfolioPosition.investment =
           portfolioPosition.investment / totalInvestment;
 
-        portfolioPosition.quantity = null;
-      }
+        for (const [platform, { current, original }] of Object.entries(
+          portfolioPosition.platforms
+        )) {
+          portfolioPosition.platforms[platform].current = current / totalValue;
+          portfolioPosition.platforms[platform].original =
+            original / totalInvestment;
+        }
 
-      for (const [name, { current, original }] of Object.entries(accounts)) {
-        accounts[name].current = current / totalValue;
-        accounts[name].original = original / totalInvestment;
+        portfolioPosition.quantity = null;
       }
     }
 
-    return <any>res.json({ accounts, holdings });
+    return <any>res.json(details);
+  }
+
+  @Get('overview')
+  @UseGuards(AuthGuard('jwt'))
+  public async getOverview(
+    @Headers('impersonation-id') impersonationId
+  ): Promise<PortfolioOverview> {
+    let overview = await this.portfolioService.getOverview(impersonationId);
+
+    if (
+      impersonationId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
+    ) {
+      overview = nullifyValuesInObject(overview, [
+        'committedFunds',
+        'fees',
+        'totalBuy',
+        'totalSell'
+      ]);
+    }
+
+    return overview;
   }
 
   @Get('performance')
@@ -176,22 +232,31 @@ export class PortfolioController {
     @Query('range') range,
     @Res() res: Response
   ): Promise<PortfolioPerformance> {
-    const performanceInformation = await this.portfolioService.getPerformance(
+    const impersonationUserId = await this.impersonationService.validateImpersonationId(
       impersonationId,
-      range
+      this.request.user.id
     );
 
-    if (performanceInformation?.hasErrors) {
+    const portfolio = await this.portfolioService.createPortfolio(
+      impersonationUserId || this.request.user.id
+    );
+
+    let performance = await portfolio.getPerformance(range);
+
+    if (hasNotDefinedValuesInObject(performance)) {
       res.status(StatusCodes.ACCEPTED);
     }
 
-    let performance = performanceInformation.performance;
     if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
+      impersonationId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
     ) {
       performance = nullifyValuesInObject(performance, [
         'currentGrossPerformance',
+        'currentNetPerformance',
         'currentValue'
       ]);
     }
@@ -199,64 +264,6 @@ export class PortfolioController {
     return <any>res.json(performance);
   }
 
-  @Get('positions')
-  @UseGuards(AuthGuard('jwt'))
-  public async getPositions(
-    @Headers('impersonation-id') impersonationId,
-    @Query('range') range,
-    @Res() res: Response
-  ): Promise<PortfolioPositions> {
-    const result = await this.portfolioService.getPositions(
-      impersonationId,
-      range
-    );
-
-    if (result?.hasErrors) {
-      res.status(StatusCodes.ACCEPTED);
-    }
-
-    if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      result.positions = result.positions.map((position) => {
-        return nullifyValuesInObject(position, [
-          'grossPerformance',
-          'investment',
-          'quantity'
-        ]);
-      });
-    }
-
-    return <any>res.json(result);
-  }
-
-  @Get('summary')
-  @UseGuards(AuthGuard('jwt'))
-  public async getSummary(
-    @Headers('impersonation-id') impersonationId
-  ): Promise<PortfolioSummary> {
-    let summary = await this.portfolioService.getSummary(impersonationId);
-
-    if (
-      impersonationId ||
-      this.userService.isRestrictedView(this.request.user)
-    ) {
-      summary = nullifyValuesInObject(summary, [
-        'cash',
-        'committedFunds',
-        'currentGrossPerformance',
-        'currentValue',
-        'fees',
-        'netWorth',
-        'totalBuy',
-        'totalSell'
-      ]);
-    }
-
-    return summary;
-  }
-
   @Get('position/:symbol')
   @UseGuards(AuthGuard('jwt'))
   public async getPosition(
@@ -270,15 +277,13 @@ export class PortfolioController {
 
     if (position) {
       if (
-        impersonationId ||
-        this.userService.isRestrictedView(this.request.user)
+        impersonationId &&
+        !hasPermission(
+          getPermissions(this.request.user.role),
+          permissions.readForeignPortfolio
+        )
       ) {
-        position = nullifyValuesInObject(position, [
-          'grossPerformance',
-          'investment',
-          'netPerformance',
-          'quantity'
-        ]);
+        position = nullifyValuesInObject(position, ['grossPerformance']);
       }
 
       return position;
@@ -295,6 +300,27 @@ export class PortfolioController {
   public async getReport(
     @Headers('impersonation-id') impersonationId
   ): Promise<PortfolioReport> {
-    return await this.portfolioService.getReport(impersonationId);
+    const impersonationUserId = await this.impersonationService.validateImpersonationId(
+      impersonationId,
+      this.request.user.id
+    );
+
+    const portfolio = await this.portfolioService.createPortfolio(
+      impersonationUserId || this.request.user.id
+    );
+
+    let report = await portfolio.getReport();
+
+    if (
+      impersonationId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
+    ) {
+      // TODO: Filter out absolute numbers
+    }
+
+    return report;
   }
 }

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

@@ -1,40 +1,42 @@
-import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { OrderModule } from '@ghostfolio/api/app/order/order.module';
-import { UserModule } from '@ghostfolio/api/app/user/user.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { RulesService } from '@ghostfolio/api/services/rules.service';
 import { Module } from '@nestjs/common';
 
-import { CurrentRateService } from './current-rate.service';
-import { MarketDataService } from './market-data.service';
+import { CacheService } from '../cache/cache.service';
+import { OrderService } from '../order/order.service';
+import { RedisCacheModule } from '../redis-cache/redis-cache.module';
+import { UserService } from '../user/user.service';
 import { PortfolioController } from './portfolio.controller';
 import { PortfolioService } from './portfolio.service';
-import { RulesService } from './rules.service';
 
 @Module({
-  imports: [
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
-    ImpersonationModule,
-    OrderModule,
-    PrismaModule,
-    UserModule
-  ],
+  imports: [RedisCacheModule],
   controllers: [PortfolioController],
   providers: [
-    AccountService,
-    CurrentRateService,
-    MarketDataService,
+    AlphaVantageService,
+    CacheService,
+    ConfigurationService,
+    DataGatheringService,
+    DataProviderService,
+    ExchangeRateDataService,
+    GhostfolioScraperApiService,
+    ImpersonationService,
+    OrderService,
     PortfolioService,
+    PrismaService,
+    RakutenRapidApiService,
     RulesService,
-    SymbolProfileService
+    UserService,
+    YahooFinanceService
   ]
 })
 export class PortfolioModule {}

apps/api/src/app/portfolio/rules.service.ts

@@ -1,23 +0,0 @@
-import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
-import { Rule } from '@ghostfolio/api/models/rule';
-import { Injectable } from '@nestjs/common';
-import { Currency } from '@prisma/client';
-
-@Injectable()
-export class RulesService {
-  public constructor() {}
-
-  public async evaluate<T extends RuleSettings>(
-    aRules: Rule<T>[],
-    aUserSettings: { baseCurrency: Currency }
-  ) {
-    return aRules
-      .filter((rule) => {
-        return rule.getSettings(aUserSettings)?.isActive;
-      })
-      .map((rule) => {
-        const evaluationResult = rule.evaluate(rule.getSettings(aUserSettings));
-        return { ...evaluationResult, name: rule.getName() };
-      });
-  }
-}

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

@@ -1,57 +0,0 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Body,
-  Controller,
-  Get,
-  HttpException,
-  Inject,
-  Post,
-  Req,
-  Res,
-  UseGuards
-} from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
-import { AuthGuard } from '@nestjs/passport';
-import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-
-import { SubscriptionService } from './subscription.service';
-
-@Controller('subscription')
-export class SubscriptionController {
-  public constructor(
-    private readonly configurationService: ConfigurationService,
-    @Inject(REQUEST) private readonly request: RequestWithUser,
-    private readonly subscriptionService: SubscriptionService
-  ) {}
-
-  @Get('stripe/callback')
-  public async stripeCallback(@Req() req, @Res() res) {
-    await this.subscriptionService.createSubscription(
-      req.query.checkoutSessionId
-    );
-
-    res.redirect(`${this.configurationService.get('ROOT_URL')}/account`);
-  }
-
-  @Post('stripe/checkout-session')
-  @UseGuards(AuthGuard('jwt'))
-  public async createCheckoutSession(
-    @Body() { couponId, priceId }: { couponId: string; priceId: string }
-  ) {
-    try {
-      return await this.subscriptionService.createCheckoutSession({
-        couponId,
-        priceId,
-        userId: this.request.user.id
-      });
-    } catch (error) {
-      console.error(error);
-
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.BAD_REQUEST),
-        StatusCodes.BAD_REQUEST
-      );
-    }
-  }
-}

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

@@ -1,14 +0,0 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Module } from '@nestjs/common';
-
-import { SubscriptionController } from './subscription.controller';
-import { SubscriptionService } from './subscription.service';
-
-@Module({
-  imports: [],
-  controllers: [SubscriptionController],
-  providers: [ConfigurationService, PrismaService, SubscriptionService],
-  exports: [SubscriptionService]
-})
-export class SubscriptionModule {}

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

@@ -1,110 +0,0 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
-import { Injectable } from '@nestjs/common';
-import { Subscription } from '@prisma/client';
-import { addDays, isBefore } from 'date-fns';
-import Stripe from 'stripe';
-
-@Injectable()
-export class SubscriptionService {
-  private stripe: Stripe;
-
-  public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly prismaService: PrismaService
-  ) {
-    this.stripe = new Stripe(
-      this.configurationService.get('STRIPE_SECRET_KEY'),
-      {
-        apiVersion: '2020-08-27'
-      }
-    );
-  }
-
-  public async createCheckoutSession({
-    couponId,
-    priceId,
-    userId
-  }: {
-    couponId?: string;
-    priceId: string;
-    userId: string;
-  }) {
-    const checkoutSessionCreateParams: Stripe.Checkout.SessionCreateParams = {
-      cancel_url: `${this.configurationService.get('ROOT_URL')}/account`,
-      client_reference_id: userId,
-      line_items: [
-        {
-          price: priceId,
-          quantity: 1
-        }
-      ],
-      mode: 'payment',
-      payment_method_types: ['card'],
-      success_url: `${this.configurationService.get(
-        'ROOT_URL'
-      )}/api/subscription/stripe/callback?checkoutSessionId={CHECKOUT_SESSION_ID}`
-    };
-
-    if (couponId) {
-      checkoutSessionCreateParams.discounts = [
-        {
-          coupon: couponId
-        }
-      ];
-    }
-
-    const session = await this.stripe.checkout.sessions.create(
-      checkoutSessionCreateParams
-    );
-
-    return {
-      sessionId: session.id
-    };
-  }
-
-  public async createSubscription(aCheckoutSessionId: string) {
-    try {
-      const session = await this.stripe.checkout.sessions.retrieve(
-        aCheckoutSessionId
-      );
-
-      await this.prismaService.subscription.create({
-        data: {
-          expiresAt: addDays(new Date(), 365),
-          User: {
-            connect: {
-              id: session.client_reference_id
-            }
-          }
-        }
-      });
-
-      await this.stripe.customers.update(session.customer as string, {
-        description: session.client_reference_id
-      });
-    } catch (error) {
-      console.error(error);
-    }
-  }
-
-  public getSubscription(aSubscriptions: Subscription[]) {
-    if (aSubscriptions.length > 0) {
-      const latestSubscription = aSubscriptions.reduce((a, b) => {
-        return new Date(a.expiresAt) > new Date(b.expiresAt) ? a : b;
-      });
-
-      return {
-        expiresAt: latestSubscription.expiresAt,
-        type: isBefore(new Date(), latestSubscription.expiresAt)
-          ? SubscriptionType.Premium
-          : SubscriptionType.Basic
-      };
-    } else {
-      return {
-        type: SubscriptionType.Basic
-      };
-    }
-  }
-}

apps/api/src/app/symbol/interfaces/lookup-item.interface.ts

@@ -1,8 +1,4 @@
-import { Currency, DataSource } from '@prisma/client';
-
 export interface LookupItem {
-  currency: Currency;
-  dataSource: DataSource;
   name: string;
   symbol: string;
 }

apps/api/src/app/symbol/interfaces/symbol-item.interface.ts

@@ -1,7 +1,6 @@
-import { Currency, DataSource } from '@prisma/client';
+import { Currency } from '@prisma/client';
 
 export interface SymbolItem {
   currency: Currency;
-  dataSource: DataSource;
   marketPrice: number;
 }

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

@@ -1,4 +1,4 @@
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import {
   Controller,
   Get,
@@ -11,7 +11,6 @@ import {
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-import { isEmpty } from 'lodash';
 
 import { LookupItem } from './interfaces/lookup-item.interface';
 import { SymbolItem } from './interfaces/symbol-item.interface';
@@ -29,12 +28,9 @@ export class SymbolController {
    */
   @Get('lookup')
   @UseGuards(AuthGuard('jwt'))
-  public async lookupSymbol(
-    @Query() { query = '' }
-  ): Promise<{ items: LookupItem[] }> {
+  public async lookupSymbol(@Query() { query }): Promise<LookupItem[]> {
     try {
-      const encodedQuery = encodeURIComponent(query.toLowerCase());
-      return this.symbolService.lookup(encodedQuery);
+      return this.symbolService.lookup(query);
     } catch {
       throw new HttpException(
         getReasonPhrase(StatusCodes.INTERNAL_SERVER_ERROR),
@@ -49,15 +45,6 @@ export class SymbolController {
   @Get(':symbol')
   @UseGuards(AuthGuard('jwt'))
   public async getPosition(@Param('symbol') symbol): Promise<SymbolItem> {
-    const result = await this.symbolService.get(symbol);
-
-    if (!result || isEmpty(result)) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.NOT_FOUND),
-        StatusCodes.NOT_FOUND
-      );
-    }
-
-    return result;
+    return this.symbolService.get(symbol);
   }
 }

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

@@ -1,14 +1,27 @@
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 
 import { SymbolController } from './symbol.controller';
 import { SymbolService } from './symbol.service';
 
 @Module({
-  imports: [ConfigurationModule, DataProviderModule, PrismaModule],
+  imports: [],
   controllers: [SymbolController],
-  providers: [SymbolService]
+  providers: [
+    AlphaVantageService,
+    ConfigurationService,
+    DataProviderService,
+    GhostfolioScraperApiService,
+    PrismaService,
+    RakutenRapidApiService,
+    SymbolService,
+    YahooFinanceService
+  ]
 })
 export class SymbolModule {}

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

@@ -1,7 +1,8 @@
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { convertFromYahooSymbol } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
 import { Injectable } from '@nestjs/common';
-import { Currency, DataSource } from '@prisma/client';
+import { Currency } from '@prisma/client';
+import * as bent from 'bent';
 
 import { LookupItem } from './interfaces/lookup-item.interface';
 import { SymbolItem } from './interfaces/symbol-item.interface';
@@ -9,62 +10,55 @@ import { SymbolItem } from './interfaces/symbol-item.interface';
 @Injectable()
 export class SymbolService {
   public constructor(
-    private readonly dataProviderService: DataProviderService,
-    private readonly prismaService: PrismaService
+    private readonly dataProviderService: DataProviderService
   ) {}
 
   public async get(aSymbol: string): Promise<SymbolItem> {
     const response = await this.dataProviderService.get([aSymbol]);
-    const { currency, dataSource, marketPrice } = response[aSymbol] ?? {};
+    const { currency, marketPrice } = response[aSymbol];
 
-    if (currency && dataSource && marketPrice) {
-      return {
-        dataSource,
-        marketPrice,
-        currency: <Currency>(<unknown>currency)
-      };
-    }
-
-    return undefined;
+    return {
+      marketPrice,
+      currency: <Currency>(<unknown>currency)
+    };
   }
 
-  public async lookup(aQuery: string): Promise<{ items: LookupItem[] }> {
-    const results: { items: LookupItem[] } = { items: [] };
-
-    if (!aQuery) {
-      return results;
-    }
+  public async lookup(aQuery: string): Promise<LookupItem[]> {
+    const get = bent(
+      `https://query1.finance.yahoo.com/v1/finance/search?q=${aQuery}&lang=en-US&region=US&quotesCount=8&newsCount=0&enableFuzzyQuery=false&quotesQueryId=tss_match_phrase_query&multiQuoteQueryId=multi_quote_single_token_query&newsQueryId=news_cie_vespa&enableCb=true&enableNavLinks=false&enableEnhancedTrivialQuery=true`,
+      'GET',
+      'json',
+      200
+    );
 
     try {
-      const { items } = await this.dataProviderService.search(aQuery);
-      results.items = items;
+      const { quotes } = await get();
 
-      // Add custom symbols
-      const ghostfolioSymbolProfiles =
-        await this.prismaService.symbolProfile.findMany({
-          select: {
-            currency: true,
-            dataSource: true,
-            name: true,
-            symbol: true
-          },
-          where: {
-            AND: [
-              {
-                dataSource: DataSource.GHOSTFOLIO,
-                name: {
-                  startsWith: aQuery
-                }
-              }
-            ]
+      return quotes
+        .filter(({ isYahooFinance }) => {
+          return isYahooFinance;
+        })
+        .filter(({ quoteType }) => {
+          return (
+            quoteType === 'CRYPTOCURRENCY' ||
+            quoteType === 'EQUITY' ||
+            quoteType === 'ETF'
+          );
+        })
+        .filter(({ quoteType, symbol }) => {
+          if (quoteType === 'CRYPTOCURRENCY') {
+            // Only allow cryptocurrencies in USD
+            return symbol.includes('USD');
           }
+
+          return true;
+        })
+        .map(({ longname, shortname, symbol }) => {
+          return {
+            name: longname || shortname,
+            symbol: convertFromYahooSymbol(symbol)
+          };
         });
-
-      for (const ghostfolioSymbolProfile of ghostfolioSymbolProfiles) {
-        results.items.push(ghostfolioSymbolProfile);
-      }
-
-      return results;
     } catch (error) {
       console.error(error);
 

apps/api/src/app/user/interfaces/user-settings-params.interface.ts

@@ -1,7 +0,0 @@
-import { Currency, ViewMode } from '@prisma/client';
-
-export interface UserSettingsParams {
-  currency?: Currency;
-  userId: string;
-  viewMode?: ViewMode;
-}

apps/api/src/app/user/interfaces/user-settings.interface.ts

@@ -1,3 +0,0 @@
-export interface UserSettings {
-  isRestrictedView?: boolean;
-}

apps/api/src/app/user/interfaces/user.interface.ts

@@ -0,0 +1,21 @@
+import { Account, Currency } from '@prisma/client';
+
+import { Access } from './access.interface';
+
+export interface User {
+  access: Access[];
+  accounts: Account[];
+  alias?: string;
+  id: string;
+  permissions: string[];
+  settings: UserSettings;
+  subscription: {
+    expiresAt: Date;
+    type: 'Trial';
+  };
+}
+
+export interface UserSettings {
+  baseCurrency: Currency;
+  locale: string;
+}

apps/api/src/app/user/update-user-setting.dto.ts

@@ -1,6 +0,0 @@
-import { IsBoolean } from 'class-validator';
-
-export class UpdateUserSettingDto {
-  @IsBoolean()
-  isRestrictedView?: boolean;
-}