Browse Source
Refactor/clean up imports, set up eslint
pull/8052/head
Szymon Łągiewka
1 week ago
Failed to extract signature
8 changed files with
26 additions and
8 deletions
-
apps/api/eslint.config.cjs
-
apps/api/src/app/activities/activities.controller.ts
-
apps/api/src/app/import/import.service.ts
-
apps/api/src/app/portfolio/current-rate.service.ts
-
apps/api/src/app/portfolio/portfolio.service.spec.ts
-
apps/api/src/app/user/user.service.ts
-
apps/api/src/services/prisma/prisma.service.ts
-
eslint.config.cjs
|
|
|
@ -21,7 +21,19 @@ module.exports = [ |
|
|
|
{ |
|
|
|
files: ['**/*.ts', '**/*.tsx'], |
|
|
|
// Override or add rules here |
|
|
|
rules: {} |
|
|
|
rules: { |
|
|
|
'@typescript-eslint/no-restricted-imports': [ |
|
|
|
'error', |
|
|
|
{ |
|
|
|
paths: [ |
|
|
|
{ |
|
|
|
message: 'Import from @ghostfolio/prisma/client instead.', |
|
|
|
name: '@prisma/client' |
|
|
|
} |
|
|
|
] |
|
|
|
} |
|
|
|
] |
|
|
|
} |
|
|
|
}, |
|
|
|
{ |
|
|
|
files: ['**/*.js', '**/*.jsx'], |
|
|
|
|
|
|
|
@ -22,7 +22,7 @@ import { |
|
|
|
import { permissions } from '@ghostfolio/common/permissions'; |
|
|
|
import { scopes } from '@ghostfolio/common/scopes'; |
|
|
|
import type { ImpersonationContext } from '@ghostfolio/common/types'; |
|
|
|
import type { Order, Prisma } from '@ghostfolio/prisma/client'; |
|
|
|
import type { Order } from '@ghostfolio/prisma/client'; |
|
|
|
|
|
|
|
import { |
|
|
|
Body, |
|
|
|
|
|
|
|
@ -41,7 +41,7 @@ import { |
|
|
|
OrderWithAccount, |
|
|
|
UserWithSettings |
|
|
|
} from '@ghostfolio/common/types'; |
|
|
|
import { type Account, Prisma } from '@ghostfolio/prisma/client'; |
|
|
|
import type { Account, Prisma } from '@ghostfolio/prisma/client'; |
|
|
|
import { DataSource } from '@ghostfolio/prisma/enums'; |
|
|
|
|
|
|
|
import { Injectable } from '@nestjs/common'; |
|
|
|
|
|
|
|
@ -11,10 +11,10 @@ import { |
|
|
|
DataProviderInfo, |
|
|
|
ResponseError |
|
|
|
} from '@ghostfolio/common/interfaces'; |
|
|
|
import { Type as ActivityType } from '@ghostfolio/prisma/enums'; |
|
|
|
|
|
|
|
import { utc } from '@date-fns/utc'; |
|
|
|
import { Injectable } from '@nestjs/common'; |
|
|
|
import { Type as ActivityType } from '@prisma/client'; |
|
|
|
import { isBefore, isSameDay } from 'date-fns'; |
|
|
|
import { isEmpty, uniqBy } from 'lodash-es'; |
|
|
|
|
|
|
|
|
|
|
|
@ -23,7 +23,7 @@ import { |
|
|
|
PortfolioSummary |
|
|
|
} from '@ghostfolio/common/interfaces'; |
|
|
|
import { AccountWithBalance } from '@ghostfolio/common/types'; |
|
|
|
import { Prisma } from '@ghostfolio/prisma/client'; |
|
|
|
import type { Prisma } from '@ghostfolio/prisma/client'; |
|
|
|
import { AssetClass, DataSource } from '@ghostfolio/prisma/enums'; |
|
|
|
|
|
|
|
import { Big } from 'big.js'; |
|
|
|
|
|
|
|
@ -40,7 +40,7 @@ import { |
|
|
|
import { getScopesOfAccess } from '@ghostfolio/common/scopes'; |
|
|
|
import { UserWithSettings } from '@ghostfolio/common/types'; |
|
|
|
import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type'; |
|
|
|
import { Prisma, type User } from '@ghostfolio/prisma/client'; |
|
|
|
import type { Prisma, User } from '@ghostfolio/prisma/client'; |
|
|
|
import { Role } from '@ghostfolio/prisma/enums'; |
|
|
|
|
|
|
|
import { Injectable, Logger } from '@nestjs/common'; |
|
|
|
|
|
|
|
@ -1,4 +1,5 @@ |
|
|
|
import { Prisma, PrismaClient } from '@ghostfolio/prisma/client'; |
|
|
|
import type { Prisma } from '@ghostfolio/prisma/client'; |
|
|
|
import { PrismaClient } from '@ghostfolio/prisma/client'; |
|
|
|
|
|
|
|
import { |
|
|
|
Injectable, |
|
|
|
|
|
|
|
@ -89,8 +89,13 @@ module.exports = [ |
|
|
|
paths: [ |
|
|
|
{ |
|
|
|
message: |
|
|
|
'Import server code from @ghostfolio/prisma/client, browser types from @ghostfolio/prisma/browser, and enums from @ghostfolio/prisma/enums instead.', |
|
|
|
'Import the types from @ghostfolio/prisma/browser and the enums from @ghostfolio/prisma/enums instead.', |
|
|
|
name: '@prisma/client' |
|
|
|
}, |
|
|
|
{ |
|
|
|
message: |
|
|
|
'Import the types from @ghostfolio/prisma/browser and the enums from @ghostfolio/prisma/enums instead.', |
|
|
|
name: '@ghostfolio/prisma/client' |
|
|
|
} |
|
|
|
] |
|
|
|
} |
|
|
|
|