Release 0.93.0

.env

@@ -3,14 +3,14 @@ COMPOSE_PROJECT_NAME=ghostfolio-development
 # CACHE
 REDIS_HOST=localhost
 REDIS_PORT=6379
-REDIS_PASSWORD=<INSERT_REDIS_PASSWORD>
 
 # POSTGRES
-POSTGRES_DB=ghostfolio-db
 POSTGRES_USER=user
-POSTGRES_PASSWORD=<INSERT_POSTGRES_PASSWORD>
+POSTGRES_PASSWORD=password
+POSTGRES_DB=ghostfolio-db
 
-ACCESS_TOKEN_SALT=<INSERT_RANDOM_STRING>
+ACCESS_TOKEN_SALT=GHOSTFOLIO
 ALPHA_VANTAGE_API_KEY=
-DATABASE_URL=postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer
-JWT_SECRET_KEY=<INSERT_RANDOM_STRING>
+DATABASE_URL=postgresql://user:password@localhost:5432/ghostfolio-db?sslmode=prefer
+JWT_SECRET_KEY=123456
+PORT=3333

.eslintrc.json

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

.github/FUNDING.yml

@@ -1 +0,0 @@
-custom: ['https://www.buymeacoffee.com/ghostfolio']

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,45 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: '[BUG]'
-labels: ''
-assignees: ''
----
-
-The Issue tracker is **ONLY** used for reporting bugs. New features should be discussed on our [Slack channel](https://ghostfolio.slack.com) or in [Discussions](https://github.com/ghostfolio/ghostfolio/discussions).
-
-**Bug Description**
-
-<!-- A clear and concise description of what the bug is. -->
-
-**To Reproduce**
-
-<!-- Steps to reproduce the behavior -->
-
-1.
-2.
-3.
-
-**Expected behavior**
-
-<!-- A clear and concise description of what you expected to happen. -->
-
-**Screenshots**
-
-<!-- If applicable, add screenshots to help explain your problem. -->
-
-**Logs**
-
-<!-- If applicable, add logs to help explain your problem. -->
-
-**Environment**
-
-<!-- Please complete the following information -->
-
-- Ghostfolio Version X.Y.Z
-- Browser
-- OS
-
-**Additional context**
-
-<!-- Add any other context about the problem here. -->

.github/workflows/build-code.yml

@@ -1,36 +0,0 @@
-name: Build code
-
-on:
-  pull_request:
-  workflow_dispatch:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node_version:
-          - 18
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Use Node.js ${{ matrix.node_version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node_version }}
-          cache: 'yarn'
-
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile
-
-      - name: Check formatting
-        run: yarn format:check
-
-      - name: Execute tests
-        run: yarn test
-
-      - name: Build application
-        run: yarn build:all

.github/workflows/docker-image.yml

@@ -1,49 +0,0 @@
-name: Docker image CD
-
-on:
-  push:
-    tags:
-      - '*.*.*'
-  pull_request:
-    branches:
-      - 'main'
-
-jobs:
-  build_and_push:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
-
-      - name: Docker metadata
-        id: meta
-        uses: docker/metadata-action@v4
-        with:
-          images: ghostfolio/ghostfolio
-          tags: |
-            type=semver,pattern={{version}}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        id: buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to DockerHub
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-
-      - name: Build and push
-        uses: docker/build-push-action@v3
-        with:
-          context: .
-          platforms: linux/amd64,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.output.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max

.gitignore

@@ -5,7 +5,6 @@
 /tmp
 
 # dependencies
-/.yarn
 /node_modules
 
 # IDEs and editors
@@ -24,18 +23,16 @@
 !.vscode/settings.json
 
 # misc
-/.angular/cache
-.env.prod
 /.sass-cache
 /connect.lock
 /coverage
 /dist
 /libpeerconnection.log
 npm-debug.log
+yarn-error.log
 testem.log
 /typings
-yarn-error.log
 
 # System Files
 .DS_Store
-Thumbs.db
+Thumbs.db

.nvmrc

@@ -1 +0,0 @@
-v16

.prettierignore

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

.prettierrc

@@ -1,13 +1,4 @@
 {
-  "attributeGroups": [
-    "$ANGULAR_ELEMENT_REF",
-    "$ANGULAR_STRUCTURAL_DIRECTIVE",
-    "$DEFAULT",
-    "$ANGULAR_INPUT",
-    "$ANGULAR_TWO_WAY_BINDING",
-    "$ANGULAR_OUTPUT"
-  ],
-  "attributeSort": "ASC",
   "endOfLine": "auto",
   "printWidth": 80,
   "singleQuote": true,

.storybook/main.js

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

.storybook/tsconfig.json

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

.vscode/launch.json

@@ -5,11 +5,11 @@
       "name": "Debug Jest File",
       "type": "node",
       "request": "launch",
-      "program": "${workspaceFolder}/node_modules/@nrwl/cli/bin/nx",
+      "program": "${workspaceFolder}/node_modules/@angular/cli/bin/ng",
       "args": [
         "test",
         "--codeCoverage=false",
-        "--testFile=${workspaceFolder}/apps/api/src/app/portfolio/portfolio-calculator-novn-buy-and-sell.spec.ts"
+        "--testFile=${workspaceFolder}/apps/api/src/models/portfolio.spec.ts"
       ],
       "cwd": "${workspaceFolder}",
       "console": "internalConsole"
@@ -26,8 +26,7 @@
       "skipFiles": [
         "${workspaceFolder}/node_modules/**/*.js",
         "<node_internals>/**/*.js"
-      ],
-      "console": "integratedTerminal"
+      ]
     }
   ]
 }

Dockerfile

@@ -1,61 +0,0 @@
-FROM --platform=$BUILDPLATFORM node:18-slim 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 ./.yarnrc .yarnrc
-COPY ./prisma/schema.prisma prisma/schema.prisma
-
-RUN apt update && apt install -y \
-    git \
-    g++ \
-    make \
-    openssl \
-    python3 \
-    && rm -rf /var/lib/apt/lists/*
-RUN yarn install
-
-# 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 ./nx.json nx.json
-COPY ./replace.build.js replace.build.js
-COPY ./jest.preset.js jest.preset.js
-COPY ./jest.config.ts jest.config.ts
-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:18-slim
-RUN apt update && apt install -y \
-    openssl \
-    && rm -rf /var/lib/apt/lists/*
-
-COPY --from=builder /ghostfolio/dist/apps /ghostfolio/apps
-WORKDIR /ghostfolio/apps/api
-EXPOSE 3333
-CMD [  "yarn", "start:prod" ]

README.md

@@ -1,65 +1,49 @@
 <div align="center">
-
-[<img src="https://avatars.githubusercontent.com/u/82473144?s=200" width="100" alt="Ghostfolio logo">](https://ghostfol.io)
-
-# Ghostfolio
-
-**Open Source Wealth Management Software**
-
-[**Ghostfol.io**](https://ghostfol.io) | [**Live Demo**](https://ghostfol.io/en/demo) | [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) | [**FAQ**](https://ghostfol.io/en/faq) |
-[**Blog**](https://ghostfol.io/en/blog) | [**Slack**](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) | [**Twitter**](https://twitter.com/ghostfolio_)
-
-[![Shield: Buy me a coffee](https://img.shields.io/badge/Buy%20me%20a%20coffee-Support-yellow?logo=buymeacoffee)](https://www.buymeacoffee.com/ghostfolio)
-[![Shield: Contributions Welcome](https://img.shields.io/badge/Contributions-Welcome-orange.svg)](#contributing)
-[![Shield: License: AGPL v3](https://img.shields.io/badge/License-AGPL%20v3-blue.svg)](https://www.gnu.org/licenses/agpl-3.0)
-
+  <h1>Ghostfolio</h1>
+  <p>
+    <strong>Open Source Portfolio Tracker</strong>
+  </p>
+  <p>
+    <a href="https://ghostfol.io"><strong>Live Demo</strong></a>
+  </p>
+  <p>
+    <a href="https://www.gnu.org/licenses/agpl-3.0" rel="nofollow">
+      <img src="https://img.shields.io/badge/License-AGPL%20v3-blue.svg" alt="License: AGPL v3">
+    </a>
+  </p>
 </div>
 
-**Ghostfolio** is an open source wealth management software built with web technology. The application empowers busy people to keep track of stocks, ETFs or cryptocurrencies and make solid, data-driven investment decisions. The software is designed for personal use in continuous operation.
-
-<div align="center">
-
-[<img src="./apps/client/src/assets/images/video-preview.jpg" width="600" alt="Preview image of the Ghostfolio video trailer">](https://www.youtube.com/watch?v=yY6ObSQVJZk)
-
-</div>
-
-## Ghostfolio Premium
-
-Our official **[Ghostfolio Premium](https://ghostfol.io/en/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 further instructions in the [Self-hosting](#self-hosting) section.
+**Ghostfolio** is an open source portfolio tracker. The software empowers busy folks to have a sharp look of their financial assets and to make solid, data-driven investment decisions by evaluating automated static portfolio analysis rules.
 
 ## Why Ghostfolio?
 
 Ghostfolio is for you if you are...
 
 - 💼 trading stocks, ETFs or cryptocurrencies on multiple platforms
+
 - 🏦 pursuing a buy & hold strategy
+
 - 🎯 interested in getting insights of your portfolio composition
+
 - 👻 valuing privacy and data ownership
+
 - 🧘 into minimalism
+
 - 🧺 caring about diversifying your financial resources
+
 - 🆓 interested in financial independence
-- 🙅 saying no to spreadsheets
+
+- 🙅 saying no to spreadsheets in 2021
+
 - 😎 still reading this list
 
 ## Features
 
 - ✅ Create, update and delete transactions
-- ✅ Multi account management
-- ✅ Portfolio performance for `Today`, `YTD`, `1Y`, `5Y`, `Max`
+- ✅ Portfolio performance (`Today`, `YTD`, `1Y`, `5Y`, `Max`)
 - ✅ Various charts
 - ✅ Static analysis to identify potential risks in your portfolio
-- ✅ Import and export transactions
 - ✅ Dark Mode
-- ✅ Zen Mode
-- ✅ Progressive Web App (PWA) with a mobile-first design
-
-<div align="center">
-
-<img src="./apps/client/src/assets/images/screenshot.png" width="300" alt="Image of a phone showing the Ghostfolio app open">
-
-</div>
 
 ## Technology Stack
 
@@ -67,214 +51,52 @@ Ghostfolio is a modern web application written in [TypeScript](https://www.types
 
 ### Backend
 
-The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://www.postgresql.org) as a database together with [Prisma](https://www.prisma.io) and [Redis](https://redis.io) for caching.
+The backend is based on [NestJS](https://nestjs.com) using [PostgreSQL](https://www.postgresql.org) as a database and [Redis](https://redis.io) for caching.
 
 ### Frontend
 
-The frontend is built with [Angular](https://angular.io) and uses [Angular Material](https://material.angular.io) with utility classes from [Bootstrap](https://getbootstrap.com).
+The frontend is built with [Angular](https://angular.io).
 
-## Self-hosting
-
-We provide official container images hosted on [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio) for `linux/amd64` and `linux/arm64`.
-
-<div align="center">
-
-[<img src="./apps/client/src/assets/images/button-buy-me-a-coffee.png" width="150" alt="Buy me a coffee button"/>](https://www.buymeacoffee.com/ghostfolio)
-
-</div>
-
-### Supported Environment Variables
-
-| Name                | Default Value | Description                                                                                                                                                                                                                                      |
-| ------------------- | ------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
-| `ACCESS_TOKEN_SALT` |               | A random string used as salt for access tokens                                                                                                                                                                                                   |
-| `BASE_CURRENCY`     | `USD`         | The base currency of the Ghostfolio application.<br />`AUD` \| `CAD` \| `CNY` \| `EUR` \| `GBP` \| `JPY` \| `RUB` \| `USD`<br />Caution: Only set if you intend to track cryptocurrencies in a non-`USD` currency. This cannot be changed later! |
-| `DATABASE_URL`      |               | The database connection URL, e.g. `postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@localhost:5432/${POSTGRES_DB}?sslmode=prefer`                                                                                                              |
-| `HOST`              | `0.0.0.0`     | The host where the Ghostfolio application will run on                                                                                                                                                                                            |
-| `JWT_SECRET_KEY`    |               | A random string used for _JSON Web Tokens_ (JWT)                                                                                                                                                                                                 |
-| `PORT`              | `3333`        | The port where the Ghostfolio application will run on                                                                                                                                                                                            |
-| `POSTGRES_DB`       |               | The name of the _PostgreSQL_ database                                                                                                                                                                                                            |
-| `POSTGRES_PASSWORD` |               | The password of the _PostgreSQL_ database                                                                                                                                                                                                        |
-| `POSTGRES_USER`     |               | The user of the _PostgreSQL_ database                                                                                                                                                                                                            |
-| `REDIS_HOST`        |               | The host where _Redis_ is running                                                                                                                                                                                                                |
-| `REDIS_PASSWORD`    |               | The password of _Redis_                                                                                                                                                                                                                          |
-| `REDIS_PORT`        |               | The port where _Redis_ is running                                                                                                                                                                                                                |
-
-### Run with Docker Compose
-
-#### Prerequisites
-
-- Basic knowledge of Docker
-- Installation of [Docker](https://www.docker.com/products/docker-desktop)
-- Local copy of this Git repository (clone)
-
-#### a. Run environment
-
-Run the following command to start the Docker images from [Docker Hub](https://hub.docker.com/r/ghostfolio/ghostfolio):
-
-```bash
-docker-compose --env-file ./.env -f docker/docker-compose.yml up -d
-```
-
-#### b. Build and run environment
-
-Run the following commands to build and start the Docker images:
-
-```bash
-docker-compose --env-file ./.env -f docker/docker-compose.build.yml build
-docker-compose --env-file ./.env -f docker/docker-compose.build.yml up -d
-```
-
-#### Fetch Historical Data
-
-Open http://localhost:3333 in your browser and accomplish these steps:
-
-1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
-1. Go to the _Market Data_ tab in the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
-1. Click _Sign out_ and check out the _Live Demo_
-
-#### Upgrade Version
-
-1. Increase the version of the `ghostfolio/ghostfolio` Docker image in `docker/docker-compose.yml`
-1. Run the following command to start the new Docker image: `docker-compose --env-file ./.env -f docker/docker-compose.yml up -d`  
-   At each start, the container will automatically apply the database schema migrations if needed.
-
-### Run with _Unraid_ (Community)
-
-Please follow the instructions of the Ghostfolio [Unraid Community App](https://unraid.net/community/apps?q=ghostfolio).
-
-## Development
+## Getting Started
 
 ### Prerequisites
 
-- [Docker](https://www.docker.com/products/docker-desktop)
-- [Node.js](https://nodejs.org/en/download) (version 16)
+- [Node.js](https://nodejs.org/en/download) (version 14+)
 - [Yarn](https://yarnpkg.com/en/docs/install)
-- A local copy of this Git repository (clone)
+- [Docker](https://www.docker.com/products/docker-desktop)
 
 ### Setup
 
 1. Run `yarn install`
-1. Run `yarn build:dev` to build the source code including the assets
-1. Run `docker-compose --env-file ./.env -f docker/docker-compose.dev.yml up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
-1. Run `yarn database:setup` to initialize the database schema and populate your database with (example) data
-1. Start the server and the client (see [_Development_](#Development))
-1. Create a new user via _Get Started_ (this first user will get the role `ADMIN`)
-1. Go to the _Market Data_ tab in the _Admin Control Panel_ and click _Gather All Data_ to fetch historical data
-1. Click _Sign out_ and check out the _Live Demo_
+2. Run `cd docker`
+3. Run `docker compose build`
+4. Run `docker compose up -d` to start [PostgreSQL](https://www.postgresql.org) and [Redis](https://redis.io)
+5. Run `cd -` to go back to the project root directory
+6. Run `yarn setup:database` to initialize the database schema and populate your database with (example) data
+7. Start server and client (see _Development_)
+8. Login as _Admin_ with the following _Security Token_: `ae76872ae8f3419c6d6f64bf51888ecbcc703927a342d815fafe486acdb938da07d0cf44fca211a0be74a423238f535362d390a41e81e633a9ce668a6e31cdf9`
+9. Go to the _Admin Control Panel_ and press _Gather All Data_ to fetch historical data
+10. Press _Sign out_ and check out the _Live Demo_
 
-### Start Server
+## Development
 
-#### Debug
+Please make sure you have completed the instructions from _Setup_
 
-Run `yarn watch:server` and click _Launch Program_ in [Visual Studio Code](https://code.visualstudio.com)
+### Start server
 
-#### Serve
+- Debug: Run `yarn watch:server` and click "Launch Program" in _Visual Studio Code_
+- Serve: Run `yarn start:server`
 
-Run `yarn start:server`
+### Start client
 
-### Start Client
-
-Run `yarn start:client`
-
-### Start _Storybook_
-
-Run `yarn start:storybook`
-
-### Migrate Database
-
-With the following command you can keep your database schema in sync:
-
-```bash
-yarn database:push
-```
+- Run `yarn start:client`
 
 ## Testing
 
 Run `yarn test`
 
-## Public API
-
-### Authorization: Bearer Token
-
-Set the header for each request as follows:
-
-```
-"Authorization": "Bearer eyJh..."
-```
-
-You can get the _Bearer Token_ via `GET http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>` or `curl -s http://localhost:3333/api/v1/auth/anonymous/<INSERT_SECURITY_TOKEN_OF_ACCOUNT>`.
-
-### Import Activities
-
-#### Request
-
-`POST http://localhost:3333/api/v1/import`
-
-#### Body
-
-```
-{
-  "activities": [
-    {
-      "currency": "USD",
-      "dataSource": "YAHOO",
-      "date": "2021-09-15T00:00:00.000Z",
-      "fee": 19,
-      "quantity": 5,
-      "symbol": "MSFT",
-      "type": "BUY",
-      "unitPrice": 298.58
-    }
-  ]
-}
-```
-
-| Field      | Type                | Description                                        |
-| ---------- | ------------------- | -------------------------------------------------- |
-| accountId  | string (`optional`) | Id of the account                                  |
-| currency   | string              | `CHF` \| `EUR` \| `USD` etc.                       |
-| dataSource | string              | `MANUAL` (for type `ITEM`) \| `YAHOO`              |
-| date       | string              | Date in the format `ISO-8601`                      |
-| fee        | number              | Fee of the activity                                |
-| quantity   | number              | Quantity of the activity                           |
-| symbol     | string              | Symbol of the activity (suitable for `dataSource`) |
-| type       | string              | `BUY` \| `DIVIDEND` \| `ITEM` \| `SELL`            |
-| unitPrice  | number              | Price per unit of the activity                     |
-
-#### Response
-
-##### Success
-
-`201 Created`
-
-##### Error
-
-`400 Bad Request`
-
-```
-{
-  "error": "Bad Request",
-  "message": [
-    "activities.1 is a duplicate activity"
-  ]
-}
-```
-
-## Community Projects
-
-- [ghostfolio-cli](https://github.com/DerAndereJohannes/ghostfolio-cli): Command-line interface to access your portfolio
-
-## Contributing
-
-Ghostfolio is **100% free** and **open source**. We encourage and support an active and healthy community that accepts contributions from the public - including you.
-
-Not sure what to work on? We have got some ideas. Please join the Ghostfolio [Slack channel](https://join.slack.com/t/ghostfolio/shared_invite/zt-vsaan64h-F_I0fEo5M0P88lP9ibCxFg) or tweet to [@ghostfolio\_](https://twitter.com/ghostfolio_). We would love to hear from you.
-
-If you like to support this project, get [**Ghostfolio Premium**](https://ghostfol.io/en/pricing) or [**Buy me a coffee**](https://www.buymeacoffee.com/ghostfolio).
-
 ## License
 
-© 2023 [Ghostfolio](https://ghostfol.io)
+© 2021 [Ghostfolio](https://ghostfol.io)
 
 Licensed under the [AGPLv3 License](https://www.gnu.org/licenses/agpl-3.0.html).

angular.json

@@ -0,0 +1,233 @@
+{
+  "version": 1,
+  "cli": {
+    "defaultCollection": "@nrwl/nest"
+  },
+  "defaultProject": "api",
+  "schematics": {
+    "@nrwl/angular:application": {
+      "unitTestRunner": "jest",
+      "e2eTestRunner": "cypress"
+    },
+    "@nrwl/angular:library": {
+      "unitTestRunner": "jest"
+    },
+    "@nrwl/nest": {}
+  },
+  "projects": {
+    "api": {
+      "root": "apps/api",
+      "sourceRoot": "apps/api/src",
+      "projectType": "application",
+      "prefix": "api",
+      "schematics": {},
+      "architect": {
+        "build": {
+          "builder": "@nrwl/node:build",
+          "options": {
+            "outputPath": "dist/apps/api",
+            "main": "apps/api/src/main.ts",
+            "tsConfig": "apps/api/tsconfig.app.json",
+            "assets": ["apps/api/src/assets"]
+          },
+          "configurations": {
+            "production": {
+              "optimization": true,
+              "extractLicenses": true,
+              "inspect": false,
+              "fileReplacements": [
+                {
+                  "replace": "apps/api/src/environments/environment.ts",
+                  "with": "apps/api/src/environments/environment.prod.ts"
+                }
+              ]
+            }
+          },
+          "outputs": ["{options.outputPath}"]
+        },
+        "serve": {
+          "builder": "@nrwl/node:execute",
+          "options": {
+            "buildTarget": "api:build"
+          }
+        },
+        "lint": {
+          "builder": "@nrwl/linter:eslint",
+          "options": {
+            "lintFilePatterns": ["apps/api/**/*.ts"]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "options": {
+            "jestConfig": "apps/api/jest.config.js",
+            "passWithNoTests": true
+          },
+          "outputs": ["coverage/apps/api"]
+        }
+      }
+    },
+    "client": {
+      "projectType": "application",
+      "schematics": {
+        "@schematics/angular:component": {
+          "style": "scss"
+        }
+      },
+      "root": "apps/client",
+      "sourceRoot": "apps/client/src",
+      "prefix": "gf",
+      "architect": {
+        "build": {
+          "builder": "@angular-devkit/build-angular:browser",
+          "options": {
+            "outputPath": "dist/apps/client",
+            "index": "apps/client/src/index.html",
+            "main": "apps/client/src/main.ts",
+            "polyfills": "apps/client/src/polyfills.ts",
+            "tsConfig": "apps/client/tsconfig.app.json",
+            "aot": true,
+            "assets": [
+              "apps/client/src/assets",
+              {
+                "glob": "assetlinks.json",
+                "input": "apps/client/src/assets",
+                "output": "./.well-known"
+              },
+              {
+                "glob": "CHANGELOG.md",
+                "input": "",
+                "output": "./"
+              },
+              {
+                "glob": "LICENSE",
+                "input": "",
+                "output": "./"
+              },
+              {
+                "glob": "sitemap.xml",
+                "input": "apps/client/src/assets",
+                "output": "./"
+              },
+              {
+                "glob": "**/*",
+                "input": "node_modules/ionicons/dist/ionicons",
+                "output": "./ionicons"
+              },
+              {
+                "glob": "**/*.js",
+                "input": "node_modules/ionicons/dist/",
+                "output": "./"
+              }
+            ],
+            "styles": ["apps/client/src/styles.scss"],
+            "scripts": ["node_modules/marked/lib/marked.js"]
+          },
+          "configurations": {
+            "production": {
+              "fileReplacements": [
+                {
+                  "replace": "apps/client/src/environments/environment.ts",
+                  "with": "apps/client/src/environments/environment.prod.ts"
+                }
+              ],
+              "optimization": true,
+              "outputHashing": "all",
+              "sourceMap": false,
+              "namedChunks": false,
+              "extractLicenses": true,
+              "vendorChunk": false,
+              "buildOptimizer": true,
+              "budgets": [
+                {
+                  "type": "initial",
+                  "maximumWarning": "2mb",
+                  "maximumError": "5mb"
+                },
+                {
+                  "type": "anyComponentStyle",
+                  "maximumWarning": "6kb",
+                  "maximumError": "10kb"
+                }
+              ]
+            }
+          },
+          "outputs": ["{options.outputPath}"]
+        },
+        "serve": {
+          "builder": "@angular-devkit/build-angular:dev-server",
+          "options": {
+            "browserTarget": "client:build",
+            "proxyConfig": "apps/client/proxy.conf.json"
+          },
+          "configurations": {
+            "production": {
+              "browserTarget": "client:build:production"
+            }
+          }
+        },
+        "extract-i18n": {
+          "builder": "@angular-devkit/build-angular:extract-i18n",
+          "options": {
+            "browserTarget": "client:build"
+          }
+        },
+        "lint": {
+          "builder": "@nrwl/linter:eslint",
+          "options": {
+            "lintFilePatterns": ["apps/client/**/*.ts"]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "options": {
+            "jestConfig": "apps/client/jest.config.js",
+            "passWithNoTests": true
+          },
+          "outputs": ["coverage/apps/client"]
+        }
+      }
+    },
+    "client-e2e": {
+      "root": "apps/client-e2e",
+      "sourceRoot": "apps/client-e2e/src",
+      "projectType": "application",
+      "architect": {
+        "e2e": {
+          "builder": "@nrwl/cypress:cypress",
+          "options": {
+            "cypressConfig": "apps/client-e2e/cypress.json",
+            "tsConfig": "apps/client-e2e/tsconfig.e2e.json",
+            "devServerTarget": "client:serve"
+          },
+          "configurations": {
+            "production": {
+              "devServerTarget": "client:serve:production"
+            }
+          }
+        }
+      }
+    },
+    "helper": {
+      "root": "libs/helper",
+      "sourceRoot": "libs/helper/src",
+      "projectType": "library",
+      "architect": {
+        "lint": {
+          "builder": "@nrwl/linter:eslint",
+          "options": {
+            "lintFilePatterns": ["libs/helper/**/*.ts"]
+          }
+        },
+        "test": {
+          "builder": "@nrwl/jest:jest",
+          "outputs": ["coverage/libs/helper"],
+          "options": {
+            "jestConfig": "libs/helper/jest.config.js",
+            "passWithNoTests": true
+          }
+        }
+      }
+    }
+  }
+}

apps/api/jest.config.js

@@ -1,7 +1,6 @@
-/* eslint-disable */
-export default {
+module.exports = {
   displayName: 'api',
-
+  preset: '../../jest.preset.js',
   globals: {
     'ts-jest': {
       tsconfig: '<rootDir>/tsconfig.spec.json'
@@ -12,7 +11,5 @@ export default {
   },
   moduleFileExtensions: ['ts', 'js', 'html'],
   coverageDirectory: '../../coverage/apps/api',
-  testTimeout: 10000,
-  testEnvironment: 'node',
-  preset: '../../jest.preset.js'
+  testTimeout: 10000
 };

apps/api/project.json

@@ -1,57 +0,0 @@
-{
-  "name": "api",
-  "$schema": "../../node_modules/nx/schemas/project-schema.json",
-  "sourceRoot": "apps/api/src",
-  "projectType": "application",
-  "prefix": "api",
-  "generators": {},
-  "targets": {
-    "build": {
-      "executor": "@nrwl/webpack:webpack",
-      "options": {
-        "outputPath": "dist/apps/api",
-        "main": "apps/api/src/main.ts",
-        "tsConfig": "apps/api/tsconfig.app.json",
-        "assets": ["apps/api/src/assets"],
-        "target": "node",
-        "compiler": "tsc"
-      },
-      "configurations": {
-        "production": {
-          "generatePackageJson": true,
-          "optimization": true,
-          "extractLicenses": true,
-          "inspect": false,
-          "fileReplacements": [
-            {
-              "replace": "apps/api/src/environments/environment.ts",
-              "with": "apps/api/src/environments/environment.prod.ts"
-            }
-          ]
-        }
-      },
-      "outputs": ["{options.outputPath}"]
-    },
-    "serve": {
-      "executor": "@nrwl/node:node",
-      "options": {
-        "buildTarget": "api:build"
-      }
-    },
-    "lint": {
-      "executor": "@nrwl/linter:eslint",
-      "options": {
-        "lintFilePatterns": ["apps/api/**/*.ts"]
-      }
-    },
-    "test": {
-      "executor": "@nrwl/jest:jest",
-      "options": {
-        "jestConfig": "apps/api/jest.config.ts",
-        "passWithNoTests": true
-      },
-      "outputs": ["{workspaceRoot}/coverage/apps/api"]
-    }
-  },
-  "tags": []
-}

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

@@ -1,25 +1,10 @@
-import { Access } from '@ghostfolio/common/interfaces';
-import { 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 { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
+import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { 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';
+import { Access } from './interfaces/access.interface';
 
 @Controller('access')
 export class AccessController {
@@ -35,70 +20,13 @@ export class AccessController {
       include: {
         GranteeUser: true
       },
-      orderBy: { granteeUserId: 'asc' },
       where: { userId: this.request.user.id }
     });
 
     return accessesWithGranteeUser.map((access) => {
-      if (access.GranteeUser) {
-        return {
-          alias: access.alias,
-          grantee: access.GranteeUser?.id,
-          id: access.id,
-          type: 'RESTRICTED_VIEW'
-        };
-      }
-
       return {
-        alias: access.alias,
-        grantee: 'Public',
-        id: access.id,
-        type: 'PUBLIC'
+        granteeAlias: access.GranteeUser.alias
       };
     });
   }
-
-  @Post()
-  @UseGuards(AuthGuard('jwt'))
-  public async createAccess(
-    @Body() data: CreateAccessDto
-  ): Promise<AccessModel> {
-    if (
-      !hasPermission(this.request.user.permissions, permissions.createAccess)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.accessService.createAccess({
-      alias: data.alias || undefined,
-      GranteeUser: data.granteeUserId
-        ? { connect: { id: data.granteeUserId } }
-        : undefined,
-      User: { connect: { id: this.request.user.id } }
-    });
-  }
-
-  @Delete(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteAccess(@Param('id') id: string): Promise<AccessModule> {
-    const access = await this.accessService.access({ id });
-
-    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteAccess) ||
-      !access ||
-      access.userId !== this.request.user.id
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.accessService.deleteAccess({
-      id
-    });
-  }
 }

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

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

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

@@ -1,22 +1,12 @@
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { AccessWithGranteeUser } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
-import { Access, Prisma } from '@prisma/client';
+import { Prisma } from '@prisma/client';
+
+import { AccessWithGranteeUser } from './interfaces/access-with-grantee-user.type';
 
 @Injectable()
 export class AccessService {
-  public constructor(private readonly prismaService: PrismaService) {}
-
-  public async access(
-    accessWhereInput: Prisma.AccessWhereInput
-  ): Promise<AccessWithGranteeUser | null> {
-    return this.prismaService.access.findFirst({
-      include: {
-        GranteeUser: true
-      },
-      where: accessWhereInput
-    });
-  }
+  public constructor(private prisma: PrismaService) {}
 
   public async accesses(params: {
     include?: Prisma.AccessInclude;
@@ -24,11 +14,11 @@ export class AccessService {
     take?: number;
     cursor?: Prisma.AccessWhereUniqueInput;
     where?: Prisma.AccessWhereInput;
-    orderBy?: Prisma.AccessOrderByWithRelationInput;
+    orderBy?: Prisma.AccessOrderByInput;
   }): Promise<AccessWithGranteeUser[]> {
     const { include, skip, take, cursor, where, orderBy } = params;
 
-    return this.prismaService.access.findMany({
+    return this.prisma.access.findMany({
       cursor,
       include,
       orderBy,
@@ -37,18 +27,4 @@ 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

@@ -1,11 +0,0 @@
-import { IsOptional, IsString } from 'class-validator';
-
-export class CreateAccessDto {
-  @IsOptional()
-  @IsString()
-  alias?: string;
-
-  @IsOptional()
-  @IsString()
-  granteeUserId?: string;
-}

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

@@ -0,0 +1,3 @@
+export interface Access {
+  granteeAlias: string;
+}

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

@@ -1,232 +0,0 @@
-import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
-import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
-import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import { Accounts } from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type {
-  AccountWithValue,
-  RequestWithUser
-} from '@ghostfolio/common/types';
-import {
-  Body,
-  Controller,
-  Delete,
-  Get,
-  Headers,
-  HttpException,
-  Inject,
-  Param,
-  Post,
-  Put,
-  UseGuards,
-  UseInterceptors
-} from '@nestjs/common';
-import { REQUEST } from '@nestjs/core';
-import { AuthGuard } from '@nestjs/passport';
-import { Account as AccountModel } from '@prisma/client';
-import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-
-import { AccountService } from './account.service';
-import { CreateAccountDto } from './create-account.dto';
-import { UpdateAccountDto } from './update-account.dto';
-
-@Controller('account')
-export class AccountController {
-  public constructor(
-    private readonly accountService: AccountService,
-    private readonly impersonationService: ImpersonationService,
-    private readonly portfolioService: PortfolioService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  @Delete(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteAccount(@Param('id') id: string): Promise<AccountModel> {
-    if (
-      !hasPermission(this.request.user.permissions, permissions.deleteAccount)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const account = await this.accountService.accountWithOrders(
-      {
-        id_userId: {
-          id,
-          userId: this.request.user.id
-        }
-      },
-      { Order: true }
-    );
-
-    if (account?.isDefault || account?.Order.length > 0) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.accountService.deleteAccount(
-      {
-        id_userId: {
-          id,
-          userId: this.request.user.id
-        }
-      },
-      this.request.user.id
-    );
-  }
-
-  @Get()
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(RedactValuesInResponseInterceptor)
-  public async getAllAccounts(
-    @Headers('impersonation-id') impersonationId
-  ): Promise<Accounts> {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(
-        impersonationId,
-        this.request.user.id
-      );
-
-    return this.portfolioService.getAccountsWithAggregations({
-      userId: impersonationUserId || this.request.user.id,
-      withExcludedAccounts: true
-    });
-  }
-
-  @Get(':id')
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(RedactValuesInResponseInterceptor)
-  public async getAccountById(
-    @Headers('impersonation-id') impersonationId,
-    @Param('id') id: string
-  ): Promise<AccountWithValue> {
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(
-        impersonationId,
-        this.request.user.id
-      );
-
-    const accountsWithAggregations =
-      await this.portfolioService.getAccountsWithAggregations({
-        filters: [{ id, type: 'ACCOUNT' }],
-        userId: impersonationUserId || this.request.user.id,
-        withExcludedAccounts: true
-      });
-
-    return accountsWithAggregations.accounts[0];
-  }
-
-  @Post()
-  @UseGuards(AuthGuard('jwt'))
-  public async createAccount(
-    @Body() data: CreateAccountDto
-  ): Promise<AccountModel> {
-    if (
-      !hasPermission(this.request.user.permissions, permissions.createAccount)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    if (data.platformId) {
-      const platformId = data.platformId;
-      delete data.platformId;
-
-      return this.accountService.createAccount(
-        {
-          ...data,
-          Platform: { connect: { id: platformId } },
-          User: { connect: { id: this.request.user.id } }
-        },
-        this.request.user.id
-      );
-    } else {
-      delete data.platformId;
-
-      return this.accountService.createAccount(
-        {
-          ...data,
-          User: { connect: { id: this.request.user.id } }
-        },
-        this.request.user.id
-      );
-    }
-  }
-
-  @Put(':id')
-  @UseGuards(AuthGuard('jwt'))
-  public async update(@Param('id') id: string, @Body() data: UpdateAccountDto) {
-    if (
-      !hasPermission(this.request.user.permissions, permissions.updateAccount)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const originalAccount = await this.accountService.account({
-      id_userId: {
-        id,
-        userId: this.request.user.id
-      }
-    });
-
-    if (!originalAccount) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    if (data.platformId) {
-      const platformId = data.platformId;
-      delete data.platformId;
-
-      return this.accountService.updateAccount(
-        {
-          data: {
-            ...data,
-            Platform: { connect: { id: platformId } },
-            User: { connect: { id: this.request.user.id } }
-          },
-          where: {
-            id_userId: {
-              id,
-              userId: this.request.user.id
-            }
-          }
-        },
-        this.request.user.id
-      );
-    } else {
-      // platformId is null, remove it
-      delete data.platformId;
-
-      return this.accountService.updateAccount(
-        {
-          data: {
-            ...data,
-            Platform: originalAccount.platformId
-              ? { disconnect: true }
-              : undefined,
-            User: { connect: { id: this.request.user.id } }
-          },
-          where: {
-            id_userId: {
-              id,
-              userId: this.request.user.id
-            }
-          }
-        },
-        this.request.user.id
-      );
-    }
-  }
-}

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

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

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

@@ -1,175 +0,0 @@
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Filter } from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-import { Account, Order, Platform, Prisma } from '@prisma/client';
-import Big from 'big.js';
-import { groupBy } from 'lodash';
-
-import { CashDetails } from './interfaces/cash-details.interface';
-
-@Injectable()
-export class AccountService {
-  public constructor(
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService
-  ) {}
-
-  public async account(
-    accountWhereUniqueInput: Prisma.AccountWhereUniqueInput
-  ): Promise<Account | null> {
-    return this.prismaService.account.findUnique({
-      where: accountWhereUniqueInput
-    });
-  }
-
-  public async accountWithOrders(
-    accountWhereUniqueInput: Prisma.AccountWhereUniqueInput,
-    accountInclude: Prisma.AccountInclude
-  ): Promise<
-    Account & {
-      Order?: Order[];
-    }
-  > {
-    return this.prismaService.account.findUnique({
-      include: accountInclude,
-      where: accountWhereUniqueInput
-    });
-  }
-
-  public async accounts(params: {
-    include?: Prisma.AccountInclude;
-    skip?: number;
-    take?: number;
-    cursor?: Prisma.AccountWhereUniqueInput;
-    where?: Prisma.AccountWhereInput;
-    orderBy?: Prisma.AccountOrderByWithRelationInput;
-  }): Promise<
-    (Account & {
-      Order?: Order[];
-      Platform?: Platform;
-    })[]
-  > {
-    const { include, skip, take, cursor, where, orderBy } = params;
-
-    return this.prismaService.account.findMany({
-      cursor,
-      include,
-      orderBy,
-      skip,
-      take,
-      where
-    });
-  }
-
-  public async createAccount(
-    data: Prisma.AccountCreateInput,
-    aUserId: string
-  ): Promise<Account> {
-    return this.prismaService.account.create({
-      data
-    });
-  }
-
-  public async deleteAccount(
-    where: Prisma.AccountWhereUniqueInput,
-    aUserId: string
-  ): Promise<Account> {
-    return this.prismaService.account.delete({
-      where
-    });
-  }
-
-  public async getAccounts(aUserId: string) {
-    const accounts = await this.accounts({
-      include: { Order: true, Platform: true },
-      orderBy: { name: 'asc' },
-      where: { userId: aUserId }
-    });
-
-    return accounts.map((account) => {
-      let transactionCount = 0;
-
-      for (const order of account.Order) {
-        if (!order.isDraft) {
-          transactionCount += 1;
-        }
-      }
-
-      const result = { ...account, transactionCount };
-
-      delete result.Order;
-
-      return result;
-    });
-  }
-
-  public async getCashDetails({
-    currency,
-    filters = [],
-    userId,
-    withExcludedAccounts = false
-  }: {
-    currency: string;
-    filters?: Filter[];
-    userId: string;
-    withExcludedAccounts?: boolean;
-  }): Promise<CashDetails> {
-    let totalCashBalanceInBaseCurrency = new Big(0);
-
-    const where: Prisma.AccountWhereInput = {
-      userId
-    };
-
-    if (withExcludedAccounts === false) {
-      where.isExcluded = false;
-    }
-
-    const {
-      ACCOUNT: filtersByAccount,
-      ASSET_CLASS: filtersByAssetClass,
-      TAG: filtersByTag
-    } = groupBy(filters, (filter) => {
-      return filter.type;
-    });
-
-    if (filtersByAccount?.length > 0) {
-      where.id = {
-        in: filtersByAccount.map(({ id }) => {
-          return id;
-        })
-      };
-    }
-
-    const accounts = await this.accounts({ where });
-
-    for (const account of accounts) {
-      totalCashBalanceInBaseCurrency = totalCashBalanceInBaseCurrency.plus(
-        this.exchangeRateDataService.toCurrency(
-          account.balance,
-          account.currency,
-          currency
-        )
-      );
-    }
-
-    return {
-      accounts,
-      balanceInBaseCurrency: totalCashBalanceInBaseCurrency.toNumber()
-    };
-  }
-
-  public async updateAccount(
-    params: {
-      where: Prisma.AccountWhereUniqueInput;
-      data: Prisma.AccountUpdateInput;
-    },
-    aUserId: string
-  ): Promise<Account> {
-    const { data, where } = params;
-    return this.prismaService.account.update({
-      data,
-      where
-    });
-  }
-}

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

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

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

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

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

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

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

@@ -1,49 +1,26 @@
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
-import { PropertyDto } from '@ghostfolio/api/services/property/property.dto';
+import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper';
 import {
-  GATHER_ASSET_PROFILE_PROCESS,
-  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-} from '@ghostfolio/common/config';
-import {
-  AdminData,
-  AdminMarketData,
-  AdminMarketDataDetails,
-  EnhancedSymbolProfile,
-  Filter
-} from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Body,
   Controller,
-  Delete,
   Get,
   HttpException,
   Inject,
-  Param,
-  Patch,
   Post,
-  Put,
-  Query,
   UseGuards
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { DataSource, MarketData } from '@prisma/client';
-import { isDate } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { AdminService } from './admin.service';
-import { UpdateAssetProfileDto } from './update-asset-profile.dto';
-import { UpdateMarketDataDto } from './update-market-data.dto';
+import { AdminData } from './interfaces/admin-data.interface';
 
 @Controller('admin')
 export class AdminController {
   public constructor(
     private readonly adminService: AdminService,
     private readonly dataGatheringService: DataGatheringService,
-    private readonly marketDataService: MarketDataService,
     @Inject(REQUEST) private readonly request: RequestWithUser
   ) {}
 
@@ -52,7 +29,7 @@ export class AdminController {
   public async getAdminData(): Promise<AdminData> {
     if (
       !hasPermission(
-        this.request.user.permissions,
+        getPermissions(this.request.user.role),
         permissions.accessAdminControl
       )
     ) {
@@ -65,30 +42,12 @@ export class AdminController {
     return this.adminService.get();
   }
 
-  @Post('gather')
-  @UseGuards(AuthGuard('jwt'))
-  public async gather7Days(): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    this.dataGatheringService.gather7Days();
-  }
-
   @Post('gather/max')
   @UseGuards(AuthGuard('jwt'))
   public async gatherMax(): Promise<void> {
     if (
       !hasPermission(
-        this.request.user.permissions,
+        getPermissions(this.request.user.role),
         permissions.accessAdminControl
       )
     ) {
@@ -98,287 +57,8 @@ export class AdminController {
       );
     }
 
-    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
-
-    for (const { dataSource, symbol } of uniqueAssets) {
-      await this.dataGatheringService.addJobToQueue(
-        GATHER_ASSET_PROFILE_PROCESS,
-        {
-          dataSource,
-          symbol
-        },
-        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-      );
-    }
-
     this.dataGatheringService.gatherMax();
-  }
-
-  @Post('gather/profile-data')
-  @UseGuards(AuthGuard('jwt'))
-  public async gatherProfileData(): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const uniqueAssets = await this.dataGatheringService.getUniqueAssets();
-
-    for (const { dataSource, symbol } of uniqueAssets) {
-      await this.dataGatheringService.addJobToQueue(
-        GATHER_ASSET_PROFILE_PROCESS,
-        {
-          dataSource,
-          symbol
-        },
-        GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-      );
-    }
-  }
-
-  @Post('gather/profile-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
-  public async gatherProfileDataForSymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    await this.dataGatheringService.addJobToQueue(
-      GATHER_ASSET_PROFILE_PROCESS,
-      {
-        dataSource,
-        symbol
-      },
-      GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-    );
-  }
-
-  @Post('gather/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
-  public async gatherSymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    this.dataGatheringService.gatherSymbol({ dataSource, symbol });
 
     return;
   }
-
-  @Post('gather/:dataSource/:symbol/:dateString')
-  @UseGuards(AuthGuard('jwt'))
-  public async gatherSymbolForDate(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('dateString') dateString: string,
-    @Param('symbol') symbol: string
-  ): Promise<MarketData> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const date = new Date(dateString);
-
-    if (!isDate(date)) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.BAD_REQUEST),
-        StatusCodes.BAD_REQUEST
-      );
-    }
-
-    return this.dataGatheringService.gatherSymbolForDate({
-      dataSource,
-      date,
-      symbol
-    });
-  }
-
-  @Get('market-data')
-  @UseGuards(AuthGuard('jwt'))
-  public async getMarketData(
-    @Query('assetSubClasses') filterByAssetSubClasses?: string
-  ): Promise<AdminMarketData> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const assetSubClasses = filterByAssetSubClasses?.split(',') ?? [];
-
-    const filters: Filter[] = [
-      ...assetSubClasses.map((assetSubClass) => {
-        return <Filter>{
-          id: assetSubClass,
-          type: 'ASSET_SUB_CLASS'
-        };
-      })
-    ];
-
-    return this.adminService.getMarketData(filters);
-  }
-
-  @Get('market-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
-  public async getMarketDataBySymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<AdminMarketDataDetails> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.adminService.getMarketDataBySymbol({ dataSource, symbol });
-  }
-
-  @Put('market-data/:dataSource/:symbol/:dateString')
-  @UseGuards(AuthGuard('jwt'))
-  public async update(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('dateString') dateString: string,
-    @Param('symbol') symbol: string,
-    @Body() data: UpdateMarketDataDto
-  ) {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    const date = new Date(dateString);
-
-    return this.marketDataService.updateMarketData({
-      data: { ...data, dataSource },
-      where: {
-        date_symbol: {
-          date,
-          symbol
-        }
-      }
-    });
-  }
-
-  @Delete('profile-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
-  public async deleteProfileData(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<void> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.adminService.deleteProfileData({ dataSource, symbol });
-  }
-
-  @Patch('profile-data/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
-  public async patchAssetProfileData(
-    @Body() assetProfileData: UpdateAssetProfileDto,
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<EnhancedSymbolProfile> {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.adminService.patchAssetProfileData({
-      ...assetProfileData,
-      dataSource,
-      symbol
-    });
-  }
-
-  @Put('settings/:key')
-  @UseGuards(AuthGuard('jwt'))
-  public async updateProperty(
-    @Param('key') key: string,
-    @Body() data: PropertyDto
-  ) {
-    if (
-      !hasPermission(
-        this.request.user.permissions,
-        permissions.accessAdminControl
-      )
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return await this.adminService.putSetting(key, data.value);
-  }
 }

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

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

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

@@ -1,237 +1,95 @@
-import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
 import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import { PROPERTY_CURRENCIES } from '@ghostfolio/common/config';
-import {
-  AdminData,
-  AdminMarketData,
-  AdminMarketDataDetails,
-  AdminMarketDataItem,
-  Filter,
-  UniqueAsset
-} from '@ghostfolio/common/interfaces';
 import { Injectable } from '@nestjs/common';
-import { AssetSubClass, Prisma, Property } from '@prisma/client';
-import { differenceInDays } from 'date-fns';
-import { groupBy } from 'lodash';
+import { Currency } from '@prisma/client';
+
+import { AdminData } from './interfaces/admin-data.interface';
 
 @Injectable()
 export class AdminService {
-  private baseCurrency: string;
-
   public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly marketDataService: MarketDataService,
-    private readonly prismaService: PrismaService,
-    private readonly propertyService: PropertyService,
-    private readonly subscriptionService: SubscriptionService,
-    private readonly symbolProfileService: SymbolProfileService
-  ) {
-    this.baseCurrency = this.configurationService.get('BASE_CURRENCY');
-  }
-
-  public async deleteProfileData({ dataSource, symbol }: UniqueAsset) {
-    await this.marketDataService.deleteMany({ dataSource, symbol });
-    await this.symbolProfileService.delete({ dataSource, symbol });
-  }
+    private exchangeRateDataService: ExchangeRateDataService,
+    private prisma: PrismaService
+  ) {}
 
   public async get(): Promise<AdminData> {
     return {
-      exchangeRates: this.exchangeRateDataService
-        .getCurrencies()
-        .filter((currency) => {
-          return currency !== this.baseCurrency;
-        })
-        .map((currency) => {
-          return {
-            label1: this.baseCurrency,
-            label2: currency,
-            value: this.exchangeRateDataService.toCurrency(
-              1,
-              this.baseCurrency,
-              currency
-            )
-          };
-        }),
-      settings: await this.propertyService.get(),
-      transactionCount: await this.prismaService.order.count(),
-      userCount: await this.prismaService.user.count(),
+      exchangeRates: [
+        {
+          label1: Currency.EUR,
+          label2: Currency.CHF,
+          value: await this.exchangeRateDataService.toCurrency(
+            1,
+            Currency.EUR,
+            Currency.CHF
+          )
+        },
+        {
+          label1: Currency.GBP,
+          label2: Currency.CHF,
+          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.prisma.order.count(),
+      userCount: await this.prisma.user.count(),
       users: await this.getUsersWithAnalytics()
     };
   }
 
-  public async getMarketData(filters?: Filter[]): Promise<AdminMarketData> {
-    const where: Prisma.SymbolProfileWhereInput = {};
-
-    const { ASSET_SUB_CLASS: filtersByAssetSubClass } = groupBy(
-      filters,
-      (filter) => {
-        return filter.type;
-      }
-    );
-
-    const marketData = await this.prismaService.marketData.groupBy({
-      _count: true,
-      by: ['dataSource', 'symbol']
+  private async getLastDataGathering() {
+    const lastDataGathering = await this.prisma.property.findUnique({
+      where: { key: 'LAST_DATA_GATHERING' }
     });
 
-    let currencyPairsToGather: AdminMarketDataItem[] = [];
-
-    if (filtersByAssetSubClass) {
-      where.assetSubClass = AssetSubClass[filtersByAssetSubClass[0].id];
-    } else {
-      currencyPairsToGather = this.exchangeRateDataService
-        .getCurrencyPairs()
-        .map(({ dataSource, symbol }) => {
-          const marketDataItemCount =
-            marketData.find((marketDataItem) => {
-              return (
-                marketDataItem.dataSource === dataSource &&
-                marketDataItem.symbol === symbol
-              );
-            })?._count ?? 0;
-
-          return {
-            dataSource,
-            marketDataItemCount,
-            symbol,
-            countriesCount: 0,
-            sectorsCount: 0
-          };
-        });
+    if (lastDataGathering?.value) {
+      return new Date(lastDataGathering.value);
     }
 
-    const symbolProfilesToGather: AdminMarketDataItem[] = (
-      await this.prismaService.symbolProfile.findMany({
-        where,
-        orderBy: [{ symbol: 'asc' }],
-        select: {
-          _count: {
-            select: { Order: true }
-          },
-          assetClass: true,
-          assetSubClass: true,
-          comment: true,
-          countries: true,
-          dataSource: true,
-          Order: {
-            orderBy: [{ date: 'asc' }],
-            select: { date: true },
-            take: 1
-          },
-          scraperConfiguration: true,
-          sectors: true,
-          symbol: true
-        }
-      })
-    ).map((symbolProfile) => {
-      const countriesCount = symbolProfile.countries
-        ? Object.keys(symbolProfile.countries).length
-        : 0;
-      const marketDataItemCount =
-        marketData.find((marketDataItem) => {
-          return (
-            marketDataItem.dataSource === symbolProfile.dataSource &&
-            marketDataItem.symbol === symbolProfile.symbol
-          );
-        })?._count ?? 0;
-      const sectorsCount = symbolProfile.sectors
-        ? Object.keys(symbolProfile.sectors).length
-        : 0;
-
-      return {
-        countriesCount,
-        marketDataItemCount,
-        sectorsCount,
-        activitiesCount: symbolProfile._count.Order,
-        assetClass: symbolProfile.assetClass,
-        assetSubClass: symbolProfile.assetSubClass,
-        comment: symbolProfile.comment,
-        dataSource: symbolProfile.dataSource,
-        date: symbolProfile.Order?.[0]?.date,
-        symbol: symbolProfile.symbol
-      };
+    const dataGatheringInProgress = await this.prisma.property.findUnique({
+      where: { key: 'LOCKED_DATA_GATHERING' }
     });
 
-    return {
-      marketData: [...currencyPairsToGather, ...symbolProfilesToGather]
-    };
-  }
-
-  public async getMarketDataBySymbol({
-    dataSource,
-    symbol
-  }: UniqueAsset): Promise<AdminMarketDataDetails> {
-    const [[assetProfile], marketData] = await Promise.all([
-      this.symbolProfileService.getSymbolProfiles([
-        {
-          dataSource,
-          symbol
-        }
-      ]),
-      this.marketDataService.marketDataItems({
-        orderBy: {
-          date: 'asc'
-        },
-        where: {
-          dataSource,
-          symbol
-        }
-      })
-    ]);
-
-    return {
-      assetProfile,
-      marketData
-    };
-  }
-
-  public async patchAssetProfileData({
-    comment,
-    dataSource,
-    symbol,
-    symbolMapping
-  }: Prisma.SymbolProfileUpdateInput & UniqueAsset) {
-    await this.symbolProfileService.updateSymbolProfile({
-      comment,
-      dataSource,
-      symbol,
-      symbolMapping
-    });
-
-    const [symbolProfile] = await this.symbolProfileService.getSymbolProfiles([
-      {
-        dataSource,
-        symbol
-      }
-    ]);
-
-    return symbolProfile;
-  }
-
-  public async putSetting(key: string, value: string) {
-    let response: Property;
-
-    if (value) {
-      response = await this.propertyService.put({ key, value });
-    } else {
-      response = await this.propertyService.delete({ key });
+    if (dataGatheringInProgress) {
+      return 'IN_PROGRESS';
     }
 
-    if (key === PROPERTY_CURRENCIES) {
-      await this.exchangeRateDataService.initialize();
-    }
-
-    return response;
+    return null;
   }
 
-  private async getUsersWithAnalytics(): Promise<AdminData['users']> {
-    const usersWithAnalytics = await this.prismaService.user.findMany({
+  private async getUsersWithAnalytics() {
+    return await this.prisma.user.findMany({
       orderBy: {
         Analytics: {
           updatedAt: 'desc'
@@ -241,48 +99,22 @@ export class AdminService {
         _count: {
           select: { Account: true, Order: true }
         },
+        alias: true,
         Analytics: {
           select: {
             activityCount: true,
-            country: true,
             updatedAt: true
           }
         },
         createdAt: true,
-        id: true,
-        Subscription: true
+        id: true
       },
-      take: 30,
+      take: 20,
       where: {
         NOT: {
           Analytics: null
         }
       }
     });
-
-    return usersWithAnalytics.map(
-      ({ _count, 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 {
-          createdAt,
-          engagement,
-          id,
-          subscription,
-          accountCount: _count.Account || 0,
-          country: Analytics.country,
-          lastActivity: Analytics.updatedAt,
-          transactionCount: _count.Order || 0
-        };
-      }
-    );
   }
 }

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

@@ -1,15 +1,15 @@
 export interface AdminData {
   exchangeRates: { label1: string; label2: string; value: number }[];
-  settings: { [key: string]: boolean | object | string | string[] };
+  lastDataGathering: Date | 'IN_PROGRESS';
   transactionCount: number;
   userCount: number;
   users: {
-    accountCount: number;
-    country: string;
+    alias: string;
     createdAt: Date;
-    engagement: number;
+    Analytics: {
+      activityCount: number;
+      updatedAt: Date;
+    };
     id: string;
-    lastActivity: Date;
-    transactionCount: number;
   }[];
 }

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

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

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

@@ -1,12 +0,0 @@
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { Module } from '@nestjs/common';
-
-import { QueueController } from './queue.controller';
-import { QueueService } from './queue.service';
-
-@Module({
-  controllers: [QueueController],
-  imports: [DataGatheringModule],
-  providers: [QueueService]
-})
-export class QueueModule {}

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

@@ -1,65 +0,0 @@
-import {
-  DATA_GATHERING_QUEUE,
-  QUEUE_JOB_STATUS_LIST
-} from '@ghostfolio/common/config';
-import { AdminJobs } from '@ghostfolio/common/interfaces';
-import { InjectQueue } from '@nestjs/bull';
-import { Injectable, Logger } from '@nestjs/common';
-import { JobStatus, Queue } from 'bull';
-
-@Injectable()
-export class QueueService {
-  public constructor(
-    @InjectQueue(DATA_GATHERING_QUEUE)
-    private readonly dataGatheringQueue: Queue
-  ) {}
-
-  public async deleteJob(aId: string) {
-    return (await this.dataGatheringQueue.getJob(aId))?.remove();
-  }
-
-  public async deleteJobs({
-    status = QUEUE_JOB_STATUS_LIST
-  }: {
-    status?: JobStatus[];
-  }) {
-    const jobs = await this.dataGatheringQueue.getJobs(status);
-
-    for (const job of jobs) {
-      try {
-        await job.remove();
-      } catch (error) {
-        Logger.warn(error, 'QueueService');
-      }
-    }
-  }
-
-  public async getJobs({
-    limit = 1000,
-    status = QUEUE_JOB_STATUS_LIST
-  }: {
-    limit?: number;
-    status?: JobStatus[];
-  }): Promise<AdminJobs> {
-    const jobs = await this.dataGatheringQueue.getJobs(status);
-
-    const jobsWithState = await Promise.all(
-      jobs.slice(0, limit).map(async (job) => {
-        return {
-          attemptsMade: job.attemptsMade + 1,
-          data: job.data,
-          finishedOn: job.finishedOn,
-          id: job.id,
-          name: job.name,
-          stacktrace: job.stacktrace,
-          state: await job.getState(),
-          timestamp: job.timestamp
-        };
-      })
-    );
-
-    return {
-      jobs: jobsWithState
-    };
-  }
-}

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

@@ -1,13 +0,0 @@
-import { IsObject, IsOptional, IsString } from 'class-validator';
-
-export class UpdateAssetProfileDto {
-  @IsString()
-  @IsOptional()
-  comment?: string;
-
-  @IsObject()
-  @IsOptional()
-  symbolMapping?: {
-    [dataProvider: string]: string;
-  };
-}

apps/api/src/app/admin/update-market-data.dto.ts

@@ -1,6 +0,0 @@
-import { IsNumber } from 'class-validator';
-
-export class UpdateMarketDataDto {
-  @IsNumber()
-  marketPrice: number;
-}

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

@@ -1,17 +1,31 @@
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { Controller } from '@nestjs/common';
 
+import { PrismaService } from '../services/prisma.service';
+import { RedisCacheService } from './redis-cache/redis-cache.service';
+
 @Controller()
 export class AppController {
   public constructor(
-    private readonly exchangeRateDataService: ExchangeRateDataService
+    private prisma: PrismaService,
+    private readonly redisCacheService: RedisCacheService
   ) {
     this.initialize();
   }
 
   private async initialize() {
-    try {
-      await this.exchangeRateDataService.initialize();
-    } catch {}
+    this.redisCacheService.reset();
+
+    const isDataGatheringLocked = await this.prisma.property.findUnique({
+      where: { key: 'LOCKED_DATA_GATHERING' }
+    });
+
+    if (!isDataGatheringLocked) {
+      // Prepare for automatical data gather if not locked
+      await this.prisma.property.deleteMany({
+        where: {
+          OR: [{ key: 'LAST_DATA_GATHERING' }, { key: 'LOCKED_DATA_GATHERING' }]
+        }
+      });
+    }
   }
 }

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

@@ -1,36 +1,30 @@
 import { join } from 'path';
 
-import { BullModule } from '@nestjs/bull';
-import { MiddlewareConsumer, Module, RequestMethod } from '@nestjs/common';
+import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { ScheduleModule } from '@nestjs/schedule';
 import { ServeStaticModule } from '@nestjs/serve-static';
 
-import { ConfigurationModule } from '../services/configuration.module';
+import { ConfigurationService } from '../services/configuration.service';
 import { CronService } from '../services/cron.service';
-import { DataGatheringModule } from '../services/data-gathering.module';
-import { DataProviderModule } from '../services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '../services/exchange-rate-data.module';
-import { PrismaModule } from '../services/prisma.module';
-import { TwitterBotModule } from '../services/twitter-bot/twitter-bot.module';
+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 { AuthDeviceModule } from './auth-device/auth-device.module';
 import { AuthModule } from './auth/auth.module';
-import { BenchmarkModule } from './benchmark/benchmark.module';
 import { CacheModule } from './cache/cache.module';
-import { ExchangeRateModule } from './exchange-rate/exchange-rate.module';
-import { ExportModule } from './export/export.module';
-import { FrontendMiddleware } from './frontend.middleware';
-import { ImportModule } from './import/import.module';
+import { ExperimentalModule } from './experimental/experimental.module';
 import { InfoModule } from './info/info.module';
-import { LogoModule } from './logo/logo.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';
 
@@ -38,31 +32,13 @@ import { UserModule } from './user/user.module';
   imports: [
     AdminModule,
     AccessModule,
-    AccountModule,
-    AuthDeviceModule,
     AuthModule,
-    BenchmarkModule,
-    BullModule.forRoot({
-      redis: {
-        host: process.env.REDIS_HOST,
-        port: parseInt(process.env.REDIS_PORT ?? '6379', 10),
-        password: process.env.REDIS_PASSWORD
-      }
-    }),
     CacheModule,
     ConfigModule.forRoot(),
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateModule,
-    ExchangeRateDataModule,
-    ExportModule,
-    ImportModule,
+    ExperimentalModule,
     InfoModule,
-    LogoModule,
     OrderModule,
     PortfolioModule,
-    PrismaModule,
     RedisCacheModule,
     ScheduleModule.forRoot(),
     ServeStaticModule.forRoot({
@@ -79,18 +55,21 @@ import { UserModule } from './user/user.module';
       rootPath: join(__dirname, '..', 'client'),
       exclude: ['/api*']
     }),
-    SubscriptionModule,
     SymbolModule,
-    TwitterBotModule,
     UserModule
   ],
   controllers: [AppController],
-  providers: [CronService]
+  providers: [
+    AlphaVantageService,
+    ConfigurationService,
+    CronService,
+    DataGatheringService,
+    DataProviderService,
+    ExchangeRateDataService,
+    GhostfolioScraperApiService,
+    PrismaService,
+    RakutenRapidApiService,
+    YahooFinanceService
+  ]
 })
-export class AppModule {
-  configure(consumer: MiddlewareConsumer) {
-    consumer
-      .apply(FrontendMiddleware)
-      .forRoutes({ path: '*', method: RequestMethod.ALL });
-  }
-}
+export class AppModule {}

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

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

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

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

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

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

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

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

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

@@ -1,42 +1,27 @@
-import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { OAuthResponse } from '@ghostfolio/common/interfaces';
 import {
-  Body,
   Controller,
   Get,
   HttpException,
   Param,
-  Post,
   Req,
   Res,
-  UseGuards,
-  VERSION_NEUTRAL,
-  Version
+  UseGuards
 } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
-import { Request, Response } from 'express';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { AuthService } from './auth.service';
-import {
-  AssertionCredentialJSON,
-  AttestationCredentialJSON
-} from './interfaces/simplewebauthn';
 
 @Controller('auth')
 export class AuthController {
   public constructor(
     private readonly authService: AuthService,
-    private readonly configurationService: ConfigurationService,
-    private readonly webAuthService: WebAuthService
+    private readonly configurationService: ConfigurationService
   ) {}
 
   @Get('anonymous/:accessToken')
-  public async accessTokenLogin(
-    @Param('accessToken') accessToken: string
-  ): Promise<OAuthResponse> {
+  public async accessTokenLogin(@Param('accessToken') accessToken: string) {
     try {
       const authToken = await this.authService.validateAnonymousLogin(
         accessToken
@@ -58,83 +43,14 @@ export class AuthController {
 
   @Get('google/callback')
   @UseGuards(AuthGuard('google'))
-  @Version(VERSION_NEUTRAL)
-  public googleLoginCallback(
-    @Req() request: Request,
-    @Res() response: Response
-  ) {
+  public googleLoginCallback(@Req() req, @Res() res) {
     // Handles the Google OAuth2 callback
-    const jwt: string = (<any>request.user).jwt;
+    const jwt: string = req.user.jwt;
 
     if (jwt) {
-      response.redirect(
-        `${this.configurationService.get(
-          'ROOT_URL'
-        )}/${DEFAULT_LANGUAGE_CODE}/auth/${jwt}`
-      );
+      res.redirect(`${this.configurationService.get('ROOT_URL')}/auth/${jwt}`);
     } else {
-      response.redirect(
-        `${this.configurationService.get(
-          'ROOT_URL'
-        )}/${DEFAULT_LANGUAGE_CODE}/auth`
-      );
-    }
-  }
-
-  @Get('internet-identity/:principalId')
-  public async internetIdentityLogin(
-    @Param('principalId') principalId: string
-  ): Promise<OAuthResponse> {
-    try {
-      const authToken = await this.authService.validateInternetIdentityLogin(
-        principalId
-      );
-      return { authToken };
-    } catch {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-  }
-
-  @Get('webauthn/generate-registration-options')
-  @UseGuards(AuthGuard('jwt'))
-  public async generateRegistrationOptions() {
-    return this.webAuthService.generateRegistrationOptions();
-  }
-
-  @Post('webauthn/verify-attestation')
-  @UseGuards(AuthGuard('jwt'))
-  public async verifyAttestation(
-    @Body() body: { deviceName: string; credential: AttestationCredentialJSON }
-  ) {
-    return this.webAuthService.verifyAttestation(
-      body.deviceName,
-      body.credential
-    );
-  }
-
-  @Post('webauthn/generate-assertion-options')
-  public async generateAssertionOptions(@Body() body: { deviceId: string }) {
-    return this.webAuthService.generateAssertionOptions(body.deviceId);
-  }
-
-  @Post('webauthn/verify-assertion')
-  public async verifyAssertion(
-    @Body() body: { deviceId: string; credential: AssertionCredentialJSON }
-  ) {
-    try {
-      const authToken = await this.webAuthService.verifyAssertion(
-        body.deviceId,
-        body.credential
-      );
-      return { authToken };
-    } catch {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
+      res.redirect(`${this.configurationService.get('ROOT_URL')}/auth`);
     }
   }
 }

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

@@ -1,13 +1,9 @@
-import { AuthDeviceService } from '@ghostfolio/api/app/auth-device/auth-device.service';
-import { WebAuthService } from '@ghostfolio/api/app/auth/web-auth.service';
-import { SubscriptionModule } from '@ghostfolio/api/app/subscription/subscription.module';
-import { UserModule } from '@ghostfolio/api/app/user/user.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
+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';
@@ -16,22 +12,18 @@ import { JwtStrategy } from './jwt.strategy';
 @Module({
   controllers: [AuthController],
   imports: [
-    ConfigurationModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '180 days' }
-    }),
-    PrismaModule,
-    PropertyModule,
-    SubscriptionModule,
-    UserModule
+    })
   ],
   providers: [
-    AuthDeviceService,
     AuthService,
+    ConfigurationService,
     GoogleStrategy,
     JwtStrategy,
-    WebAuthService
+    PrismaService,
+    UserService
   ]
 })
 export class AuthModule {}

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

@@ -1,10 +1,8 @@
-import { UserService } from '@ghostfolio/api/app/user/user.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import { Provider } from '@prisma/client';
 
+import { UserService } from '../user/user.service';
 import { ValidateOAuthLoginParams } from './interfaces/interfaces';
 
 @Injectable()
@@ -12,11 +10,10 @@ export class AuthService {
   public constructor(
     private readonly configurationService: ConfigurationService,
     private readonly jwtService: JwtService,
-    private readonly propertyService: PropertyService,
     private readonly userService: UserService
   ) {}
 
-  public async validateAnonymousLogin(accessToken: string): Promise<string> {
+  public async validateAnonymousLogin(accessToken: string) {
     return new Promise(async (resolve, reject) => {
       try {
         const hashedAccessToken = this.userService.createAccessToken(
@@ -29,7 +26,7 @@ export class AuthService {
         });
 
         if (user) {
-          const jwt = this.jwtService.sign({
+          const jwt: string = this.jwtService.sign({
             id: user.id
           });
 
@@ -43,42 +40,6 @@ export class AuthService {
     });
   }
 
-  public async validateInternetIdentityLogin(principalId: string) {
-    try {
-      const provider: Provider = 'INTERNET_IDENTITY';
-
-      let [user] = await this.userService.users({
-        where: { provider, thirdPartyId: principalId }
-      });
-
-      if (!user) {
-        const isUserSignupEnabled =
-          await this.propertyService.isUserSignupEnabled();
-
-        if (!isUserSignupEnabled) {
-          throw new Error('Sign up forbidden');
-        }
-
-        // Create new user if not found
-        user = await this.userService.createUser({
-          data: {
-            provider,
-            thirdPartyId: principalId
-          }
-        });
-      }
-
-      return this.jwtService.sign({
-        id: user.id
-      });
-    } catch (error) {
-      throw new InternalServerErrorException(
-        'validateInternetIdentityLogin',
-        error.message
-      );
-    }
-  }
-
   public async validateOAuthLogin({
     provider,
     thirdPartyId
@@ -89,30 +50,20 @@ export class AuthService {
       });
 
       if (!user) {
-        const isUserSignupEnabled =
-          await this.propertyService.isUserSignupEnabled();
-
-        if (!isUserSignupEnabled) {
-          throw new Error('Sign up forbidden');
-        }
-
         // Create new user if not found
         user = await this.userService.createUser({
-          data: {
-            provider,
-            thirdPartyId
-          }
+          provider,
+          thirdPartyId
         });
       }
 
-      return this.jwtService.sign({
+      const jwt: string = this.jwtService.sign({
         id: user.id
       });
-    } catch (error) {
-      throw new InternalServerErrorException(
-        'validateOAuthLogin',
-        error.message
-      );
+
+      return jwt;
+    } catch (err) {
+      throw new InternalServerErrorException('validateOAuthLogin', err.message);
     }
   }
 }

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

@@ -1,5 +1,5 @@
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { Injectable, Logger } from '@nestjs/common';
+import { Injectable } 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 (error) {
-      Logger.error(error, 'GoogleStrategy');
-      done(error, false);
+    } catch (err) {
+      console.error(err);
+      done(err, false);
     }
   }
 }

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

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

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

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

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

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

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

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

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

@@ -1,48 +0,0 @@
-import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
-import {
-  BenchmarkMarketDataDetails,
-  BenchmarkResponse
-} from '@ghostfolio/common/interfaces';
-import {
-  Controller,
-  Get,
-  Param,
-  UseGuards,
-  UseInterceptors
-} from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-import { DataSource } from '@prisma/client';
-
-import { BenchmarkService } from './benchmark.service';
-
-@Controller('benchmark')
-export class BenchmarkController {
-  public constructor(private readonly benchmarkService: BenchmarkService) {}
-
-  @Get()
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
-  public async getBenchmark(): Promise<BenchmarkResponse> {
-    return {
-      benchmarks: await this.benchmarkService.getBenchmarks()
-    };
-  }
-
-  @Get(':dataSource/:symbol/:startDateString')
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  public async getBenchmarkMarketDataBySymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('startDateString') startDateString: string,
-    @Param('symbol') symbol: string
-  ): Promise<BenchmarkMarketDataDetails> {
-    const startDate = new Date(startDateString);
-
-    return this.benchmarkService.getMarketDataBySymbol({
-      dataSource,
-      startDate,
-      symbol
-    });
-  }
-}

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

@@ -1,27 +0,0 @@
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { SymbolModule } from '@ghostfolio/api/app/symbol/symbol.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { MarketDataModule } from '@ghostfolio/api/services/market-data.module';
-import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
-import { Module } from '@nestjs/common';
-
-import { BenchmarkController } from './benchmark.controller';
-import { BenchmarkService } from './benchmark.service';
-
-@Module({
-  controllers: [BenchmarkController],
-  exports: [BenchmarkService],
-  imports: [
-    ConfigurationModule,
-    DataProviderModule,
-    MarketDataModule,
-    PropertyModule,
-    RedisCacheModule,
-    SymbolModule,
-    SymbolProfileModule
-  ],
-  providers: [BenchmarkService]
-})
-export class BenchmarkModule {}

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

@@ -1,15 +0,0 @@
-import { BenchmarkService } from './benchmark.service';
-
-describe('BenchmarkService', () => {
-  let benchmarkService: BenchmarkService;
-
-  beforeAll(async () => {
-    benchmarkService = new BenchmarkService(null, null, null, null, null, null);
-  });
-
-  it('calculateChangeInPercentage', async () => {
-    expect(benchmarkService.calculateChangeInPercentage(1, 2)).toEqual(1);
-    expect(benchmarkService.calculateChangeInPercentage(2, 2)).toEqual(0);
-    expect(benchmarkService.calculateChangeInPercentage(2, 1)).toEqual(-0.5);
-  });
-});

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

@@ -1,210 +0,0 @@
-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
-import { SymbolService } from '@ghostfolio/api/app/symbol/symbol.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { MarketDataService } from '@ghostfolio/api/services/market-data.service';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import {
-  MAX_CHART_ITEMS,
-  PROPERTY_BENCHMARKS
-} from '@ghostfolio/common/config';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import {
-  BenchmarkMarketDataDetails,
-  BenchmarkResponse,
-  UniqueAsset
-} from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-import { SymbolProfile } from '@prisma/client';
-import Big from 'big.js';
-import { format } from 'date-fns';
-import ms from 'ms';
-
-@Injectable()
-export class BenchmarkService {
-  private readonly CACHE_KEY_BENCHMARKS = 'BENCHMARKS';
-
-  public constructor(
-    private readonly dataProviderService: DataProviderService,
-    private readonly marketDataService: MarketDataService,
-    private readonly propertyService: PropertyService,
-    private readonly redisCacheService: RedisCacheService,
-    private readonly symbolProfileService: SymbolProfileService,
-    private readonly symbolService: SymbolService
-  ) {}
-
-  public calculateChangeInPercentage(baseValue: number, currentValue: number) {
-    if (baseValue && currentValue) {
-      return new Big(currentValue).div(baseValue).minus(1).toNumber();
-    }
-
-    return 0;
-  }
-
-  public async getBenchmarks({ useCache = true } = {}): Promise<
-    BenchmarkResponse['benchmarks']
-  > {
-    let benchmarks: BenchmarkResponse['benchmarks'];
-
-    if (useCache) {
-      try {
-        benchmarks = JSON.parse(
-          await this.redisCacheService.get(this.CACHE_KEY_BENCHMARKS)
-        );
-
-        if (benchmarks) {
-          return benchmarks;
-        }
-      } catch {}
-    }
-
-    const benchmarkAssetProfiles = await this.getBenchmarkAssetProfiles();
-
-    const promises: Promise<number>[] = [];
-
-    const quotes = await this.dataProviderService.getQuotes(
-      benchmarkAssetProfiles.map(({ dataSource, symbol }) => {
-        return { dataSource, symbol };
-      })
-    );
-
-    for (const { dataSource, symbol } of benchmarkAssetProfiles) {
-      promises.push(this.marketDataService.getMax({ dataSource, symbol }));
-    }
-
-    const allTimeHighs = await Promise.all(promises);
-    let storeInCache = true;
-
-    benchmarks = allTimeHighs.map((allTimeHigh, index) => {
-      const { marketPrice } =
-        quotes[benchmarkAssetProfiles[index].symbol] ?? {};
-
-      let performancePercentFromAllTimeHigh = 0;
-
-      if (allTimeHigh && marketPrice) {
-        performancePercentFromAllTimeHigh = this.calculateChangeInPercentage(
-          allTimeHigh,
-          marketPrice
-        );
-      } else {
-        storeInCache = false;
-      }
-
-      return {
-        marketCondition: this.getMarketCondition(
-          performancePercentFromAllTimeHigh
-        ),
-        name: benchmarkAssetProfiles[index].name,
-        performances: {
-          allTimeHigh: {
-            performancePercent: performancePercentFromAllTimeHigh
-          }
-        }
-      };
-    });
-
-    if (storeInCache) {
-      await this.redisCacheService.set(
-        this.CACHE_KEY_BENCHMARKS,
-        JSON.stringify(benchmarks),
-        ms('4 hours') / 1000
-      );
-    }
-
-    return benchmarks;
-  }
-
-  public async getBenchmarkAssetProfiles(): Promise<Partial<SymbolProfile>[]> {
-    const symbolProfileIds: string[] = (
-      ((await this.propertyService.getByKey(PROPERTY_BENCHMARKS)) as {
-        symbolProfileId: string;
-      }[]) ?? []
-    ).map(({ symbolProfileId }) => {
-      return symbolProfileId;
-    });
-
-    const assetProfiles =
-      await this.symbolProfileService.getSymbolProfilesByIds(symbolProfileIds);
-
-    return assetProfiles
-      .map(({ dataSource, id, name, symbol }) => {
-        return {
-          dataSource,
-          id,
-          name,
-          symbol
-        };
-      })
-      .sort((a, b) => a.name.localeCompare(b.name));
-  }
-
-  public async getMarketDataBySymbol({
-    dataSource,
-    startDate,
-    symbol
-  }: { startDate: Date } & UniqueAsset): Promise<BenchmarkMarketDataDetails> {
-    const [currentSymbolItem, marketDataItems] = await Promise.all([
-      this.symbolService.get({
-        dataGatheringItem: {
-          dataSource,
-          symbol
-        }
-      }),
-      this.marketDataService.marketDataItems({
-        orderBy: {
-          date: 'asc'
-        },
-        where: {
-          dataSource,
-          symbol,
-          date: {
-            gte: startDate
-          }
-        }
-      })
-    ]);
-
-    const step = Math.round(
-      marketDataItems.length / Math.min(marketDataItems.length, MAX_CHART_ITEMS)
-    );
-
-    const marketPriceAtStartDate = marketDataItems?.[0]?.marketPrice ?? 0;
-    const response = {
-      marketData: [
-        ...marketDataItems
-          .filter((marketDataItem, index) => {
-            return index % step === 0;
-          })
-          .map((marketDataItem) => {
-            return {
-              date: format(marketDataItem.date, DATE_FORMAT),
-              value:
-                marketPriceAtStartDate === 0
-                  ? 0
-                  : this.calculateChangeInPercentage(
-                      marketPriceAtStartDate,
-                      marketDataItem.marketPrice
-                    ) * 100
-            };
-          })
-      ]
-    };
-
-    if (currentSymbolItem?.marketPrice) {
-      response.marketData.push({
-        date: format(new Date(), DATE_FORMAT),
-        value:
-          this.calculateChangeInPercentage(
-            marketPriceAtStartDate,
-            currentSymbolItem.marketPrice
-          ) * 100
-      });
-    }
-
-    return response;
-  }
-
-  private getMarketCondition(aPerformanceInPercent: number) {
-    return aPerformanceInPercent <= -0.2 ? 'BEAR_MARKET' : 'NEUTRAL_MARKET';
-  }
-}

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

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

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

@@ -1,24 +1,13 @@
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
+import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { Module } from '@nestjs/common';
 
+import { RedisCacheModule } from '../redis-cache/redis-cache.module';
 import { CacheController } from './cache.controller';
+import { CacheService } from './cache.service';
 
 @Module({
+  imports: [RedisCacheModule],
   controllers: [CacheController],
-  imports: [
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
-    PrismaModule,
-    RedisCacheModule,
-    SymbolProfileModule
-  ]
+  providers: [CacheService, PrismaService]
 })
 export class CacheModule {}

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

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

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

@@ -1,26 +0,0 @@
-import { IDataProviderHistoricalResponse } from '@ghostfolio/api/services/interfaces/interfaces';
-import { Controller, Get, Param, UseGuards } from '@nestjs/common';
-import { AuthGuard } from '@nestjs/passport';
-
-import { ExchangeRateService } from './exchange-rate.service';
-
-@Controller('exchange-rate')
-export class ExchangeRateController {
-  public constructor(
-    private readonly exchangeRateService: ExchangeRateService
-  ) {}
-
-  @Get(':symbol/:dateString')
-  @UseGuards(AuthGuard('jwt'))
-  public async getExchangeRate(
-    @Param('dateString') dateString: string,
-    @Param('symbol') symbol: string
-  ): Promise<IDataProviderHistoricalResponse> {
-    const date = new Date(dateString);
-
-    return this.exchangeRateService.getExchangeRate({
-      date,
-      symbol
-    });
-  }
-}

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

@@ -1,13 +0,0 @@
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { Module } from '@nestjs/common';
-
-import { ExchangeRateController } from './exchange-rate.controller';
-import { ExchangeRateService } from './exchange-rate.service';
-
-@Module({
-  controllers: [ExchangeRateController],
-  exports: [ExchangeRateService],
-  imports: [ExchangeRateDataModule],
-  providers: [ExchangeRateService]
-})
-export class ExchangeRateModule {}

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

@@ -1,29 +0,0 @@
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { IDataProviderHistoricalResponse } from '@ghostfolio/api/services/interfaces/interfaces';
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class ExchangeRateService {
-  public constructor(
-    private readonly exchangeRateDataService: ExchangeRateDataService
-  ) {}
-
-  public async getExchangeRate({
-    date,
-    symbol
-  }: {
-    date: Date;
-    symbol: string;
-  }): Promise<IDataProviderHistoricalResponse> {
-    const [currency1, currency2] = symbol.split('-');
-
-    const marketPrice = await this.exchangeRateDataService.toCurrencyAtDate(
-      1,
-      currency1,
-      currency2,
-      date
-    );
-
-    return { marketPrice };
-  }
-}

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

@@ -0,0 +1,22 @@
+import { Currency, Type } from '@prisma/client';
+import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
+
+export class CreateOrderDto {
+  @IsString()
+  currency: Currency;
+
+  @IsISO8601()
+  date: string;
+
+  @IsNumber()
+  quantity: number;
+
+  @IsString()
+  symbol: string;
+
+  @IsString()
+  type: Type;
+
+  @IsNumber()
+  unitPrice: number;
+}

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

@@ -0,0 +1,91 @@
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
+import {
+  baseCurrency,
+  benchmarks,
+  isApiTokenAuthorized
+} from '@ghostfolio/helper';
+import {
+  Body,
+  Controller,
+  Get,
+  Headers,
+  HttpException,
+  Inject,
+  Param,
+  Post
+} from '@nestjs/common';
+import { REQUEST } from '@nestjs/core';
+import { parse } from 'date-fns';
+import { StatusCodes, getReasonPhrase } from 'http-status-codes';
+
+import { CreateOrderDto } from './create-order.dto';
+import { ExperimentalService } from './experimental.service';
+import { Data } from './interfaces/data.interface';
+
+@Controller('experimental')
+export class ExperimentalController {
+  public constructor(
+    private readonly experimentalService: ExperimentalService,
+    @Inject(REQUEST) private readonly request: RequestWithUser
+  ) {}
+
+  @Get('benchmarks')
+  public async getBenchmarks(
+    @Headers('Authorization') apiToken: string
+  ): Promise<string[]> {
+    if (!isApiTokenAuthorized(apiToken)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    return benchmarks;
+  }
+
+  @Get('benchmarks/:symbol')
+  public async getBenchmark(
+    @Headers('Authorization') apiToken: string,
+    @Param('symbol') symbol: string
+  ): Promise<{ date: Date; marketPrice: number }[]> {
+    if (!isApiTokenAuthorized(apiToken)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const marketData = await this.experimentalService.getBenchmark(symbol);
+
+    if (marketData?.length === 0) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.NOT_FOUND),
+        StatusCodes.NOT_FOUND
+      );
+    }
+
+    return marketData;
+  }
+
+  @Post('value/:dateString?')
+  public async getValue(
+    @Body() orders: CreateOrderDto[],
+    @Headers('Authorization') apiToken: string,
+    @Param('dateString') dateString: string
+  ): Promise<Data> {
+    if (!isApiTokenAuthorized(apiToken)) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    let date = new Date();
+
+    if (dateString) {
+      date = parse(dateString, 'yyyy-MM-dd', new Date());
+    }
+
+    return this.experimentalService.getValue(orders, date, baseCurrency);
+  }
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,87 +0,0 @@
-import { environment } from '@ghostfolio/api/environments/environment';
-import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { Export } from '@ghostfolio/common/interfaces';
-import { Injectable } from '@nestjs/common';
-
-@Injectable()
-export class ExportService {
-  public constructor(private readonly prismaService: PrismaService) {}
-
-  public async export({
-    activityIds,
-    userId
-  }: {
-    activityIds?: string[];
-    userId: string;
-  }): Promise<Export> {
-    const accounts = await this.prismaService.account.findMany({
-      orderBy: {
-        name: 'asc'
-      },
-      select: {
-        accountType: true,
-        balance: true,
-        currency: true,
-        id: true,
-        isExcluded: true,
-        name: true,
-        platformId: true
-      },
-      where: { userId }
-    });
-
-    let activities = await this.prismaService.order.findMany({
-      orderBy: { date: 'desc' },
-      select: {
-        accountId: true,
-        comment: true,
-        date: true,
-        fee: true,
-        id: true,
-        quantity: true,
-        SymbolProfile: true,
-        type: true,
-        unitPrice: true
-      },
-      where: { userId }
-    });
-
-    if (activityIds) {
-      activities = activities.filter((activity) => {
-        return activityIds.includes(activity.id);
-      });
-    }
-
-    return {
-      meta: { date: new Date().toISOString(), version: environment.version },
-      accounts,
-      activities: activities.map(
-        ({
-          accountId,
-          comment,
-          date,
-          fee,
-          id,
-          quantity,
-          SymbolProfile,
-          type,
-          unitPrice
-        }) => {
-          return {
-            accountId,
-            comment,
-            fee,
-            id,
-            quantity,
-            type,
-            unitPrice,
-            currency: SymbolProfile.currency,
-            dataSource: SymbolProfile.dataSource,
-            date: date.toISOString(),
-            symbol: type === 'ITEM' ? SymbolProfile.name : SymbolProfile.symbol
-          };
-        }
-      )
-    };
-  }
-}

apps/api/src/app/frontend.middleware.ts

@@ -1,201 +0,0 @@
-import * as fs from 'fs';
-import * as path from 'path';
-
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { DEFAULT_LANGUAGE_CODE } from '@ghostfolio/common/config';
-import { DATE_FORMAT } from '@ghostfolio/common/helper';
-import { Injectable, NestMiddleware } from '@nestjs/common';
-import { ConfigService } from '@nestjs/config';
-import { format } from 'date-fns';
-import { NextFunction, Request, Response } from 'express';
-
-@Injectable()
-export class FrontendMiddleware implements NestMiddleware {
-  public indexHtmlDe = '';
-  public indexHtmlEn = '';
-  public indexHtmlEs = '';
-  public indexHtmlFr = '';
-  public indexHtmlIt = '';
-  public indexHtmlNl = '';
-  public indexHtmlPt = '';
-  public isProduction: boolean;
-
-  public constructor(
-    private readonly configService: ConfigService,
-    private readonly configurationService: ConfigurationService
-  ) {
-    const NODE_ENV =
-      this.configService.get<'development' | 'production'>('NODE_ENV') ??
-      'development';
-
-    this.isProduction = NODE_ENV === 'production';
-
-    try {
-      this.indexHtmlDe = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('de'),
-        'utf8'
-      );
-      this.indexHtmlEn = fs.readFileSync(
-        this.getPathOfIndexHtmlFile(DEFAULT_LANGUAGE_CODE),
-        'utf8'
-      );
-      this.indexHtmlEs = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('es'),
-        'utf8'
-      );
-      this.indexHtmlFr = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('fr'),
-        'utf8'
-      );
-      this.indexHtmlIt = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('it'),
-        'utf8'
-      );
-      this.indexHtmlNl = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('nl'),
-        'utf8'
-      );
-      this.indexHtmlPt = fs.readFileSync(
-        this.getPathOfIndexHtmlFile('pt'),
-        'utf8'
-      );
-    } catch {}
-  }
-
-  public use(request: Request, response: Response, next: NextFunction) {
-    const currentDate = format(new Date(), DATE_FORMAT);
-    let featureGraphicPath = 'assets/cover.png';
-    let title = 'Ghostfolio – Open Source Wealth Management Software';
-
-    if (request.path.startsWith('/en/blog/2022/08/500-stars-on-github')) {
-      featureGraphicPath = 'assets/images/blog/500-stars-on-github.jpg';
-      title = `500 Stars - ${title}`;
-    } else if (request.path.startsWith('/en/blog/2022/10/hacktoberfest-2022')) {
-      featureGraphicPath = 'assets/images/blog/hacktoberfest-2022.png';
-      title = `Hacktoberfest 2022 - ${title}`;
-    } else if (request.path.startsWith('/en/blog/2022/11/black-friday-2022')) {
-      featureGraphicPath = 'assets/images/blog/black-friday-2022.jpg';
-      title = `Black Friday 2022 - ${title}`;
-    } else if (
-      request.path.startsWith(
-        '/en/blog/2022/12/the-importance-of-tracking-your-personal-finances'
-      )
-    ) {
-      featureGraphicPath = 'assets/images/blog/20221226.jpg';
-      title = `The importance of tracking your personal finances - ${title}`;
-    } else if (
-      request.path.startsWith(
-        '/de/blog/2023/01/ghostfolio-auf-sackgeld-vorgestellt'
-      )
-    ) {
-      featureGraphicPath = 'assets/images/blog/ghostfolio-x-sackgeld.png';
-      title = `Ghostfolio auf Sackgeld.com vorgestellt - ${title}`;
-    }
-
-    if (
-      request.path.startsWith('/api/') ||
-      this.isFileRequest(request.url) ||
-      !this.isProduction
-    ) {
-      // Skip
-      next();
-    } else if (request.path === '/de' || request.path.startsWith('/de/')) {
-      response.send(
-        this.interpolate(this.indexHtmlDe, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          languageCode: 'de',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/es' || request.path.startsWith('/es/')) {
-      response.send(
-        this.interpolate(this.indexHtmlEs, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          languageCode: 'es',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/fr' || request.path.startsWith('/fr/')) {
-      response.send(
-        this.interpolate(this.indexHtmlFr, {
-          featureGraphicPath,
-          languageCode: 'fr',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/it' || request.path.startsWith('/it/')) {
-      response.send(
-        this.interpolate(this.indexHtmlIt, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          languageCode: 'it',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/nl' || request.path.startsWith('/nl/')) {
-      response.send(
-        this.interpolate(this.indexHtmlNl, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          languageCode: 'nl',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else if (request.path === '/pt' || request.path.startsWith('/pt/')) {
-      response.send(
-        this.interpolate(this.indexHtmlPt, {
-          featureGraphicPath,
-          languageCode: 'pt',
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    } else {
-      response.send(
-        this.interpolate(this.indexHtmlEn, {
-          currentDate,
-          featureGraphicPath,
-          title,
-          languageCode: DEFAULT_LANGUAGE_CODE,
-          path: request.path,
-          rootUrl: this.configurationService.get('ROOT_URL')
-        })
-      );
-    }
-  }
-
-  private getPathOfIndexHtmlFile(aLocale: string) {
-    return path.join(__dirname, '..', 'client', aLocale, 'index.html');
-  }
-
-  private interpolate(template: string, context: any) {
-    return template.replace(/[$]{([^}]+)}/g, (_, objectPath) => {
-      const properties = objectPath.split('.');
-      return properties.reduce(
-        (previous, current) => previous?.[current],
-        context
-      );
-    });
-  }
-
-  private isFileRequest(filename: string) {
-    if (filename === '/assets/LICENSE') {
-      return true;
-    } else if (filename.includes('auth/ey')) {
-      return false;
-    }
-
-    return filename.split('.').pop() !== filename;
-  }
-}

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

@@ -1,17 +0,0 @@
-import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
-import { Type } from 'class-transformer';
-import { IsArray, IsOptional, ValidateNested } from 'class-validator';
-
-export class ImportDataDto {
-  @IsOptional()
-  @IsArray()
-  @Type(() => CreateAccountDto)
-  @ValidateNested({ each: true })
-  accounts: CreateAccountDto[];
-
-  @IsArray()
-  @Type(() => CreateOrderDto)
-  @ValidateNested({ each: true })
-  activities: CreateOrderDto[];
-}

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

@@ -1,107 +0,0 @@
-import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
-import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { ImportResponse } from '@ghostfolio/common/interfaces';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
-import {
-  Body,
-  Controller,
-  Get,
-  HttpException,
-  Inject,
-  Logger,
-  Param,
-  Post,
-  Query,
-  UseGuards,
-  UseInterceptors
-} 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 { ImportDataDto } from './import-data.dto';
-import { ImportService } from './import.service';
-
-@Controller('import')
-export class ImportController {
-  public constructor(
-    private readonly configurationService: ConfigurationService,
-    private readonly importService: ImportService,
-    @Inject(REQUEST) private readonly request: RequestWithUser
-  ) {}
-
-  @Post()
-  @UseGuards(AuthGuard('jwt'))
-  public async import(
-    @Body() importData: ImportDataDto,
-    @Query('dryRun') isDryRun?: boolean
-  ): Promise<ImportResponse> {
-    if (
-      !this.configurationService.get('ENABLE_FEATURE_IMPORT') ||
-      !hasPermission(this.request.user.permissions, permissions.createAccount)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    let maxActivitiesToImport = this.configurationService.get(
-      'MAX_ACTIVITIES_TO_IMPORT'
-    );
-
-    if (
-      this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') &&
-      this.request.user.subscription.type === 'Premium'
-    ) {
-      maxActivitiesToImport = Number.MAX_SAFE_INTEGER;
-    }
-
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
-
-    try {
-      const activities = await this.importService.import({
-        isDryRun,
-        maxActivitiesToImport,
-        userCurrency,
-        accountsDto: importData.accounts ?? [],
-        activitiesDto: importData.activities,
-        userId: this.request.user.id
-      });
-
-      return { activities };
-    } catch (error) {
-      Logger.error(error, ImportController);
-
-      throw new HttpException(
-        {
-          error: getReasonPhrase(StatusCodes.BAD_REQUEST),
-          message: [error.message]
-        },
-        StatusCodes.BAD_REQUEST
-      );
-    }
-  }
-
-  @Get('dividends/:dataSource/:symbol')
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
-  public async gatherDividends(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string
-  ): Promise<ImportResponse> {
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
-
-    const activities = await this.importService.getDividends({
-      dataSource,
-      symbol,
-      userCurrency
-    });
-
-    return { activities };
-  }
-}

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

@@ -1,34 +0,0 @@
-import { AccountModule } from '@ghostfolio/api/app/account/account.module';
-import { CacheModule } from '@ghostfolio/api/app/cache/cache.module';
-import { OrderModule } from '@ghostfolio/api/app/order/order.module';
-import { PortfolioModule } from '@ghostfolio/api/app/portfolio/portfolio.module';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
-import { Module } from '@nestjs/common';
-
-import { ImportController } from './import.controller';
-import { ImportService } from './import.service';
-
-@Module({
-  controllers: [ImportController],
-  imports: [
-    AccountModule,
-    CacheModule,
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
-    OrderModule,
-    PortfolioModule,
-    PrismaModule,
-    RedisCacheModule,
-    SymbolProfileModule
-  ],
-  providers: [ImportService]
-})
-export class ImportModule {}

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

@@ -1,398 +0,0 @@
-import { AccountService } from '@ghostfolio/api/app/account/account.service';
-import { CreateAccountDto } from '@ghostfolio/api/app/account/create-account.dto';
-import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
-import { Activity } from '@ghostfolio/api/app/order/interfaces/activities.interface';
-import { OrderService } from '@ghostfolio/api/app/order/order.service';
-import { PortfolioService } from '@ghostfolio/api/app/portfolio/portfolio.service';
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import { parseDate } from '@ghostfolio/common/helper';
-import { UniqueAsset } from '@ghostfolio/common/interfaces';
-import {
-  AccountWithPlatform,
-  OrderWithAccount
-} from '@ghostfolio/common/types';
-import { Injectable } from '@nestjs/common';
-import { SymbolProfile } from '@prisma/client';
-import Big from 'big.js';
-import { endOfToday, isAfter, isSameDay, parseISO } from 'date-fns';
-import { v4 as uuidv4 } from 'uuid';
-
-@Injectable()
-export class ImportService {
-  public constructor(
-    private readonly accountService: AccountService,
-    private readonly dataProviderService: DataProviderService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly orderService: OrderService,
-    private readonly portfolioService: PortfolioService,
-    private readonly symbolProfileService: SymbolProfileService
-  ) {}
-
-  public async getDividends({
-    dataSource,
-    symbol,
-    userCurrency
-  }: UniqueAsset & { userCurrency: string }): Promise<Activity[]> {
-    try {
-      const { firstBuyDate, historicalData, orders } =
-        await this.portfolioService.getPosition(dataSource, undefined, symbol);
-
-      const [[assetProfile], dividends] = await Promise.all([
-        this.symbolProfileService.getSymbolProfiles([
-          {
-            dataSource,
-            symbol
-          }
-        ]),
-        await this.dataProviderService.getDividends({
-          dataSource,
-          symbol,
-          from: parseDate(firstBuyDate),
-          granularity: 'day',
-          to: new Date()
-        })
-      ]);
-
-      const accounts = orders.map((order) => {
-        return order.Account;
-      });
-
-      const Account = this.isUniqueAccount(accounts) ? accounts[0] : undefined;
-
-      return Object.entries(dividends).map(([dateString, { marketPrice }]) => {
-        const quantity =
-          historicalData.find((historicalDataItem) => {
-            return historicalDataItem.date === dateString;
-          })?.quantity ?? 0;
-
-        const value = new Big(quantity).mul(marketPrice).toNumber();
-
-        return {
-          Account,
-          quantity,
-          value,
-          accountId: Account?.id,
-          accountUserId: undefined,
-          comment: undefined,
-          createdAt: undefined,
-          date: parseDate(dateString),
-          fee: 0,
-          feeInBaseCurrency: 0,
-          id: assetProfile.id,
-          isDraft: false,
-          SymbolProfile: <SymbolProfile>(<unknown>assetProfile),
-          symbolProfileId: assetProfile.id,
-          type: 'DIVIDEND',
-          unitPrice: marketPrice,
-          updatedAt: undefined,
-          userId: Account?.userId,
-          valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
-            value,
-            assetProfile.currency,
-            userCurrency
-          )
-        };
-      });
-    } catch {
-      return [];
-    }
-  }
-
-  public async import({
-    accountsDto,
-    activitiesDto,
-    isDryRun = false,
-    maxActivitiesToImport,
-    userCurrency,
-    userId
-  }: {
-    accountsDto: Partial<CreateAccountDto>[];
-    activitiesDto: Partial<CreateOrderDto>[];
-    isDryRun?: boolean;
-    maxActivitiesToImport: number;
-    userCurrency: string;
-    userId: string;
-  }): Promise<Activity[]> {
-    const accountIdMapping: { [oldAccountId: string]: string } = {};
-
-    if (!isDryRun && accountsDto?.length) {
-      const existingAccounts = await this.accountService.accounts({
-        where: {
-          id: {
-            in: accountsDto.map(({ id }) => {
-              return id;
-            })
-          }
-        }
-      });
-
-      for (const account of accountsDto) {
-        // Check if there is any existing account with the same ID
-        const accountWithSameId = existingAccounts.find(
-          (existingAccount) => existingAccount.id === account.id
-        );
-
-        // If there is no account or if the account belongs to a different user then create a new account
-        if (!accountWithSameId || accountWithSameId.userId !== userId) {
-          let oldAccountId: string;
-          const platformId = account.platformId;
-
-          delete account.platformId;
-
-          if (accountWithSameId) {
-            oldAccountId = account.id;
-            delete account.id;
-          }
-
-          const newAccountObject = {
-            ...account,
-            User: { connect: { id: userId } }
-          };
-
-          if (platformId) {
-            Object.assign(newAccountObject, {
-              Platform: { connect: { id: platformId } }
-            });
-          }
-
-          const newAccount = await this.accountService.createAccount(
-            newAccountObject,
-            userId
-          );
-
-          // Store the new to old account ID mappings for updating activities
-          if (accountWithSameId && oldAccountId) {
-            accountIdMapping[oldAccountId] = newAccount.id;
-          }
-        }
-      }
-    }
-
-    for (const activity of activitiesDto) {
-      if (!activity.dataSource) {
-        if (activity.type === 'ITEM') {
-          activity.dataSource = 'MANUAL';
-        } else {
-          activity.dataSource = this.dataProviderService.getPrimaryDataSource();
-        }
-      }
-
-      // If a new account is created, then update the accountId in all activities
-      if (!isDryRun) {
-        if (Object.keys(accountIdMapping).includes(activity.accountId)) {
-          activity.accountId = accountIdMapping[activity.accountId];
-        }
-      }
-    }
-
-    const assetProfiles = await this.validateActivities({
-      activitiesDto,
-      maxActivitiesToImport,
-      userId
-    });
-
-    const accounts = (await this.accountService.getAccounts(userId)).map(
-      (account) => {
-        return { id: account.id, name: account.name };
-      }
-    );
-
-    if (isDryRun) {
-      accountsDto.forEach(({ id, name }) => {
-        accounts.push({ id, name });
-      });
-    }
-
-    const activities: Activity[] = [];
-
-    for (const {
-      accountId,
-      comment,
-      currency,
-      dataSource,
-      date: dateString,
-      fee,
-      quantity,
-      symbol,
-      type,
-      unitPrice
-    } of activitiesDto) {
-      const date = parseISO(<string>(<unknown>dateString));
-      const validatedAccount = accounts.find(({ id }) => {
-        return id === accountId;
-      });
-
-      let order:
-        | OrderWithAccount
-        | (Omit<OrderWithAccount, 'Account'> & {
-            Account?: { id: string; name: string };
-          });
-
-      if (isDryRun) {
-        order = {
-          comment,
-          date,
-          fee,
-          quantity,
-          type,
-          unitPrice,
-          userId,
-          accountId: validatedAccount?.id,
-          accountUserId: undefined,
-          createdAt: new Date(),
-          id: uuidv4(),
-          isDraft: isAfter(date, endOfToday()),
-          SymbolProfile: {
-            currency,
-            dataSource,
-            symbol,
-            assetClass: null,
-            assetSubClass: null,
-            comment: null,
-            countries: null,
-            createdAt: undefined,
-            id: undefined,
-            name: null,
-            scraperConfiguration: null,
-            sectors: null,
-            symbolMapping: null,
-            updatedAt: undefined,
-            url: null,
-            ...assetProfiles[symbol]
-          },
-          Account: validatedAccount,
-          symbolProfileId: undefined,
-          updatedAt: new Date()
-        };
-      } else {
-        order = await this.orderService.createOrder({
-          comment,
-          date,
-          fee,
-          quantity,
-          type,
-          unitPrice,
-          userId,
-          accountId: validatedAccount?.id,
-          SymbolProfile: {
-            connectOrCreate: {
-              create: {
-                currency,
-                dataSource,
-                symbol
-              },
-              where: {
-                dataSource_symbol: {
-                  dataSource,
-                  symbol
-                }
-              }
-            }
-          },
-          User: { connect: { id: userId } }
-        });
-      }
-
-      const value = new Big(quantity).mul(unitPrice).toNumber();
-
-      //@ts-ignore
-      activities.push({
-        ...order,
-        value,
-        feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
-          fee,
-          currency,
-          userCurrency
-        ),
-        valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
-          value,
-          currency,
-          userCurrency
-        )
-      });
-    }
-
-    return activities;
-  }
-
-  private isUniqueAccount(accounts: AccountWithPlatform[]) {
-    const uniqueAccountIds = new Set<string>();
-
-    for (const account of accounts) {
-      uniqueAccountIds.add(account.id);
-    }
-
-    return uniqueAccountIds.size === 1;
-  }
-
-  private async validateActivities({
-    activitiesDto,
-    maxActivitiesToImport,
-    userId
-  }: {
-    activitiesDto: Partial<CreateOrderDto>[];
-    maxActivitiesToImport: number;
-    userId: string;
-  }) {
-    if (activitiesDto?.length > maxActivitiesToImport) {
-      throw new Error(`Too many activities (${maxActivitiesToImport} at most)`);
-    }
-
-    const assetProfiles: {
-      [symbol: string]: Partial<SymbolProfile>;
-    } = {};
-    const existingActivities = await this.orderService.orders({
-      include: { SymbolProfile: true },
-      orderBy: { date: 'desc' },
-      where: { userId }
-    });
-
-    for (const [
-      index,
-      { currency, dataSource, date, fee, quantity, symbol, type, unitPrice }
-    ] of activitiesDto.entries()) {
-      const duplicateActivity = existingActivities.find((activity) => {
-        return (
-          activity.SymbolProfile.currency === currency &&
-          activity.SymbolProfile.dataSource === dataSource &&
-          isSameDay(activity.date, parseISO(<string>(<unknown>date))) &&
-          activity.fee === fee &&
-          activity.quantity === quantity &&
-          activity.SymbolProfile.symbol === symbol &&
-          activity.type === type &&
-          activity.unitPrice === unitPrice
-        );
-      });
-
-      if (duplicateActivity) {
-        throw new Error(`activities.${index} is a duplicate activity`);
-      }
-
-      if (dataSource !== 'MANUAL') {
-        const assetProfile = (
-          await this.dataProviderService.getAssetProfiles([
-            { dataSource, symbol }
-          ])
-        )?.[symbol];
-
-        if (assetProfile === undefined) {
-          throw new Error(
-            `activities.${index}.symbol ("${symbol}") is not valid for the specified data source ("${dataSource}")`
-          );
-        }
-
-        if (assetProfile.currency !== currency) {
-          throw new Error(
-            `activities.${index}.currency ("${currency}") does not match with "${assetProfile.currency}"`
-          );
-        }
-
-        assetProfiles[symbol] = assetProfile;
-      }
-    }
-
-    return assetProfiles;
-  }
-}

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

@@ -1,15 +1,13 @@
-import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
-import { InfoItem } from '@ghostfolio/common/interfaces';
-import { Controller, Get, UseInterceptors } from '@nestjs/common';
+import { Controller, Get } from '@nestjs/common';
 
 import { InfoService } from './info.service';
+import { InfoItem } from './interfaces/info-item.interface';
 
 @Controller('info')
 export class InfoController {
   public constructor(private readonly infoService: InfoService) {}
 
   @Get()
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async getInfo(): Promise<InfoItem> {
     return this.infoService.get();
   }

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

@@ -1,13 +1,5 @@
-import { BenchmarkModule } from '@ghostfolio/api/app/benchmark/benchmark.module';
-import { RedisCacheModule } from '@ghostfolio/api/app/redis-cache/redis-cache.module';
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { DataGatheringModule } from '@ghostfolio/api/services/data-gathering.module';
-import { DataProviderModule } from '@ghostfolio/api/services/data-provider/data-provider.module';
-import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-data.module';
-import { PrismaModule } from '@ghostfolio/api/services/prisma.module';
-import { PropertyModule } from '@ghostfolio/api/services/property/property.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
-import { TagModule } from '@ghostfolio/api/services/tag/tag.module';
+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';
 
@@ -15,23 +7,13 @@ import { InfoController } from './info.controller';
 import { InfoService } from './info.service';
 
 @Module({
-  controllers: [InfoController],
   imports: [
-    BenchmarkModule,
-    ConfigurationModule,
-    DataGatheringModule,
-    DataProviderModule,
-    ExchangeRateDataModule,
     JwtModule.register({
       secret: process.env.JWT_SECRET_KEY,
       signOptions: { expiresIn: '30 days' }
-    }),
-    PrismaModule,
-    PropertyModule,
-    RedisCacheModule,
-    SymbolProfileModule,
-    TagModule
+    })
   ],
-  providers: [InfoService]
+  controllers: [InfoController],
+  providers: [ConfigurationService, InfoService, PrismaService]
 })
 export class InfoModule {}

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

@@ -1,320 +1,58 @@
-import { BenchmarkService } from '@ghostfolio/api/app/benchmark/benchmark.service';
-import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
 import { ConfigurationService } from '@ghostfolio/api/services/configuration.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
-import { PropertyService } from '@ghostfolio/api/services/property/property.service';
-import { TagService } from '@ghostfolio/api/services/tag/tag.service';
-import {
-  DEMO_USER_ID,
-  PROPERTY_COUNTRIES_OF_SUBSCRIBERS,
-  PROPERTY_IS_READ_ONLY_MODE,
-  PROPERTY_SLACK_COMMUNITY_USERS,
-  PROPERTY_STRIPE_CONFIG,
-  PROPERTY_SYSTEM_MESSAGE,
-  ghostfolioFearAndGreedIndexDataSource
-} from '@ghostfolio/common/config';
-import {
-  encodeDataSource,
-  extractNumberFromString
-} from '@ghostfolio/common/helper';
-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, Logger } from '@nestjs/common';
+import { permissions } from '@ghostfolio/helper';
+import { Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
-import * as bent from 'bent';
-import * as cheerio from 'cheerio';
-import { subDays } from 'date-fns';
+import { Currency } from '@prisma/client';
+
+import { InfoItem } from './interfaces/info-item.interface';
 
 @Injectable()
 export class InfoService {
-  private static CACHE_KEY_STATISTICS = 'STATISTICS';
+  private static DEMO_USER_ID = '9b112b4d-3b7d-4bad-9bdd-3b0f7b4dac2f';
 
   public constructor(
-    private readonly benchmarkService: BenchmarkService,
     private readonly configurationService: ConfigurationService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly jwtService: JwtService,
-    private readonly prismaService: PrismaService,
-    private readonly propertyService: PropertyService,
-    private readonly redisCacheService: RedisCacheService,
-    private readonly tagService: TagService
+    private jwtService: JwtService,
+    private prisma: PrismaService
   ) {}
 
   public async get(): Promise<InfoItem> {
-    const info: Partial<InfoItem> = {};
-    let isReadOnlyMode: boolean;
-    const platforms = await this.prismaService.platform.findMany({
+    const platforms = await this.prisma.platform.findMany({
       orderBy: { name: 'asc' },
       select: { id: true, name: true }
     });
-    let systemMessage: string;
 
     const globalPermissions: string[] = [];
 
-    if (this.configurationService.get('ENABLE_FEATURE_BLOG')) {
-      globalPermissions.push(permissions.enableBlog);
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_FEAR_AND_GREED_INDEX')) {
-      if (
-        this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION') === true
-      ) {
-        info.fearAndGreedDataSource = encodeDataSource(
-          ghostfolioFearAndGreedIndexDataSource
-        );
-      } else {
-        info.fearAndGreedDataSource = ghostfolioFearAndGreedIndexDataSource;
-      }
-
-      globalPermissions.push(permissions.enableFearAndGreedIndex);
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_IMPORT')) {
-      globalPermissions.push(permissions.enableImport);
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_READ_ONLY_MODE')) {
-      isReadOnlyMode = (await this.propertyService.getByKey(
-        PROPERTY_IS_READ_ONLY_MODE
-      )) as boolean;
-    }
-
     if (this.configurationService.get('ENABLE_FEATURE_SOCIAL_LOGIN')) {
       globalPermissions.push(permissions.enableSocialLogin);
     }
 
-    if (this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {
-      globalPermissions.push(permissions.enableStatistics);
-    }
-
     if (this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
       globalPermissions.push(permissions.enableSubscription);
-
-      info.countriesOfSubscribers =
-        ((await this.propertyService.getByKey(
-          PROPERTY_COUNTRIES_OF_SUBSCRIBERS
-        )) as string[]) ?? [];
-      info.stripePublicKey = this.configurationService.get('STRIPE_PUBLIC_KEY');
-    }
-
-    if (this.configurationService.get('ENABLE_FEATURE_SYSTEM_MESSAGE')) {
-      globalPermissions.push(permissions.enableSystemMessage);
-
-      systemMessage = (await this.propertyService.getByKey(
-        PROPERTY_SYSTEM_MESSAGE
-      )) as string;
-    }
-
-    const isUserSignupEnabled =
-      await this.propertyService.isUserSignupEnabled();
-
-    if (isUserSignupEnabled) {
-      globalPermissions.push(permissions.createUserAccount);
     }
 
     return {
-      ...info,
       globalPermissions,
-      isReadOnlyMode,
       platforms,
-      systemMessage,
-      baseCurrency: this.configurationService.get('BASE_CURRENCY'),
-      benchmarks: await this.benchmarkService.getBenchmarkAssetProfiles(),
-      currencies: this.exchangeRateDataService.getCurrencies(),
+      currencies: Object.values(Currency),
       demoAuthToken: this.getDemoAuthToken(),
-      statistics: await this.getStatistics(),
-      subscriptions: await this.getSubscriptions(),
-      tags: await this.tagService.get()
+      lastDataGathering: await this.getLastDataGathering()
     };
   }
 
-  private async countActiveUsers(aDays: number) {
-    return await this.prismaService.user.count({
-      orderBy: {
-        Analytics: {
-          updatedAt: 'desc'
-        }
-      },
-      where: {
-        AND: [
-          {
-            NOT: {
-              Analytics: null
-            }
-          },
-          {
-            Analytics: {
-              updatedAt: {
-                gt: subDays(new Date(), aDays)
-              }
-            }
-          }
-        ]
-      }
-    });
-  }
-
-  private async countDockerHubPulls(): Promise<number> {
-    try {
-      const get = bent(
-        `https://hub.docker.com/v2/repositories/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
-        {
-          'User-Agent': 'request'
-        }
-      );
-
-      const { pull_count } = await get();
-      return pull_count;
-    } catch (error) {
-      Logger.error(error, 'InfoService');
-
-      return undefined;
-    }
-  }
-
-  private async countGitHubContributors(): Promise<number> {
-    try {
-      const get = bent(
-        'https://github.com/ghostfolio/ghostfolio',
-        'GET',
-        'string',
-        200,
-        {}
-      );
-
-      const html = await get();
-      const $ = cheerio.load(html);
-
-      return extractNumberFromString(
-        $(
-          `a[href="/ghostfolio/ghostfolio/graphs/contributors"] .Counter`
-        ).text()
-      );
-    } catch (error) {
-      Logger.error(error, 'InfoService');
-
-      return undefined;
-    }
-  }
-
-  private async countGitHubStargazers(): Promise<number> {
-    try {
-      const get = bent(
-        `https://api.github.com/repos/ghostfolio/ghostfolio`,
-        'GET',
-        'json',
-        200,
-        {
-          'User-Agent': 'request'
-        }
-      );
-
-      const { stargazers_count } = await get();
-      return stargazers_count;
-    } catch (error) {
-      Logger.error(error, 'InfoService');
-
-      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 async countSlackCommunityUsers() {
-    return (await this.propertyService.getByKey(
-      PROPERTY_SLACK_COMMUNITY_USERS
-    )) as string;
-  }
-
   private getDemoAuthToken() {
     return this.jwtService.sign({
-      id: DEMO_USER_ID
+      id: InfoService.DEMO_USER_ID
     });
   }
 
-  private async getStatistics() {
-    if (!this.configurationService.get('ENABLE_FEATURE_STATISTICS')) {
-      return undefined;
-    }
+  private async getLastDataGathering() {
+    const lastDataGathering = await this.prisma.property.findUnique({
+      where: { key: 'LAST_DATA_GATHERING' }
+    });
 
-    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 activeUsers30d = await this.countActiveUsers(30);
-    const newUsers30d = await this.countNewUsers(30);
-
-    const dockerHubPulls = await this.countDockerHubPulls();
-    const gitHubContributors = await this.countGitHubContributors();
-    const gitHubStargazers = await this.countGitHubStargazers();
-    const slackCommunityUsers = await this.countSlackCommunityUsers();
-
-    statistics = {
-      activeUsers1d,
-      activeUsers30d,
-      dockerHubPulls,
-      gitHubContributors,
-      gitHubStargazers,
-      newUsers30d,
-      slackCommunityUsers
-    };
-
-    await this.redisCacheService.set(
-      InfoService.CACHE_KEY_STATISTICS,
-      JSON.stringify(statistics)
-    );
-
-    return statistics;
-  }
-
-  private async getSubscriptions(): Promise<Subscription[]> {
-    if (!this.configurationService.get('ENABLE_FEATURE_SUBSCRIPTION')) {
-      return undefined;
-    }
-
-    let subscriptions: Subscription[] = [];
-
-    const stripeConfig = (await this.prismaService.property.findUnique({
-      where: { key: PROPERTY_STRIPE_CONFIG }
-    })) ?? { value: '{}' };
-
-    subscriptions = [JSON.parse(stripeConfig.value)];
-
-    return subscriptions;
+    return lastDataGathering?.value ? new Date(lastDataGathering.value) : null;
   }
 }

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

@@ -0,0 +1,13 @@
+import { Currency } from '@prisma/client';
+
+export interface InfoItem {
+  currencies: Currency[];
+  demoAuthToken: string;
+  globalPermissions: string[];
+  lastDataGathering?: Date;
+  message?: {
+    text: string;
+    type: string;
+  };
+  platforms: { id: string; name: string }[];
+}

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

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

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

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

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

@@ -1,54 +0,0 @@
-import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-import {
-  Controller,
-  Get,
-  HttpStatus,
-  Param,
-  Query,
-  Res,
-  UseInterceptors
-} from '@nestjs/common';
-import { DataSource } from '@prisma/client';
-import { Response } from 'express';
-
-import { LogoService } from './logo.service';
-
-@Controller('logo')
-export class LogoController {
-  public constructor(private readonly logoService: LogoService) {}
-
-  @Get(':dataSource/:symbol')
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  public async getLogoByDataSourceAndSymbol(
-    @Param('dataSource') dataSource: DataSource,
-    @Param('symbol') symbol: string,
-    @Res() response: Response
-  ) {
-    try {
-      const buffer = await this.logoService.getLogoByDataSourceAndSymbol({
-        dataSource,
-        symbol
-      });
-
-      response.contentType('image/png');
-      response.send(buffer);
-    } catch {
-      response.status(HttpStatus.NOT_FOUND).send();
-    }
-  }
-
-  @Get()
-  public async getLogoByUrl(
-    @Query('url') url: string,
-    @Res() response: Response
-  ) {
-    try {
-      const buffer = await this.logoService.getLogoByUrl(url);
-
-      response.contentType('image/png');
-      response.send(buffer);
-    } catch {
-      response.status(HttpStatus.NOT_FOUND).send();
-    }
-  }
-}

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

@@ -1,13 +0,0 @@
-import { ConfigurationModule } from '@ghostfolio/api/services/configuration.module';
-import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile.module';
-import { Module } from '@nestjs/common';
-
-import { LogoController } from './logo.controller';
-import { LogoService } from './logo.service';
-
-@Module({
-  controllers: [LogoController],
-  imports: [ConfigurationModule, SymbolProfileModule],
-  providers: [LogoService]
-})
-export class LogoModule {}

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

@@ -1,55 +0,0 @@
-import { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import { UniqueAsset } from '@ghostfolio/common/interfaces';
-import { HttpException, Injectable } from '@nestjs/common';
-import { DataSource } from '@prisma/client';
-import * as bent from 'bent';
-import { StatusCodes, getReasonPhrase } from 'http-status-codes';
-
-@Injectable()
-export class LogoService {
-  public constructor(
-    private readonly symbolProfileService: SymbolProfileService
-  ) {}
-
-  public async getLogoByDataSourceAndSymbol({
-    dataSource,
-    symbol
-  }: UniqueAsset) {
-    if (!DataSource[dataSource]) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.NOT_FOUND),
-        StatusCodes.NOT_FOUND
-      );
-    }
-
-    const [assetProfile] = await this.symbolProfileService.getSymbolProfiles([
-      { dataSource, symbol }
-    ]);
-
-    if (!assetProfile) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.NOT_FOUND),
-        StatusCodes.NOT_FOUND
-      );
-    }
-
-    return this.getBuffer(assetProfile.url);
-  }
-
-  public async getLogoByUrl(aUrl: string) {
-    return this.getBuffer(aUrl);
-  }
-
-  private getBuffer(aUrl: string) {
-    const get = bent(
-      `https://t0.gstatic.com/faviconV2?client=SOCIAL&type=FAVICON&fallback_opts=TYPE,SIZE,URL&url=${aUrl}&size=64`,
-      'GET',
-      'buffer',
-      200,
-      {
-        'User-Agent': 'request'
-      }
-    );
-    return get();
-  }
-}

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

@@ -1,47 +1,12 @@
-import {
-  AssetClass,
-  AssetSubClass,
-  DataSource,
-  Tag,
-  Type
-} from '@prisma/client';
-import { Transform, TransformFnParams } from 'class-transformer';
-import {
-  IsArray,
-  IsEnum,
-  IsISO8601,
-  IsNumber,
-  IsOptional,
-  IsString
-} from 'class-validator';
-import { isString } from 'lodash';
+import { Currency, Type } from '@prisma/client';
+import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
 
 export class CreateOrderDto {
-  @IsOptional()
   @IsString()
-  accountId?: string;
-
-  @IsOptional()
-  @IsEnum(AssetClass, { each: true })
-  assetClass?: AssetClass;
-
-  @IsOptional()
-  @IsEnum(AssetSubClass, { each: true })
-  assetSubClass?: AssetSubClass;
-
-  @IsOptional()
-  @IsString()
-  @Transform(({ value }: TransformFnParams) =>
-    isString(value) ? value.trim() : value
-  )
-  comment?: string;
+  accountId: string;
 
   @IsString()
-  currency: string;
-
-  @IsOptional()
-  @IsEnum(DataSource, { each: true })
-  dataSource?: DataSource;
+  currency: Currency;
 
   @IsISO8601()
   date: string;
@@ -49,17 +14,17 @@ export class CreateOrderDto {
   @IsNumber()
   fee: number;
 
+  @IsString()
+  @ValidateIf((object, value) => value !== null)
+  platformId: string | null;
+
   @IsNumber()
   quantity: number;
 
   @IsString()
   symbol: string;
 
-  @IsArray()
-  @IsOptional()
-  tags?: Tag[];
-
-  @IsEnum(Type, { each: true })
+  @IsString()
   type: Type;
 
   @IsNumber()

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

@@ -1,11 +0,0 @@
-import { OrderWithAccount } from '@ghostfolio/common/types';
-
-export interface Activities {
-  activities: Activity[];
-}
-
-export interface Activity extends OrderWithAccount {
-  feeInBaseCurrency: number;
-  value: number;
-  valueInBaseCurrency: number;
-}

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

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

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

@@ -1,10 +1,7 @@
-import { RedactValuesInResponseInterceptor } from '@ghostfolio/api/interceptors/redact-values-in-response.interceptor';
-import { TransformDataSourceInRequestInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-request.interceptor';
-import { TransformDataSourceInResponseInterceptor } from '@ghostfolio/api/interceptors/transform-data-source-in-response.interceptor';
-import { ApiService } from '@ghostfolio/api/services/api/api.service';
+import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
+import { nullifyValuesInObjects } from '@ghostfolio/api/helper/object.helper';
 import { ImpersonationService } from '@ghostfolio/api/services/impersonation.service';
-import { hasPermission, permissions } from '@ghostfolio/common/permissions';
-import type { RequestWithUser } from '@ghostfolio/common/types';
+import { getPermissions, hasPermission, permissions } from '@ghostfolio/helper';
 import {
   Body,
   Controller,
@@ -16,9 +13,7 @@ import {
   Param,
   Post,
   Put,
-  Query,
-  UseGuards,
-  UseInterceptors
+  UseGuards
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
@@ -27,14 +22,12 @@ import { parseISO } from 'date-fns';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { CreateOrderDto } from './create-order.dto';
-import { Activities } from './interfaces/activities.interface';
 import { OrderService } from './order.service';
 import { UpdateOrderDto } from './update-order.dto';
 
 @Controller('order')
 export class OrderController {
   public constructor(
-    private readonly apiService: ApiService,
     private readonly impersonationService: ImpersonationService,
     private readonly orderService: OrderService,
     @Inject(REQUEST) private readonly request: RequestWithUser
@@ -43,12 +36,11 @@ export class OrderController {
   @Delete(':id')
   @UseGuards(AuthGuard('jwt'))
   public async deleteOrder(@Param('id') id: string): Promise<OrderModel> {
-    const order = await this.orderService.order({ id });
-
     if (
-      !hasPermission(this.request.user.permissions, permissions.deleteOrder) ||
-      !order ||
-      order.userId !== this.request.user.id
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.deleteOrder
+      )
     ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -56,93 +48,67 @@ export class OrderController {
       );
     }
 
-    return this.orderService.deleteOrder({
-      id
-    });
+    return this.orderService.deleteOrder(
+      {
+        id_userId: {
+          id,
+          userId: this.request.user.id
+        }
+      },
+      this.request.user.id
+    );
   }
 
   @Get()
   @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(RedactValuesInResponseInterceptor)
-  @UseInterceptors(TransformDataSourceInResponseInterceptor)
   public async getAllOrders(
-    @Headers('impersonation-id') impersonationId,
-    @Query('accounts') filterByAccounts?: string,
-    @Query('assetClasses') filterByAssetClasses?: string,
-    @Query('tags') filterByTags?: string
-  ): Promise<Activities> {
-    const filters = this.apiService.buildFiltersFromQueryParams({
-      filterByAccounts,
-      filterByAssetClasses,
-      filterByTags
+    @Headers('impersonation-id') impersonationId
+  ): Promise<OrderModel[]> {
+    const impersonationUserId = await this.impersonationService.validateImpersonationId(
+      impersonationId,
+      this.request.user.id
+    );
+
+    let orders = await this.orderService.orders({
+      include: {
+        Platform: true
+      },
+      orderBy: { date: 'desc' },
+      where: { userId: impersonationUserId || this.request.user.id }
     });
 
-    const impersonationUserId =
-      await this.impersonationService.validateImpersonationId(
-        impersonationId,
-        this.request.user.id
-      );
-    const userCurrency = this.request.user.Settings.settings.baseCurrency;
+    if (
+      impersonationUserId &&
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.readForeignPortfolio
+      )
+    ) {
+      orders = nullifyValuesInObjects(orders, ['fee', 'quantity', 'unitPrice']);
+    }
 
-    const activities = await this.orderService.getOrders({
-      filters,
-      userCurrency,
-      includeDrafts: true,
-      userId: impersonationUserId || this.request.user.id,
-      withExcludedAccounts: true
+    return orders;
+  }
+
+  @Get(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async getOrderById(@Param('id') id: string): Promise<OrderModel> {
+    return this.orderService.order({
+      id_userId: {
+        id,
+        userId: this.request.user.id
+      }
     });
-
-    return { activities };
   }
 
   @Post()
   @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
   public async createOrder(@Body() data: CreateOrderDto): Promise<OrderModel> {
     if (
-      !hasPermission(this.request.user.permissions, permissions.createOrder)
-    ) {
-      throw new HttpException(
-        getReasonPhrase(StatusCodes.FORBIDDEN),
-        StatusCodes.FORBIDDEN
-      );
-    }
-
-    return this.orderService.createOrder({
-      ...data,
-      date: parseISO(data.date),
-      SymbolProfile: {
-        connectOrCreate: {
-          create: {
-            currency: data.currency,
-            dataSource: data.dataSource,
-            symbol: data.symbol
-          },
-          where: {
-            dataSource_symbol: {
-              dataSource: data.dataSource,
-              symbol: data.symbol
-            }
-          }
-        }
-      },
-      User: { connect: { id: this.request.user.id } },
-      userId: this.request.user.id
-    });
-  }
-
-  @Put(':id')
-  @UseGuards(AuthGuard('jwt'))
-  @UseInterceptors(TransformDataSourceInRequestInterceptor)
-  public async update(@Param('id') id: string, @Body() data: UpdateOrderDto) {
-    const originalOrder = await this.orderService.order({
-      id
-    });
-
-    if (
-      !hasPermission(this.request.user.permissions, permissions.updateOrder) ||
-      !originalOrder ||
-      originalOrder.userId !== this.request.user.id
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.createOrder
+      )
     ) {
       throw new HttpException(
         getReasonPhrase(StatusCodes.FORBIDDEN),
@@ -155,33 +121,124 @@ export class OrderController {
     const accountId = data.accountId;
     delete data.accountId;
 
-    return this.orderService.updateOrder({
-      data: {
-        ...data,
-        date,
-        Account: {
-          connect: {
-            id_userId: { id: accountId, userId: this.request.user.id }
-          }
-        },
-        SymbolProfile: {
-          connect: {
-            dataSource_symbol: {
-              dataSource: data.dataSource,
-              symbol: data.symbol
+    if (data.platformId) {
+      const platformId = data.platformId;
+      delete data.platformId;
+
+      return this.orderService.createOrder(
+        {
+          ...data,
+          date,
+          Account: {
+            connect: {
+              id_userId: { id: accountId, userId: this.request.user.id }
             }
           },
-          update: {
-            assetClass: data.assetClass,
-            assetSubClass: data.assetSubClass,
-            name: data.symbol
-          }
+          Platform: { connect: { id: platformId } },
+          User: { connect: { id: this.request.user.id } }
         },
-        User: { connect: { id: this.request.user.id } }
-      },
-      where: {
-        id
+        this.request.user.id
+      );
+    } else {
+      delete data.platformId;
+
+      return this.orderService.createOrder(
+        {
+          ...data,
+          date,
+          Account: {
+            connect: {
+              id_userId: { id: accountId, userId: this.request.user.id }
+            }
+          },
+          User: { connect: { id: this.request.user.id } }
+        },
+        this.request.user.id
+      );
+    }
+  }
+
+  @Put(':id')
+  @UseGuards(AuthGuard('jwt'))
+  public async update(@Param('id') id: string, @Body() data: UpdateOrderDto) {
+    if (
+      !hasPermission(
+        getPermissions(this.request.user.role),
+        permissions.updateOrder
+      )
+    ) {
+      throw new HttpException(
+        getReasonPhrase(StatusCodes.FORBIDDEN),
+        StatusCodes.FORBIDDEN
+      );
+    }
+
+    const originalOrder = await this.orderService.order({
+      id_userId: {
+        id,
+        userId: this.request.user.id
       }
     });
+
+    const date = parseISO(data.date);
+
+    const accountId = data.accountId;
+    delete data.accountId;
+
+    if (data.platformId) {
+      const platformId = data.platformId;
+      delete data.platformId;
+
+      return this.orderService.updateOrder(
+        {
+          data: {
+            ...data,
+            date,
+            Account: {
+              connect: {
+                id_userId: { id: accountId, userId: this.request.user.id }
+              }
+            },
+            Platform: { connect: { id: platformId } },
+            User: { connect: { id: this.request.user.id } }
+          },
+          where: {
+            id_userId: {
+              id,
+              userId: this.request.user.id
+            }
+          }
+        },
+        this.request.user.id
+      );
+    } else {
+      // platformId is null, remove it
+      delete data.platformId;
+
+      return this.orderService.updateOrder(
+        {
+          data: {
+            ...data,
+            date,
+            Account: {
+              connect: {
+                id_userId: { id: accountId, userId: this.request.user.id }
+              }
+            },
+            Platform: originalOrder.platformId
+              ? { disconnect: true }
+              : undefined,
+            User: { connect: { id: this.request.user.id } }
+          },
+          where: {
+            id_userId: {
+              id,
+              userId: this.request.user.id
+            }
+          }
+        },
+        this.request.user.id
+      );
+    }
   }
 }

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

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

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

@@ -1,45 +1,25 @@
-import { AccountService } from '@ghostfolio/api/app/account/account.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 { SymbolProfileService } from '@ghostfolio/api/services/symbol-profile.service';
-import {
-  GATHER_ASSET_PROFILE_PROCESS,
-  GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-} from '@ghostfolio/common/config';
-import { Filter } from '@ghostfolio/common/interfaces';
-import { OrderWithAccount } from '@ghostfolio/common/types';
 import { Injectable } from '@nestjs/common';
-import {
-  AssetClass,
-  AssetSubClass,
-  DataSource,
-  Order,
-  Prisma,
-  Tag,
-  Type as TypeOfOrder
-} from '@prisma/client';
-import Big from 'big.js';
-import { endOfToday, isAfter } from 'date-fns';
-import { groupBy } from 'lodash';
-import { v4 as uuidv4 } from 'uuid';
+import { Order, Prisma } from '@prisma/client';
 
-import { Activity } from './interfaces/activities.interface';
+import { CacheService } from '../cache/cache.service';
+import { RedisCacheService } from '../redis-cache/redis-cache.service';
+import { OrderWithPlatform } from './interfaces/order-with-platform.type';
 
 @Injectable()
 export class OrderService {
   public constructor(
-    private readonly accountService: AccountService,
+    private readonly cacheService: CacheService,
     private readonly dataGatheringService: DataGatheringService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly prismaService: PrismaService,
-    private readonly symbolProfileService: SymbolProfileService
+    private readonly redisCacheService: RedisCacheService,
+    private prisma: PrismaService
   ) {}
 
   public async order(
     orderWhereUniqueInput: Prisma.OrderWhereUniqueInput
   ): Promise<Order | null> {
-    return this.prismaService.order.findUnique({
+    return this.prisma.order.findUnique({
       where: orderWhereUniqueInput
     });
   }
@@ -50,11 +30,11 @@ export class OrderService {
     take?: number;
     cursor?: Prisma.OrderWhereUniqueInput;
     where?: Prisma.OrderWhereInput;
-    orderBy?: Prisma.OrderOrderByWithRelationInput;
-  }): Promise<OrderWithAccount[]> {
+    orderBy?: Prisma.OrderOrderByInput;
+  }): Promise<OrderWithPlatform[]> {
     const { include, skip, take, cursor, where, orderBy } = params;
 
-    return this.prismaService.order.findMany({
+    return this.prisma.order.findMany({
       cursor,
       include,
       orderBy,
@@ -65,316 +45,60 @@ export class OrderService {
   }
 
   public async createOrder(
-    data: Prisma.OrderCreateInput & {
-      accountId?: string;
-      assetClass?: AssetClass;
-      assetSubClass?: AssetSubClass;
-      currency?: string;
-      dataSource?: DataSource;
-      symbol?: string;
-      tags?: Tag[];
-      userId: string;
-    }
+    data: Prisma.OrderCreateInput,
+    aUserId: string
   ): Promise<Order> {
-    let Account;
+    this.redisCacheService.remove(`${aUserId}.portfolio`);
 
-    if (data.accountId) {
-      Account = {
-        connect: {
-          id_userId: {
-            userId: data.userId,
-            id: data.accountId
-          }
-        }
-      };
-    }
-
-    const tags = data.tags ?? [];
-
-    if (data.type === 'ITEM') {
-      const assetClass = data.assetClass;
-      const assetSubClass = data.assetSubClass;
-      const currency = data.SymbolProfile.connectOrCreate.create.currency;
-      const dataSource: DataSource = 'MANUAL';
-      const id = uuidv4();
-      const name = data.SymbolProfile.connectOrCreate.create.symbol;
-
-      data.id = id;
-      data.SymbolProfile.connectOrCreate.create.assetClass = assetClass;
-      data.SymbolProfile.connectOrCreate.create.assetSubClass = assetSubClass;
-      data.SymbolProfile.connectOrCreate.create.currency = currency;
-      data.SymbolProfile.connectOrCreate.create.dataSource = dataSource;
-      data.SymbolProfile.connectOrCreate.create.name = name;
-      data.SymbolProfile.connectOrCreate.create.symbol = id;
-      data.SymbolProfile.connectOrCreate.where.dataSource_symbol = {
-        dataSource,
-        symbol: id
-      };
-    } else {
-      data.SymbolProfile.connectOrCreate.create.symbol =
-        data.SymbolProfile.connectOrCreate.create.symbol.toUpperCase();
-    }
-
-    await this.dataGatheringService.addJobToQueue(
-      GATHER_ASSET_PROFILE_PROCESS,
+    // Gather symbol data of order in the background
+    this.dataGatheringService.gatherSymbols([
       {
-        dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
-        symbol: data.SymbolProfile.connectOrCreate.create.symbol
-      },
-      GATHER_ASSET_PROFILE_PROCESS_OPTIONS
-    );
-
-    const isDraft = isAfter(data.date as Date, endOfToday());
-
-    if (!isDraft) {
-      // Gather symbol data of order in the background, if not draft
-      this.dataGatheringService.gatherSymbols([
-        {
-          dataSource: data.SymbolProfile.connectOrCreate.create.dataSource,
-          date: <Date>data.date,
-          symbol: data.SymbolProfile.connectOrCreate.create.symbol
-        }
-      ]);
-    }
-
-    delete data.accountId;
-    delete data.assetClass;
-    delete data.assetSubClass;
-
-    if (!data.comment) {
-      delete data.comment;
-    }
-
-    delete data.currency;
-    delete data.dataSource;
-    delete data.symbol;
-    delete data.tags;
-    delete data.userId;
-
-    const orderData: Prisma.OrderCreateInput = data;
-
-    return this.prismaService.order.create({
-      data: {
-        ...orderData,
-        Account,
-        isDraft,
-        tags: {
-          connect: tags.map(({ id }) => {
-            return { id };
-          })
-        }
+        date: <Date>data.date,
+        symbol: data.symbol
       }
+    ]);
+
+    await this.cacheService.flush(aUserId);
+
+    return this.prisma.order.create({
+      data
     });
   }
 
   public async deleteOrder(
-    where: Prisma.OrderWhereUniqueInput
+    where: Prisma.OrderWhereUniqueInput,
+    aUserId: string
   ): Promise<Order> {
-    const order = await this.prismaService.order.delete({
+    this.redisCacheService.remove(`${aUserId}.portfolio`);
+
+    return this.prisma.order.delete({
       where
     });
-
-    if (order.type === 'ITEM') {
-      await this.symbolProfileService.deleteById(order.symbolProfileId);
-    }
-
-    return order;
   }
 
-  public async getOrders({
-    filters,
-    includeDrafts = false,
-    types,
-    userCurrency,
-    userId,
-    withExcludedAccounts = false
-  }: {
-    filters?: Filter[];
-    includeDrafts?: boolean;
-    types?: TypeOfOrder[];
-    userCurrency: string;
-    userId: string;
-    withExcludedAccounts?: boolean;
-  }): Promise<Activity[]> {
-    const where: Prisma.OrderWhereInput = { userId };
+  public async updateOrder(
+    params: {
+      where: Prisma.OrderWhereUniqueInput;
+      data: Prisma.OrderUpdateInput;
+    },
+    aUserId: string
+  ): Promise<Order> {
+    const { data, where } = params;
 
-    const {
-      ACCOUNT: filtersByAccount,
-      ASSET_CLASS: filtersByAssetClass,
-      TAG: filtersByTag
-    } = groupBy(filters, (filter) => {
-      return filter.type;
-    });
+    this.redisCacheService.remove(`${aUserId}.portfolio`);
 
-    if (filtersByAccount?.length > 0) {
-      where.accountId = {
-        in: filtersByAccount.map(({ id }) => {
-          return id;
-        })
-      };
-    }
-
-    if (includeDrafts === false) {
-      where.isDraft = false;
-    }
-
-    if (filtersByAssetClass?.length > 0) {
-      where.SymbolProfile = {
-        OR: [
-          {
-            AND: [
-              {
-                OR: filtersByAssetClass.map(({ id }) => {
-                  return { assetClass: AssetClass[id] };
-                })
-              },
-              {
-                OR: [
-                  { SymbolProfileOverrides: { is: null } },
-                  { SymbolProfileOverrides: { assetClass: null } }
-                ]
-              }
-            ]
-          },
-          {
-            SymbolProfileOverrides: {
-              OR: filtersByAssetClass.map(({ id }) => {
-                return { assetClass: AssetClass[id] };
-              })
-            }
-          }
-        ]
-      };
-    }
-
-    if (filtersByTag?.length > 0) {
-      where.tags = {
-        some: {
-          OR: filtersByTag.map(({ id }) => {
-            return { id };
-          })
-        }
-      };
-    }
-
-    if (types) {
-      where.OR = types.map((type) => {
-        return {
-          type: {
-            equals: type
-          }
-        };
-      });
-    }
-
-    return (
-      await this.orders({
-        where,
-        include: {
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          Account: {
-            include: {
-              Platform: true
-            }
-          },
-          // eslint-disable-next-line @typescript-eslint/naming-convention
-          SymbolProfile: true,
-          tags: true
-        },
-        orderBy: { date: 'asc' }
-      })
-    )
-      .filter((order) => {
-        return withExcludedAccounts || order.Account?.isExcluded === false;
-      })
-      .map((order) => {
-        const value = new Big(order.quantity).mul(order.unitPrice).toNumber();
-
-        return {
-          ...order,
-          value,
-          feeInBaseCurrency: this.exchangeRateDataService.toCurrency(
-            order.fee,
-            order.SymbolProfile.currency,
-            userCurrency
-          ),
-          valueInBaseCurrency: this.exchangeRateDataService.toCurrency(
-            value,
-            order.SymbolProfile.currency,
-            userCurrency
-          )
-        };
-      });
-  }
-
-  public async updateOrder({
-    data,
-    where
-  }: {
-    data: Prisma.OrderUpdateInput & {
-      assetClass?: AssetClass;
-      assetSubClass?: AssetSubClass;
-      currency?: string;
-      dataSource?: DataSource;
-      symbol?: string;
-      tags?: Tag[];
-    };
-    where: Prisma.OrderWhereUniqueInput;
-  }): Promise<Order> {
-    if (data.Account.connect.id_userId.id === null) {
-      delete data.Account;
-    }
-
-    if (!data.comment) {
-      data.comment = null;
-    }
-
-    const tags = data.tags ?? [];
-
-    let isDraft = false;
-
-    if (data.type === 'ITEM') {
-      delete data.SymbolProfile.connect;
-    } else {
-      delete data.SymbolProfile.update;
-
-      isDraft = isAfter(data.date as Date, endOfToday());
-
-      if (!isDraft) {
-        // Gather symbol data of order in the background, if not draft
-        this.dataGatheringService.gatherSymbols([
-          {
-            dataSource: data.SymbolProfile.connect.dataSource_symbol.dataSource,
-            date: <Date>data.date,
-            symbol: data.SymbolProfile.connect.dataSource_symbol.symbol
-          }
-        ]);
+    // Gather symbol data of order in the background
+    this.dataGatheringService.gatherSymbols([
+      {
+        date: <Date>data.date,
+        symbol: <string>data.symbol
       }
-    }
+    ]);
 
-    delete data.assetClass;
-    delete data.assetSubClass;
-    delete data.currency;
-    delete data.dataSource;
-    delete data.symbol;
-    delete data.tags;
+    await this.cacheService.flush(aUserId);
 
-    // Remove existing tags
-    await this.prismaService.order.update({
-      data: { tags: { set: [] } },
-      where
-    });
-
-    return this.prismaService.order.update({
-      data: {
-        ...data,
-        isDraft,
-        tags: {
-          connect: tags.map(({ id }) => {
-            return { id };
-          })
-        }
-      },
+    return this.prisma.order.update({
+      data,
       where
     });
   }

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

@@ -1,46 +1,12 @@
-import {
-  AssetClass,
-  AssetSubClass,
-  DataSource,
-  Tag,
-  Type
-} from '@prisma/client';
-import { Transform, TransformFnParams } from 'class-transformer';
-import {
-  IsArray,
-  IsEnum,
-  IsISO8601,
-  IsNumber,
-  IsOptional,
-  IsString
-} from 'class-validator';
-import { isString } from 'lodash';
+import { Currency, Type } from '@prisma/client';
+import { IsISO8601, IsNumber, IsString, ValidateIf } from 'class-validator';
 
 export class UpdateOrderDto {
-  @IsOptional()
   @IsString()
-  accountId?: string;
-
-  @IsEnum(AssetClass, { each: true })
-  @IsOptional()
-  assetClass?: AssetClass;
-
-  @IsEnum(AssetSubClass, { each: true })
-  @IsOptional()
-  assetSubClass?: AssetSubClass;
-
-  @IsOptional()
-  @IsString()
-  @Transform(({ value }: TransformFnParams) =>
-    isString(value) ? value.trim() : value
-  )
-  comment?: string;
+  accountId: string;
 
   @IsString()
-  currency: string;
-
-  @IsString()
-  dataSource: DataSource;
+  currency: Currency;
 
   @IsISO8601()
   date: string;
@@ -48,6 +14,10 @@ export class UpdateOrderDto {
   @IsNumber()
   fee: number;
 
+  @IsString()
+  @ValidateIf((object, value) => value !== null)
+  platformId: string | null;
+
   @IsString()
   id: string;
 
@@ -57,10 +27,6 @@ export class UpdateOrderDto {
   @IsString()
   symbol: string;
 
-  @IsArray()
-  @IsOptional()
-  tags?: Tag[];
-
   @IsString()
   type: Type;
 

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

@@ -1,86 +0,0 @@
-import { parseDate, resetHours } from '@ghostfolio/common/helper';
-import { addDays, endOfDay, isBefore, isSameDay } from 'date-fns';
-
-import { GetValueObject } from './interfaces/get-value-object.interface';
-import { GetValuesParams } from './interfaces/get-values-params.interface';
-
-function mockGetValue(symbol: string, date: Date) {
-  switch (symbol) {
-    case 'BALN.SW':
-      if (isSameDay(parseDate('2021-11-12'), date)) {
-        return { marketPrice: 146 };
-      } else if (isSameDay(parseDate('2021-11-22'), date)) {
-        return { marketPrice: 142.9 };
-      } else if (isSameDay(parseDate('2021-11-26'), date)) {
-        return { marketPrice: 139.9 };
-      } else if (isSameDay(parseDate('2021-11-30'), date)) {
-        return { marketPrice: 136.6 };
-      } else if (isSameDay(parseDate('2021-12-18'), date)) {
-        return { marketPrice: 148.9 };
-      }
-
-      return { marketPrice: 0 };
-
-    case 'BTCUSD':
-      if (isSameDay(parseDate('2015-01-01'), date)) {
-        return { marketPrice: 314.25 };
-      } else if (isSameDay(parseDate('2017-12-31'), date)) {
-        return { marketPrice: 14156.4 };
-      } else if (isSameDay(parseDate('2018-01-01'), date)) {
-        return { marketPrice: 13657.2 };
-      }
-
-      return { marketPrice: 0 };
-
-    case 'NOVN.SW':
-      if (isSameDay(parseDate('2022-04-11'), date)) {
-        return { marketPrice: 87.8 };
-      }
-
-      return { marketPrice: 0 };
-
-    default:
-      return { marketPrice: 0 };
-  }
-}
-
-export const CurrentRateServiceMock = {
-  getValues: ({
-    dataGatheringItems,
-    dateQuery
-  }: GetValuesParams): Promise<GetValueObject[]> => {
-    const result: GetValueObject[] = [];
-    if (dateQuery.lt) {
-      for (
-        let date = resetHours(dateQuery.gte);
-        isBefore(date, endOfDay(dateQuery.lt));
-        date = addDays(date, 1)
-      ) {
-        for (const dataGatheringItem of dataGatheringItems) {
-          result.push({
-            date,
-            marketPriceInBaseCurrency: mockGetValue(
-              dataGatheringItem.symbol,
-              date
-            ).marketPrice,
-            symbol: dataGatheringItem.symbol
-          });
-        }
-      }
-    } else {
-      for (const date of dateQuery.in) {
-        for (const dataGatheringItem of dataGatheringItems) {
-          result.push({
-            date,
-            marketPriceInBaseCurrency: mockGetValue(
-              dataGatheringItem.symbol,
-              date
-            ).marketPrice,
-            symbol: dataGatheringItem.symbol
-          });
-        }
-      }
-    }
-    return Promise.resolve(result);
-  }
-};

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

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

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

@@ -1,95 +0,0 @@
-import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
-import { ExchangeRateDataService } from '@ghostfolio/api/services/exchange-rate-data.service';
-import { MarketDataService } from '@ghostfolio/api/services/market-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 { GetValuesParams } from './interfaces/get-values-params.interface';
-
-@Injectable()
-export class CurrentRateService {
-  public constructor(
-    private readonly dataProviderService: DataProviderService,
-    private readonly exchangeRateDataService: ExchangeRateDataService,
-    private readonly marketDataService: MarketDataService
-  ) {}
-
-  public async getValues({
-    currencies,
-    dataGatheringItems,
-    dateQuery,
-    userCurrency
-  }: GetValuesParams): Promise<GetValueObject[]> {
-    const includeToday =
-      (!dateQuery.lt || isBefore(new Date(), dateQuery.lt)) &&
-      (!dateQuery.gte || isBefore(dateQuery.gte, new Date())) &&
-      (!dateQuery.in || this.containsToday(dateQuery.in));
-
-    const promises: Promise<GetValueObject[]>[] = [];
-
-    if (includeToday) {
-      const today = resetHours(new Date());
-      promises.push(
-        this.dataProviderService
-          .getQuotes(dataGatheringItems)
-          .then((dataResultProvider) => {
-            const result: GetValueObject[] = [];
-            for (const dataGatheringItem of dataGatheringItems) {
-              result.push({
-                date: today,
-                marketPriceInBaseCurrency:
-                  this.exchangeRateDataService.toCurrency(
-                    dataResultProvider?.[dataGatheringItem.symbol]
-                      ?.marketPrice ?? 0,
-                    dataResultProvider?.[dataGatheringItem.symbol]?.currency,
-                    userCurrency
-                  ),
-                symbol: dataGatheringItem.symbol
-              });
-            }
-            return result;
-          })
-      );
-    }
-
-    const symbols = dataGatheringItems.map((dataGatheringItem) => {
-      return dataGatheringItem.symbol;
-    });
-
-    promises.push(
-      this.marketDataService
-        .getRange({
-          dateQuery,
-          symbols
-        })
-        .then((data) => {
-          return data.map((marketDataItem) => {
-            return {
-              date: marketDataItem.date,
-              marketPriceInBaseCurrency:
-                this.exchangeRateDataService.toCurrency(
-                  marketDataItem.marketPrice,
-                  currencies[marketDataItem.symbol],
-                  userCurrency
-                ),
-              symbol: marketDataItem.symbol
-            };
-          });
-        })
-    );
-
-    return flatten(await Promise.all(promises));
-  }
-
-  private containsToday(dates: Date[]): boolean {
-    for (const date of dates) {
-      if (isToday(date)) {
-        return true;
-      }
-    }
-    return false;
-  }
-}

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

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

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

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