From a4cd08f99bd04fcf1deeda8ed9a8db9bcb0aad39 Mon Sep 17 00:00:00 2001
From: Thomas <4159106+dtslvr@users.noreply.github.com>
Date: Sun, 16 May 2021 17:56:12 +0200
Subject: [PATCH] Move interfaces and types

* UserWithSettings
* RequestWithUser
---
 apps/api/src/app/access/access.controller.ts             | 2 +-
 apps/api/src/app/account/account.controller.ts           | 4 ++--
 apps/api/src/app/admin/admin.controller.ts               | 2 +-
 apps/api/src/app/cache/cache.controller.ts               | 4 ++--
 apps/api/src/app/experimental/experimental.controller.ts | 2 +-
 apps/api/src/app/order/order.controller.ts               | 2 +-
 apps/api/src/app/portfolio/portfolio.controller.ts       | 2 +-
 apps/api/src/app/portfolio/portfolio.service.ts          | 2 +-
 apps/api/src/app/symbol/symbol.controller.ts             | 2 +-
 apps/api/src/app/user/user.controller.ts                 | 2 +-
 apps/api/src/app/user/user.service.ts                    | 4 +---
 apps/api/src/models/portfolio.ts                         | 2 +-
 libs/helper/src/lib/interfaces/index.ts                  | 4 +++-
 .../helper/src/lib}/interfaces/user-with-settings.ts     | 0
 libs/helper/src/lib/types/index.ts                       | 9 ++++++++-
 .../helper/src/lib/types}/request-with-user.type.ts      | 2 +-
 16 files changed, 26 insertions(+), 19 deletions(-)
 rename {apps/api/src/app => libs/helper/src/lib}/interfaces/user-with-settings.ts (100%)
 rename {apps/api/src/app/interfaces => libs/helper/src/lib/types}/request-with-user.type.ts (51%)

diff --git a/apps/api/src/app/access/access.controller.ts b/apps/api/src/app/access/access.controller.ts
index 2d9b0c28f..2bbc32f38 100644
--- a/apps/api/src/app/access/access.controller.ts
+++ b/apps/api/src/app/access/access.controller.ts
@@ -1,5 +1,5 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { Access } from '@ghostfolio/helper/interfaces';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import { Controller, Get, Inject, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
diff --git a/apps/api/src/app/account/account.controller.ts b/apps/api/src/app/account/account.controller.ts
index d33e07eea..8595daaa1 100644
--- a/apps/api/src/app/account/account.controller.ts
+++ b/apps/api/src/app/account/account.controller.ts
@@ -1,4 +1,3 @@
-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 {
@@ -6,6 +5,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/helper/permissions';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Body,
   Controller,
@@ -21,7 +21,7 @@ import {
 } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
-import { Account as AccountModel, Order } from '@prisma/client';
+import { Account as AccountModel } from '@prisma/client';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
 import { AccountService } from './account.service';
diff --git a/apps/api/src/app/admin/admin.controller.ts b/apps/api/src/app/admin/admin.controller.ts
index 823a9605c..93dc8f647 100644
--- a/apps/api/src/app/admin/admin.controller.ts
+++ b/apps/api/src/app/admin/admin.controller.ts
@@ -1,4 +1,3 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { DataGatheringService } from '@ghostfolio/api/services/data-gathering.service';
 import { AdminData } from '@ghostfolio/helper/interfaces';
 import {
@@ -6,6 +5,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/helper/permissions';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Controller,
   Get,
diff --git a/apps/api/src/app/cache/cache.controller.ts b/apps/api/src/app/cache/cache.controller.ts
index 5567f6053..8c208a063 100644
--- a/apps/api/src/app/cache/cache.controller.ts
+++ b/apps/api/src/app/cache/cache.controller.ts
@@ -1,5 +1,5 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
-import { Controller, Inject, Param, Post, UseGuards } from '@nestjs/common';
+import { RequestWithUser } from '@ghostfolio/helper/types';
+import { Controller, Inject, Post, UseGuards } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
 import { AuthGuard } from '@nestjs/passport';
 
diff --git a/apps/api/src/app/experimental/experimental.controller.ts b/apps/api/src/app/experimental/experimental.controller.ts
index 5534d7531..0e82fa9b4 100644
--- a/apps/api/src/app/experimental/experimental.controller.ts
+++ b/apps/api/src/app/experimental/experimental.controller.ts
@@ -1,6 +1,6 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { baseCurrency, benchmarks } from '@ghostfolio/helper/config';
 import { isApiTokenAuthorized } from '@ghostfolio/helper/permissions';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Body,
   Controller,
diff --git a/apps/api/src/app/order/order.controller.ts b/apps/api/src/app/order/order.controller.ts
index 3c62dc21a..5c6f5fcf3 100644
--- a/apps/api/src/app/order/order.controller.ts
+++ b/apps/api/src/app/order/order.controller.ts
@@ -1,4 +1,3 @@
-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 {
@@ -6,6 +5,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/helper/permissions';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Body,
   Controller,
diff --git a/apps/api/src/app/portfolio/portfolio.controller.ts b/apps/api/src/app/portfolio/portfolio.controller.ts
index dd88460d6..0dc3498e0 100644
--- a/apps/api/src/app/portfolio/portfolio.controller.ts
+++ b/apps/api/src/app/portfolio/portfolio.controller.ts
@@ -18,6 +18,7 @@ import {
   hasPermission,
   permissions
 } from '@ghostfolio/helper/permissions';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Controller,
   Get,
@@ -34,7 +35,6 @@ import { AuthGuard } from '@nestjs/passport';
 import { Response } from 'express';
 import { StatusCodes, getReasonPhrase } from 'http-status-codes';
 
-import { RequestWithUser } from '../interfaces/request-with-user.type';
 import {
   HistoricalDataItem,
   PortfolioPositionDetail
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 9ea500864..5b161f749 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -1,4 +1,3 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 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';
@@ -9,6 +8,7 @@ import {
   PortfolioItem,
   PortfolioOverview
 } from '@ghostfolio/helper/interfaces';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import { DateRange } from '@ghostfolio/helper/types';
 import { Inject, Injectable } from '@nestjs/common';
 import { REQUEST } from '@nestjs/core';
diff --git a/apps/api/src/app/symbol/symbol.controller.ts b/apps/api/src/app/symbol/symbol.controller.ts
index d2dc68c15..b9b6e74c6 100644
--- a/apps/api/src/app/symbol/symbol.controller.ts
+++ b/apps/api/src/app/symbol/symbol.controller.ts
@@ -1,4 +1,4 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Controller,
   Get,
diff --git a/apps/api/src/app/user/user.controller.ts b/apps/api/src/app/user/user.controller.ts
index c0f42ec3c..c794c2d44 100644
--- a/apps/api/src/app/user/user.controller.ts
+++ b/apps/api/src/app/user/user.controller.ts
@@ -1,10 +1,10 @@
-import { RequestWithUser } from '@ghostfolio/api/app/interfaces/request-with-user.type';
 import { User } from '@ghostfolio/helper/interfaces';
 import {
   getPermissions,
   hasPermission,
   permissions
 } from '@ghostfolio/helper/permissions';
+import { RequestWithUser } from '@ghostfolio/helper/types';
 import {
   Body,
   Controller,
diff --git a/apps/api/src/app/user/user.service.ts b/apps/api/src/app/user/user.service.ts
index 3e9979a12..23880bdb9 100644
--- a/apps/api/src/app/user/user.service.ts
+++ b/apps/api/src/app/user/user.service.ts
@@ -2,14 +2,12 @@ import { ConfigurationService } from '@ghostfolio/api/services/configuration.ser
 import { PrismaService } from '@ghostfolio/api/services/prisma.service';
 import { locale } from '@ghostfolio/helper/config';
 import { resetHours } from '@ghostfolio/helper/helper';
-import { User as IUser } from '@ghostfolio/helper/interfaces';
+import { User as IUser, UserWithSettings } from '@ghostfolio/helper/interfaces';
 import { getPermissions, permissions } from '@ghostfolio/helper/permissions';
 import { Injectable } from '@nestjs/common';
 import { Currency, Prisma, Provider, User } from '@prisma/client';
 import { add } from 'date-fns';
 
-import { UserWithSettings } from '../interfaces/user-with-settings';
-
 const crypto = require('crypto');
 
 @Injectable()
diff --git a/apps/api/src/models/portfolio.ts b/apps/api/src/models/portfolio.ts
index a865eca0d..1d2b89788 100644
--- a/apps/api/src/models/portfolio.ts
+++ b/apps/api/src/models/portfolio.ts
@@ -7,6 +7,7 @@ import {
   PortfolioReport,
   Position
 } from '@ghostfolio/helper/interfaces';
+import { UserWithSettings } from '@ghostfolio/helper/interfaces';
 import { DateRange } from '@ghostfolio/helper/types';
 import { OrderWithAccount } from '@ghostfolio/helper/types';
 import {
@@ -28,7 +29,6 @@ import {
 import { cloneDeep, isEmpty } from 'lodash';
 import * as roundTo from 'round-to';
 
-import { UserWithSettings } from '../app/interfaces/user-with-settings';
 import { DataProviderService } from '../services/data-provider.service';
 import { ExchangeRateDataService } from '../services/exchange-rate-data.service';
 import { IOrder } from '../services/interfaces/interfaces';
diff --git a/libs/helper/src/lib/interfaces/index.ts b/libs/helper/src/lib/interfaces/index.ts
index 2df2c8687..eb84932e7 100644
--- a/libs/helper/src/lib/interfaces/index.ts
+++ b/libs/helper/src/lib/interfaces/index.ts
@@ -9,6 +9,7 @@ import { PortfolioReportRule } from './portfolio-report-rule.interface';
 import { PortfolioReport } from './portfolio-report.interface';
 import { Position } from './position.interface';
 import { UserSettings } from './user-settings.interface';
+import { UserWithSettings } from './user-with-settings';
 import { User } from './user.interface';
 
 export {
@@ -23,5 +24,6 @@ export {
   PortfolioReportRule,
   Position,
   User,
-  UserSettings
+  UserSettings,
+  UserWithSettings
 };
diff --git a/apps/api/src/app/interfaces/user-with-settings.ts b/libs/helper/src/lib/interfaces/user-with-settings.ts
similarity index 100%
rename from apps/api/src/app/interfaces/user-with-settings.ts
rename to libs/helper/src/lib/interfaces/user-with-settings.ts
diff --git a/libs/helper/src/lib/types/index.ts b/libs/helper/src/lib/types/index.ts
index ca148276e..9d6d78b01 100644
--- a/libs/helper/src/lib/types/index.ts
+++ b/libs/helper/src/lib/types/index.ts
@@ -2,5 +2,12 @@ import { AccessWithGranteeUser } from './access-with-grantee-user.type';
 import { DateRange } from './date-range.type';
 import { Granularity } from './granularity.type';
 import { OrderWithAccount } from './order-with-account.type';
+import { RequestWithUser } from './request-with-user.type';
 
-export { AccessWithGranteeUser, DateRange, Granularity, OrderWithAccount };
+export {
+  AccessWithGranteeUser,
+  DateRange,
+  Granularity,
+  OrderWithAccount,
+  RequestWithUser
+};
diff --git a/apps/api/src/app/interfaces/request-with-user.type.ts b/libs/helper/src/lib/types/request-with-user.type.ts
similarity index 51%
rename from apps/api/src/app/interfaces/request-with-user.type.ts
rename to libs/helper/src/lib/types/request-with-user.type.ts
index 9e26b55b4..a58760891 100644
--- a/apps/api/src/app/interfaces/request-with-user.type.ts
+++ b/libs/helper/src/lib/types/request-with-user.type.ts
@@ -1,3 +1,3 @@
-import { UserWithSettings } from './user-with-settings';
+import { UserWithSettings } from '@ghostfolio/helper/interfaces';
 
 export type RequestWithUser = Request & { user: UserWithSettings };