Skip to content

Open Source Wealth Management Software. Angular + NestJS + Prisma + Nx + TypeScript 🤍

Feature/improve liabilities in portfolio calculator (#3696)

Thomas Kaule23019a11594
diff --git a/apps/api/src/app/order/order.service.ts b/apps/api/src/app/order/order.service.ts
index cb8543f9ae..f66380e1f4 100644
--- a/apps/api/src/app/order/order.service.ts
+++ b/apps/api/src/app/order/order.service.ts
@@ -519,6 +519,23 @@ export class OrderService {
return { activities, count };
}
+ public async getOrdersForPortfolioCalculator({
+ filters,
+ userCurrency,
+ userId
+ }: {
+ filters?: Filter[];
+ userCurrency: string;
+ userId: string;
+ }) {
+ return this.getOrders({
+ filters,
+ userCurrency,
+ userId,
+ withExcludedAccounts: false // TODO
+ });
+ }
+
public async getStatisticsByCurrency(
currency: EnhancedSymbolProfile['currency']
): Promise<{
diff --git a/apps/api/src/app/portfolio/portfolio.service.ts b/apps/api/src/app/portfolio/portfolio.service.ts
index 8c42d49510..4e5ae2bb63 100644
--- a/apps/api/src/app/portfolio/portfolio.service.ts
+++ b/apps/api/src/app/portfolio/portfolio.service.ts
@@ -247,13 +247,12 @@ export class PortfolioService {
const { endDate, startDate } = getIntervalFromDateRange(dateRange);
- const { activities } = await this.orderService.getOrders({
- filters,
- userId,
- includeDrafts: true,
- types: ['BUY', 'SELL'],
- userCurrency: this.getUserCurrency()
- });
+ const { activities } =
+ await this.orderService.getOrdersForPortfolioCalculator({
+ filters,
+ userId,
+ userCurrency: this.getUserCurrency()
+ });
if (activities.length === 0) {
return {
@@ -332,12 +331,12 @@ export class PortfolioService {
(user.Settings?.settings as UserSettings)?.emergencyFund ?? 0
);
- const { activities } = await this.orderService.getOrders({
- filters,
- userCurrency,
- userId,
- withExcludedAccounts
- });
+ const { activities } =
+ await this.orderService.getOrdersForPortfolioCalculator({
+ filters,
+ userCurrency,
+ userId
+ });
const portfolioCalculator = this.calculatorFactory.createCalculator({
activities,
@@ -597,11 +596,11 @@ export class PortfolioService {
const user = await this.userService.user({ id: userId });
const userCurrency = this.getUserCurrency(user);
- const { activities } = await this.orderService.getOrders({
- userCurrency,
- userId,
- withExcludedAccounts: true
- });
+ const { activities } =
+ await this.orderService.getOrdersForPortfolioCalculator({
+ userCurrency,
+ userId
+ });
const orders = activities.filter(({ SymbolProfile }) => {
return (
@@ -906,14 +905,12 @@ export class PortfolioService {
const userId = await this.getUserId(impersonationId, this.request.user.id);
const user = await this.userService.user({ id: userId });
- const { endDate } = getIntervalFromDateRange(dateRange);
-
- const { activities } = await this.orderService.getOrders({
- endDate,
- filters,
- userId,
- userCurrency: this.getUserCurrency()
- });
+ const { activities } =
+ await this.orderService.getOrdersForPortfolioCalculator({
+ filters,
+ userId,
+ userCurrency: this.getUserCurrency()
+ });
if (activities?.length <= 0) {
return {
@@ -1085,15 +1082,12 @@ export class PortfolioService {
)
);
- const { endDate, startDate } = getIntervalFromDateRange(dateRange);
-
- const { activities } = await this.orderService.getOrders({
- endDate,
- filters,
- userCurrency,
- userId,
- withExcludedAccounts
- });
+ const { activities } =
+ await this.orderService.getOrdersForPortfolioCalculator({
+ filters,
+ userCurrency,
+ userId
+ });
if (accountBalanceItems?.length <= 0 && activities?.length <= 0) {
return {
@@ -1126,6 +1120,8 @@ export class PortfolioService {
const { errors, hasErrors, historicalData } =
await portfolioCalculator.getSnapshot();
+ const { endDate, startDate } = getIntervalFromDateRange(dateRange);
+
const { chart } = await portfolioCalculator.getPerformance({
end: endDate,
start: startDate
@@ -1175,10 +1171,11 @@ export class PortfolioService {
const user = await this.userService.user({ id: userId });
const userCurrency = this.getUserCurrency(user);
- const { activities } = await this.orderService.getOrders({
- userCurrency,
- userId
- });
+ const { activities } =
+ await this.orderService.getOrdersForPortfolioCalculator({
+ userCurrency,
+ userId
+ });
const portfolioCalculator = this.calculatorFactory.createCalculator({
activities,