diff --git a/apps/client/src/app/components/rule/rule.component.ts b/apps/client/src/app/components/rule/rule.component.ts index 2bf6fe4a5..941bf2070 100644 --- a/apps/client/src/app/components/rule/rule.component.ts +++ b/apps/client/src/app/components/rule/rule.component.ts @@ -4,7 +4,7 @@ import { Input, OnInit } from '@angular/core'; -import { PortfolioReportRule } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-report.interface'; +import { PortfolioReportRule } from '@ghostfolio/helper/interfaces'; @Component({ selector: 'gf-rule', diff --git a/apps/client/src/app/components/rules/rules.component.ts b/apps/client/src/app/components/rules/rules.component.ts index 61af91883..c77642484 100644 --- a/apps/client/src/app/components/rules/rules.component.ts +++ b/apps/client/src/app/components/rules/rules.component.ts @@ -1,5 +1,5 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; -import { PortfolioReportRule } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-report.interface'; +import { PortfolioReportRule } from '@ghostfolio/helper/interfaces'; @Component({ selector: 'gf-rules', diff --git a/apps/client/src/app/pages/report/report-page.component.ts b/apps/client/src/app/pages/report/report-page.component.ts index 8687798fa..aa71391f2 100644 --- a/apps/client/src/app/pages/report/report-page.component.ts +++ b/apps/client/src/app/pages/report/report-page.component.ts @@ -1,6 +1,6 @@ import { ChangeDetectorRef, Component, OnInit } from '@angular/core'; -import { PortfolioReportRule } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-report.interface'; import { DataService } from '@ghostfolio/client/services/data.service'; +import { PortfolioReportRule } from '@ghostfolio/helper/interfaces'; import { Subject } from 'rxjs'; import { takeUntil } from 'rxjs/operators'; diff --git a/apps/client/src/app/services/data.service.ts b/apps/client/src/app/services/data.service.ts index 43c7a5114..0010212ad 100644 --- a/apps/client/src/app/services/data.service.ts +++ b/apps/client/src/app/services/data.service.ts @@ -11,7 +11,6 @@ import { HistoricalDataItem, PortfolioPositionDetail } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-position-detail.interface'; -import { PortfolioReport } from '@ghostfolio/api/app/portfolio/interfaces/portfolio-report.interface'; import { LookupItem } from '@ghostfolio/api/app/symbol/interfaces/lookup-item.interface'; import { SymbolItem } from '@ghostfolio/api/app/symbol/interfaces/symbol-item.interface'; import { UserItem } from '@ghostfolio/api/app/user/interfaces/user-item.interface'; @@ -23,7 +22,8 @@ import { PortfolioItem, PortfolioOverview, PortfolioPerformance, - PortfolioPosition + PortfolioPosition, + PortfolioReport } from '@ghostfolio/helper/interfaces'; import { Order as OrderModel } from '@prisma/client'; import { Account as AccountModel } from '@prisma/client'; diff --git a/libs/helper/src/lib/interfaces/index.ts b/libs/helper/src/lib/interfaces/index.ts index d31caec84..04656f0a6 100644 --- a/libs/helper/src/lib/interfaces/index.ts +++ b/libs/helper/src/lib/interfaces/index.ts @@ -4,6 +4,8 @@ import { PortfolioItem } from './portfolio-item.interface'; import { PortfolioOverview } from './portfolio-overview.interface'; import { PortfolioPerformance } from './portfolio-performance.interface'; import { PortfolioPosition } from './portfolio-position.interface'; +import { PortfolioReportRule } from './portfolio-report-rule.interface'; +import { PortfolioReport } from './portfolio-report.interface'; import { Position } from './position.interface'; export { @@ -13,5 +15,7 @@ export { PortfolioOverview, PortfolioPerformance, PortfolioPosition, + PortfolioReport, + PortfolioReportRule, Position }; diff --git a/apps/api/src/app/portfolio/interfaces/portfolio-report.interface.ts b/libs/helper/src/lib/interfaces/portfolio-report-rule.interface.ts similarity index 51% rename from apps/api/src/app/portfolio/interfaces/portfolio-report.interface.ts rename to libs/helper/src/lib/interfaces/portfolio-report-rule.interface.ts index cbec2ecaf..5ba8ccef3 100644 --- a/apps/api/src/app/portfolio/interfaces/portfolio-report.interface.ts +++ b/libs/helper/src/lib/interfaces/portfolio-report-rule.interface.ts @@ -1,7 +1,3 @@ -export interface PortfolioReport { - rules: { [group: string]: PortfolioReportRule[] }; -} - export interface PortfolioReportRule { evaluation: string; name: string; diff --git a/libs/helper/src/lib/interfaces/portfolio-report.interface.ts b/libs/helper/src/lib/interfaces/portfolio-report.interface.ts new file mode 100644 index 000000000..a33a0aae6 --- /dev/null +++ b/libs/helper/src/lib/interfaces/portfolio-report.interface.ts @@ -0,0 +1,5 @@ +import { PortfolioReportRule } from './portfolio-report-rule.interface'; + +export interface PortfolioReport { + rules: { [group: string]: PortfolioReportRule[] }; +}