Skip to content

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

Feature/expose thresholds in rule settings (#3770)

Thomas Kaul3de192c65ef6
diff --git a/apps/api/src/app/portfolio/rules.service.ts b/apps/api/src/app/portfolio/rules.service.ts
index 6b6526144c..fd9d794b21 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 61fe389afb..29cbb4a8f6 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;
}