Browse Source

chore: revert import changes

Signed-off-by: Dominik Willner <th33xitus@gmail.com>
pull/3983/head
dw-0 10 months ago
parent
commit
860483a013
  1. 35
      apps/api/src/app/user/user.service.ts
  2. 9
      apps/api/src/services/market-data/market-data.service.ts
  3. 6
      apps/api/src/services/queues/data-gathering/data-gathering.processor.ts
  4. 18
      apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts
  5. 6
      apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

35
apps/api/src/app/user/user.service.ts

@ -1,3 +1,20 @@
import { OrderService } from '@ghostfolio/api/app/order/order.service';
import { SubscriptionService } from '@ghostfolio/api/app/subscription/subscription.service';
import { environment } from '@ghostfolio/api/environments/environment';
import { PortfolioChangedEvent } from '@ghostfolio/api/events/portfolio-changed.event';
import { AccountClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/account-cluster-risk/current-investment';
import { AccountClusterRiskSingleAccount } from '@ghostfolio/api/models/rules/account-cluster-risk/single-account';
import { AllocationClusterRiskDevelopedMarkets } from '@ghostfolio/api/models/rules/allocation-cluster-risk/developed-markets';
import { AllocationClusterRiskEmergingMarkets } from '@ghostfolio/api/models/rules/allocation-cluster-risk/emerging-markets';
import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/base-currency-current-investment';
import { CurrencyClusterRiskCurrentInvestment } from '@ghostfolio/api/models/rules/currency-cluster-risk/current-investment';
import { EmergencyFundSetup } from '@ghostfolio/api/models/rules/emergency-fund/emergency-fund-setup';
import { FeeRatioInitialInvestment } from '@ghostfolio/api/models/rules/fees/fee-ratio-initial-investment';
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
import { I18nService } from '@ghostfolio/api/services/i18n/i18n.service';
import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
import { PropertyService } from '@ghostfolio/api/services/property/property.service';
import { TagService } from '@ghostfolio/api/services/tag/tag.service';
import { import {
DEFAULT_CURRENCY, DEFAULT_CURRENCY,
DEFAULT_LANGUAGE_CODE, DEFAULT_LANGUAGE_CODE,
@ -23,24 +40,6 @@ import { Prisma, Role, User } from '@prisma/client';
import { differenceInDays } from 'date-fns'; import { differenceInDays } from 'date-fns';
import { sortBy, without } from 'lodash'; import { sortBy, without } from 'lodash';
import { environment } from '../../environments/environment';
import { PortfolioChangedEvent } from '../../events/portfolio-changed.event';
import { AccountClusterRiskCurrentInvestment } from '../../models/rules/account-cluster-risk/current-investment';
import { AccountClusterRiskSingleAccount } from '../../models/rules/account-cluster-risk/single-account';
import { AllocationClusterRiskDevelopedMarkets } from '../../models/rules/allocation-cluster-risk/developed-markets';
import { AllocationClusterRiskEmergingMarkets } from '../../models/rules/allocation-cluster-risk/emerging-markets';
import { CurrencyClusterRiskBaseCurrencyCurrentInvestment } from '../../models/rules/currency-cluster-risk/base-currency-current-investment';
import { CurrencyClusterRiskCurrentInvestment } from '../../models/rules/currency-cluster-risk/current-investment';
import { EmergencyFundSetup } from '../../models/rules/emergency-fund/emergency-fund-setup';
import { FeeRatioInitialInvestment } from '../../models/rules/fees/fee-ratio-initial-investment';
import { ConfigurationService } from '../../services/configuration/configuration.service';
import { I18nService } from '../../services/i18n/i18n.service';
import { PrismaService } from '../../services/prisma/prisma.service';
import { PropertyService } from '../../services/property/property.service';
import { TagService } from '../../services/tag/tag.service';
import { OrderService } from '../order/order.service';
import { SubscriptionService } from '../subscription/subscription.service';
const crypto = require('crypto'); const crypto = require('crypto');
@Injectable() @Injectable()

9
apps/api/src/services/market-data/market-data.service.ts

@ -1,3 +1,7 @@
import { UpdateMarketDataDto } from '@ghostfolio/api/app/admin/update-market-data.dto';
import { DateQuery } from '@ghostfolio/api/app/portfolio/interfaces/date-query.interface';
import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service';
import { resetHours } from '@ghostfolio/common/helper'; import { resetHours } from '@ghostfolio/common/helper';
import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces'; import { AssetProfileIdentifier } from '@ghostfolio/common/interfaces';
@ -9,11 +13,6 @@ import {
Prisma Prisma
} from '@prisma/client'; } from '@prisma/client';
import { UpdateMarketDataDto } from '../../app/admin/update-market-data.dto';
import { DateQuery } from '../../app/portfolio/interfaces/date-query.interface';
import { IDataGatheringItem } from '../interfaces/interfaces';
import { PrismaService } from '../prisma/prisma.service';
@Injectable() @Injectable()
export class MarketDataService { export class MarketDataService {
public constructor(private readonly prismaService: PrismaService) {} public constructor(private readonly prismaService: PrismaService) {}

6
apps/api/src/services/queues/data-gathering/data-gathering.processor.ts

@ -1,3 +1,6 @@
import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service';
import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces';
import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service';
import { import {
DATA_GATHERING_QUEUE, DATA_GATHERING_QUEUE,
DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY, DEFAULT_PROCESSOR_GATHER_ASSET_PROFILE_CONCURRENCY,
@ -22,9 +25,6 @@ import {
parseISO parseISO
} from 'date-fns'; } from 'date-fns';
import { DataProviderService } from '../../data-provider/data-provider.service';
import { IDataGatheringItem } from '../../interfaces/interfaces';
import { MarketDataService } from '../../market-data/market-data.service';
import { DataGatheringService } from './data-gathering.service'; import { DataGatheringService } from './data-gathering.service';
@Injectable() @Injectable()

18
apps/api/src/services/queues/portfolio-snapshot/portfolio-snapshot.processor.ts

@ -1,3 +1,12 @@
import { AccountBalanceService } from '@ghostfolio/api/app/account-balance/account-balance.service';
import { OrderService } from '@ghostfolio/api/app/order/order.service';
import {
PerformanceCalculationType,
PortfolioCalculatorFactory
} from '@ghostfolio/api/app/portfolio/calculator/portfolio-calculator.factory';
import { PortfolioSnapshotValue } from '@ghostfolio/api/app/portfolio/interfaces/snapshot-value.interface';
import { RedisCacheService } from '@ghostfolio/api/app/redis-cache/redis-cache.service';
import { ConfigurationService } from '@ghostfolio/api/services/configuration/configuration.service';
import { import {
CACHE_TTL_INFINITE, CACHE_TTL_INFINITE,
DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY, DEFAULT_PROCESSOR_PORTFOLIO_SNAPSHOT_COMPUTATION_CONCURRENCY,
@ -10,15 +19,6 @@ import { Injectable, Logger } from '@nestjs/common';
import { Job } from 'bull'; import { Job } from 'bull';
import { addMilliseconds } from 'date-fns'; import { addMilliseconds } from 'date-fns';
import { AccountBalanceService } from '../../../app/account-balance/account-balance.service';
import { OrderService } from '../../../app/order/order.service';
import {
PerformanceCalculationType,
PortfolioCalculatorFactory
} from '../../../app/portfolio/calculator/portfolio-calculator.factory';
import { PortfolioSnapshotValue } from '../../../app/portfolio/interfaces/snapshot-value.interface';
import { RedisCacheService } from '../../../app/redis-cache/redis-cache.service';
import { ConfigurationService } from '../../configuration/configuration.service';
import { IPortfolioSnapshotQueueJob } from './interfaces/portfolio-snapshot-queue-job.interface'; import { IPortfolioSnapshotQueueJob } from './interfaces/portfolio-snapshot-queue-job.interface';
@Injectable() @Injectable()

6
apps/client/src/app/components/admin-market-data/admin-market-data.component.ts

@ -1,3 +1,6 @@
import { AdminService } from '@ghostfolio/client/services/admin.service';
import { DataService } from '@ghostfolio/client/services/data.service';
import { UserService } from '@ghostfolio/client/services/user/user.service';
import { import {
DEFAULT_PAGE_SIZE, DEFAULT_PAGE_SIZE,
ghostfolioScraperApiSymbolPrefix ghostfolioScraperApiSymbolPrefix
@ -34,9 +37,6 @@ import { DeviceDetectorService } from 'ngx-device-detector';
import { Subject } from 'rxjs'; import { Subject } from 'rxjs';
import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators'; import { distinctUntilChanged, switchMap, takeUntil } from 'rxjs/operators';
import { AdminService } from '../../services/admin.service';
import { DataService } from '../../services/data.service';
import { UserService } from '../../services/user/user.service';
import { AdminMarketDataService } from './admin-market-data.service'; import { AdminMarketDataService } from './admin-market-data.service';
import { AssetProfileDialog } from './asset-profile-dialog/asset-profile-dialog.component'; import { AssetProfileDialog } from './asset-profile-dialog/asset-profile-dialog.component';
import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/interfaces'; import { AssetProfileDialogParams } from './asset-profile-dialog/interfaces/interfaces';

Loading…
Cancel
Save