Browse Source

Refactor/clean up imports, set up eslint

pull/8052/head
Szymon Łągiewka 1 week ago
parent
commit
1fb32febb7
Failed to extract signature
  1. 14
      apps/api/eslint.config.cjs
  2. 2
      apps/api/src/app/activities/activities.controller.ts
  3. 2
      apps/api/src/app/import/import.service.ts
  4. 2
      apps/api/src/app/portfolio/current-rate.service.ts
  5. 2
      apps/api/src/app/portfolio/portfolio.service.spec.ts
  6. 2
      apps/api/src/app/user/user.service.ts
  7. 3
      apps/api/src/services/prisma/prisma.service.ts
  8. 7
      eslint.config.cjs

14
apps/api/eslint.config.cjs

@ -21,7 +21,19 @@ module.exports = [
{ {
files: ['**/*.ts', '**/*.tsx'], files: ['**/*.ts', '**/*.tsx'],
// Override or add rules here // 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'], files: ['**/*.js', '**/*.jsx'],

2
apps/api/src/app/activities/activities.controller.ts

@ -22,7 +22,7 @@ import {
import { permissions } from '@ghostfolio/common/permissions'; import { permissions } from '@ghostfolio/common/permissions';
import { scopes } from '@ghostfolio/common/scopes'; import { scopes } from '@ghostfolio/common/scopes';
import type { ImpersonationContext } from '@ghostfolio/common/types'; import type { ImpersonationContext } from '@ghostfolio/common/types';
import type { Order, Prisma } from '@ghostfolio/prisma/client'; import type { Order } from '@ghostfolio/prisma/client';
import { import {
Body, Body,

2
apps/api/src/app/import/import.service.ts

@ -41,7 +41,7 @@ import {
OrderWithAccount, OrderWithAccount,
UserWithSettings UserWithSettings
} from '@ghostfolio/common/types'; } 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 { DataSource } from '@ghostfolio/prisma/enums';
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';

2
apps/api/src/app/portfolio/current-rate.service.ts

@ -11,10 +11,10 @@ import {
DataProviderInfo, DataProviderInfo,
ResponseError ResponseError
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { Type as ActivityType } from '@ghostfolio/prisma/enums';
import { utc } from '@date-fns/utc'; import { utc } from '@date-fns/utc';
import { Injectable } from '@nestjs/common'; import { Injectable } from '@nestjs/common';
import { Type as ActivityType } from '@prisma/client';
import { isBefore, isSameDay } from 'date-fns'; import { isBefore, isSameDay } from 'date-fns';
import { isEmpty, uniqBy } from 'lodash-es'; import { isEmpty, uniqBy } from 'lodash-es';

2
apps/api/src/app/portfolio/portfolio.service.spec.ts

@ -23,7 +23,7 @@ import {
PortfolioSummary PortfolioSummary
} from '@ghostfolio/common/interfaces'; } from '@ghostfolio/common/interfaces';
import { AccountWithBalance } from '@ghostfolio/common/types'; 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 { AssetClass, DataSource } from '@ghostfolio/prisma/enums';
import { Big } from 'big.js'; import { Big } from 'big.js';

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

@ -40,7 +40,7 @@ import {
import { getScopesOfAccess } from '@ghostfolio/common/scopes'; import { getScopesOfAccess } from '@ghostfolio/common/scopes';
import { UserWithSettings } from '@ghostfolio/common/types'; import { UserWithSettings } from '@ghostfolio/common/types';
import { PerformanceCalculationType } from '@ghostfolio/common/types/performance-calculation-type.type'; 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 { Role } from '@ghostfolio/prisma/enums';
import { Injectable, Logger } from '@nestjs/common'; import { Injectable, Logger } from '@nestjs/common';

3
apps/api/src/services/prisma/prisma.service.ts

@ -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 { import {
Injectable, Injectable,

7
eslint.config.cjs

@ -89,8 +89,13 @@ module.exports = [
paths: [ paths: [
{ {
message: 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' name: '@prisma/client'
},
{
message:
'Import the types from @ghostfolio/prisma/browser and the enums from @ghostfolio/prisma/enums instead.',
name: '@ghostfolio/prisma/client'
} }
] ]
} }

Loading…
Cancel
Save