From 3de192c65ef65b8e0e4b9c8f26a3921e1524d073 Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 14 Sep 2024 19:42:37 +0200
Subject: [PATCH] Feature/expose thresholds in rule settings (#3770)

---
 apps/api/src/app/portfolio/rules.service.ts   | 21 ++++++++++++-------
 .../portfolio-report-rule.interface.ts        |  4 ++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/apps/api/src/app/portfolio/rules.service.ts b/apps/api/src/app/portfolio/rules.service.ts
index 6b6526144..fd9d794b2 100644
--- a/apps/api/src/app/portfolio/rules.service.ts
+++ b/apps/api/src/app/portfolio/rules.service.ts
@@ -1,6 +1,9 @@
 import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { Rule } from '@ghostfolio/api/models/rule';
-import { UserSettings } from '@ghostfolio/common/interfaces';
+import {
+  PortfolioReportRule,
+  UserSettings
+} from '@ghostfolio/common/interfaces';
 
 import { Injectable } from '@nestjs/common';
 
@@ -11,19 +14,23 @@ export class RulesService {
   public async evaluate<T extends RuleSettings>(
     aRules: Rule<T>[],
     aUserSettings: UserSettings
-  ) {
+  ): Promise<PortfolioReportRule[]> {
     return aRules.map((rule) => {
-      if (rule.getSettings(aUserSettings)?.isActive) {
-        const { evaluation, value } = rule.evaluate(
-          rule.getSettings(aUserSettings)
-        );
+      const settings = rule.getSettings(aUserSettings);
+
+      if (settings?.isActive) {
+        const { evaluation, value } = rule.evaluate(settings);
 
         return {
           evaluation,
           value,
           isActive: true,
           key: rule.getKey(),
-          name: rule.getName()
+          name: rule.getName(),
+          settings: <PortfolioReportRule['settings']>{
+            thresholdMax: settings['thresholdMax'],
+            thresholdMin: settings['thresholdMin']
+          }
         };
       } else {
         return {
diff --git a/libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts b/libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts
index 61fe389af..29cbb4a8f 100644
--- a/libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts
+++ b/libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts
@@ -3,5 +3,9 @@ export interface PortfolioReportRule {
   isActive: boolean;
   key: string;
   name: string;
+  settings?: {
+    thresholdMax?: number;
+    thresholdMin?: number;
+  };
   value?: boolean;
 }