diff --git a/backend/jest.config.js b/backend/jest.config.js index 0e4643c63..f61917b01 100644 --- a/backend/jest.config.js +++ b/backend/jest.config.js @@ -6,6 +6,11 @@ module.exports = { collectCoverageFrom: ['src/**/*.ts', '!**/node_modules/**'], setupFiles: ['/test/testSetup.ts'], moduleNameMapper: { + '@/(.*)': '/src/$1', + '@model/(.*)': '/src/graphql/model/$1', + '@arg/(.*)': '/src/graphql/arg/$1', + '@enum/(.*)': '/src/graphql/enum/$1', + '@repository/(.*)': '/src/typeorm/repository/$1', '@entity/(.*)': process.env.NODE_ENV === 'development' ? '/../database/entity/$1' diff --git a/backend/package.json b/backend/package.json index c27419ddb..710d73a8c 100644 --- a/backend/package.json +++ b/backend/package.json @@ -60,7 +60,12 @@ "typescript": "^4.3.4" }, "_moduleAliases": { + "@": "./src", + "@arg": "./src/graphql/arg", + "@dbTools": "../database/build/src", "@entity": "../database/build/entity", - "@dbTools": "../database/build/src" + "@enum": "./src/graphql/enum", + "@model": "./src/graphql/model", + "@repository": "./src/typeorm/repository" } } diff --git a/backend/src/apis/KlicktippController.ts b/backend/src/apis/KlicktippController.ts index 0777211ad..824d40af2 100644 --- a/backend/src/apis/KlicktippController.ts +++ b/backend/src/apis/KlicktippController.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { KlicktippConnector } from './klicktippConnector' -import CONFIG from '../config' +import CONFIG from '@/config' const klicktippConnector = new KlicktippConnector() diff --git a/backend/src/auth/JWT.ts b/backend/src/auth/JWT.ts index 06c6507b8..e32e68223 100644 --- a/backend/src/auth/JWT.ts +++ b/backend/src/auth/JWT.ts @@ -1,5 +1,5 @@ import jwt from 'jsonwebtoken' -import CONFIG from '../config/' +import CONFIG from '@/config/' import { CustomJwtPayload } from './CustomJwtPayload' export const decode = (token: string): CustomJwtPayload | null => { diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts index 85853a1c7..f365165de 100644 --- a/backend/src/graphql/arg/Paginated.ts +++ b/backend/src/graphql/arg/Paginated.ts @@ -1,5 +1,5 @@ import { ArgsType, Field, Int } from 'type-graphql' -import { Order } from '../enum/Order' +import { Order } from '@enum/Order' @ArgsType() export default class Paginated { diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index 89da13ff7..aa407c95f 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -2,12 +2,12 @@ import { AuthChecker } from 'type-graphql' -import { decode, encode } from '../../auth/JWT' -import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '../../auth/ROLES' -import { RIGHTS } from '../../auth/RIGHTS' +import { decode, encode } from '@/auth/JWT' +import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES' +import { RIGHTS } from '@/auth/RIGHTS' import { getCustomRepository } from '@dbTools/typeorm' -import { UserRepository } from '../../typeorm/repository/User' -import { INALIENABLE_RIGHTS } from '../../auth/INALIENABLE_RIGHTS' +import { UserRepository } from '@repository/User' +import { INALIENABLE_RIGHTS } from '@/auth/INALIENABLE_RIGHTS' import { ServerUser } from '@entity/ServerUser' const isAuthorized: AuthChecker = async ({ context }, rights) => { diff --git a/backend/src/graphql/model/CreatePendingCreation.ts b/backend/src/graphql/model/CreatePendingCreation.ts deleted file mode 100644 index e69de29bb..000000000 diff --git a/backend/src/graphql/model/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts index 2f4b31b00..43529fb06 100644 --- a/backend/src/graphql/model/GdtEntry.ts +++ b/backend/src/graphql/model/GdtEntry.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { ObjectType, Field } from 'type-graphql' -import { GdtEntryType } from '../enum/GdtEntryType' +import { GdtEntryType } from '@enum/GdtEntryType' @ObjectType() export class GdtEntry { diff --git a/backend/src/graphql/model/GdtSumPerEmail.ts b/backend/src/graphql/model/GdtSumPerEmail.ts deleted file mode 100644 index c90c7293b..000000000 --- a/backend/src/graphql/model/GdtSumPerEmail.ts +++ /dev/null @@ -1,19 +0,0 @@ -/* eslint-disable @typescript-eslint/no-explicit-any */ -/* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -/* -import { ObjectType, Field } from 'type-graphql' - -@ObjectType() -export class GdtSumPerEmail { - constructor(email: string, summe: number) { - this.email = email - this.summe = summe - } - - @Field(() => String) - email: string - - @Field(() => Number) - summe: number -} -*/ diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index cf2e899b2..29a8a4bbd 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql' import { Decay } from './Decay' import { Transaction as dbTransaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' -import { TransactionTypeId } from '../enum/TransactionTypeId' +import { TransactionTypeId } from '@enum/TransactionTypeId' import { User } from './User' @ObjectType() diff --git a/backend/src/graphql/model/TransactionList.ts b/backend/src/graphql/model/TransactionList.ts index 364e98f09..c34a594f5 100644 --- a/backend/src/graphql/model/TransactionList.ts +++ b/backend/src/graphql/model/TransactionList.ts @@ -1,5 +1,5 @@ import { ObjectType, Field } from 'type-graphql' -import CONFIG from '../../config' +import CONFIG from '@/config' import Decimal from 'decimal.js-light' import { Transaction } from './Transaction' diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 4ea1f2fd1..f116c3968 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -10,25 +10,25 @@ import { getConnection, In, } from '@dbTools/typeorm' -import { UserAdmin, SearchUsersResult } from '../model/UserAdmin' -import { PendingCreation } from '../model/PendingCreation' -import { CreatePendingCreations } from '../model/CreatePendingCreations' -import { UpdatePendingCreation } from '../model/UpdatePendingCreation' -import { RIGHTS } from '../../auth/RIGHTS' -import { UserRepository } from '../../typeorm/repository/User' -import CreatePendingCreationArgs from '../arg/CreatePendingCreationArgs' -import UpdatePendingCreationArgs from '../arg/UpdatePendingCreationArgs' -import SearchUsersArgs from '../arg/SearchUsersArgs' +import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' +import { PendingCreation } from '@model/PendingCreation' +import { CreatePendingCreations } from '@model/CreatePendingCreations' +import { UpdatePendingCreation } from '@model/UpdatePendingCreation' +import { RIGHTS } from '@/auth/RIGHTS' +import { UserRepository } from '@repository/User' +import CreatePendingCreationArgs from '@arg/CreatePendingCreationArgs' +import UpdatePendingCreationArgs from '@arg/UpdatePendingCreationArgs' +import SearchUsersArgs from '@arg/SearchUsersArgs' import { Transaction } from '@entity/Transaction' -import { TransactionRepository } from '../../typeorm/repository/Transaction' -import { calculateDecay } from '../../util/decay' +import { TransactionRepository } from '@repository/Transaction' +import { calculateDecay } from '@/util/decay' import { AdminPendingCreation } from '@entity/AdminPendingCreation' -import { hasElopageBuys } from '../../util/hasElopageBuys' +import { hasElopageBuys } from '@/util/hasElopageBuys' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User } from '@entity/User' -import { TransactionTypeId } from '../enum/TransactionTypeId' +import { TransactionTypeId } from '@enum/TransactionTypeId' import Decimal from 'decimal.js-light' -import { Decay } from '../model/Decay' +import { Decay } from '@model/Decay' // const EMAIL_OPT_IN_REGISTER = 1 // const EMAIL_OPT_UNKNOWN = 3 // elopage? diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index e536093bb..12d5b2ba4 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -3,10 +3,10 @@ import { Resolver, Query, Ctx, Authorized } from 'type-graphql' import { getCustomRepository } from '@dbTools/typeorm' -import { Balance } from '../model/Balance' -import { UserRepository } from '../../typeorm/repository/User' -import { calculateDecay } from '../../util/decay' -import { RIGHTS } from '../../auth/RIGHTS' +import { Balance } from '@model/Balance' +import { UserRepository } from '@repository/User' +import { calculateDecay } from '@/util/decay' +import { RIGHTS } from '@/auth/RIGHTS' import { Transaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index cc481c101..cb916e47c 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -2,10 +2,10 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { createTestClient } from 'apollo-server-testing' -import createServer from '../../server/createServer' -import CONFIG from '../../config' +import createServer from '@/server/createServer' +import CONFIG from '@/config' -jest.mock('../../config') +jest.mock('@/config') let query: any diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index 1fa3887dc..1693574cb 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -2,9 +2,9 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Resolver, Query, Authorized } from 'type-graphql' -import { RIGHTS } from '../../auth/RIGHTS' -import CONFIG from '../../config' -import { Community } from '../model/Community' +import { RIGHTS } from '@/auth/RIGHTS' +import CONFIG from '@/config' +import { Community } from '@model/Community' @Resolver() export class CommunityResolver { diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index c515b4e26..c8c4cb331 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -3,13 +3,13 @@ import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql' import { getCustomRepository } from '@dbTools/typeorm' -import CONFIG from '../../config' -import { GdtEntryList } from '../model/GdtEntryList' -import Paginated from '../arg/Paginated' -import { apiGet } from '../../apis/HttpRequest' -import { UserRepository } from '../../typeorm/repository/User' -import { Order } from '../enum/Order' -import { RIGHTS } from '../../auth/RIGHTS' +import CONFIG from '@/config' +import { GdtEntryList } from '@model/GdtEntryList' +import Paginated from '@arg/Paginated' +import { apiGet } from '@/apis/HttpRequest' +import { UserRepository } from '@repository/User' +import { Order } from '@enum/Order' +import { RIGHTS } from '@/auth/RIGHTS' @Resolver() export class GdtResolver { diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts index 0ba2387e3..d13f1dd8e 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.ts @@ -7,9 +7,9 @@ import { getKlicktippTagMap, unsubscribe, klicktippSignIn, -} from '../../apis/KlicktippController' -import { RIGHTS } from '../../auth/RIGHTS' -import SubscribeNewsletterArgs from '../arg/SubscribeNewsletterArgs' +} from '@/apis/KlicktippController' +import { RIGHTS } from '@/auth/RIGHTS' +import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs' @Resolver() export class KlicktippResolver { diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 9e70155ac..d674fc69e 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -6,32 +6,32 @@ import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' import { getCustomRepository, getConnection } from '@dbTools/typeorm' -import CONFIG from '../../config' -import { sendTransactionReceivedEmail } from '../../mailer/sendTransactionReceivedEmail' +import CONFIG from '@/config' +import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail' -import { Transaction } from '../model/Transaction' -import { TransactionList } from '../model/TransactionList' +import { Transaction } from '@model/Transaction' +import { TransactionList } from '@model/TransactionList' -import TransactionSendArgs from '../arg/TransactionSendArgs' -import Paginated from '../arg/Paginated' +import TransactionSendArgs from '@arg/TransactionSendArgs' +import Paginated from '@arg/Paginated' -import { Order } from '../enum/Order' +import { Order } from '@enum/Order' -import { UserRepository } from '../../typeorm/repository/User' -import { TransactionRepository } from '../../typeorm/repository/Transaction' +import { UserRepository } from '@repository/User' +import { TransactionRepository } from '@repository/Transaction' import { User as dbUser } from '@entity/User' import { Transaction as dbTransaction } from '@entity/Transaction' -import { apiPost } from '../../apis/HttpRequest' -import { TransactionTypeId } from '../enum/TransactionTypeId' -import { calculateBalance, isHexPublicKey } from '../../util/validate' -import { RIGHTS } from '../../auth/RIGHTS' -import { User } from '../model/User' -import { communityUser } from '../../util/communityUser' -import { virtualDecayTransaction } from '../../util/virtualDecayTransaction' +import { apiPost } from '@/apis/HttpRequest' +import { TransactionTypeId } from '@enum/TransactionTypeId' +import { calculateBalance, isHexPublicKey } from '@/util/validate' +import { RIGHTS } from '@/auth/RIGHTS' +import { User } from '@model/User' +import { communityUser } from '@/util/communityUser' +import { virtualDecayTransaction } from '@/util/virtualDecayTransaction' import Decimal from 'decimal.js-light' -import { calculateDecay } from '../../util/decay' +import { calculateDecay } from '@/util/decay' @Resolver() export class TransactionResolver { diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index dcb3e03b6..4d1454e86 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -4,24 +4,24 @@ import fs from 'fs' import { Resolver, Query, Args, Arg, Authorized, Ctx, UseMiddleware, Mutation } from 'type-graphql' import { getConnection, getCustomRepository, QueryRunner } from '@dbTools/typeorm' -import CONFIG from '../../config' -import { User } from '../model/User' +import CONFIG from '@/config' +import { User } from '@model/User' import { User as DbUser } from '@entity/User' -import { encode } from '../../auth/JWT' -import CreateUserArgs from '../arg/CreateUserArgs' -import UnsecureLoginArgs from '../arg/UnsecureLoginArgs' -import UpdateUserInfosArgs from '../arg/UpdateUserInfosArgs' -import { klicktippNewsletterStateMiddleware } from '../../middleware/klicktippMiddleware' -import { UserSettingRepository } from '../../typeorm/repository/UserSettingRepository' -import { Setting } from '../enum/Setting' -import { UserRepository } from '../../typeorm/repository/User' +import { encode } from '@/auth/JWT' +import CreateUserArgs from '@arg/CreateUserArgs' +import UnsecureLoginArgs from '@arg/UnsecureLoginArgs' +import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs' +import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware' +import { UserSettingRepository } from '@repository/UserSettingRepository' +import { Setting } from '@enum/Setting' +import { UserRepository } from '@repository/User' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' -import { sendResetPasswordEmail } from '../../mailer/sendResetPasswordEmail' -import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail' -import { klicktippSignIn } from '../../apis/KlicktippController' -import { RIGHTS } from '../../auth/RIGHTS' -import { ROLE_ADMIN } from '../../auth/ROLES' -import { hasElopageBuys } from '../../util/hasElopageBuys' +import { sendResetPasswordEmail } from '@/mailer/sendResetPasswordEmail' +import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' +import { klicktippSignIn } from '@/apis/KlicktippController' +import { RIGHTS } from '@/auth/RIGHTS' +import { ROLE_ADMIN } from '@/auth/ROLES' +import { hasElopageBuys } from '@/util/hasElopageBuys' import { ServerUser } from '@entity/ServerUser' const EMAIL_OPT_IN_RESET_PASSWORD = 2 diff --git a/backend/src/mailer/sendEMail.test.ts b/backend/src/mailer/sendEMail.test.ts index 5baae00ab..b7cc06a60 100644 --- a/backend/src/mailer/sendEMail.test.ts +++ b/backend/src/mailer/sendEMail.test.ts @@ -1,6 +1,6 @@ import { sendEMail } from './sendEMail' import { createTransport } from 'nodemailer' -import CONFIG from '../config' +import CONFIG from '@/config' CONFIG.EMAIL = false CONFIG.EMAIL_SMTP_URL = 'EMAIL_SMTP_URL' diff --git a/backend/src/mailer/sendEMail.ts b/backend/src/mailer/sendEMail.ts index e26589347..13c28996b 100644 --- a/backend/src/mailer/sendEMail.ts +++ b/backend/src/mailer/sendEMail.ts @@ -1,6 +1,6 @@ import { createTransport } from 'nodemailer' -import CONFIG from '../config' +import CONFIG from '@/config' export const sendEMail = async (emailDef: { to: string diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts index d0fde8195..b3699f29b 100644 --- a/backend/src/middleware/klicktippMiddleware.ts +++ b/backend/src/middleware/klicktippMiddleware.ts @@ -1,7 +1,7 @@ import { MiddlewareFn } from 'type-graphql' -import { /* klicktippSignIn, */ getKlickTippUser } from '../apis/KlicktippController' -import { KlickTipp } from '../graphql/model/KlickTipp' -import CONFIG from '../config/index' +import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController' +import { KlickTipp } from '@model/KlickTipp' +import CONFIG from '@/config' // export const klicktippRegistrationMiddleware: MiddlewareFn = async ( // // Only for demo diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 4596eef4a..c52ca791a 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -5,8 +5,8 @@ import { ApolloServer } from 'apollo-server-express' import express, { Express } from 'express' // database -import connection from '../typeorm/connection' -import { checkDBVersion } from '../typeorm/DBVersion' +import connection from '@/typeorm/connection' +import { checkDBVersion } from '@/typeorm/DBVersion' // server import cors from './cors' @@ -14,13 +14,13 @@ import serverContext from './context' import plugins from './plugins' // config -import CONFIG from '../config' +import CONFIG from '@/config' // graphql -import schema from '../graphql/schema' +import schema from '@/graphql/schema' // webhooks -import { elopageWebhook } from '../webhook/elopage' +import { elopageWebhook } from '@/webhook/elopage' import { Connection } from '@dbTools/typeorm' // TODO implement diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts index bfd64f92f..745b2da94 100644 --- a/backend/src/typeorm/connection.ts +++ b/backend/src/typeorm/connection.ts @@ -1,7 +1,7 @@ // TODO This is super weird - since the entities are defined in another project they have their own globals. // We cannot use our connection here, but must use the external typeorm installation import { Connection, createConnection, FileLogger } from '@dbTools/typeorm' -import CONFIG from '../config' +import CONFIG from '@/config' import { entities } from '@entity/index' const connection = async (): Promise => { diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index e1af105f8..f84b57626 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { Transaction } from '@entity/Transaction' -import { Order } from '../../graphql/enum/Order' -import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId' +import { Order } from '@enum/Order' +import { TransactionTypeId } from '@enum/TransactionTypeId' @EntityRepository(Transaction) export class TransactionRepository extends Repository { diff --git a/backend/src/typeorm/repository/UserSettingRepository.ts b/backend/src/typeorm/repository/UserSettingRepository.ts index 42171e04a..528090ff2 100644 --- a/backend/src/typeorm/repository/UserSettingRepository.ts +++ b/backend/src/typeorm/repository/UserSettingRepository.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { UserSetting } from '@entity/UserSetting' -import { Setting } from '../../graphql/enum/Setting' -import { isStringBoolean } from '../../util/validate' +import { Setting } from '@enum/Setting' +import { isStringBoolean } from '@/util/validate' @EntityRepository(UserSetting) export class UserSettingRepository extends Repository { diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts index 5dfec9327..33ac2fad2 100644 --- a/backend/src/util/communityUser.ts +++ b/backend/src/util/communityUser.ts @@ -2,7 +2,7 @@ import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { User as dbUser } from '@entity/User' -import { User } from '../graphql/model/User' +import { User } from '@model/User' const communityDbUser: dbUser = { id: -1, diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts index d26afbd33..36f83f23f 100644 --- a/backend/src/util/decay.ts +++ b/backend/src/util/decay.ts @@ -1,6 +1,6 @@ import Decimal from 'decimal.js-light' -import CONFIG from '../config' -import { Decay } from '../graphql/model/Decay' +import CONFIG from '@/config' +import { Decay } from '@model/Decay' // TODO: externalize all those definitions and functions into an external decay library diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index eba206b24..3699fe511 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -1,7 +1,7 @@ import { calculateDecay } from './decay' import Decimal from 'decimal.js-light' import { Transaction } from '@entity/Transaction' -import { Decay } from '../graphql/model/Decay' +import { Decay } from '@model/Decay' function isStringBoolean(value: string): boolean { const lowerValue = value.toLowerCase() diff --git a/backend/src/util/virtualDecayTransaction.ts b/backend/src/util/virtualDecayTransaction.ts index df3482716..ff51ea4f5 100644 --- a/backend/src/util/virtualDecayTransaction.ts +++ b/backend/src/util/virtualDecayTransaction.ts @@ -3,9 +3,9 @@ import Decimal from 'decimal.js-light' import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { calculateDecay } from './decay' -import { TransactionTypeId } from '../graphql/enum/TransactionTypeId' -import { Transaction } from '../graphql/model/Transaction' -import { User } from '../graphql/model/User' +import { TransactionTypeId } from '@enum/TransactionTypeId' +import { Transaction } from '@model/Transaction' +import { User } from '@model/User' const virtualDecayTransaction = ( balance: Decimal, diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index abd139552..d5eaef521 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -28,7 +28,7 @@ */ import { LoginElopageBuys } from '@entity/LoginElopageBuys' -import { UserResolver } from '../graphql/resolver/UserResolver' +import { UserResolver } from '@/graphql/resolver/UserResolver' import { User as dbUser } from '@entity/User' export const elopageWebhook = async (req: any, res: any): Promise => { diff --git a/backend/tsconfig.json b/backend/tsconfig.json index eabdc75b0..26e3706fe 100644 --- a/backend/tsconfig.json +++ b/backend/tsconfig.json @@ -47,8 +47,13 @@ // "moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */ // "baseUrl": "./", /* Base directory to resolve non-absolute module names. */ "paths": { /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */ + "@/*": ["./src/*"], + "@arg/*": ["./src/graphql/arg/*"], + "@dbTools/*": ["../database/src/*"], "@entity/*": ["../database/entity/*"], - "@dbTools/*": ["../database/src/*"] + "@enum/*": ["./src/graphql/enum/*"], + "@model/*": ["./src/graphql/model/*"], + "@repository/*": ["./src/typeorm/repository/*"] }, // "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */ // "typeRoots": [], /* List of folders to include type definitions from. */