Release 1.72.0 (#459)

* Refactor logger

* Fix exception

* Update changelog

.prettierignore

@@ -1 +1,2 @@
 /dist
+/test/import

.storybook/main.js

@@ -0,0 +1,11 @@
+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

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

.vscode/launch.json

@@ -26,7 +26,8 @@
       "skipFiles": [
         "${workspaceFolder}/node_modules/**/*.js",
         "<node_internals>/**/*.js"
-      ]
+      ],
+      "console": "integratedTerminal"
     }
   ]
 }

CHANGELOG.md

@@ -5,6 +5,443 @@ 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.72.0 - 08.11.2021
+
+### Changed
+
+- Cached the statistics section on the about page
+
+## 1.71.0 - 07.11.2021
+
+### Changed
+
+- Changed the logger from `console.log()` to `Logger.log()`
+
+### Fixed
+
+- Fixed an exception in the scraper configuration
+
+## 1.70.0 - 07.11.2021
+
+### Changed
+
+- Improved the validation of `json` files in the import functionality for transactions
+- Moved the scraper configuration to the symbol profile model
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.69.0 - 07.11.2021
+
+### Added
+
+- Added the symbol mapping attribute to the symbol profile model
+
+### Changed
+
+- Improved the registration page
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.68.0 - 01.11.2021
+
+### Changed
+
+- Prettified the generic scraper symbols in the portfolio proportion chart component
+- Extended the statistics section on the about page by the active users count (7d)
+- Extended the statistics section on the about page by the new users count
+
+## 1.67.0 - 31.10.2021
+
+### Added
+
+- Added more details to the public page (currencies, sectors, continents and regions)
+- Added a `Dockerfile` and documentation to build a _Docker_ image
+
+## 1.66.0 - 30.10.2021
+
+### Changed
+
+- Improved the landing page
+- Ordered the granted accesses by type
+
+## 1.65.0 - 25.10.2021
+
+### Added
+
+- Added the user interface for granting and revoking public access to share the portfolio
+
+### Changed
+
+- Moved the data enhancer calls from the data provider (`get()`) to the data gathering service to reduce traffic to 3rd party data providers
+- Changed the profile data gathering from every 12 hours to once every weekend
+
+## 1.64.0 - 21.10.2021
+
+### Added
+
+- Added support for more cryptocurrency symbols like _Avalanche_, _Polygon_, _Shiba Inu_ etc.
+
+### Changed
+
+- Changed the data provider service to handle a dynamic list of services
+
+## 1.63.0 - 19.10.2021
+
+### Added
+
+- Added a public page to share the portfolio
+
+### Changed
+
+- Improved the skeleton loader size of the portfolio proportion chart component
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.62.0 - 17.10.2021
+
+### Added
+
+- Extended the validation message of the import functionality for transactions
+
+## 1.61.0 - 15.10.2021
+
+### Added
+
+- Extended the import functionality for transactions by `csv` files
+- Introduced the primary data source
+
+### Changed
+
+- Restricted the file selector of the import functionality for transactions to `csv` and `json`
+
+## 1.60.0 - 13.10.2021
+
+### Added
+
+- Extended the validation of the import functionality for transactions
+  - Valid data types
+  - Maximum number of orders
+  - No duplicate orders
+  - Data provider service returns data for the `dataSource` / `symbol` pair
+
+### Changed
+
+- Harmonized the page layouts
+
+### Fixed
+
+- Fixed the broken line charts showing value labels
+
+## 1.59.0 - 11.10.2021
+
+### Added
+
+- Added a data enhancer for symbol profile data (countries and sectors) via _Trackinsight_
+
+### Changed
+
+- Changed the values of the global heat map to fixed-point notation
+
+### Fixed
+
+- Fixed the links of cryptocurrency assets in the positions table
+- Fixed various values in the impersonation mode which have not been nullified
+
+## 1.58.1 - 03.10.2021
+
+### Fixed
+
+- Fixed an issue in the symbol conversion for _Yahoo Finance_ (for a cryptocurrency with the same code as a currency)
+
+## 1.58.0 - 02.10.2021
+
+### Changed
+
+- Improved the symbol conversion for _Yahoo Finance_: Support for _Solana USD_ (`SOL1-USD`)
+- Improved the tooltips of the allocations page
+- Upgraded `envalid` from version `7.1.0` to `7.2.1`
+
+## 1.57.0 - 29.09.2021
+
+### Added
+
+- Added a protection for endpoints (subscriptions)
+
+### Changed
+
+- Reformatted the exchange rates table in the admin control panel
+
+## 1.56.0 - 25.09.2021
+
+### Added
+
+- Added a story for the line chart component
+- Added a story for the portfolio proportion chart component
+
+### Changed
+
+- Changed the navigation to always show the portfolio page
+- Migrated the data type of currencies from `enum` to `string` in the database
+- Supported unlimited currencies (instead of `CHF`, `EUR`, `GBP` and `USD`)
+- Respected the accounts' currencies in the exchange rate service
+
+### Fixed
+
+- Hid the actions from the accounts table in the _Presenter View_
+- Hid the actions from the transactions table in the _Presenter View_
+- Fixed the data gathering of the initial project setup (database seeding)
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.55.0 - 20.09.2021
+
+### Changed
+
+- Removed the default value of the data source attribute
+- Upgraded `@storybook` dependencies
+
+### Fixed
+
+- Fixed an issue in the create or edit transaction dialog
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.54.0 - 18.09.2021
+
+### Added
+
+- Added the data source attribute to the symbol profile model
+
+### Changed
+
+- Respected the data source attribute in the data provider service
+- Respected the data source attribute in the symbol data endpoint
+- Improved the search functionality of the data management (multiple data sources)
+
+### Fixed
+
+- Hid the net performance in the _Presenter View_ (portfolio holdings and summary tab on the home page)
+- Hid the sign if the performance is zero in the value component
+
+### Todo
+
+- Apply data migration (`yarn database:migrate`)
+
+## 1.53.0 - 13.09.2021
+
+### Changed
+
+- Optimized the annualized performance calculation
+- Changed the data gathering selection from distinct orders to symbol profiles
+
+## 1.52.0 - 11.09.2021
+
+### Added
+
+- Added the annualized performance to the portfolio summary tab on the home page
+- Added the Ghostfolio Slack channel to the about page
+
+### Changed
+
+- Upgraded `@simplewebauthn/browser` and `@simplewebauthn/server` from version `3.0.0` to `4.1.0`
+
+### Fixed
+
+- Fixed the sign in with fingerprint for some android devices
+
+## 1.51.0 - 11.09.2021
+
+### Changed
+
+- Provided the name in the portfolio position endpoint
+
+## 1.50.0 - 11.09.2021
+
+### Fixed
+
+- Fixed the _Fear & Greed Index_ (market mood)
+- Fixed the overlap of the home button with tabs on iOS (_Add to Home Screen_)
+
+## 1.49.0 - 08.09.2021
+
+### Added
+
+- Added labels to the allocation chart by symbol on desktop
+
+## 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:migrate`)
+
+## 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:migrate`)
+
+## 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
@@ -33,7 +470,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Todo
 
-- Apply data migration (`yarn database:push`)
+- Apply data migration (`yarn database:migrate`)
 
 ## 1.34.0 - 07.08.2021
 

Dockerfile

@@ -0,0 +1,51 @@
+FROM node:14-alpine as builder
+
+# Build application and add additional files
+
+WORKDIR /ghostfolio
+
+# Only add basic files without the application itself to avoid rebuilding
+# layers when files (package.json etc.) have not changed
+COPY ./CHANGELOG.md CHANGELOG.md
+COPY ./LICENSE LICENSE
+COPY ./package.json package.json
+COPY ./yarn.lock yarn.lock
+COPY ./prisma/schema.prisma prisma/schema.prisma
+
+RUN yarn
+
+# See https://github.com/nrwl/nx/issues/6586 for further details
+COPY ./decorate-angular-cli.js decorate-angular-cli.js
+RUN node decorate-angular-cli.js
+
+COPY ./angular.json angular.json
+COPY ./nx.json nx.json
+COPY ./replace.build.js replace.build.js
+COPY ./jest.preset.js jest.preset.js
+COPY ./jest.config.js jest.config.js
+COPY ./tsconfig.base.json tsconfig.base.json
+COPY ./libs libs
+COPY ./apps apps
+
+RUN yarn build:all
+
+# Prepare the dist image with additional node_modules
+WORKDIR /ghostfolio/dist/apps/api
+# package.json was generated by the build process, however the original
+# yarn.lock needs to be used to ensure the same versions
+COPY ./yarn.lock /ghostfolio/dist/apps/api/yarn.lock
+
+RUN yarn
+COPY prisma /ghostfolio/dist/apps/api/prisma
+
+# Overwrite the generated package.json with the original one to ensure having
+# all the scripts
+COPY package.json /ghostfolio/dist/apps/api
+RUN yarn database:generate-typings
+
+# Image to run, copy everything needed from builder
+FROM node:14-alpine
+COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
+WORKDIR /ghostfolio/apps/api
+EXPOSE 3333
+CMD [ "node", "main" ]

README.md

@@ -12,7 +12,7 @@
     <strong>Open Source Wealth Management Software made for Humans</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> | <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://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg"><strong>Slack</strong></a> | <a href="https://twitter.com/ghostfolio_"><strong>Twitter</strong></a>
   </p>
   <p>
     <a href="#contributing">
@@ -34,7 +34,7 @@
 
 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_.
+If you prefer to run Ghostfolio on your own infrastructure, please find further instructions in the section [Run with Docker](#run-with-docker).
 
 ## Why Ghostfolio?
 
@@ -62,7 +62,7 @@ Ghostfolio is for you if you are...
 
 - ✅ Create, update and delete transactions
 - ✅ Multi account management
-- ✅ Portfolio performance (`Today`, `YTD`, `1Y`, `5Y`, `Max`)
+- ✅ Portfolio performance: Time-weighted rate of return (TWR) for `Today`, `YTD`, `1Y`, `5Y`, `Max`
 - ✅ Various charts
 - ✅ Static analysis to identify potential risks in your portfolio
 - ✅ Dark Mode
@@ -81,13 +81,52 @@ The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://
 
 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).
 
-## Getting Started
+## Run with Docker
 
 ### Prerequisites
 
+- [Docker](https://www.docker.com/products/docker-desktop)
+
+### Setup Docker Image
+
+Run the following commands to build and start the Docker image:
+
+```bash
+docker-compose -f docker/docker-compose-build-local.yml build
+docker-compose -f docker/docker-compose-build-local.yml up
+```
+
+### Setup Database
+
+Run the following command to setup the database once Ghostfolio is running:
+
+```bash
+docker-compose -f docker/docker-compose-build-local.yml exec ghostfolio yarn database:setup
+```
+
+### Fetch Historical Data
+
+Open http://localhost:3333 in your browser and accomplish these steps:
+
+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_
+
+### Migrate Database
+
+With the following command you can keep your database schema in sync after a Ghostfolio version update:
+
+```bash
+docker-compose -f docker/docker-compose-build-local.yml exec ghostfolio yarn database:migrate
+```
+
+## Development
+
+### Prerequisites
+
+- [Docker](https://www.docker.com/products/docker-desktop)
 - [Node.js](https://nodejs.org/en/download) (version 14+)
 - [Yarn](https://yarnpkg.com/en/docs/install)
-- [Docker](https://www.docker.com/products/docker-desktop)
 
 ### Setup
 
@@ -95,27 +134,27 @@ The frontend is built with [Angular](https://angular.io) and uses [Angular Mater
 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. Run `yarn database:setup` 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_
 
-## Development
+### Start Server
-
-Please make sure you have completed the instructions from [_Setup_](#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>Debug: Run <code>yarn watch:server</code> and click "Launch Program" in <a href="https://code.visualstudio.com">Visual Studio Code</a></li>
   <li>Serve: Run <code>yarn start:server</code></li>
 </ol>
 
-### Start client
+### Start Client
 
 Run `yarn start:client`
 
+### Start _Storybook_
+
+Run `yarn start:storybook`
+
 ## Testing
 
 Run `yarn test`
@@ -124,7 +163,7 @@ Run `yarn test`
 
 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.
+Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg), tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_) or send an e-mail to hi@ghostfol.io. We would love to hear from you.
 
 ## License
 

angular.json

@@ -6,13 +6,16 @@
   "defaultProject": "api",
   "schematics": {
     "@nrwl/angular:application": {
+      "linter": "eslint",
       "unitTestRunner": "jest",
       "e2eTestRunner": "cypress"
     },
     "@nrwl/angular:library": {
+      "linter": "eslint",
       "unitTestRunner": "jest"
     },
-    "@nrwl/nest": {}
+    "@nrwl/nest": {},
+    "@nrwl/angular:component": {}
   },
   "projects": {
     "api": {
@@ -32,6 +35,7 @@
           },
           "configurations": {
             "production": {
+              "generatePackageJson": true,
               "optimization": true,
               "extractLicenses": true,
               "inspect": false,
@@ -96,12 +100,12 @@
               {
                 "glob": "CHANGELOG.md",
                 "input": "",
-                "output": "./"
+                "output": "./assets"
               },
               {
                 "glob": "LICENSE",
                 "input": "",
-                "output": "./"
+                "output": "./assets"
               },
               {
                 "glob": "robots.txt",
@@ -239,6 +243,90 @@
           }
         }
       }
+    },
+    "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/src/app/access/access.controller.ts

@@ -1,10 +1,29 @@
 import { Access } from '@ghostfolio/common/interfaces';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import {
-import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
+  getPermissions,
+  hasPermission,
+  permissions
+} from '@ghostfolio/common/permissions';
+import type { RequestWithUser } from '@ghostfolio/common/types';
+import {
+  Body,
+  Controller,
+  Delete,
+  Get,
+  HttpException,
+  Inject,
+  Param,
+  Post,
+  UseGuards
+} from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import { Access as AccessModel } from '@prisma/client';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
+import { AccessModule } from './access.module';
 import { AccessService } from './access.service';
+import { CreateAccessDto } from './create-access.dto';
 
 @Controller('access')
 export class AccessController {
@@ -20,13 +39,69 @@ export class AccessController {
       include: {
         GranteeUser: true
       },
+      orderBy: { granteeUserId: 'asc' },
       where: { userId: this.request.user.id }
     });
 
     return accessesWithGranteeUser.map((access) => {
+      if (access.GranteeUser) {
+        return {
+          granteeAlias: access.GranteeUser?.alias,
+          id: access.id,
+          type: 'RESTRICTED_VIEW'
+        };
+      }
+
       return {
-        granteeAlias: access.GranteeUser.alias
+        granteeAlias: 'Public',
+        id: access.id,
+        type: 'PUBLIC'
       };
     });
   }
+
+  @Post()
+  @UseGuards(AuthGuard('jwt'))
+  public async createAccess(
+    @Body() data: CreateAccessDto
+  ): Promise<AccessModel> {
+    if (
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.createAccess
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.accessService.createAccess({
+      User: { connect: { id: this.request.user.id } }
+    });
+  }
+
+  @Delete(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async deleteAccess(@Param('id') id: string): Promise<AccessModule> {
+    if (
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.deleteAccess
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return this.accessService.deleteAccess({
+      id_userId: {
+        id,
+        userId: this.request.user.id
+      }
+    });
+  }
 }

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

@@ -5,8 +5,9 @@ import { AccessController } from './access.controller';
 import { AccessService } from './access.service';
 
 @Module({
-  imports: [],
   controllers: [AccessController],
+  exports: [AccessService],
+  imports: [],
   providers: [AccessService, PrismaService]
 })
 export class AccessModule {}

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

@@ -1,12 +1,23 @@
 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 { Access, Prisma } from '@prisma/client';
 
 @Injectable()
 export class AccessService {
   public constructor(private readonly prismaService: PrismaService) {}
 
+  public async access(
+    accessWhereInput: Prisma.AccessWhereInput
+  ): Promise<AccessWithGranteeUser | null> {
+    return this.prismaService.access.findFirst({
+      include: {
+        GranteeUser: true
+      },
+      where: accessWhereInput
+    });
+  }
+
   public async accesses(params: {
     include?: Prisma.AccessInclude;
     skip?: number;
@@ -26,4 +37,18 @@ export class AccessService {
       where
     });
   }
+
+  public async createAccess(data: Prisma.AccessCreateInput): Promise<Access> {
+    return this.prismaService.access.create({
+      data
+    });
+  }
+
+  public async deleteAccess(
+    where: Prisma.AccessWhereUniqueInput
+  ): Promise<Access> {
+    return this.prismaService.access.delete({
+      where
+    });
+  }
 }

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

@@ -0,0 +1 @@
+export class CreateAccessDto {}

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

@@ -1,3 +1,4 @@
+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 {
@@ -5,7 +6,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
@@ -33,7 +34,8 @@ export class AccountController {
   public constructor(
     private readonly accountService: AccountService,
     private readonly impersonationService: ImpersonationService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly userService: UserService
   ) {}
 
   @Delete(':id')
@@ -84,25 +86,22 @@ export class AccountController {
   public async getAllAccounts(
     @Headers('impersonation-id') impersonationId
   ): Promise<AccountModel[]> {
-    const impersonationUserId = await this.impersonationService.validateImpersonationId(
+    const impersonationUserId =
-      impersonationId,
+      await this.impersonationService.validateImpersonationId(
-      this.request.user.id
+        impersonationId,
+        this.request.user.id
+      );
+
+    let accounts = await this.accountService.getAccounts(
+      impersonationUserId || this.request.user.id
     );
 
-    let accounts = await this.accountService.accounts({
-      include: { Order: true, Platform: true },
-      orderBy: { name: 'asc' },
-      where: { userId: impersonationUserId || this.request.user.id }
-    });
-
     if (
-      impersonationUserId &&
+      impersonationUserId ||
-      !hasPermission(
+      this.userService.isRestrictedView(this.request.user)
-        getPermissions(this.request.user.role),
-        permissions.readForeignPortfolio
-      )
     ) {
       accounts = nullifyValuesInObjects(accounts, [
+        'balance',
         'fee',
         'quantity',
         'unitPrice'

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

@@ -1,32 +1,26 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { UserModule } from '@ghostfolio/api/app/user/user.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { RakutenRapidApiService } from '@ghostfolio/api/services/data-provider/rakuten-rapid-api/rakuten-rapid-api.service';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { YahooFinanceService } from '@ghostfolio/api/services/data-provider/yahoo-finance/yahoo-finance.service';
+import { ImpersonationModule } from '@ghostfolio/api/services/impersonation.module';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 
-import { RedisCacheModule } from '../redis-cache/redis-cache.module';
 import { AccountController } from './account.controller';
 import { AccountService } from './account.service';
 
 @Module({
-  imports: [RedisCacheModule],
+  imports: [
+    ConfigurationModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
+    ImpersonationModule,
+    RedisCacheModule,
+    PrismaModule,
+    UserModule
+  ],
   controllers: [AccountController],
-  providers: [
+  providers: [AccountService]
-    AccountService,
-    AlphaVantageService,
-    ConfigurationService,
-    DataProviderService,
-    ExchangeRateDataService,
-    GhostfolioScraperApiService,
-    ImpersonationService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
 })
 export class AccountModule {}

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

@@ -1,7 +1,7 @@
 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, Prisma } from '@prisma/client';
+import { Account, Order, Platform, Prisma } from '@prisma/client';
 
 import { CashDetails } from './interfaces/cash-details.interface';
 
@@ -41,7 +41,12 @@ export class AccountService {
     cursor?: Prisma.AccountWhereUniqueInput;
     where?: Prisma.AccountWhereInput;
     orderBy?: Prisma.AccountOrderByInput;
-  }): Promise<Account[]> {
+  }): Promise<
+    (Account & {
+      Order?: Order[];
+      Platform?: Platform;
+    })[]
+  > {
     const { include, skip, take, cursor, where, orderBy } = params;
 
     return this.prismaService.account.findMany({
@@ -72,9 +77,25 @@ export class AccountService {
     });
   }
 
+  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
+    aCurrency: string
   ): Promise<CashDetails> {
     let totalCashBalance = 0;
 

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

@@ -1,4 +1,4 @@
-import { AccountType, Currency } from '@prisma/client';
+import { AccountType } from '@prisma/client';
 import { IsNumber, IsString, ValidateIf } from 'class-validator';
 
 export class CreateAccountDto {
@@ -9,7 +9,7 @@ export class CreateAccountDto {
   balance: number;
 
   @IsString()
-  currency: Currency;
+  currency: string;
 
   @IsString()
   name: string;

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

@@ -1,4 +1,4 @@
-import { AccountType, Currency } from '@prisma/client';
+import { AccountType } from '@prisma/client';
 import { IsNumber, IsString, ValidateIf } from 'class-validator';
 
 export class UpdateAccountDto {
@@ -9,7 +9,7 @@ export class UpdateAccountDto {
   balance: number;
 
   @IsString()
-  currency: Currency;
+  currency: string;
 
   @IsString()
   id: string;

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

@@ -5,7 +5,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Controller,
   Get,

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

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

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

@@ -1,67 +1,41 @@
+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 { baseCurrency } from '@ghostfolio/common/config';
 import { AdminData } from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
-import { Currency } from '@prisma/client';
+import { differenceInDays } from 'date-fns';
 
 @Injectable()
 export class AdminService {
   public constructor(
+    private readonly configurationService: ConfigurationService,
     private readonly dataGatheringService: DataGatheringService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService
+    private readonly prismaService: PrismaService,
+    private readonly subscriptionService: SubscriptionService
   ) {}
 
   public async get(): Promise<AdminData> {
     return {
-      exchangeRates: [
+      exchangeRates: this.exchangeRateDataService
-        {
+        .getCurrencies()
-          label1: Currency.EUR,
+        .filter((currency) => {
-          label2: Currency.CHF,
+          return currency !== baseCurrency;
-          value: await this.exchangeRateDataService.toCurrency(
+        })
-            1,
+        .map((currency) => {
-            Currency.EUR,
+          return {
-            Currency.CHF
+            label1: baseCurrency,
-          )
+            label2: currency,
-        },
+            value: this.exchangeRateDataService.toCurrency(
-        {
+              1,
-          label1: Currency.GBP,
+              baseCurrency,
-          label2: Currency.CHF,
+              currency
-          value: await this.exchangeRateDataService.toCurrency(
+            )
-            1,
+          };
-            Currency.GBP,
+        }),
-            Currency.CHF
-          )
-        },
-        {
-          label1: Currency.USD,
-          label2: Currency.CHF,
-          value: await this.exchangeRateDataService.toCurrency(
-            1,
-            Currency.USD,
-            Currency.CHF
-          )
-        },
-        {
-          label1: Currency.USD,
-          label2: Currency.EUR,
-          value: await this.exchangeRateDataService.toCurrency(
-            1,
-            Currency.USD,
-            Currency.EUR
-          )
-        },
-        {
-          label1: Currency.USD,
-          label2: Currency.GBP,
-          value: await this.exchangeRateDataService.toCurrency(
-            1,
-            Currency.USD,
-            Currency.GBP
-          )
-        }
-      ],
       lastDataGathering: await this.getLastDataGathering(),
       transactionCount: await this.prismaService.order.count(),
       userCount: await this.prismaService.user.count(),
@@ -87,8 +61,8 @@ export class AdminService {
     return null;
   }
 
-  private async getUsersWithAnalytics() {
+  private async getUsersWithAnalytics(): Promise<AdminData['users']> {
-    return await this.prismaService.user.findMany({
+    const usersWithAnalytics = await this.prismaService.user.findMany({
       orderBy: {
         Analytics: {
           updatedAt: 'desc'
@@ -106,7 +80,8 @@ export class AdminService {
           }
         },
         createdAt: true,
-        id: true
+        id: true,
+        Subscription: true
       },
       take: 30,
       where: {
@@ -115,5 +90,30 @@ export class AdminService {
         }
       }
     });
+
+    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/app.module.ts

@@ -1,35 +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 { CoreModule } from './core/core.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 { RedisCacheModule } from './redis-cache/redis-cache.module';
 import { SubscriptionModule } from './subscription/subscription.module';
 import { SymbolModule } from './symbol/symbol.module';
 import { UserModule } from './user/user.module';
@@ -43,13 +38,17 @@ import { UserModule } from './user/user.module';
     AuthModule,
     CacheModule,
     ConfigModule.forRoot(),
-    CoreModule,
+    ConfigurationModule,
+    DataGatheringModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
     ExperimentalModule,
     ExportModule,
     ImportModule,
     InfoModule,
     OrderModule,
     PortfolioModule,
+    PrismaModule,
     RedisCacheModule,
     ScheduleModule.forRoot(),
     ServeStaticModule.forRoot({
@@ -71,17 +70,6 @@ import { UserModule } from './user/user.module';
     UserModule
   ],
   controllers: [AppController],
-  providers: [
+  providers: [CronService]
-    AlphaVantageService,
-    ConfigurationService,
-    CronService,
-    DataGatheringService,
-    DataProviderService,
-    ExchangeRateDataService,
-    GhostfolioScraperApiService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
 })
 export class AppModule {}

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

@@ -4,7 +4,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Controller,
   Delete,

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

@@ -62,10 +62,10 @@ export class AuthController {
     }
   }
 
-  @Get('webauthn/generate-attestation-options')
+  @Get('webauthn/generate-registration-options')
   @UseGuards(AuthGuard('jwt'))
-  public async generateAttestationOptions() {
+  public async generateRegistrationOptions() {
-    return this.webAuthService.generateAttestationOptions();
+    return this.webAuthService.generateRegistrationOptions();
   }
 
   @Post('webauthn/verify-attestation')

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

@@ -1,11 +1,12 @@
 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';
@@ -17,7 +18,8 @@ import { JwtStrategy } from './jwt.strategy';
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '180 days' }
-    })
+    }),
+    SubscriptionModule
   ],
   providers: [
     AuthDeviceService,

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/google.strategy.ts

@@ -1,5 +1,5 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { PassportStrategy } from '@nestjs/passport';
 import { Provider } from '@prisma/client';
 import { Strategy } from 'passport-google-oauth20';
@@ -41,9 +41,9 @@ export class GoogleStrategy extends PassportStrategy(Strategy, 'google') {
       };
 
       done(null, user);
-    } catch (err) {
+    } catch (error) {
-      console.error(err);
+      Logger.error(error);
-      done(err, false);
+      done(error, false);
     }
   }
 }

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

@@ -1,11 +1,10 @@
+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(

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

@@ -1,28 +1,29 @@
 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 type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Inject,
   Injectable,
-  InternalServerErrorException
+  InternalServerErrorException,
+  Logger
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { JwtService } from '@nestjs/jwt';
 import {
-  GenerateAssertionOptionsOpts,
+  GenerateAuthenticationOptionsOpts,
-  GenerateAttestationOptionsOpts,
+  GenerateRegistrationOptionsOpts,
-  VerifiedAssertion,
+  VerifiedAuthenticationResponse,
-  VerifiedAttestation,
+  VerifiedRegistrationResponse,
-  VerifyAssertionResponseOpts,
+  VerifyAuthenticationResponseOpts,
-  VerifyAttestationResponseOpts,
+  VerifyRegistrationResponseOpts,
-  generateAssertionOptions,
+  generateAuthenticationOptions,
-  generateAttestationOptions,
+  generateRegistrationOptions,
-  verifyAssertionResponse,
+  verifyAuthenticationResponse,
-  verifyAttestationResponse
+  verifyRegistrationResponse
 } from '@simplewebauthn/server';
 
-import { UserService } from '../user/user.service';
 import {
   AssertionCredentialJSON,
   AttestationCredentialJSON
@@ -46,10 +47,10 @@ export class WebAuthService {
     return this.configurationService.get('ROOT_URL');
   }
 
-  public async generateAttestationOptions() {
+  public async generateRegistrationOptions() {
     const user = this.request.user;
 
-    const opts: GenerateAttestationOptionsOpts = {
+    const opts: GenerateRegistrationOptionsOpts = {
       rpName: 'Ghostfolio',
       rpID: this.rpID,
       userID: user.id,
@@ -63,7 +64,7 @@ export class WebAuthService {
       }
     };
 
-    const options = generateAttestationOptions(opts);
+    const options = generateRegistrationOptions(opts);
 
     await this.userService.updateUser({
       data: {
@@ -84,27 +85,27 @@ export class WebAuthService {
     const user = this.request.user;
     const expectedChallenge = user.authChallenge;
 
-    let verification: VerifiedAttestation;
+    let verification: VerifiedRegistrationResponse;
     try {
-      const opts: VerifyAttestationResponseOpts = {
+      const opts: VerifyRegistrationResponseOpts = {
         credential,
         expectedChallenge,
         expectedOrigin: this.expectedOrigin,
         expectedRPID: this.rpID
       };
-      verification = await verifyAttestationResponse(opts);
+      verification = await verifyRegistrationResponse(opts);
     } catch (error) {
-      console.error(error);
+      Logger.error(error);
       throw new InternalServerErrorException(error.message);
     }
 
-    const { verified, attestationInfo } = verification;
+    const { registrationInfo, verified } = verification;
 
     const devices = await this.deviceService.authDevices({
       where: { userId: user.id }
     });
-    if (verified && attestationInfo) {
+    if (registrationInfo && verified) {
-      const { credentialPublicKey, credentialID, counter } = attestationInfo;
+      const { counter, credentialID, credentialPublicKey } = registrationInfo;
 
       let existingDevice = devices.find(
         (device) => device.credentialId === credentialID
@@ -115,9 +116,9 @@ export class WebAuthService {
          * Add the returned device to the user's list of devices
          */
         existingDevice = await this.deviceService.createAuthDevice({
+          counter,
           credentialPublicKey,
           credentialId: credentialID,
-          counter,
           User: { connect: { id: user.id } }
         });
       }
@@ -138,20 +139,20 @@ export class WebAuthService {
       throw new Error('Device not found');
     }
 
-    const opts: GenerateAssertionOptionsOpts = {
+    const opts: GenerateAuthenticationOptionsOpts = {
-      timeout: 60000,
       allowCredentials: [
         {
           id: device.credentialId,
-          type: 'public-key',
+          transports: ['internal'],
-          transports: ['internal']
+          type: 'public-key'
         }
       ],
-      userVerification: 'preferred',
+      rpID: this.rpID,
-      rpID: this.rpID
+      timeout: 60000,
+      userVerification: 'preferred'
     };
 
-    const options = generateAssertionOptions(opts);
+    const options = generateAuthenticationOptions(opts);
 
     await this.userService.updateUser({
       data: {
@@ -177,29 +178,29 @@ export class WebAuthService {
 
     const user = await this.userService.user({ id: device.userId });
 
-    let verification: VerifiedAssertion;
+    let verification: VerifiedAuthenticationResponse;
     try {
-      const opts: VerifyAssertionResponseOpts = {
+      const opts: VerifyAuthenticationResponseOpts = {
         credential,
-        expectedChallenge: `${user.authChallenge}`,
-        expectedOrigin: this.expectedOrigin,
-        expectedRPID: this.rpID,
         authenticator: {
           credentialID: device.credentialId,
           credentialPublicKey: device.credentialPublicKey,
           counter: device.counter
-        }
+        },
+        expectedChallenge: `${user.authChallenge}`,
+        expectedOrigin: this.expectedOrigin,
+        expectedRPID: this.rpID
       };
-      verification = verifyAssertionResponse(opts);
+      verification = verifyAuthenticationResponse(opts);
     } catch (error) {
-      console.error(error);
+      Logger.error(error);
       throw new InternalServerErrorException({ error: error.message });
     }
 
-    const { verified, assertionInfo } = verification;
+    const { verified, authenticationInfo } = verification;
 
     if (verified) {
-      device.counter = assertionInfo.newCounter;
+      device.counter = authenticationInfo.newCounter;
 
       await this.deviceService.updateAuthDevice({
         data: device,

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

@@ -1,11 +1,10 @@
-import { RequestWithUser } from '@ghostfolio/common/types';
+import { CacheService } from '@ghostfolio/api/app/cache/cache.service';
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import { Controller, Inject, 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(

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

@@ -1,30 +1,30 @@
+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 { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-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 { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
 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],
+  imports: [
+    DataGatheringModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
+    RedisCacheModule,
+    SymbolProfileModule
+  ],
   controllers: [CacheController],
   providers: [
-    AlphaVantageService,
     CacheService,
     ConfigurationService,
     DataGatheringService,
-    DataProviderService,
+    PrismaService
-    GhostfolioScraperApiService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
   ]
 })
 export class CacheModule {}

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

@@ -1,30 +0,0 @@
-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 { Module } from '@nestjs/common';
-
-import { CurrentRateService } from './current-rate.service';
-import { MarketDataService } from './market-data.service';
-
-@Module({
-  imports: [],
-  controllers: [],
-  providers: [
-    AlphaVantageService,
-    ConfigurationService,
-    CurrentRateService,
-    DataProviderService,
-    ExchangeRateDataService,
-    GhostfolioScraperApiService,
-    MarketDataService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
-})
-export class CoreModule {}

apps/api/src/app/core/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/core/interfaces/get-values-params.interface.ts

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

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

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

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

@@ -1,9 +1,9 @@
-import { Currency, Type } from '@prisma/client';
+import { Type } from '@prisma/client';
-import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
+import { IsISO8601, IsNumber, IsString } from 'class-validator';
 
 export class CreateOrderDto {
   @IsString()
-  currency: Currency;
+  currency: string;
 
   @IsISO8601()
   date: string;

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

@@ -1,7 +1,7 @@
 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 type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,

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

@@ -1,34 +1,23 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { GhostfolioScraperApiService } from '@ghostfolio/api/services/data-provider/ghostfolio-scraper-api/ghostfolio-scraper-api.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-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: [RedisCacheModule],
+  imports: [
+    ConfigurationModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
+    RedisCacheModule,
+    PrismaModule
+  ],
   controllers: [ExperimentalController],
-  providers: [
+  providers: [AccountService, ExperimentalService]
-    AccountService,
-    AlphaVantageService,
-    ConfigurationService,
-    DataProviderService,
-    ExchangeRateDataService,
-    ExperimentalService,
-    GhostfolioScraperApiService,
-    PrismaService,
-    RakutenRapidApiService,
-    RulesService,
-    YahooFinanceService
-  ]
 })
 export class ExperimentalModule {}

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

@@ -1,8 +1,7 @@
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/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';
 
 @Injectable()
@@ -11,8 +10,7 @@ export class ExperimentalService {
     private readonly accountService: AccountService,
     private readonly dataProviderService: DataProviderService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService,
+    private readonly prismaService: PrismaService
-    private readonly rulesService: RulesService
   ) {}
 
   public async getBenchmark(aSymbol: string) {

apps/api/src/app/experimental/interfaces/data.interface.ts

@@ -1,6 +1,4 @@
-import { Currency } from '@prisma/client';
-
 export interface Data {
-  currency: Currency;
+  currency: string;
   value: number;
 }

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

@@ -1,5 +1,5 @@
 import { Export } from '@ghostfolio/common/interfaces';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';

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

@@ -1,32 +1,22 @@
-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 { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-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 { ExportController } from './export.controller';
 import { ExportService } from './export.service';
 
 @Module({
-  imports: [RedisCacheModule],
+  imports: [
+    ConfigurationModule,
+    DataGatheringModule,
+    DataProviderModule,
+    PrismaModule,
+    RedisCacheModule
+  ],
   controllers: [ExportController],
-  providers: [
+  providers: [ExportService]
-    AlphaVantageService,
-    CacheService,
-    ConfigurationService,
-    DataGatheringService,
-    DataProviderService,
-    ExportService,
-    GhostfolioScraperApiService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
 })
 export class ExportModule {}

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

@@ -1,7 +1,11 @@
+import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
 import { Order } from '@prisma/client';
-import { IsArray } from 'class-validator';
+import { Type } from 'class-transformer';
+import { IsArray, ValidateNested } from 'class-validator';
 
 export class ImportDataDto {
   @IsArray()
-  orders: Partial<Order>[];
+  @Type(() => CreateOrderDto)
+  @ValidateNested({ each: true })
+  orders: Order[];
 }

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

@@ -1,10 +1,11 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
   HttpException,
   Inject,
+  Logger,
   Post,
   UseGuards
 } from '@nestjs/common';
@@ -39,10 +40,13 @@ export class ImportController {
         userId: this.request.user.id
       });
     } catch (error) {
-      console.error(error);
+      Logger.error(error);
 
       throw new HttpException(
-        getReasonPhrase(StatusCodes.BAD_REQUEST),
+        {
+          error: getReasonPhrase(StatusCodes.BAD_REQUEST),
+          message: [error.message]
+        },
         StatusCodes.BAD_REQUEST
       );
     }

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

@@ -1,34 +1,24 @@
 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 { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-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 { ImportController } from './import.controller';
 import { ImportService } from './import.service';
 
 @Module({
-  imports: [RedisCacheModule],
+  imports: [
+    ConfigurationModule,
+    DataGatheringModule,
+    DataProviderModule,
+    PrismaModule,
+    RedisCacheModule
+  ],
   controllers: [ImportController],
-  providers: [
+  providers: [CacheService, ImportService, OrderService]
-    AlphaVantageService,
-    CacheService,
-    ConfigurationService,
-    DataGatheringService,
-    DataProviderService,
-    GhostfolioScraperApiService,
-    ImportService,
-    OrderService,
-    PrismaService,
-    RakutenRapidApiService,
-    YahooFinanceService
-  ]
 })
 export class ImportModule {}

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

@@ -1,11 +1,17 @@
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { Injectable } from '@nestjs/common';
 import { Order } from '@prisma/client';
-import { parseISO } from 'date-fns';
+import { isSameDay, parseISO } from 'date-fns';
 
 @Injectable()
 export class ImportService {
-  public constructor(private readonly orderService: OrderService) {}
+  private static MAX_ORDERS_TO_IMPORT = 20;
+
+  public constructor(
+    private readonly dataProviderService: DataProviderService,
+    private readonly orderService: OrderService
+  ) {}
 
   public async import({
     orders,
@@ -14,7 +20,10 @@ export class ImportService {
     orders: Partial<Order>[];
     userId: string;
   }): Promise<void> {
+    await this.validateOrders({ orders, userId });
+
     for (const {
+      accountId,
       currency,
       dataSource,
       date,
@@ -25,6 +34,11 @@ export class ImportService {
       unitPrice
     } of orders) {
       await this.orderService.createOrder({
+        Account: {
+          connect: {
+            id_userId: { userId, id: accountId }
+          }
+        },
         currency,
         dataSource,
         fee,
@@ -37,4 +51,53 @@ export class ImportService {
       });
     }
   }
+
+  private async validateOrders({
+    orders,
+    userId
+  }: {
+    orders: Partial<Order>[];
+    userId: string;
+  }) {
+    if (orders?.length > ImportService.MAX_ORDERS_TO_IMPORT) {
+      throw new Error('Too many transactions');
+    }
+
+    const existingOrders = await this.orderService.orders({
+      orderBy: { date: 'desc' },
+      where: { userId }
+    });
+
+    for (const [
+      index,
+      { currency, dataSource, date, fee, quantity, symbol, type, unitPrice }
+    ] of orders.entries()) {
+      const duplicateOrder = existingOrders.find((order) => {
+        return (
+          order.currency === currency &&
+          order.dataSource === dataSource &&
+          isSameDay(order.date, parseISO(<string>(<unknown>date))) &&
+          order.fee === fee &&
+          order.quantity === quantity &&
+          order.symbol === symbol &&
+          order.type === type &&
+          order.unitPrice === unitPrice
+        );
+      });
+
+      if (duplicateOrder) {
+        throw new Error(`orders.${index} is a duplicate transaction`);
+      }
+
+      const result = await this.dataProviderService.get([
+        { dataSource, symbol }
+      ]);
+
+      if (result[symbol] === undefined) {
+        throw new Error(
+          `orders.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
+        );
+      }
+    }
+  }
 }

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

@@ -1,11 +1,11 @@
+import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-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 { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
 import { Module } from '@nestjs/common';
 import { JwtModule } from '@nestjs/jwt';
 
@@ -14,22 +14,22 @@ import { InfoService } from './info.service';
 
 @Module({
   imports: [
+    DataGatheringModule,
+    DataProviderModule,
+    ExchangeRateDataModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '30 days' }
-    })
+    }),
+    RedisCacheModule,
+    SymbolProfileModule
   ],
   controllers: [InfoController],
   providers: [
-    AlphaVantageService,
     ConfigurationService,
     DataGatheringService,
-    DataProviderService,
-    GhostfolioScraperApiService,
     InfoService,
-    PrismaService,
+    PrismaService
-    RakutenRapidApiService,
-    YahooFinanceService
   ]
 })
 export class InfoModule {}

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

@@ -1,24 +1,31 @@
+import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.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/data-provider.service';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { InfoItem } from '@ghostfolio/common/interfaces';
+import { Statistics } from '@ghostfolio/common/interfaces/statistics.interface';
 import { Subscription } from '@ghostfolio/common/interfaces/subscription.interface';
 import { permissions } from '@ghostfolio/common/permissions';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { Currency } from '@prisma/client';
 import * as bent from 'bent';
 import { subDays } from 'date-fns';
 
 @Injectable()
 export class InfoService {
   private static DEMO_USER_ID = '9b112b4d-3b7d-4bad-9bdd-3b0f7b4dac2f';
+  private static CACHE_KEY_STATISTICS = 'STATISTICS';
 
   public constructor(
     private readonly configurationService: ConfigurationService,
+    private readonly dataProviderService: DataProviderService,
+    private readonly exchangeRateDataService: ExchangeRateDataService,
     private readonly dataGatheringService: DataGatheringService,
     private readonly jwtService: JwtService,
-    private readonly prismaService: PrismaService
+    private readonly prismaService: PrismaService,
+    private readonly redisCacheService: RedisCacheService
   ) {}
 
   public async get(): Promise<InfoItem> {
@@ -56,9 +63,10 @@ export class InfoService {
       ...info,
       globalPermissions,
       platforms,
-      currencies: Object.values(Currency),
+      currencies: this.exchangeRateDataService.getCurrencies(),
       demoAuthToken: this.getDemoAuthToken(),
       lastDataGathering: await this.getLastDataGathering(),
+      primaryDataSource: this.dataProviderService.getPrimaryDataSource(),
       statistics: await this.getStatistics(),
       subscriptions: await this.getSubscriptions()
     };
@@ -90,6 +98,27 @@ export class InfoService {
     });
   }
 
+  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) {
+      Logger.error(error);
+
+      return undefined;
+    }
+  }
+
   private async countGitHubStargazers(): Promise<number> {
     try {
       const get = bent(
@@ -105,12 +134,34 @@ export class InfoService {
       const { stargazers_count } = await get();
       return stargazers_count;
     } catch (error) {
-      console.error(error);
+      Logger.error(error);
 
       return undefined;
     }
   }
 
+  private async countNewUsers(aDays: number) {
+    return await this.prismaService.user.count({
+      orderBy: {
+        createdAt: 'desc'
+      },
+      where: {
+        AND: [
+          {
+            NOT: {
+              Analytics: null
+            }
+          },
+          {
+            createdAt: {
+              gt: subDays(new Date(), aDays)
+            }
+          }
+        ]
+      }
+    });
+  }
+
   private getDemoAuthToken() {
     return this.jwtService.sign({
       id: InfoService.DEMO_USER_ID
@@ -129,15 +180,40 @@ export class InfoService {
       return undefined;
     }
 
+    let statistics: Statistics;
+
+    try {
+      statistics = JSON.parse(
+        await this.redisCacheService.get(InfoService.CACHE_KEY_STATISTICS)
+      );
+
+      if (statistics) {
+        return statistics;
+      }
+    } catch {}
+
     const activeUsers1d = await this.countActiveUsers(1);
+    const activeUsers7d = await this.countActiveUsers(7);
     const activeUsers30d = await this.countActiveUsers(30);
+    const newUsers30d = await this.countNewUsers(30);
+    const gitHubContributors = await this.countGitHubContributors();
     const gitHubStargazers = await this.countGitHubStargazers();
 
-    return {
+    statistics = {
       activeUsers1d,
+      activeUsers7d,
       activeUsers30d,
-      gitHubStargazers
+      gitHubContributors,
+      gitHubStargazers,
+      newUsers30d
     };
+
+    await this.redisCacheService.set(
+      InfoService.CACHE_KEY_STATISTICS,
+      JSON.stringify(statistics)
+    );
+
+    return statistics;
   }
 
   private async getSubscriptions(): Promise<Subscription[]> {

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

@@ -1,14 +1,14 @@
-import { Currency, DataSource, Type } from '@prisma/client';
+import { DataSource, Type } from '@prisma/client';
-import { IsISO8601, IsNumber, IsString } from 'class-validator';
+import { IsEnum, IsISO8601, IsNumber, IsString } from 'class-validator';
 
 export class CreateOrderDto {
   @IsString()
   accountId: string;
 
   @IsString()
-  currency: Currency;
+  currency: string;
 
-  @IsString()
+  @IsEnum(DataSource, { each: true })
   dataSource: DataSource;
 
   @IsISO8601()
@@ -23,7 +23,7 @@ export class CreateOrderDto {
   @IsString()
   symbol: string;
 
-  @IsString()
+  @IsEnum(Type, { each: true })
   type: Type;
 
   @IsNumber()

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

@@ -1,3 +1,4 @@
+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 {
@@ -5,7 +6,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
@@ -34,7 +35,8 @@ export class OrderController {
   public constructor(
     private readonly impersonationService: ImpersonationService,
     private readonly orderService: OrderService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    @Inject(REQUEST) private readonly request: RequestWithUser,
+    private readonly userService: UserService
   ) {}
 
   @Delete(':id')
@@ -89,11 +91,8 @@ export class OrderController {
     });
 
     if (
-      impersonationUserId &&
+      impersonationUserId ||
-      !hasPermission(
+      this.userService.isRestrictedView(this.request.user)
-        getPermissions(this.request.user.role),
-        permissions.readForeignPortfolio
-      )
     ) {
       orders = nullifyValuesInObjects(orders, ['fee', 'quantity', 'unitPrice']);
     }

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

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

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

@@ -1,3 +1,4 @@
+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';
@@ -5,8 +6,6 @@ import { Injectable } from '@nestjs/common';
 import { DataSource, Order, Prisma } from '@prisma/client';
 import { endOfToday, isAfter } from 'date-fns';
 
-import { CacheService } from '../cache/cache.service';
-
 @Injectable()
 export class OrderService {
   public constructor(
@@ -57,7 +56,9 @@ export class OrderService {
       ]);
     }
 
-    this.dataGatheringService.gatherProfileData([data.symbol]);
+    this.dataGatheringService.gatherProfileData([
+      { dataSource: data.dataSource, symbol: data.symbol }
+    ]);
 
     await this.cacheService.flush();
 

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

@@ -1,12 +1,12 @@
-import { Currency, DataSource, Type } from '@prisma/client';
+import { DataSource, Type } from '@prisma/client';
-import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
+import { IsISO8601, IsNumber, IsString } from 'class-validator';
 
 export class UpdateOrderDto {
   @IsString()
   accountId: string;
 
   @IsString()
-  currency: Currency;
+  currency: string;
 
   @IsString()
   dataSource: DataSource;

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

@@ -1,8 +1,8 @@
-import { CurrentRateService } from '@ghostfolio/api/app/core/current-rate.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { Currency, MarketData } from '@prisma/client';
+import { DataSource, MarketData } from '@prisma/client';
 
+import { CurrentRateService } from './current-rate.service';
 import { MarketDataService } from './market-data.service';
 
 jest.mock('./market-data.service', () => {
@@ -14,6 +14,7 @@ jest.mock('./market-data.service', () => {
             date,
             symbol,
             createdAt: date,
+            dataSource: DataSource.YAHOO,
             id: 'aefcbe3a-ee10-4c4f-9f2d-8ffad7b05584',
             marketPrice: 1847.839966
           });
@@ -30,6 +31,7 @@ jest.mock('./market-data.service', () => {
           return Promise.resolve<MarketData[]>([
             {
               createdAt: dateRangeStart,
+              dataSource: DataSource.YAHOO,
               date: dateRangeStart,
               id: '8fa48fde-f397-4b0d-adbc-fb940e830e6d',
               marketPrice: 1841.823902,
@@ -37,6 +39,7 @@ jest.mock('./market-data.service', () => {
             },
             {
               createdAt: dateRangeEnd,
+              dataSource: DataSource.YAHOO,
               date: dateRangeEnd,
               id: '082d6893-df27-4c91-8a5d-092e84315b56',
               marketPrice: 1847.839966,
@@ -69,15 +72,8 @@ describe('CurrentRateService', () => {
   let marketDataService: MarketDataService;
 
   beforeAll(async () => {
-    dataProviderService = new DataProviderService(
+    dataProviderService = new DataProviderService(null, [], null);
-      null,
+    exchangeRateDataService = new ExchangeRateDataService(null, null);
-      null,
-      null,
-      null,
-      null,
-      null
-    );
-    exchangeRateDataService = new ExchangeRateDataService(null);
     marketDataService = new MarketDataService(null);
 
     await exchangeRateDataService.initialize();
@@ -92,10 +88,10 @@ describe('CurrentRateService', () => {
   it('getValue', async () => {
     expect(
       await currentRateService.getValue({
-        currency: Currency.USD,
+        currency: 'USD',
         date: new Date(Date.UTC(2020, 0, 1, 0, 0, 0)),
         symbol: 'AMZN',
-        userCurrency: Currency.CHF
+        userCurrency: 'CHF'
       })
     ).toMatchObject({
       marketPrice: 1847.839966
@@ -105,13 +101,13 @@ describe('CurrentRateService', () => {
   it('getValues', async () => {
     expect(
       await currentRateService.getValues({
-        currencies: { AMZN: Currency.USD },
+        currencies: { AMZN: 'USD' },
+        dataGatheringItems: [{ dataSource: DataSource.YAHOO, symbol: 'AMZN' }],
         dateQuery: {
           lt: new Date(Date.UTC(2020, 0, 2, 0, 0, 0)),
           gte: new Date(Date.UTC(2020, 0, 1, 0, 0, 0))
         },
-        symbols: ['AMZN'],
+        userCurrency: 'CHF'
-        userCurrency: Currency.CHF
       })
     ).toMatchObject([
       {

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

@@ -1,13 +1,13 @@
-import { GetValueObject } from '@ghostfolio/api/app/core/interfaces/get-value-object.interface';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { GetValueParams } from '@ghostfolio/api/app/core/interfaces/get-value-params.interface';
-import { GetValuesParams } from '@ghostfolio/api/app/core/interfaces/get-values-params.interface';
-import { DataProviderService } from '@ghostfolio/api/services/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()
@@ -25,11 +25,16 @@ export class CurrentRateService {
     userCurrency
   }: GetValueParams): Promise<GetValueObject> {
     if (isToday(date)) {
-      const dataProviderResult = await this.dataProviderService.get([symbol]);
+      const dataProviderResult = await this.dataProviderService.get([
+        {
+          symbol,
+          dataSource: this.dataProviderService.getPrimaryDataSource()
+        }
+      ]);
       return {
+        symbol,
         date: resetHours(date),
-        marketPrice: dataProviderResult?.[symbol]?.marketPrice ?? 0,
+        marketPrice: dataProviderResult?.[symbol]?.marketPrice ?? 0
-        symbol: symbol
       };
     }
 
@@ -55,8 +60,8 @@ export class CurrentRateService {
 
   public async getValues({
     currencies,
+    dataGatheringItems,
     dateQuery,
-    symbols,
     userCurrency
   }: GetValuesParams): Promise<GetValueObject[]> {
     const includeToday =
@@ -75,24 +80,31 @@ export class CurrentRateService {
     if (includeToday) {
       const today = resetHours(new Date());
       promises.push(
-        this.dataProviderService.get(symbols).then((dataResultProvider) => {
+        this.dataProviderService
-          const result = [];
+          .get(dataGatheringItems)
-          for (const symbol of symbols) {
+          .then((dataResultProvider) => {
-            result.push({
+            const result = [];
-              symbol,
+            for (const dataGatheringItem of dataGatheringItems) {
-              date: today,
+              result.push({
-              marketPrice: this.exchangeRateDataService.toCurrency(
+                date: today,
-                dataResultProvider?.[symbol]?.marketPrice ?? 0,
+                marketPrice: this.exchangeRateDataService.toCurrency(
-                dataResultProvider?.[symbol]?.currency,
+                  dataResultProvider?.[dataGatheringItem.symbol]?.marketPrice ??
-                userCurrency
+                    0,
-              )
+                  dataResultProvider?.[dataGatheringItem.symbol]?.currency,
-            });
+                  userCurrency
-          }
+                ),
-          return result;
+                symbol: dataGatheringItem.symbol
-        })
+              });
+            }
+            return result;
+          })
       );
     }
 
+    const symbols = dataGatheringItems.map((dataGatheringItem) => {
+      return dataGatheringItem.symbol;
+    });
+
     promises.push(
       this.marketDataService
         .getRange({

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

@@ -6,6 +6,9 @@ export interface CurrentPositions {
   positions: TimelinePosition[];
   grossPerformance: Big;
   grossPerformancePercentage: Big;
+  netAnnualizedPerformance: Big;
+  netPerformance: Big;
+  netPerformancePercentage: Big;
   currentValue: Big;
   totalInvestment: Big;
 }

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

@@ -0,0 +1,6 @@
+export interface GetValueParams {
+  currency: string;
+  date: Date;
+  symbol: string;
+  userCurrency: string;
+}

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

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

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

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

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,6 +9,9 @@ export interface PortfolioPositionDetail {
   marketPrice: number;
   maxPrice: number;
   minPrice: number;
+  name: string;
+  netPerformance: number;
+  netPerformancePercent: number;
   quantity: number;
   symbol: string;
   transactionCount: number;

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

@@ -4,5 +4,6 @@ export interface TimelinePeriod {
   date: string;
   grossPerformance: Big;
   investment: Big;
+  netPerformance: Big;
   value: Big;
 }

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

@@ -1,8 +1,10 @@
-import { Currency } from '@prisma/client';
+import { DataSource } from '@prisma/client';
 import Big from 'big.js';
 
 export interface TransactionPointSymbol {
-  currency: Currency;
+  currency: string;
+  dataSource: DataSource;
+  fee: Big;
   firstBuyDate: string;
   investment: Big;
   quantity: Big;

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

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

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

@@ -1,23 +1,14 @@
-import { CurrentRateService } from '@ghostfolio/api/app/core/current-rate.service';
-import { CurrentPositions } from '@ghostfolio/api/app/core/interfaces/current-positions.interface';
-import { GetValueObject } from '@ghostfolio/api/app/core/interfaces/get-value-object.interface';
-import { PortfolioOrder } from '@ghostfolio/api/app/core/interfaces/portfolio-order.interface';
-import { TimelinePeriod } from '@ghostfolio/api/app/core/interfaces/timeline-period.interface';
-import {
-  Accuracy,
-  TimelineSpecification
-} from '@ghostfolio/api/app/core/interfaces/timeline-specification.interface';
-import { TransactionPointSymbol } from '@ghostfolio/api/app/core/interfaces/transaction-point-symbol.interface';
-import { TransactionPoint } from '@ghostfolio/api/app/core/interfaces/transaction-point.interface';
 import { OrderType } from '@ghostfolio/api/models/order-type';
+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { DATE_FORMAT, parseDate, resetHours } from '@ghostfolio/common/helper';
 import { TimelinePosition } from '@ghostfolio/common/interfaces';
-import { Currency } from '@prisma/client';
+import { Logger } from '@nestjs/common';
 import Big from 'big.js';
 import {
   addDays,
   addMonths,
   addYears,
+  differenceInDays,
   endOfDay,
   format,
   isAfter,
@@ -25,14 +16,26 @@ import {
   max,
   min
 } from 'date-fns';
-import { flatten } from 'lodash';
+import { flatten, isNumber } 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
+    private currency: string
   ) {}
 
   public computeTransactionPoints(orders: PortfolioOrder[]) {
@@ -57,6 +60,8 @@ export class PortfolioCalculator {
           .plus(oldAccumulatedSymbol.quantity);
         currentTransactionPointItem = {
           currency: order.currency,
+          dataSource: order.dataSource,
+          fee: order.fee.plus(oldAccumulatedSymbol.fee),
           firstBuyDate: oldAccumulatedSymbol.firstBuyDate,
           investment: newQuantity.eq(0)
             ? new Big(0)
@@ -71,6 +76,8 @@ export class PortfolioCalculator {
       } else {
         currentTransactionPointItem = {
           currency: order.currency,
+          dataSource: order.dataSource,
+          fee: order.fee,
           firstBuyDate: order.date,
           investment: unitPrice.mul(order.quantity).mul(factor),
           quantity: order.quantity.mul(factor),
@@ -100,6 +107,23 @@ export class PortfolioCalculator {
     }
   }
 
+  public getAnnualizedPerformancePercent({
+    daysInMarket,
+    netPerformancePercent
+  }: {
+    daysInMarket: number;
+    netPerformancePercent: Big;
+  }): Big {
+    if (isNumber(daysInMarket) && daysInMarket > 0) {
+      const exponent = new Big(365).div(daysInMarket).toNumber();
+      return new Big(
+        Math.pow(netPerformancePercent.plus(1).toNumber(), exponent)
+      ).minus(1);
+    }
+
+    return new Big(0);
+  }
+
   public getTransactionPoints(): TransactionPoint[] {
     return this.transactionPoints;
   }
@@ -111,11 +135,14 @@ export class PortfolioCalculator {
   public async getCurrentPositions(start: Date): Promise<CurrentPositions> {
     if (!this.transactionPoints?.length) {
       return {
+        currentValue: new Big(0),
         hasErrors: false,
-        positions: [],
         grossPerformance: new Big(0),
         grossPerformancePercentage: new Big(0),
-        currentValue: new Big(0),
+        netAnnualizedPerformance: new Big(0),
+        netPerformance: new Big(0),
+        netPerformancePercentage: new Big(0),
+        positions: [],
         totalInvestment: new Big(0)
       };
     }
@@ -129,12 +156,15 @@ export class PortfolioCalculator {
     let firstTransactionPoint: TransactionPoint = null;
     let firstIndex = this.transactionPoints.length;
     const dates = [];
-    const symbols = new Set<string>();
+    const dataGatheringItems: IDataGatheringItem[] = [];
-    const currencies: { [symbol: string]: Currency } = {};
+    const currencies: { [symbol: string]: string } = {};
 
     dates.push(resetHours(start));
     for (const item of this.transactionPoints[firstIndex - 1].items) {
-      symbols.add(item.symbol);
+      dataGatheringItems.push({
+        dataSource: item.dataSource,
+        symbol: item.symbol
+      });
       currencies[item.symbol] = item.currency;
     }
     for (let i = 0; i < this.transactionPoints.length; i++) {
@@ -154,10 +184,10 @@ export class PortfolioCalculator {
 
     const marketSymbols = await this.currentRateService.getValues({
       currencies,
+      dataGatheringItems,
       dateQuery: {
         in: dates
       },
-      symbols: Array.from(symbols),
       userCurrency: this.currency
     });
 
@@ -180,7 +210,9 @@ export class PortfolioCalculator {
     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) {
@@ -189,6 +221,7 @@ export class PortfolioCalculator {
     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++) {
@@ -201,14 +234,10 @@ export class PortfolioCalculator {
 
       const items = this.transactionPoints[i].items;
       for (const item of items) {
-        let oldHoldingPeriodReturn = holdingPeriodReturns[item.symbol];
-        if (!oldHoldingPeriodReturn) {
-          oldHoldingPeriodReturn = new Big(1);
-        }
         if (!marketSymbolMap[nextDate]?.[item.symbol]) {
           invalidSymbols.push(item.symbol);
           hasErrors = true;
-          console.error(
+          Logger.error(
             `Missing value for symbol ${item.symbol} at ${nextDate}`
           );
           continue;
@@ -223,6 +252,13 @@ export class PortfolioCalculator {
         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;
@@ -234,7 +270,7 @@ export class PortfolioCalculator {
           if (!initialValue) {
             invalidSymbols.push(item.symbol);
             hasErrors = true;
-            console.error(
+            Logger.error(
               `Missing value for symbol ${item.symbol} at ${currentDate}`
             );
             continue;
@@ -246,18 +282,26 @@ export class PortfolioCalculator {
           );
 
           const holdingPeriodReturn = endValue.div(initialValue.plus(cashFlow));
-          holdingPeriodReturns[item.symbol] =
+          holdingPeriodReturns[item.symbol] = (
-            oldHoldingPeriodReturn.mul(holdingPeriodReturn);
+            holdingPeriodReturns[item.symbol] ?? new Big(1)
-          let oldGrossPerformance = grossPerformance[item.symbol];
+          ).mul(holdingPeriodReturn);
-          if (!oldGrossPerformance) {
+          grossPerformance[item.symbol] = (
-            oldGrossPerformance = new Big(0);
+            grossPerformance[item.symbol] ?? new Big(0)
-          }
+          ).plus(endValue.minus(investedValue));
-          const currentPerformance = endValue.minus(investedValue);
+
-          grossPerformance[item.symbol] =
+          const netHoldingPeriodReturn = endValue.div(
-            oldGrossPerformance.plus(currentPerformance);
+            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;
       }
     }
 
@@ -271,6 +315,7 @@ export class PortfolioCalculator {
           ? new Big(0)
           : item.investment.div(item.quantity),
         currency: item.currency,
+        dataSource: item.dataSource,
         firstBuyDate: item.firstBuyDate,
         grossPerformance: isValid
           ? grossPerformance[item.symbol] ?? null
@@ -281,15 +326,17 @@ export class PortfolioCalculator {
             : 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.calculateOverallGrossPerformance(
+    const overall = this.calculateOverallPerformance(positions, initialValues);
-      positions,
-      initialValues
-    );
 
     return {
       ...overall,
@@ -377,7 +424,7 @@ export class PortfolioCalculator {
     return flatten(timelinePeriods);
   }
 
-  private calculateOverallGrossPerformance(
+  private calculateOverallPerformance(
     positions: TimelinePosition[],
     initialValues: { [p: string]: Big }
   ) {
@@ -386,7 +433,14 @@ export class PortfolioCalculator {
     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);
+    let netAnnualizedPerformance = new Big(0);
+
+    // use Date.now() to use the mock for today
+    const today = new Date(Date.now());
+
     for (const currentPosition of positions) {
       if (currentPosition.marketPrice) {
         currentValue = currentValue.add(
@@ -400,6 +454,7 @@ export class PortfolioCalculator {
         grossPerformance = grossPerformance.plus(
           currentPosition.grossPerformance
         );
+        netPerformance = netPerformance.plus(currentPosition.netPerformance);
       } else if (!currentPosition.quantity.eq(0)) {
         hasErrors = true;
       }
@@ -413,8 +468,20 @@ export class PortfolioCalculator {
         grossPerformancePercentage = grossPerformancePercentage.plus(
           currentPosition.grossPerformancePercentage.mul(currentInitialValue)
         );
+        netAnnualizedPerformance = netAnnualizedPerformance.plus(
+          this.getAnnualizedPerformancePercent({
+            daysInMarket: differenceInDays(
+              today,
+              parseDate(currentPosition.firstBuyDate)
+            ),
+            netPerformancePercent: currentPosition.netPerformancePercentage
+          }).mul(currentInitialValue)
+        );
+        netPerformancePercentage = netPerformancePercentage.plus(
+          currentPosition.netPerformancePercentage.mul(currentInitialValue)
+        );
       } else if (!currentPosition.quantity.eq(0)) {
-        console.error(
+        Logger.error(
           `Initial value is missing for symbol ${currentPosition.symbol}`
         );
         hasErrors = true;
@@ -424,6 +491,10 @@ export class PortfolioCalculator {
     if (!completeInitialValue.eq(0)) {
       grossPerformancePercentage =
         grossPerformancePercentage.div(completeInitialValue);
+      netPerformancePercentage =
+        netPerformancePercentage.div(completeInitialValue);
+      netAnnualizedPerformance =
+        netAnnualizedPerformance.div(completeInitialValue);
     }
 
     return {
@@ -431,6 +502,9 @@ export class PortfolioCalculator {
       grossPerformance,
       grossPerformancePercentage,
       hasErrors,
+      netAnnualizedPerformance,
+      netPerformance,
+      netPerformancePercentage,
       totalInvestment
     };
   }
@@ -441,34 +515,39 @@ export class PortfolioCalculator {
     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 currencies: { [name: string]: string } = {};
-      const symbols: string[] = [];
+      const dataGatheringItems: IDataGatheringItem[] = [];
 
       for (const item of this.transactionPoints[j].items) {
         currencies[item.symbol] = item.currency;
-        symbols.push(item.symbol);
+        dataGatheringItems.push({
+          dataSource: item.dataSource,
+          symbol: item.symbol
+        });
         investment = investment.add(item.investment);
+        fees = fees.add(item.fee);
       }
 
       let marketSymbols: GetValueObject[] = [];
-      if (symbols.length > 0) {
+      if (dataGatheringItems.length > 0) {
         try {
           marketSymbols = await this.currentRateService.getValues({
+            currencies,
+            dataGatheringItems,
             dateQuery: {
               gte: startDate,
               lt: endOfDay(endDate)
             },
-            symbols,
-            currencies,
             userCurrency: this.currency
           });
         } catch (error) {
-          console.error(
+          Logger.error(
             `Failed to fetch info for date ${startDate} with exception`,
             error
           );
@@ -489,7 +568,7 @@ export class PortfolioCalculator {
       }
     }
 
-    const results = [];
+    const results: TimelinePeriod[] = [];
     for (
       let currentDate = startDate;
       isBefore(currentDate, endDate);
@@ -512,11 +591,13 @@ export class PortfolioCalculator {
         }
       }
       if (!invalid) {
+        const grossPerformance = value.minus(investment);
         const result = {
-          date: currentDateAsString,
+          grossPerformance,
-          grossPerformance: value.minus(investment),
           investment,
-          value
+          value,
+          date: currentDateAsString,
+          netPerformance: grossPerformance.minus(fees)
         };
         results.push(result);
       }

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

@@ -1,22 +1,21 @@
+import { AccessService } from '@ghostfolio/api/app/access/access.service';
+import { UserService } from '@ghostfolio/api/app/user/user.service';
 import {
   hasNotDefinedValuesInObject,
   nullifyValuesInObject
 } from '@ghostfolio/api/helper/object.helper';
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
+import { baseCurrency } from '@ghostfolio/common/config';
 import {
-  PortfolioOverview,
+  PortfolioDetails,
   PortfolioPerformance,
-  PortfolioPosition,
+  PortfolioPublicDetails,
-  PortfolioReport
+  PortfolioReport,
+  PortfolioSummary
 } from '@ghostfolio/common/interfaces';
 import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
-import {
+import type { RequestWithUser } from '@ghostfolio/common/types';
-  getPermissions,
-  hasPermission,
-  permissions
-} from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Controller,
   Get,
@@ -43,27 +42,35 @@ import { PortfolioService } from './portfolio.service';
 @Controller('portfolio')
 export class PortfolioController {
   public constructor(
+    private readonly accessService: AccessService,
+    private readonly configurationService: ConfigurationService,
     private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly impersonationService: ImpersonationService,
+    private readonly portfolioService: PortfolioService,
-    private portfolioService: PortfolioService,
+    @Inject(REQUEST) private readonly request: RequestWithUser,
-    @Inject(REQUEST) private readonly request: RequestWithUser
+    private readonly userService: UserService
   ) {}
 
-  @Get('/investments')
+  @Get('investments')
   @UseGuards(AuthGuard('jwt'))
   public async findAll(
-    @Headers('impersonation-id') impersonationId
+    @Headers('impersonation-id') impersonationId,
+    @Res() res: Response
   ): Promise<InvestmentItem[]> {
+    if (
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+      this.request.user.subscription.type === 'Basic'
+    ) {
+      res.status(StatusCodes.FORBIDDEN);
+      return <any>res.json([]);
+    }
+
     let investments = await this.portfolioService.getInvestments(
       impersonationId
     );
 
     if (
-      impersonationId &&
+      impersonationId ||
-      !hasPermission(
+      this.userService.isRestrictedView(this.request.user)
-        getPermissions(this.request.user.role),
-        permissions.readForeignPortfolio
-      )
     ) {
       const maxInvestment = investments.reduce(
         (investment, item) => Math.max(investment, item.investment),
@@ -76,7 +83,7 @@ export class PortfolioController {
       }));
     }
 
-    return investments;
+    return <any>res.json(investments);
   }
 
   @Get('chart')
@@ -104,11 +111,8 @@ export class PortfolioController {
     }
 
     if (
-      impersonationId &&
+      impersonationId ||
-      !hasPermission(
+      this.userService.isRestrictedView(this.request.user)
-        getPermissions(this.request.user.role),
-        permissions.readForeignPortfolio
-      )
     ) {
       let maxValue = 0;
 
@@ -135,44 +139,37 @@ export class PortfolioController {
     @Headers('impersonation-id') impersonationId,
     @Query('range') range,
     @Res() res: Response
-  ): Promise<{ [symbol: string]: PortfolioPosition }> {
+  ): Promise<PortfolioDetails> {
-    let details: { [symbol: string]: PortfolioPosition } = {};
+    if (
-
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-    const impersonationUserId =
+      this.request.user.subscription.type === 'Basic'
-      await this.impersonationService.validateImpersonationId(
+    ) {
-        impersonationId,
+      res.status(StatusCodes.FORBIDDEN);
-        this.request.user.id
+      return <any>res.json({ accounts: {}, holdings: {} });
-      );
-
-    try {
-      details = await this.portfolioService.getDetails(
-        impersonationUserId,
-        range
-      );
-    } catch (error) {
-      console.error(error);
-
-      res.status(StatusCodes.ACCEPTED);
     }
 
-    if (hasNotDefinedValuesInObject(details)) {
+    const { accounts, holdings, hasErrors } =
+      await this.portfolioService.getDetails(
+        impersonationId,
+        this.request.user.id,
+        range
+      );
+
+    if (hasErrors || hasNotDefinedValuesInObject(holdings)) {
       res.status(StatusCodes.ACCEPTED);
     }
 
     if (
-      impersonationId &&
+      impersonationId ||
-      !hasPermission(
+      this.userService.isRestrictedView(this.request.user)
-        getPermissions(this.request.user.role),
-        permissions.readForeignPortfolio
-      )
     ) {
-      const totalInvestment = Object.values(details)
+      const totalInvestment = Object.values(holdings)
         .map((portfolioPosition) => {
           return portfolioPosition.investment;
         })
         .reduce((a, b) => a + b, 0);
 
-      const totalValue = Object.values(details)
+      const totalValue = Object.values(holdings)
         .map((portfolioPosition) => {
           return this.exchangeRateDataService.toCurrency(
             portfolioPosition.quantity * portfolioPosition.marketPrice,
@@ -182,50 +179,22 @@ export class PortfolioController {
         })
         .reduce((a, b) => a + b, 0);
 
-      for (const [symbol, portfolioPosition] of Object.entries(details)) {
+      for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
         portfolioPosition.grossPerformance = null;
         portfolioPosition.investment =
           portfolioPosition.investment / totalInvestment;
-
+        portfolioPosition.netPerformance = null;
-        for (const [account, { current, original }] of Object.entries(
-          portfolioPosition.accounts
-        )) {
-          portfolioPosition.accounts[account].current = current / totalValue;
-          portfolioPosition.accounts[account].original =
-            original / totalInvestment;
-        }
-
         portfolioPosition.quantity = null;
+        portfolioPosition.value = portfolioPosition.value / totalValue;
+      }
+
+      for (const [name, { current, original }] of Object.entries(accounts)) {
+        accounts[name].current = current / totalValue;
+        accounts[name].original = original / totalInvestment;
       }
     }
 
-    return <any>res.json(details);
+    return <any>res.json({ accounts, holdings });
-  }
-
-  @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, [
-        'cash',
-        'committedFunds',
-        'fees',
-        'totalBuy',
-        'totalSell'
-      ]);
-    }
-
-    return overview;
   }
 
   @Get('performance')
@@ -246,15 +215,11 @@ export class PortfolioController {
 
     let performance = performanceInformation.performance;
     if (
-      impersonationId &&
+      impersonationId ||
-      !hasPermission(
+      this.userService.isRestrictedView(this.request.user)
-        getPermissions(this.request.user.role),
-        permissions.readForeignPortfolio
-      )
     ) {
       performance = nullifyValuesInObject(performance, [
         'currentGrossPerformance',
-        'currentNetPerformance',
         'currentValue'
       ]);
     }
@@ -278,9 +243,109 @@ export class PortfolioController {
       res.status(StatusCodes.ACCEPTED);
     }
 
+    if (
+      impersonationId ||
+      this.userService.isRestrictedView(this.request.user)
+    ) {
+      result.positions = result.positions.map((position) => {
+        return nullifyValuesInObject(position, [
+          'grossPerformance',
+          'investment',
+          'netPerformance',
+          'quantity'
+        ]);
+      });
+    }
+
     return <any>res.json(result);
   }
 
+  @Get('public/:accessId')
+  public async getPublic(
+    @Param('accessId') accessId,
+    @Res() res: Response
+  ): Promise<PortfolioPublicDetails> {
+    const access = await this.accessService.access({ id: accessId });
+    const user = await this.userService.user({
+      id: access.userId
+    });
+
+    if (!access) {
+      res.status(StatusCodes.NOT_FOUND);
+      return <any>res.json({ accounts: {}, holdings: {} });
+    }
+
+    let hasDetails = true;
+    if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
+      hasDetails = user.subscription.type === 'Premium';
+    }
+
+    const { holdings } = await this.portfolioService.getDetails(
+      access.userId,
+      access.userId
+    );
+
+    const portfolioPublicDetails: PortfolioPublicDetails = {
+      hasDetails,
+      holdings: {}
+    };
+
+    const totalValue = Object.values(holdings)
+      .filter((holding) => {
+        return holding.assetClass === 'EQUITY';
+      })
+      .map((portfolioPosition) => {
+        return this.exchangeRateDataService.toCurrency(
+          portfolioPosition.quantity * portfolioPosition.marketPrice,
+          portfolioPosition.currency,
+          this.request.user?.Settings?.currency ?? baseCurrency
+        );
+      })
+      .reduce((a, b) => a + b, 0);
+
+    for (const [symbol, portfolioPosition] of Object.entries(holdings)) {
+      if (portfolioPosition.assetClass === 'EQUITY') {
+        portfolioPublicDetails.holdings[symbol] = {
+          allocationCurrent: portfolioPosition.allocationCurrent,
+          countries: hasDetails ? portfolioPosition.countries : [],
+          currency: portfolioPosition.currency,
+          name: portfolioPosition.name,
+          sectors: hasDetails ? portfolioPosition.sectors : [],
+          value: portfolioPosition.value / totalValue
+        };
+      }
+    }
+
+    return <any>res.json(portfolioPublicDetails);
+  }
+
+  @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',
+        'currentNetPerformance',
+        'currentValue',
+        'fees',
+        'netWorth',
+        'totalBuy',
+        'totalSell'
+      ]);
+    }
+
+    return summary;
+  }
+
   @Get('position/:symbol')
   @UseGuards(AuthGuard('jwt'))
   public async getPosition(
@@ -294,13 +359,15 @@ export class PortfolioController {
 
     if (position) {
       if (
-        impersonationId &&
+        impersonationId ||
-        !hasPermission(
+        this.userService.isRestrictedView(this.request.user)
-          getPermissions(this.request.user.role),
-          permissions.readForeignPortfolio
-        )
       ) {
-        position = nullifyValuesInObject(position, ['grossPerformance']);
+        position = nullifyValuesInObject(position, [
+          'grossPerformance',
+          'investment',
+          'netPerformance',
+          'quantity'
+        ]);
       }
 
       return position;
@@ -315,8 +382,19 @@ export class PortfolioController {
   @Get('report')
   @UseGuards(AuthGuard('jwt'))
   public async getReport(
-    @Headers('impersonation-id') impersonationId
+    @Headers('impersonation-id') impersonationId,
+    @Res() res: Response
   ): Promise<PortfolioReport> {
-    return await this.portfolioService.getReport(impersonationId);
+    if (
+      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
+      this.request.user.subscription.type === 'Basic'
+    ) {
+      res.status(StatusCodes.FORBIDDEN);
+      return <any>res.json({ rules: [] });
+    }
+
+    return <any>(
+      res.json(await this.portfolioService.getReport(impersonationId))
+    );
   }
 }

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

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

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

@@ -1,11 +1,13 @@
+// TODO ///////////
+
 import { AccountService } from '@ghostfolio/api/app/account/account.service';
 import { CashDetails } from '@ghostfolio/api/app/account/interfaces/cash-details.interface';
-import { CurrentRateService } from '@ghostfolio/api/app/core/current-rate.service';
-import { PortfolioOrder } from '@ghostfolio/api/app/core/interfaces/portfolio-order.interface';
-import { TimelineSpecification } from '@ghostfolio/api/app/core/interfaces/timeline-specification.interface';
-import { TransactionPoint } from '@ghostfolio/api/app/core/interfaces/transaction-point.interface';
-import { PortfolioCalculator } from '@ghostfolio/api/app/core/portfolio-calculator';
 import { OrderService } from '@ghostfolio/api/app/order/order.service';
+import { CurrentRateService } from '@ghostfolio/api/app/portfolio/current-rate.service';
+import { PortfolioOrder } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-order.interface';
+import { TimelineSpecification } from '@ghostfolio/api/app/portfolio/interfaces/timeline-specification.interface';
+import { TransactionPoint } from '@ghostfolio/api/app/portfolio/interfaces/transaction-point.interface';
+import { PortfolioCalculator } from '@ghostfolio/api/app/portfolio/portfolio-calculator';
 import { OrderType } from '@ghostfolio/api/models/order-type';
 import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
 import { AccountClusterRiskInitialInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/initial-investment';
@@ -15,37 +17,35 @@ import { CurrencyClusterRiskBaseCurrencyInitialInvestment } from '@ghostfolio/ap
 import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
 import { CurrencyClusterRiskInitialInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/initial-investment';
 import { FeeRatioInitialInvestment } from '@ghostfolio/api/models/rules/fees/fee-ratio-initial-investment';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
 import { MarketState } from '@ghostfolio/api/services/interfaces/interfaces';
 import { EnhancedSymbolProfile } from '@ghostfolio/api/services/interfaces/symbol-profile.interface';
-import { RulesService } from '@ghostfolio/api/services/rules.service';
 import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import { UNKNOWN_KEY, ghostfolioCashSymbol } from '@ghostfolio/common/config';
+import {
+  UNKNOWN_KEY,
+  baseCurrency,
+  ghostfolioCashSymbol
+} from '@ghostfolio/common/config';
 import { DATE_FORMAT, parseDate } from '@ghostfolio/common/helper';
 import {
-  PortfolioOverview,
+  PortfolioDetails,
   PortfolioPerformance,
-  PortfolioPosition,
   PortfolioReport,
+  PortfolioSummary,
   Position,
   TimelinePosition
 } from '@ghostfolio/common/interfaces';
 import { InvestmentItem } from '@ghostfolio/common/interfaces/investment-item.interface';
-import {
+import type {
   DateRange,
   OrderWithAccount,
   RequestWithUser
 } from '@ghostfolio/common/types';
 import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
-import {
+import { AssetClass, DataSource, Type as TypeOfOrder } from '@prisma/client';
-  AssetClass,
-  Currency,
-  DataSource,
-  Type as TypeOfOrder
-} from '@prisma/client';
 import Big from 'big.js';
 import {
   endOfToday,
@@ -65,6 +65,7 @@ import {
   HistoricalDataItem,
   PortfolioPositionDetail
 } from './interfaces/portfolio-position-detail.interface';
+import { RulesService } from './rules.service';
 
 @Injectable()
 export class PortfolioService {
@@ -83,7 +84,7 @@ export class PortfolioService {
   public async getInvestments(
     aImpersonationId: string
   ): Promise<InvestmentItem[]> {
-    const userId = await this.getUserId(aImpersonationId);
+    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
 
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
@@ -111,7 +112,7 @@ export class PortfolioService {
     aImpersonationId: string,
     aDateRange: DateRange = 'max'
   ): Promise<HistoricalDataItem[]> {
-    const userId = await this.getUserId(aImpersonationId);
+    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
 
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
@@ -147,42 +148,18 @@ export class PortfolioService {
       .map((timelineItem) => ({
         date: timelineItem.date,
         marketPrice: timelineItem.value,
-        value: timelineItem.grossPerformance.toNumber()
+        value: timelineItem.netPerformance.toNumber()
       }));
   }
 
-  public async getOverview(
-    aImpersonationId: string
-  ): Promise<PortfolioOverview> {
-    const userId = await this.getUserId(aImpersonationId);
-
-    const currency = this.request.user.Settings.currency;
-    const { balance } = await this.accountService.getCashDetails(
-      userId,
-      currency
-    );
-    const orders = await this.orderService.getOrders({ userId });
-    const fees = this.getFees(orders);
-
-    const totalBuy = this.getTotalByType(orders, currency, TypeOfOrder.BUY);
-    const totalSell = this.getTotalByType(orders, currency, TypeOfOrder.SELL);
-    return {
-      committedFunds: totalBuy - totalSell,
-      fees,
-      cash: balance,
-      ordersCount: orders.length,
-      totalBuy: totalBuy,
-      totalSell: totalSell
-    };
-  }
-
   public async getDetails(
     aImpersonationId: string,
+    aUserId: string,
     aDateRange: DateRange = 'max'
-  ): Promise<{ [symbol: string]: PortfolioPosition }> {
+  ): Promise<PortfolioDetails & { hasErrors: boolean }> {
-    const userId = await this.getUserId(aImpersonationId);
+    const userId = await this.getUserId(aImpersonationId, aUserId);
 
-    const userCurrency = this.request.user.Settings.currency;
+    const userCurrency = this.request.user?.Settings?.currency ?? baseCurrency;
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
       userCurrency
@@ -193,7 +170,7 @@ export class PortfolioService {
     });
 
     if (transactionPoints?.length <= 0) {
-      return {};
+      return { accounts: {}, holdings: {}, hasErrors: false };
     }
 
     portfolioCalculator.setTransactionPoints(transactionPoints);
@@ -204,27 +181,29 @@ export class PortfolioService {
       startDate
     );
 
-    if (currentPositions.hasErrors) {
-      throw new Error('Missing information');
-    }
-
     const cashDetails = await this.accountService.getCashDetails(
       userId,
       userCurrency
     );
 
-    const result: { [symbol: string]: PortfolioPosition } = {};
+    const holdings: PortfolioDetails['holdings'] = {};
     const totalInvestment = currentPositions.totalInvestment.plus(
       cashDetails.balance
     );
     const totalValue = currentPositions.currentValue.plus(cashDetails.balance);
 
+    const dataGatheringItems = currentPositions.positions.map((position) => {
+      return {
+        dataSource: position.dataSource,
+        symbol: position.symbol
+      };
+    });
     const symbols = currentPositions.positions.map(
       (position) => position.symbol
     );
 
     const [dataProviderResponses, symbolProfiles] = await Promise.all([
-      this.dataProviderService.get(symbols),
+      this.dataProviderService.get(dataGatheringItems),
       this.symbolProfileService.getSymbolProfiles(symbols)
     ]);
 
@@ -237,26 +216,33 @@ export class PortfolioService {
     for (const position of currentPositions.positions) {
       portfolioItemsNow[position.symbol] = position;
     }
-    const accounts = this.getAccounts(orders, portfolioItemsNow, userCurrency);
 
     for (const item of currentPositions.positions) {
+      if (item.quantity.lte(0)) {
+        // Ignore positions without any quantity
+        continue;
+      }
+
       const value = item.quantity.mul(item.marketPrice);
       const symbolProfile = symbolProfileMap[item.symbol];
       const dataProviderResponse = dataProviderResponses[item.symbol];
-      result[item.symbol] = {
+      holdings[item.symbol] = {
-        accounts,
         allocationCurrent: value.div(totalValue).toNumber(),
         allocationInvestment: item.investment.div(totalInvestment).toNumber(),
         assetClass: symbolProfile.assetClass,
+        assetSubClass: symbolProfile.assetSubClass,
         countries: symbolProfile.countries,
         currency: item.currency,
         exchange: dataProviderResponse.exchange,
-        grossPerformance: item.grossPerformance.toNumber(),
+        grossPerformance: item.grossPerformance?.toNumber() ?? 0,
-        grossPerformancePercent: item.grossPerformancePercentage.toNumber(),
+        grossPerformancePercent:
+          item.grossPerformancePercentage?.toNumber() ?? 0,
         investment: item.investment.toNumber(),
         marketPrice: item.marketPrice,
         marketState: dataProviderResponse.marketState,
         name: symbolProfile.name,
+        netPerformance: item.netPerformance?.toNumber() ?? 0,
+        netPerformancePercent: item.netPerformancePercentage?.toNumber() ?? 0,
         quantity: item.quantity.toNumber(),
         sectors: symbolProfile.sectors,
         symbol: item.symbol,
@@ -266,20 +252,27 @@ export class PortfolioService {
     }
 
     // TODO: Add a cash position for each currency
-    result[ghostfolioCashSymbol] = await this.getCashPosition({
+    holdings[ghostfolioCashSymbol] = await this.getCashPosition({
       cashDetails,
       investment: totalInvestment,
       value: totalValue
     });
 
-    return result;
+    const accounts = await this.getAccounts(
+      orders,
+      portfolioItemsNow,
+      userCurrency,
+      userId
+    );
+
+    return { accounts, holdings, hasErrors: currentPositions.hasErrors };
   }
 
   public async getPosition(
     aImpersonationId: string,
     aSymbol: string
   ): Promise<PortfolioPositionDetail> {
-    const userId = await this.getUserId(aImpersonationId);
+    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
 
     const orders = (await this.orderService.getOrders({ userId })).filter(
       (order) => order.symbol === aSymbol
@@ -297,6 +290,9 @@ export class PortfolioService {
         marketPrice: undefined,
         maxPrice: undefined,
         minPrice: undefined,
+        name: undefined,
+        netPerformance: undefined,
+        netPerformancePercent: undefined,
         quantity: undefined,
         symbol: aSymbol,
         transactionCount: undefined
@@ -304,10 +300,13 @@ export class PortfolioService {
     }
 
     const positionCurrency = orders[0].currency;
+    const name = orders[0].SymbolProfile?.name ?? '';
 
     const portfolioOrders: PortfolioOrder[] = orders.map((order) => ({
       currency: order.currency,
+      dataSource: order.dataSource,
       date: format(order.date, DATE_FORMAT),
+      fee: new Big(order.fee),
       name: order.SymbolProfile?.name,
       quantity: new Big(order.quantity),
       symbol: order.symbol,
@@ -335,13 +334,14 @@ export class PortfolioService {
       const {
         averagePrice,
         currency,
+        dataSource,
         firstBuyDate,
         marketPrice,
         quantity,
         transactionCount
       } = position;
 
-      // Convert investment and gross performance to currency of user
+      // Convert investment, gross and net performance to currency of user
       const userCurrency = this.request.user.Settings.currency;
       const investment = this.exchangeRateDataService.toCurrency(
         position.investment.toNumber(),
@@ -353,17 +353,31 @@ export class PortfolioService {
         currency,
         userCurrency
       );
+      const netPerformance = this.exchangeRateDataService.toCurrency(
+        position.netPerformance.toNumber(),
+        currency,
+        userCurrency
+      );
 
       const historicalData = await this.dataProviderService.getHistorical(
-        [aSymbol],
+        [{ dataSource, symbol: aSymbol }],
         'day',
         parseISO(firstBuyDate),
         new Date()
       );
 
       const historicalDataArray: HistoricalDataItem[] = [];
-      let maxPrice = marketPrice;
+      let maxPrice = Math.max(orders[0].unitPrice, marketPrice);
-      let minPrice = marketPrice;
+      let minPrice = Math.min(orders[0].unitPrice, marketPrice);
+
+      if (!historicalData?.[aSymbol]?.[firstBuyDate]) {
+        // Add historical entry for buy date, if no historical data available
+        historicalDataArray.push({
+          averagePrice: orders[0].unitPrice,
+          date: firstBuyDate,
+          value: orders[0].unitPrice
+        });
+      }
 
       if (historicalData[aSymbol]) {
         let j = -1;
@@ -405,19 +419,24 @@ export class PortfolioService {
         marketPrice,
         maxPrice,
         minPrice,
+        name,
+        netPerformance,
         transactionCount,
         averagePrice: averagePrice.toNumber(),
         grossPerformancePercent: position.grossPerformancePercentage.toNumber(),
         historicalData: historicalDataArray,
+        netPerformancePercent: position.netPerformancePercentage.toNumber(),
         quantity: quantity.toNumber(),
         symbol: aSymbol
       };
     } else {
-      const currentData = await this.dataProviderService.get([aSymbol]);
+      const currentData = await this.dataProviderService.get([
+        { dataSource: DataSource.YAHOO, symbol: aSymbol }
+      ]);
       const marketPrice = currentData[aSymbol]?.marketPrice;
 
       let historicalData = await this.dataProviderService.getHistorical(
-        [aSymbol],
+        [{ dataSource: DataSource.YAHOO, symbol: aSymbol }],
         'day',
         portfolioStart,
         new Date()
@@ -451,6 +470,7 @@ export class PortfolioService {
         marketPrice,
         maxPrice,
         minPrice,
+        name,
         averagePrice: 0,
         currency: currentData[aSymbol]?.currency,
         firstBuyDate: undefined,
@@ -458,6 +478,8 @@ export class PortfolioService {
         grossPerformancePercent: undefined,
         historicalData: historicalDataArray,
         investment: 0,
+        netPerformance: undefined,
+        netPerformancePercent: undefined,
         quantity: 0,
         symbol: aSymbol,
         transactionCount: undefined
@@ -469,7 +491,7 @@ export class PortfolioService {
     aImpersonationId: string,
     aDateRange: DateRange = 'max'
   ): Promise<{ hasErrors: boolean; positions: Position[] }> {
-    const userId = await this.getUserId(aImpersonationId);
+    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
 
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
@@ -496,10 +518,16 @@ export class PortfolioService {
     const positions = currentPositions.positions.filter(
       (item) => !item.quantity.eq(0)
     );
+    const dataGatheringItem = positions.map((position) => {
+      return {
+        dataSource: position.dataSource,
+        symbol: position.symbol
+      };
+    });
     const symbols = positions.map((position) => position.symbol);
 
     const [dataProviderResponses, symbolProfiles] = await Promise.all([
-      this.dataProviderService.get(symbols),
+      this.dataProviderService.get(dataGatheringItem),
       this.symbolProfileService.getSymbolProfiles(symbols)
     ]);
 
@@ -521,6 +549,9 @@ export class PortfolioService {
           investment: new Big(position.investment).toNumber(),
           marketState: dataProviderResponses[position.symbol].marketState,
           name: symbolProfileMap[position.symbol].name,
+          netPerformance: position.netPerformance?.toNumber() ?? null,
+          netPerformancePercentage:
+            position.netPerformancePercentage?.toNumber() ?? null,
           quantity: new Big(position.quantity).toNumber()
         };
       })
@@ -531,7 +562,7 @@ export class PortfolioService {
     aImpersonationId: string,
     aDateRange: DateRange = 'max'
   ): Promise<{ hasErrors: boolean; performance: PortfolioPerformance }> {
-    const userId = await this.getUserId(aImpersonationId);
+    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
 
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
@@ -544,6 +575,7 @@ export class PortfolioService {
       return {
         hasErrors: false,
         performance: {
+          annualizedPerformancePercent: 0,
           currentGrossPerformance: 0,
           currentGrossPerformancePercent: 0,
           currentNetPerformance: 0,
@@ -562,19 +594,25 @@ export class PortfolioService {
     );
 
     const hasErrors = currentPositions.hasErrors;
+    const annualizedPerformancePercent =
+      currentPositions.netAnnualizedPerformance.toNumber();
     const currentValue = currentPositions.currentValue.toNumber();
     const currentGrossPerformance =
       currentPositions.grossPerformance.toNumber();
     const currentGrossPerformancePercent =
       currentPositions.grossPerformancePercentage.toNumber();
+    const currentNetPerformance = currentPositions.netPerformance.toNumber();
+    const currentNetPerformancePercent =
+      currentPositions.netPerformancePercentage.toNumber();
+
     return {
       hasErrors: currentPositions.hasErrors || hasErrors,
       performance: {
+        annualizedPerformancePercent,
         currentGrossPerformance,
         currentGrossPerformancePercent,
-        // TODO: the next two should include fees
+        currentNetPerformance,
-        currentNetPerformance: currentGrossPerformance,
+        currentNetPerformancePercent,
-        currentNetPerformancePercent: currentGrossPerformancePercent,
         currentValue: currentValue
       }
     };
@@ -597,8 +635,8 @@ export class PortfolioService {
   }
 
   public async getReport(impersonationId: string): Promise<PortfolioReport> {
-    const userId = await this.getUserId(impersonationId);
+    const currency = this.request.user.Settings.currency;
-    const baseCurrency = this.request.user.Settings.currency;
+    const userId = await this.getUserId(impersonationId, this.request.user.id);
 
     const { orders, transactionPoints } = await this.getTransactionPoints({
       userId
@@ -612,7 +650,7 @@ export class PortfolioService {
 
     const portfolioCalculator = new PortfolioCalculator(
       this.currentRateService,
-      this.request.user.Settings.currency
+      currency
     );
     portfolioCalculator.setTransactionPoints(transactionPoints);
 
@@ -625,7 +663,12 @@ export class PortfolioService {
     for (const position of currentPositions.positions) {
       portfolioItemsNow[position.symbol] = position;
     }
-    const accounts = this.getAccounts(orders, portfolioItemsNow, baseCurrency);
+    const accounts = await this.getAccounts(
+      orders,
+      portfolioItemsNow,
+      currency,
+      userId
+    );
     return {
       rules: {
         accountClusterRisk: await this.rulesService.evaluate(
@@ -643,7 +686,7 @@ export class PortfolioService {
               accounts
             )
           ],
-          { baseCurrency }
+          { baseCurrency: currency }
         ),
         currencyClusterRisk: await this.rulesService.evaluate(
           [
@@ -664,7 +707,7 @@ export class PortfolioService {
               currentPositions
             )
           ],
-          { baseCurrency }
+          { baseCurrency: currency }
         ),
         fees: await this.rulesService.evaluate(
           [
@@ -674,12 +717,48 @@ export class PortfolioService {
               this.getFees(orders)
             )
           ],
-          { baseCurrency }
+          { baseCurrency: currency }
         )
       }
     };
   }
 
+  public async getSummary(aImpersonationId: string): Promise<PortfolioSummary> {
+    const currency = this.request.user.Settings.currency;
+    const userId = await this.getUserId(aImpersonationId, this.request.user.id);
+
+    const performanceInformation = await this.getPerformance(aImpersonationId);
+
+    const { balance } = await this.accountService.getCashDetails(
+      userId,
+      currency
+    );
+    const orders = await this.orderService.getOrders({ userId });
+    const fees = this.getFees(orders);
+    const firstOrderDate = orders[0]?.date;
+
+    const totalBuy = this.getTotalByType(orders, currency, TypeOfOrder.BUY);
+    const totalSell = this.getTotalByType(orders, currency, TypeOfOrder.SELL);
+
+    const committedFunds = new Big(totalBuy).sub(totalSell);
+
+    const netWorth = new Big(balance)
+      .plus(performanceInformation.performance.currentValue)
+      .toNumber();
+
+    return {
+      ...performanceInformation.performance,
+      fees,
+      firstOrderDate,
+      netWorth,
+      cash: balance,
+      committedFunds: committedFunds.toNumber(),
+      ordersCount: orders.length,
+      totalBuy: totalBuy,
+      totalSell: totalSell
+    };
+  }
+
   private async getCashPosition({
     cashDetails,
     investment,
@@ -689,29 +768,23 @@ export class PortfolioService {
     investment: Big;
     value: Big;
   }) {
-    const accounts = {};
     const cashValue = new Big(cashDetails.balance);
 
-    cashDetails.accounts.forEach((account) => {
-      accounts[account.name] = {
-        current: account.balance,
-        original: account.balance
-      };
-    });
-
     return {
-      accounts,
       allocationCurrent: cashValue.div(value).toNumber(),
       allocationInvestment: cashValue.div(investment).toNumber(),
       assetClass: AssetClass.CASH,
+      assetSubClass: AssetClass.CASH,
       countries: [],
-      currency: Currency.CHF,
+      currency: 'CHF',
       grossPerformance: 0,
       grossPerformancePercent: 0,
       investment: cashValue.toNumber(),
       marketPrice: 0,
       marketState: MarketState.open,
       name: 'Cash',
+      netPerformance: 0,
+      netPerformancePercent: 0,
       quantity: 0,
       sectors: [],
       symbol: ghostfolioCashSymbol,
@@ -754,10 +827,18 @@ export class PortfolioService {
       return { transactionPoints: [], orders: [] };
     }
 
-    const userCurrency = this.request.user.Settings.currency;
+    const userCurrency = this.request.user?.Settings?.currency ?? baseCurrency;
     const portfolioOrders: PortfolioOrder[] = orders.map((order) => ({
       currency: order.currency,
+      dataSource: order.dataSource,
       date: format(order.date, DATE_FORMAT),
+      fee: new Big(
+        this.exchangeRateDataService.toCurrency(
+          order.fee,
+          order.currency,
+          userCurrency
+        )
+      ),
       name: order.SymbolProfile?.name,
       quantity: new Big(order.quantity),
       symbol: order.symbol,
@@ -782,57 +863,83 @@ export class PortfolioService {
     };
   }
 
-  private getAccounts(
+  private async getAccounts(
     orders: OrderWithAccount[],
     portfolioItemsNow: { [p: string]: TimelinePosition },
-    userCurrency
+    userCurrency: string,
+    userId: string
   ) {
-    const accounts: PortfolioPosition['accounts'] = {};
+    const accounts: PortfolioDetails['accounts'] = {};
-    for (const order of orders) {
-      let currentValueOfSymbol = this.exchangeRateDataService.toCurrency(
-        order.quantity * portfolioItemsNow[order.symbol].marketPrice,
-        order.currency,
-        userCurrency
-      );
-      let originalValueOfSymbol = this.exchangeRateDataService.toCurrency(
-        order.quantity * order.unitPrice,
-        order.currency,
-        userCurrency
-      );
 
-      if (order.type === 'SELL') {
+    const currentAccounts = await this.accountService.getAccounts(userId);
-        currentValueOfSymbol *= -1;
+
-        originalValueOfSymbol *= -1;
+    for (const account of currentAccounts) {
+      const ordersByAccount = orders.filter(({ accountId }) => {
+        return accountId === account.id;
+      });
+
+      if (ordersByAccount.length <= 0) {
+        // Add account without orders
+        const balance = this.exchangeRateDataService.toCurrency(
+          account.balance,
+          account.currency,
+          userCurrency
+        );
+        accounts[account.name] = {
+          current: balance,
+          original: balance
+        };
+
+        continue;
       }
 
-      if (accounts[order.Account?.name || UNKNOWN_KEY]?.current) {
+      for (const order of ordersByAccount) {
-        accounts[order.Account?.name || UNKNOWN_KEY].current +=
+        let currentValueOfSymbol = this.exchangeRateDataService.toCurrency(
-          currentValueOfSymbol;
+          order.quantity * portfolioItemsNow[order.symbol].marketPrice,
-        accounts[order.Account?.name || UNKNOWN_KEY].original +=
+          order.currency,
-          originalValueOfSymbol;
+          userCurrency
-      } else {
+        );
-        accounts[order.Account?.name || UNKNOWN_KEY] = {
+        let originalValueOfSymbol = this.exchangeRateDataService.toCurrency(
-          current: currentValueOfSymbol,
+          order.quantity * order.unitPrice,
-          original: originalValueOfSymbol
+          order.currency,
-        };
+          userCurrency
+        );
+
+        if (order.type === 'SELL') {
+          currentValueOfSymbol *= -1;
+          originalValueOfSymbol *= -1;
+        }
+
+        if (accounts[order.Account?.name || UNKNOWN_KEY]?.current) {
+          accounts[order.Account?.name || UNKNOWN_KEY].current +=
+            currentValueOfSymbol;
+          accounts[order.Account?.name || UNKNOWN_KEY].original +=
+            originalValueOfSymbol;
+        } else {
+          accounts[order.Account?.name || UNKNOWN_KEY] = {
+            current: currentValueOfSymbol,
+            original: originalValueOfSymbol
+          };
+        }
       }
     }
+
     return accounts;
   }
 
-  private async getUserId(aImpersonationId: string) {
+  private async getUserId(aImpersonationId: string, aUserId: string) {
     const impersonationUserId =
       await this.impersonationService.validateImpersonationId(
         aImpersonationId,
-        this.request.user.id
+        aUserId
       );
 
-    return impersonationUserId || this.request.user.id;
+    return impersonationUserId || aUserId;
   }
 
   private getTotalByType(
     orders: OrderWithAccount[],
-    currency: Currency,
+    currency: string,
     type: TypeOfOrder
   ) {
     return orders

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

@@ -1,8 +1,6 @@
 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';
-
-import { Rule } from '../models/rule';
 
 @Injectable()
 export class RulesService {
@@ -10,7 +8,7 @@ export class RulesService {
 
   public async evaluate<T extends RuleSettings>(
     aRules: Rule<T>[],
-    aUserSettings: { baseCurrency: Currency }
+    aUserSettings: { baseCurrency: string }
   ) {
     return aRules
       .filter((rule) => {

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

@@ -21,9 +21,9 @@ export class RedisCacheService {
     await this.cache.reset();
   }
 
-  public async set(key: string, value: string) {
+  public async set(key: string, value: string, ttlInSeconds?: number) {
     await this.cache.set(key, value, {
-      ttl: this.configurationService.get('CACHE_TTL')
+      ttl: ttlInSeconds ?? this.configurationService.get('CACHE_TTL')
     });
   }
 }

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

@@ -1,11 +1,12 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
   Get,
   HttpException,
   Inject,
+  Logger,
   Post,
   Req,
   Res,
@@ -46,7 +47,7 @@ export class SubscriptionController {
         userId: this.request.user.id
       });
     } catch (error) {
-      console.error(error);
+      Logger.error(error);
 
       throw new HttpException(
         getReasonPhrase(StatusCodes.BAD_REQUEST),

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

@@ -8,6 +8,7 @@ import { SubscriptionService } from './subscription.service';
 @Module({
   imports: [],
   controllers: [SubscriptionController],
-  providers: [ConfigurationService, PrismaService, SubscriptionService]
+  providers: [ConfigurationService, PrismaService, SubscriptionService],
+  exports: [SubscriptionService]
 })
 export class SubscriptionModule {}

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

@@ -1,7 +1,9 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Injectable } from '@nestjs/common';
+import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
-import { addDays } from 'date-fns';
+import { Injectable, Logger } from '@nestjs/common';
+import { Subscription } from '@prisma/client';
+import { addDays, isBefore } from 'date-fns';
 import Stripe from 'stripe';
 
 @Injectable()
@@ -83,7 +85,26 @@ export class SubscriptionService {
         description: session.client_reference_id
       });
     } catch (error) {
-      console.error(error);
+      Logger.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,6 +1,7 @@
 import { DataSource } from '@prisma/client';
 
 export interface LookupItem {
+  currency: string;
   dataSource: DataSource;
   name: string;
   symbol: string;

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

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

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

@@ -1,4 +1,4 @@
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Controller,
   Get,
@@ -10,7 +10,9 @@ import {
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
+import { DataSource } from '@prisma/client';
 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';
@@ -45,9 +47,28 @@ export class SymbolController {
   /**
    * Must be after /lookup
    */
-  @Get(':symbol')
+  @Get(':dataSource/:symbol')
   @UseGuards(AuthGuard('jwt'))
-  public async getPosition(@Param('symbol') symbol): Promise<SymbolItem> {
+  public async getSymbolData(
-    return this.symbolService.get(symbol);
+    @Param('dataSource') dataSource: DataSource,
+    @Param('symbol') symbol: string
+  ): Promise<SymbolItem> {
+    if (!DataSource[dataSource]) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.NOT_FOUND),
+        StatusCodes.NOT_FOUND
+      );
+    }
+
+    const result = await this.symbolService.get({ dataSource, symbol });
+
+    if (!result || isEmpty(result)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.NOT_FOUND),
+        StatusCodes.NOT_FOUND
+      );
+    }
+
+    return result;
   }
 }

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

@@ -1,27 +1,14 @@
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider.service';
+import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { AlphaVantageService } from '@ghostfolio/api/services/data-provider/alpha-vantage/alpha-vantage.service';
+import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-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: [],
+  imports: [ConfigurationModule, DataProviderModule, PrismaModule],
   controllers: [SymbolController],
-  providers: [
+  providers: [SymbolService]
-    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.service';
+import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
+import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
-import { Currency, DataSource } from '@prisma/client';
+import { DataSource } from '@prisma/client';
 
 import { LookupItem } from './interfaces/lookup-item.interface';
 import { SymbolItem } from './interfaces/symbol-item.interface';
@@ -13,15 +14,19 @@ export class SymbolService {
     private readonly prismaService: PrismaService
   ) {}
 
-  public async get(aSymbol: string): Promise<SymbolItem> {
+  public async get(dataGatheringItem: IDataGatheringItem): Promise<SymbolItem> {
-    const response = await this.dataProviderService.get([aSymbol]);
+    const response = await this.dataProviderService.get([dataGatheringItem]);
-    const { currency, dataSource, marketPrice } = response[aSymbol];
+    const { currency, marketPrice } = response[dataGatheringItem.symbol] ?? {};
 
-    return {
+    if (dataGatheringItem.dataSource && marketPrice) {
-      dataSource,
+      return {
-      marketPrice,
+        currency,
-      currency: <Currency>(<unknown>currency)
+        marketPrice,
-    };
+        dataSource: dataGatheringItem.dataSource
+      };
+    }
+
+    return undefined;
   }
 
   public async lookup(aQuery: string): Promise<{ items: LookupItem[] }> {
@@ -39,6 +44,7 @@ export class SymbolService {
       const ghostfolioSymbolProfiles =
         await this.prismaService.symbolProfile.findMany({
           select: {
+            currency: true,
             dataSource: true,
             name: true,
             symbol: true
@@ -61,7 +67,7 @@ export class SymbolService {
 
       return results;
     } catch (error) {
-      console.error(error);
+      Logger.error(error);
 
       throw error;
     }

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

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

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

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

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

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

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

@@ -1,9 +1,9 @@
-import { Currency, ViewMode } from '@prisma/client';
+import { ViewMode } from '@prisma/client';
 import { IsString } from 'class-validator';
 
 export class UpdateUserSettingsDto {
   @IsString()
-  baseCurrency: Currency;
+  baseCurrency: string;
 
   @IsString()
   viewMode: ViewMode;

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

@@ -4,7 +4,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/common/permissions';
-import { RequestWithUser } from '@ghostfolio/common/types';
+import type { RequestWithUser } from '@ghostfolio/common/types';
 import {
   Body,
   Controller,
@@ -26,6 +26,8 @@ import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { UserItem } from './interfaces/user-item.interface';
 import { UserSettingsParams } from './interfaces/user-settings-params.interface';
+import { UserSettings } from './interfaces/user-settings.interface';
+import { UpdateUserSettingDto } from './update-user-setting.dto';
 import { UpdateUserSettingsDto } from './update-user-settings.dto';
 import { UserService } from './user.service';
 
@@ -78,6 +80,32 @@ export class UserController {
     };
   }
 
+  @Put('setting')
+  @UseGuards(AuthGuard('jwt'))
+  public async updateUserSetting(@Body() data: UpdateUserSettingDto) {
+    if (
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.updateUserSettings
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const userSettings: UserSettings = {
+      ...(<UserSettings>this.request.user.Settings.settings),
+      ...data
+    };
+
+    return await this.userService.updateUserSetting({
+      userSettings,
+      userId: this.request.user.id
+    });
+  }
+
   @Put('settings')
   @UseGuards(AuthGuard('jwt'))
   public async updateUserSettings(@Body() data: UpdateUserSettingsDto) {

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

@@ -1,3 +1,4 @@
+import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
@@ -11,9 +12,11 @@ import { UserService } from './user.service';
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '30 days' }
-    })
+    }),
+    SubscriptionModule
   ],
   controllers: [UserController],
-  providers: [ConfigurationService, PrismaService, UserService]
+  providers: [ConfigurationService, PrismaService, UserService],
+  exports: [UserService]
 })
 export class UserModule {}

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

@@ -1,24 +1,26 @@
+import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { locale } from '@ghostfolio/common/config';
+import { baseCurrency, locale } from '@ghostfolio/common/config';
 import { User as IUser, UserWithSettings } from '@ghostfolio/common/interfaces';
 import { getPermissions, permissions } from '@ghostfolio/common/permissions';
 import { SubscriptionType } from '@ghostfolio/common/types/subscription.type';
 import { Injectable } from '@nestjs/common';
-import { Currency, Prisma, Provider, User, ViewMode } from '@prisma/client';
+import { Prisma, Provider, User, ViewMode } from '@prisma/client';
-import { isBefore } from 'date-fns';
 
 import { UserSettingsParams } from './interfaces/user-settings-params.interface';
+import { UserSettings } from './interfaces/user-settings.interface';
 
 const crypto = require('crypto');
 
 @Injectable()
 export class UserService {
-  public static DEFAULT_CURRENCY = Currency.USD;
+  public static DEFAULT_CURRENCY = 'USD';
 
   public constructor(
     private readonly configurationService: ConfigurationService,
-    private readonly prismaService: PrismaService
+    private readonly prismaService: PrismaService,
+    private readonly subscriptionService: SubscriptionService
   ) {}
 
   public async getUser({
@@ -50,6 +52,7 @@ export class UserService {
       }),
       accounts: Account,
       settings: {
+        ...(<UserSettings>Settings.settings),
         locale,
         baseCurrency: Settings?.currency ?? UserService.DEFAULT_CURRENCY,
         viewMode: Settings?.viewMode ?? ViewMode.DEFAULT
@@ -57,6 +60,10 @@ export class UserService {
     };
   }
 
+  public isRestrictedView(aUser: UserWithSettings) {
+    return (aUser.Settings.settings as UserSettings)?.isRestrictedView ?? false;
+  }
+
   public async user(
     userWhereUniqueInput: Prisma.UserWhereUniqueInput
   ): Promise<UserWithSettings | null> {
@@ -84,6 +91,7 @@ export class UserService {
       // Set default settings if needed
       userFromDatabase.Settings = {
         currency: UserService.DEFAULT_CURRENCY,
+        settings: null,
         updatedAt: new Date(),
         userId: userFromDatabase?.id,
         viewMode: ViewMode.DEFAULT
@@ -91,24 +99,9 @@ export class UserService {
     }
 
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      if (userFromDatabase?.Subscription?.length > 0) {
+      user.subscription = this.subscriptionService.getSubscription(
-        const latestSubscription = userFromDatabase.Subscription.reduce(
+        userFromDatabase?.Subscription
-          (a, b) => {
+      );
-            return new Date(a.expiresAt) > new Date(b.expiresAt) ? a : b;
-          }
-        );
-
-        user.subscription = {
-          expiresAt: latestSubscription.expiresAt,
-          type: isBefore(new Date(), latestSubscription.expiresAt)
-            ? SubscriptionType.Premium
-            : SubscriptionType.Basic
-        };
-      } else {
-        user.subscription = {
-          type: SubscriptionType.Basic
-        };
-      }
 
       if (user.subscription.type === SubscriptionType.Basic) {
         user.permissions = user.permissions.filter((permission) => {
@@ -151,9 +144,15 @@ export class UserService {
         ...data,
         Account: {
           create: {
+            currency: baseCurrency,
             isDefault: true,
             name: 'Default Account'
           }
+        },
+        Settings: {
+          create: {
+            currency: baseCurrency
+          }
         }
       }
     });
@@ -219,6 +218,35 @@ export class UserService {
     });
   }
 
+  public async updateUserSetting({
+    userId,
+    userSettings
+  }: {
+    userId: string;
+    userSettings: UserSettings;
+  }) {
+    const settings = userSettings as Prisma.JsonObject;
+
+    await this.prismaService.settings.upsert({
+      create: {
+        settings,
+        User: {
+          connect: {
+            id: userId
+          }
+        }
+      },
+      update: {
+        settings
+      },
+      where: {
+        userId: userId
+      }
+    });
+
+    return;
+  }
+
   public async updateUserSettings({
     currency,
     userId,

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

@@ -1,5 +1,3 @@
-import { Currency } from '@prisma/client';
-
 export interface UserSettings {
-  baseCurrency: Currency;
+  baseCurrency: string;
 }

apps/api/src/models/order.ts

@@ -1,4 +1,4 @@
-import { Account, Currency, SymbolProfile } from '@prisma/client';
+import { Account, SymbolProfile } from '@prisma/client';
 import { v4 as uuidv4 } from 'uuid';
 
 import { IOrder } from '../services/interfaces/interfaces';
@@ -6,7 +6,7 @@ import { OrderType } from './order-type';
 
 export class Order {
   private account: Account;
-  private currency: Currency;
+  private currency: string;
   private fee: number;
   private date: string;
   private id: string;

apps/api/src/models/rule.ts

@@ -1,10 +1,9 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
+import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { groupBy } from '@ghostfolio/common/helper';
 import { TimelinePosition } from '@ghostfolio/common/interfaces';
-import { Currency } from '@prisma/client';
 
-import { ExchangeRateDataService } from '../services/exchange-rate-data.service';
 import { EvaluationResult } from './interfaces/evaluation-result.interface';
 import { RuleInterface } from './interfaces/rule.interface';
 
@@ -29,7 +28,7 @@ export abstract class Rule<T extends RuleSettings> implements RuleInterface<T> {
   public groupCurrentPositionsByAttribute(
     positions: TimelinePosition[],
     attribute: keyof TimelinePosition,
-    baseCurrency: Currency
+    baseCurrency: string
   ) {
     return Array.from(groupBy(attribute, positions).entries()).map(
       ([attributeValue, objs]) => ({

apps/api/src/models/rules/account-cluster-risk/current-investment.ts

@@ -1,16 +1,17 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { PortfolioPosition } from '@ghostfolio/common/interfaces';
+import {
+  PortfolioDetails,
+  PortfolioPosition
+} from '@ghostfolio/common/interfaces';
 
 import { Rule } from '../../rule';
 
 export class AccountClusterRiskCurrentInvestment extends Rule<Settings> {
   public constructor(
     protected exchangeRateDataService: ExchangeRateDataService,
-    private accounts: {
+    private accounts: PortfolioDetails['accounts']
-      [account: string]: { current: number; original: number };
-    }
   ) {
     super(exchangeRateDataService, {
       name: 'Current Investment'

apps/api/src/models/rules/account-cluster-risk/initial-investment.ts

@@ -1,6 +1,9 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
-import { PortfolioPosition } from '@ghostfolio/common/interfaces';
+import {
+  PortfolioDetails,
+  PortfolioPosition
+} from '@ghostfolio/common/interfaces';
 import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';
 
 import { Rule } from '../../rule';
@@ -8,9 +11,7 @@ import { Rule } from '../../rule';
 export class AccountClusterRiskInitialInvestment extends Rule<Settings> {
   public constructor(
     protected exchangeRateDataService: ExchangeRateDataService,
-    private accounts: {
+    private accounts: PortfolioDetails['accounts']
-      [account: string]: { current: number; original: number };
-    }
   ) {
     super(exchangeRateDataService, {
       name: 'Initial Investment'

apps/api/src/models/rules/account-cluster-risk/single-account.ts

@@ -1,5 +1,6 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
+import { PortfolioDetails } from '@ghostfolio/common/interfaces';
 import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';
 
 import { Rule } from '../../rule';
@@ -7,9 +8,7 @@ import { Rule } from '../../rule';
 export class AccountClusterRiskSingleAccount extends Rule<RuleSettings> {
   public constructor(
     protected exchangeRateDataService: ExchangeRateDataService,
-    private accounts: {
+    private accounts: PortfolioDetails['accounts']
-      [account: string]: { current: number; original: number };
-    }
   ) {
     super(exchangeRateDataService, {
       name: 'Single Account'

apps/api/src/models/rules/currency-cluster-risk/base-currency-current-investment.ts

@@ -1,9 +1,7 @@
-import { CurrentPositions } from '@ghostfolio/api/app/core/interfaces/current-positions.interface';
+import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { PortfolioPosition } from '@ghostfolio/common/interfaces';
-import { Currency } from '@prisma/client';
 
 import { Rule } from '../../rule';
 
@@ -69,5 +67,5 @@ export class CurrencyClusterRiskBaseCurrencyCurrentInvestment extends Rule<Setti
 }
 
 interface Settings extends RuleSettings {
-  baseCurrency: Currency;
+  baseCurrency: string;
 }

apps/api/src/models/rules/currency-cluster-risk/base-currency-initial-investment.ts

@@ -1,7 +1,6 @@
-import { CurrentPositions } from '@ghostfolio/api/app/core/interfaces/current-positions.interface';
+import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
-import { Currency } from '@prisma/client';
 import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';
 
 import { Rule } from '../../rule';
@@ -69,5 +68,5 @@ export class CurrencyClusterRiskBaseCurrencyInitialInvestment extends Rule<Setti
 }
 
 interface Settings extends RuleSettings {
-  baseCurrency: Currency;
+  baseCurrency: string;
 }

apps/api/src/models/rules/currency-cluster-risk/current-investment.ts

@@ -1,7 +1,6 @@
-import { CurrentPositions } from '@ghostfolio/api/app/core/interfaces/current-positions.interface';
+import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
-import { Currency } from '@prisma/client';
 import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';
 
 import { Rule } from '../../rule';
@@ -69,6 +68,6 @@ export class CurrencyClusterRiskCurrentInvestment extends Rule<Settings> {
 }
 
 interface Settings extends RuleSettings {
-  baseCurrency: Currency;
+  baseCurrency: string;
   threshold: number;
 }

apps/api/src/models/rules/currency-cluster-risk/initial-investment.ts

@@ -1,7 +1,6 @@
-import { CurrentPositions } from '@ghostfolio/api/app/core/interfaces/current-positions.interface';
+import { CurrentPositions } from '@ghostfolio/api/app/portfolio/interfaces/current-positions.interface';
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
-import { Currency } from '@prisma/client';
 import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';
 
 import { Rule } from '../../rule';
@@ -69,6 +68,6 @@ export class CurrencyClusterRiskInitialInvestment extends Rule<Settings> {
 }
 
 interface Settings extends RuleSettings {
-  baseCurrency: Currency;
+  baseCurrency: string;
   threshold: number;
 }

apps/api/src/models/rules/fees/fee-ratio-initial-investment.ts

@@ -1,6 +1,5 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { UserSettings } from '@ghostfolio/api/models/interfaces/user-settings.interface';
-import { Currency } from '@prisma/client';
 import { ExchangeRateDataService } from 'apps/api/src/services/exchange-rate-data.service';
 
 import { Rule } from '../../rule';
@@ -46,6 +45,6 @@ export class FeeRatioInitialInvestment extends Rule<Settings> {
 }
 
 interface Settings extends RuleSettings {
-  baseCurrency: Currency;
+  baseCurrency: string;
   threshold: number;
 }

apps/api/src/services/configuration.module.ts

@@ -0,0 +1,8 @@
+import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
+import { Module } from '@nestjs/common';
+
+@Module({
+  providers: [ConfigurationService],
+  exports: [ConfigurationService]
+})
+export class ConfigurationModule {}