From 0136a22f0c45bc56e4fe45be0125d41678ee2725 Mon Sep 17 00:00:00 2001 From: Moriz Wahl Date: Mon, 7 Mar 2022 21:35:50 +0100 Subject: [PATCH] resolve relative paths in resolvers --- backend/src/graphql/resolver/AdminResolver.ts | 28 +++++++-------- .../src/graphql/resolver/BalanceResolver.ts | 8 ++--- .../resolver/CommunityResolver.test.ts | 4 +-- .../src/graphql/resolver/CommunityResolver.ts | 6 ++-- backend/src/graphql/resolver/GdtResolver.ts | 14 ++++---- .../src/graphql/resolver/KlicktippResolver.ts | 6 ++-- .../graphql/resolver/TransactionResolver.ts | 34 +++++++++---------- .../src/graphql/resolver/UserResolver.test.ts | 6 ++-- backend/src/graphql/resolver/UserResolver.ts | 32 ++++++++--------- 9 files changed, 69 insertions(+), 69 deletions(-) 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..3779d5ba8 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -2,8 +2,8 @@ /* 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') 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.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index b01c99552..d322bb5d2 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -4,12 +4,12 @@ import { createTestClient } from 'apollo-server-testing' import gql from 'graphql-tag' import { GraphQLError } from 'graphql' -import createServer from '../../server/createServer' +import createServer from '@/server/createServer' import { resetDB, initialize } from '@dbTools/helpers' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User } from '@entity/User' -import CONFIG from '../../config' -import { sendAccountActivationEmail } from '../../mailer/sendAccountActivationEmail' +import CONFIG from '@/config' +import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' // import { klicktippSignIn } from '../../apis/KlicktippController' jest.setTimeout(10000) 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