From a6a82a9f5f3a17f6c14c000900c1ff96eede053b Mon Sep 17 00:00:00 2001 From: Daniel Devaud Date: Fri, 23 Feb 2024 17:46:42 +0100 Subject: [PATCH] Fix Formatting --- apps/api/src/app/admin/admin.module.ts | 2 +- apps/api/src/app/admin/admin.service.ts | 2 +- apps/api/src/app/portfolio/current-rate.service.ts | 2 +- apps/api/src/app/user/update-user-setting.dto.ts | 13 ++++++++++++- apps/api/src/helper/dateQueryHelper.ts | 4 +++- .../data-gathering/data-gathering.service.ts | 2 +- .../src/services/market-data/market-data.service.ts | 4 ++-- .../symbol-profile-overwrite.module.ts | 1 + .../symbol-profile-overwrite.service.ts | 1 + .../asset-profile-dialog.module.ts | 4 ++-- libs/common/src/lib/types/date-range.type.ts | 12 +++++++++++- 11 files changed, 36 insertions(+), 11 deletions(-) diff --git a/apps/api/src/app/admin/admin.module.ts b/apps/api/src/app/admin/admin.module.ts index e8068eca1..b2b4574eb 100644 --- a/apps/api/src/app/admin/admin.module.ts +++ b/apps/api/src/app/admin/admin.module.ts @@ -7,6 +7,7 @@ import { ExchangeRateDataModule } from '@ghostfolio/api/services/exchange-rate-d import { MarketDataModule } from '@ghostfolio/api/services/market-data/market-data.module'; import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module'; import { PropertyModule } from '@ghostfolio/api/services/property/property.module'; +import { SymbolProfileOverwriteModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile-overwrite.module'; import { SymbolProfileModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile.module'; import { Module } from '@nestjs/common'; @@ -14,7 +15,6 @@ import { Module } from '@nestjs/common'; import { AdminController } from './admin.controller'; import { AdminService } from './admin.service'; import { QueueModule } from './queue/queue.module'; -import { SymbolProfileOverwriteModule } from '@ghostfolio/api/services/symbol-profile/symbol-profile-overwrite.module'; @Module({ imports: [ diff --git a/apps/api/src/app/admin/admin.service.ts b/apps/api/src/app/admin/admin.service.ts index baca47383..eca88143b 100644 --- a/apps/api/src/app/admin/admin.service.ts +++ b/apps/api/src/app/admin/admin.service.ts @@ -363,7 +363,7 @@ export class AdminService { tags, scraperConfiguration, sectors, - symbol, + symbol, symbolMapping }); diff --git a/apps/api/src/app/portfolio/current-rate.service.ts b/apps/api/src/app/portfolio/current-rate.service.ts index e03bc03b1..a5b018374 100644 --- a/apps/api/src/app/portfolio/current-rate.service.ts +++ b/apps/api/src/app/portfolio/current-rate.service.ts @@ -1,3 +1,4 @@ +import { DateQueryHelper } from '@ghostfolio/api/helper/dateQueryHelper'; import { DataProviderService } from '@ghostfolio/api/services/data-provider/data-provider.service'; import { MarketDataService } from '@ghostfolio/api/services/market-data/market-data.service'; import { resetHours } from '@ghostfolio/common/helper'; @@ -14,7 +15,6 @@ import { flatten, isEmpty, uniqBy } from 'lodash'; import { GetValueObject } from './interfaces/get-value-object.interface'; import { GetValuesObject } from './interfaces/get-values-object.interface'; import { GetValuesParams } from './interfaces/get-values-params.interface'; -import { DateQueryHelper } from '@ghostfolio/api/helper/dateQueryHelper'; @Injectable() export class CurrentRateService { diff --git a/apps/api/src/app/user/update-user-setting.dto.ts b/apps/api/src/app/user/update-user-setting.dto.ts index 845bb2037..09aba752f 100644 --- a/apps/api/src/app/user/update-user-setting.dto.ts +++ b/apps/api/src/app/user/update-user-setting.dto.ts @@ -31,7 +31,18 @@ export class UpdateUserSettingDto { @IsOptional() colorScheme?: ColorScheme; - @IsIn(['1d', '1w', '1m', '3m', '1y', '5y', 'max', 'mtd', 'wtd', 'ytd']) + @IsIn([ + '1d', + '1w', + '1m', + '3m', + '1y', + '5y', + 'max', + 'mtd', + 'wtd', + 'ytd' + ]) @IsOptional() dateRange?: DateRange; diff --git a/apps/api/src/helper/dateQueryHelper.ts b/apps/api/src/helper/dateQueryHelper.ts index 2016de74a..6269dce9c 100644 --- a/apps/api/src/helper/dateQueryHelper.ts +++ b/apps/api/src/helper/dateQueryHelper.ts @@ -1,7 +1,9 @@ import { resetHours } from '@ghostfolio/common/helper'; -import { DateQuery } from '../app/portfolio/interfaces/date-query.interface'; + import { addDays } from 'date-fns'; +import { DateQuery } from '../app/portfolio/interfaces/date-query.interface'; + export class DateQueryHelper { public handleDateQueryIn(dateQuery: DateQuery): { query: DateQuery; diff --git a/apps/api/src/services/data-gathering/data-gathering.service.ts b/apps/api/src/services/data-gathering/data-gathering.service.ts index 121c15a51..957c624d1 100644 --- a/apps/api/src/services/data-gathering/data-gathering.service.ts +++ b/apps/api/src/services/data-gathering/data-gathering.service.ts @@ -22,10 +22,10 @@ import { BenchmarkProperty, UniqueAsset } from '@ghostfolio/common/interfaces'; import { InjectQueue } from '@nestjs/bull'; import { Inject, Injectable, Logger } from '@nestjs/common'; import { DataSource } from '@prisma/client'; +import AwaitLock from 'await-lock'; import { JobOptions, Queue } from 'bull'; import { format, min, subDays, subYears } from 'date-fns'; import { isEmpty } from 'lodash'; -import AwaitLock from 'await-lock'; @Injectable() export class DataGatheringService { diff --git a/apps/api/src/services/market-data/market-data.service.ts b/apps/api/src/services/market-data/market-data.service.ts index 4e78a4b51..c79039783 100644 --- a/apps/api/src/services/market-data/market-data.service.ts +++ b/apps/api/src/services/market-data/market-data.service.ts @@ -1,9 +1,10 @@ import { UpdateMarketDataDto } from '@ghostfolio/api/app/admin/update-market-data.dto'; import { DateQuery } from '@ghostfolio/api/app/portfolio/interfaces/date-query.interface'; +import { DateQueryHelper } from '@ghostfolio/api/helper/dateQueryHelper'; import { IDataGatheringItem } from '@ghostfolio/api/services/interfaces/interfaces'; import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; -import { resetHours } from '@ghostfolio/common/helper'; import { BatchPrismaClient } from '@ghostfolio/common/chunkhelper'; +import { resetHours } from '@ghostfolio/common/helper'; import { UniqueAsset } from '@ghostfolio/common/interfaces'; import { Injectable } from '@nestjs/common'; @@ -13,7 +14,6 @@ import { MarketDataState, Prisma } from '@prisma/client'; -import { DateQueryHelper } from '@ghostfolio/api/helper/dateQueryHelper'; import AwaitLock from 'await-lock'; @Injectable() diff --git a/apps/api/src/services/symbol-profile/symbol-profile-overwrite.module.ts b/apps/api/src/services/symbol-profile/symbol-profile-overwrite.module.ts index 3015b268c..9ebd3e2b1 100644 --- a/apps/api/src/services/symbol-profile/symbol-profile-overwrite.module.ts +++ b/apps/api/src/services/symbol-profile/symbol-profile-overwrite.module.ts @@ -1,4 +1,5 @@ import { PrismaModule } from '@ghostfolio/api/services/prisma/prisma.module'; + import { Module } from '@nestjs/common'; import { SymbolProfileOverwriteService } from './symbol-profile-overwrite.service'; diff --git a/apps/api/src/services/symbol-profile/symbol-profile-overwrite.service.ts b/apps/api/src/services/symbol-profile/symbol-profile-overwrite.service.ts index 1b1326849..ed454ae9f 100644 --- a/apps/api/src/services/symbol-profile/symbol-profile-overwrite.service.ts +++ b/apps/api/src/services/symbol-profile/symbol-profile-overwrite.service.ts @@ -1,4 +1,5 @@ import { PrismaService } from '@ghostfolio/api/services/prisma/prisma.service'; + import { Injectable } from '@nestjs/common'; import { DataSource, Prisma, SymbolProfileOverrides } from '@prisma/client'; diff --git a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts index d791df333..99bf8d0cf 100644 --- a/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts +++ b/apps/client/src/app/components/admin-market-data/asset-profile-dialog/asset-profile-dialog.module.ts @@ -7,8 +7,10 @@ import { TextFieldModule } from '@angular/cdk/text-field'; import { CommonModule } from '@angular/common'; import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; +import { MatAutocompleteModule } from '@angular/material/autocomplete'; import { MatButtonModule } from '@angular/material/button'; import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatChipsModule } from '@angular/material/chips'; import { MatDialogModule } from '@angular/material/dialog'; import { MatInputModule } from '@angular/material/input'; import { MatMenuModule } from '@angular/material/menu'; @@ -16,8 +18,6 @@ import { MatSelectModule } from '@angular/material/select'; import { MatSnackBarModule } from '@angular/material/snack-bar'; import { AssetProfileDialog } from './asset-profile-dialog.component'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatChipsModule } from '@angular/material/chips'; @NgModule({ declarations: [AssetProfileDialog], diff --git a/libs/common/src/lib/types/date-range.type.ts b/libs/common/src/lib/types/date-range.type.ts index f68f94396..ec5c6f684 100644 --- a/libs/common/src/lib/types/date-range.type.ts +++ b/libs/common/src/lib/types/date-range.type.ts @@ -1 +1,11 @@ -export type DateRange = '1d' | 'wtd' | '1w' | 'mtd' | '1m' | '3m' | 'ytd' | '1y' | '5y' | 'max'; +export type DateRange = + | '1d' + | 'wtd' + | '1w' + | 'mtd' + | '1m' + | '3m' + | 'ytd' + | '1y' + | '5y' + | 'max';