From cc855c59210e2a40acad91678033a3935ddce07a Mon Sep 17 00:00:00 2001
From: Thomas Kaul <4159106+dtslvr@users.noreply.github.com>
Date: Sat, 12 Oct 2024 20:11:55 +0200
Subject: [PATCH] Refactoring

---
 apps/api/src/app/portfolio/rules.service.ts            | 10 +++++-----
 .../client/src/app/components/rule/rule.component.html |  4 ++--
 apps/client/src/app/components/rule/rule.component.ts  |  3 ++-
 .../lib/interfaces/portfolio-report-rule.interface.ts  |  8 ++++----
 libs/common/src/lib/types/x-ray-rules-settings.type.ts |  4 +---
 5 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/apps/api/src/app/portfolio/rules.service.ts b/apps/api/src/app/portfolio/rules.service.ts
index 6c46db0a0..1d7acbd9d 100644
--- a/apps/api/src/app/portfolio/rules.service.ts
+++ b/apps/api/src/app/portfolio/rules.service.ts
@@ -25,13 +25,13 @@ export class RulesService {
         return {
           evaluation,
           value,
-          isActive: true,
-          key: rule.getKey(),
-          name: rule.getName(),
-          settings: {
+          configuration: {
             thresholdMax: isNumber(settings['thresholdMax']) ? true : false,
             thresholdMin: isNumber(settings['thresholdMin']) ? true : false
-          } as PortfolioReportRule['settings']
+          } as PortfolioReportRule['configuration'],
+          isActive: true,
+          key: rule.getKey(),
+          name: rule.getName()
         };
       } else {
         return {
diff --git a/apps/client/src/app/components/rule/rule.component.html b/apps/client/src/app/components/rule/rule.component.html
index 85dd3a490..aed14da63 100644
--- a/apps/client/src/app/components/rule/rule.component.html
+++ b/apps/client/src/app/components/rule/rule.component.html
@@ -64,8 +64,8 @@
           <mat-menu #rulesMenu="matMenu" xPosition="before">
             @if (
               rule?.isActive &&
-              (rule?.settings.thresholdMax >= 0 ||
-                rule?.settings.thresholdMin >= 0)
+              (rule?.configuration?.thresholdMax ||
+                rule?.configuration?.thresholdMin)
             ) {
               <button mat-menu-item (click)="onCustomizeRule(rule)">
                 <ng-container i18n>Customize</ng-container>...
diff --git a/apps/client/src/app/components/rule/rule.component.ts b/apps/client/src/app/components/rule/rule.component.ts
index 99abf110c..f51ce805f 100644
--- a/apps/client/src/app/components/rule/rule.component.ts
+++ b/apps/client/src/app/components/rule/rule.component.ts
@@ -1,4 +1,5 @@
 import { UpdateUserSettingDto } from '@ghostfolio/api/app/user/update-user-setting.dto';
+import { RuleSettings } from '@ghostfolio/api/models/interfaces/rule-settings.interface';
 import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
 import { XRayRulesSettings } from '@ghostfolio/common/types';
 
@@ -55,7 +56,7 @@ export class RuleComponent implements OnInit {
     dialogRef
       .afterClosed()
       .pipe(takeUntil(this.unsubscribeSubject))
-      .subscribe((settings: PortfolioReportRule['settings']) => {
+      .subscribe((settings: RuleSettings) => {
         if (settings) {
           this.ruleUpdated.emit({
             xRayRules: {
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 a32aa62b3..ace2583a8 100644
--- a/libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts
+++ b/libs/common/src/lib/interfaces/portfolio-report-rule.interface.ts
@@ -1,11 +1,11 @@
 export interface PortfolioReportRule {
+  configuration?: {
+    thresholdMax: boolean;
+    thresholdMin: boolean;
+  };
   evaluation?: string;
   isActive: boolean;
   key: string;
   name: string;
-  settings?: {
-    thresholdMax: boolean;
-    thresholdMin: boolean;
-  };
   value?: boolean;
 }
diff --git a/libs/common/src/lib/types/x-ray-rules-settings.type.ts b/libs/common/src/lib/types/x-ray-rules-settings.type.ts
index db91aeeef..fddd708cc 100644
--- a/libs/common/src/lib/types/x-ray-rules-settings.type.ts
+++ b/libs/common/src/lib/types/x-ray-rules-settings.type.ts
@@ -1,5 +1,3 @@
-import { PortfolioReportRule } from '@ghostfolio/common/interfaces';
-
 export type XRayRulesSettings = {
   AccountClusterRiskCurrentInvestment?: RuleSettings;
   AccountClusterRiskSingleAccount?: RuleSettings;
@@ -9,7 +7,7 @@ export type XRayRulesSettings = {
   FeeRatioInitialInvestment?: RuleSettings;
 };
 
-interface RuleSettings extends Pick<PortfolioReportRule, 'settings'> {
+interface RuleSettings {
   isActive: boolean;
   thresholdMax?: number;
   thresholdMin?: number;