From 4554b01b892a65ac3908f9bc3f1f55f52bbffb70 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Tue, 22 Nov 2022 13:01:38 +0100 Subject: [PATCH] order and correct imports of resolvers --- .../src/graphql/resolver/BalanceResolver.ts | 19 +++--- .../src/graphql/resolver/CommunityResolver.ts | 4 +- .../resolver/ContributionMessageResolver.ts | 25 ++++---- .../graphql/resolver/ContributionResolver.ts | 43 +++++++------- backend/src/graphql/resolver/GdtResolver.ts | 10 ++-- .../src/graphql/resolver/KlicktippResolver.ts | 4 +- .../graphql/resolver/StatisticsResolver.ts | 15 +++-- .../resolver/TransactionLinkResolver.ts | 58 ++++++++++--------- .../graphql/resolver/TransactionResolver.ts | 41 ++++++------- backend/src/graphql/resolver/UserResolver.ts | 41 +++++++------ 10 files changed, 140 insertions(+), 120 deletions(-) diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 176b45354..a0016e8f2 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -1,16 +1,19 @@ -import { backendLogger as logger } from '@/server/logger' - -import { Context, getUser } from '@/server/context' +import Decimal from 'decimal.js-light' import { Resolver, Query, Ctx, Authorized } from 'type-graphql' +import { getCustomRepository } from '@dbTools/typeorm' + +import { Transaction as dbTransaction } from '@entity/Transaction' +import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' + +import { TransactionLinkRepository } from '@repository/TransactionLink' + import { Balance } from '@model/Balance' + +import { backendLogger as logger } from '@/server/logger' +import { Context, getUser } from '@/server/context' import { calculateDecay } from '@/util/decay' import { RIGHTS } from '@/auth/RIGHTS' -import { Transaction as dbTransaction } from '@entity/Transaction' -import Decimal from 'decimal.js-light' import { GdtResolver } from './GdtResolver' -import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' -import { getCustomRepository } from '@dbTools/typeorm' -import { TransactionLinkRepository } from '@repository/TransactionLink' @Resolver() export class BalanceResolver { diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index c194cdf1a..f56254e1f 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -1,7 +1,9 @@ import { Resolver, Query, Authorized } from 'type-graphql' + +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/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 84eccf5ca..1f47a14d6 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -1,17 +1,20 @@ +import { Arg, Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql' +import { getConnection } from '@dbTools/typeorm' + +import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage' +import { Contribution as DbContribution } from '@entity/Contribution' +import { UserContact } from '@entity/UserContact' + +import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage' +import ContributionMessageArgs from '@arg/ContributionMessageArgs' +import { ContributionMessageType } from '@enum/MessageType' +import { ContributionStatus } from '@enum/ContributionStatus' +import { Order } from '@enum/Order' +import Paginated from '@arg/Paginated' + import { backendLogger as logger } from '@/server/logger' import { RIGHTS } from '@/auth/RIGHTS' import { Context, getUser } from '@/server/context' -import { ContributionMessage as DbContributionMessage } from '@entity/ContributionMessage' -import { Arg, Args, Authorized, Ctx, Mutation, Query, Resolver } from 'type-graphql' -import ContributionMessageArgs from '@arg/ContributionMessageArgs' -import { Contribution as DbContribution } from '@entity/Contribution' -import { ContributionMessageType } from '@enum/MessageType' -import { ContributionStatus } from '@enum/ContributionStatus' -import { getConnection } from '@dbTools/typeorm' -import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage' -import Paginated from '@arg/Paginated' -import { Order } from '@enum/Order' -import { UserContact } from '@entity/UserContact' import { sendAddedContributionMessageEmail } from '@/mailer/sendAddedContributionMessageEmail' import CONFIG from '@/config' diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 6d0716915..d3e72c2ff 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -1,16 +1,31 @@ -import { RIGHTS } from '@/auth/RIGHTS' -import { Context, getUser, getClientTimezoneOffset } from '@/server/context' -import { backendLogger as logger } from '@/server/logger' -import { Contribution as DbContribution } from '@entity/Contribution' +import Decimal from 'decimal.js-light' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' import { FindOperator, IsNull, In, getConnection } from '@dbTools/typeorm' -import ContributionArgs from '@arg/ContributionArgs' -import Paginated from '@arg/Paginated' + +import { Contribution as DbContribution } from '@entity/Contribution' +import { ContributionMessage } from '@entity/ContributionMessage' +import { UserContact } from '@entity/UserContact' +import { User as DbUser } from '@entity/User' +import { Transaction as DbTransaction } from '@entity/Transaction' + +import { AdminCreateContributions } from '@model/AdminCreateContributions' +import { AdminUpdateContribution } from '@model/AdminUpdateContribution' +import { Contribution, ContributionListResult } from '@model/Contribution' +import { UnconfirmedContribution } from '@model/UnconfirmedContribution' +import { Decay } from '@model/Decay' +import { TransactionTypeId } from '@enum/TransactionTypeId' import { Order } from '@enum/Order' import { ContributionType } from '@enum/ContributionType' import { ContributionStatus } from '@enum/ContributionStatus' -import { Contribution, ContributionListResult } from '@model/Contribution' -import { UnconfirmedContribution } from '@model/UnconfirmedContribution' +import { ContributionMessageType } from '@enum/MessageType' +import ContributionArgs from '@arg/ContributionArgs' +import Paginated from '@arg/Paginated' +import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' +import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs' + +import { RIGHTS } from '@/auth/RIGHTS' +import { Context, getUser, getClientTimezoneOffset } from '@/server/context' +import { backendLogger as logger } from '@/server/logger' import { getUserCreation, getUserCreations, @@ -19,8 +34,6 @@ import { isValidDateString, } from './util/creations' import { MEMO_MAX_CHARS, MEMO_MIN_CHARS, FULL_CREATION_AVAILABLE } from './const/const' -import { ContributionMessage } from '@entity/ContributionMessage' -import { ContributionMessageType } from '@enum/MessageType' import { Event, EventContributionCreate, @@ -32,18 +45,8 @@ import { EventAdminContributionUpdate, } from '@/event/Event' import { eventProtocol } from '@/event/EventProtocolEmitter' -import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' -import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs' -import Decimal from 'decimal.js-light' import CONFIG from '@/config' -import { UserContact } from '@entity/UserContact' -import { AdminCreateContributions } from '@model/AdminCreateContributions' -import { AdminUpdateContribution } from '@model/AdminUpdateContribution' -import { User as DbUser } from '@entity/User' import { sendContributionRejectedEmail } from '@/mailer/sendContributionRejectedEmail' -import { Transaction as DbTransaction } from '@entity/Transaction' -import { Decay } from '@model/Decay' -import { TransactionTypeId } from '@enum/TransactionTypeId' import { calculateDecay } from '@/util/decay' import { sendContributionConfirmedEmail } from '@/mailer/sendContributionConfirmedEmail' diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index a1d75e946..6f9691cd9 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -1,10 +1,12 @@ -import { Context, getUser } from '@/server/context' import { Resolver, Query, Args, Ctx, Authorized, Arg } from 'type-graphql' -import CONFIG from '@/config' + import { GdtEntryList } from '@model/GdtEntryList' -import Paginated from '@arg/Paginated' -import { apiGet, apiPost } from '@/apis/HttpRequest' import { Order } from '@enum/Order' +import Paginated from '@arg/Paginated' + +import { Context, getUser } from '@/server/context' +import CONFIG from '@/config' +import { apiGet, apiPost } from '@/apis/HttpRequest' import { RIGHTS } from '@/auth/RIGHTS' @Resolver() diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts index ce9a097e2..4f88ccdc1 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.ts @@ -1,4 +1,7 @@ import { Resolver, Query, Authorized, Arg, Mutation, Args } from 'type-graphql' + +import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs' + import { getKlickTippUser, getKlicktippTagMap, @@ -6,7 +9,6 @@ import { klicktippSignIn, } from '@/apis/KlicktippController' import { RIGHTS } from '@/auth/RIGHTS' -import SubscribeNewsletterArgs from '@arg/SubscribeNewsletterArgs' @Resolver() export class KlicktippResolver { diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts index 7bfae319e..f6c2b9e22 100644 --- a/backend/src/graphql/resolver/StatisticsResolver.ts +++ b/backend/src/graphql/resolver/StatisticsResolver.ts @@ -1,10 +1,13 @@ -import { Resolver, Query, Authorized } from 'type-graphql' -import { RIGHTS } from '@/auth/RIGHTS' -import { CommunityStatistics } from '@model/CommunityStatistics' -import { User as DbUser } from '@entity/User' -import { Transaction as DbTransaction } from '@entity/Transaction' -import { getConnection } from '@dbTools/typeorm' import Decimal from 'decimal.js-light' +import { Resolver, Query, Authorized } from 'type-graphql' +import { getConnection } from '@dbTools/typeorm' + +import { Transaction as DbTransaction } from '@entity/Transaction' +import { User as DbUser } from '@entity/User' + +import { CommunityStatistics } from '@model/CommunityStatistics' + +import { RIGHTS } from '@/auth/RIGHTS' import { calculateDecay } from '@/util/decay' /* eslint-disable @typescript-eslint/no-explicit-any */ diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 9de8efa35..297a96ce9 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -1,6 +1,31 @@ +import { randomBytes } from 'crypto' +import Decimal from 'decimal.js-light' + +import { getConnection, MoreThan, FindOperator, IsNull } from '@dbTools/typeorm' + +import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' +import { User as DbUser } from '@entity/User' +import { Transaction as DbTransaction } from '@entity/Transaction' +import { Contribution as DbContribution } from '@entity/Contribution' +import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' + +import { User } from '@model/User' +import { ContributionLink } from '@model/ContributionLink' +import { Decay } from '@model/Decay' +import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' +import { ContributionLinkList } from '@model/ContributionLinkList' +import { Order } from '@enum/Order' +import { ContributionType } from '@enum/ContributionType' +import { ContributionStatus } from '@enum/ContributionStatus' +import { TransactionTypeId } from '@enum/TransactionTypeId' +import { ContributionCycleType } from '@enum/ContributionCycleType' +import TransactionLinkArgs from '@arg/TransactionLinkArgs' +import Paginated from '@arg/Paginated' +import TransactionLinkFilters from '@arg/TransactionLinkFilters' +import ContributionLinkArgs from '@arg/ContributionLinkArgs' + import { backendLogger as logger } from '@/server/logger' import { Context, getUser, getClientTimezoneOffset } from '@/server/context' -import { getConnection, MoreThan, FindOperator, IsNull } from '@dbTools/typeorm' import { Resolver, Args, @@ -12,39 +37,18 @@ import { Int, createUnionType, } from 'type-graphql' -import { ContributionLink } from '@model/ContributionLink' -import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' -import { Transaction as DbTransaction } from '@entity/Transaction' -import { User as dbUser } from '@entity/User' -import TransactionLinkArgs from '@arg/TransactionLinkArgs' -import Paginated from '@arg/Paginated' import { calculateBalance } from '@/util/validate' import { RIGHTS } from '@/auth/RIGHTS' -import { randomBytes } from 'crypto' -import { User } from '@model/User' import { calculateDecay } from '@/util/decay' -import { executeTransaction } from './TransactionResolver' -import { Order } from '@enum/Order' -import { ContributionType } from '@enum/ContributionType' -import { ContributionStatus } from '@enum/ContributionStatus' -import { Contribution as DbContribution } from '@entity/Contribution' -import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' import { getUserCreation, validateContribution, isStartEndDateValid } from './util/creations' -import { Decay } from '@model/Decay' -import Decimal from 'decimal.js-light' -import { TransactionTypeId } from '@enum/TransactionTypeId' -import { ContributionCycleType } from '@enum/ContributionCycleType' -import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' -import TransactionLinkFilters from '@arg/TransactionLinkFilters' import { CONTRIBUTIONLINK_NAME_MAX_CHARS, CONTRIBUTIONLINK_NAME_MIN_CHARS, MEMO_MAX_CHARS, MEMO_MIN_CHARS, } from './const/const' -import ContributionLinkArgs from '@arg/ContributionLinkArgs' +import { executeTransaction } from './TransactionResolver' import { transactionLinkCode as contributionLinkCode } from './TransactionLinkResolver' -import { ContributionLinkList } from '@model/ContributionLinkList' const QueryLinkResult = createUnionType({ name: 'QueryLinkResult', // the name of the GraphQL union @@ -140,10 +144,10 @@ export class TransactionLinkResolver { return new ContributionLink(contributionLink) } else { const transactionLink = await DbTransactionLink.findOneOrFail({ code }, { withDeleted: true }) - const user = await dbUser.findOneOrFail({ id: transactionLink.userId }) + const user = await DbUser.findOneOrFail({ id: transactionLink.userId }) let redeemedBy: User | null = null if (transactionLink && transactionLink.redeemedBy) { - redeemedBy = new User(await dbUser.findOneOrFail({ id: transactionLink.redeemedBy })) + redeemedBy = new User(await DbUser.findOneOrFail({ id: transactionLink.redeemedBy })) } return new TransactionLink(transactionLink, new User(user), redeemedBy) } @@ -329,7 +333,7 @@ export class TransactionLinkResolver { return true } else { const transactionLink = await DbTransactionLink.findOneOrFail({ code }) - const linkedUser = await dbUser.findOneOrFail( + const linkedUser = await DbUser.findOneOrFail( { id: transactionLink.userId }, { relations: ['emailContact'] }, ) @@ -368,7 +372,7 @@ export class TransactionLinkResolver { @Arg('userId', () => Int) userId: number, ): Promise { - const user = await dbUser.findOneOrFail({ id: userId }) + const user = await DbUser.findOneOrFail({ id: userId }) const where: { userId: number redeemedBy?: number | null diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index f0fb2f452..57fe3bd3c 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -1,45 +1,40 @@ /* eslint-disable new-cap */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { backendLogger as logger } from '@/server/logger' -import CONFIG from '@/config' - -import { Context, getUser } from '@/server/context' +import Decimal from 'decimal.js-light' import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' import { getCustomRepository, getConnection, In } from '@dbTools/typeorm' -import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail' - -import { Transaction } from '@model/Transaction' -import { TransactionList } from '@model/TransactionList' - -import TransactionSendArgs from '@arg/TransactionSendArgs' -import Paginated from '@arg/Paginated' - -import { Order } from '@enum/Order' - -import { TransactionRepository } from '@repository/Transaction' -import { TransactionLinkRepository } from '@repository/TransactionLink' - import { User as dbUser } from '@entity/User' import { Transaction as dbTransaction } from '@entity/Transaction' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' +import { TransactionRepository } from '@repository/Transaction' +import { TransactionLinkRepository } from '@repository/TransactionLink' +import { Decay } from '@model/Decay' +import { User } from '@model/User' +import { Transaction } from '@model/Transaction' +import { TransactionList } from '@model/TransactionList' +import { Order } from '@enum/Order' import { TransactionTypeId } from '@enum/TransactionTypeId' +import TransactionSendArgs from '@arg/TransactionSendArgs' +import Paginated from '@arg/Paginated' + +import { backendLogger as logger } from '@/server/logger' +import CONFIG from '@/config' +import { Context, getUser } from '@/server/context' +import { sendTransactionReceivedEmail } from '@/mailer/sendTransactionReceivedEmail' import { calculateBalance, isHexPublicKey } from '@/util/validate' import { RIGHTS } from '@/auth/RIGHTS' -import { User } from '@model/User' import { communityUser } from '@/util/communityUser' import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions' -import Decimal from 'decimal.js-light' +import { sendTransactionLinkRedeemedEmail } from '@/mailer/sendTransactionLinkRedeemed' +import { Event, EventTransactionReceive, EventTransactionSend } from '@/event/Event' +import { eventProtocol } from '@/event/EventProtocolEmitter' import { BalanceResolver } from './BalanceResolver' import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const' import { findUserByEmail } from './UserResolver' -import { sendTransactionLinkRedeemedEmail } from '@/mailer/sendTransactionLinkRedeemed' -import { Event, EventTransactionReceive, EventTransactionSend } from '@/event/Event' -import { eventProtocol } from '@/event/EventProtocolEmitter' -import { Decay } from '../model/Decay' export const executeTransaction = async ( amount: Decimal, diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 067b7a0d4..39f7783e1 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -1,7 +1,6 @@ import fs from 'fs' -import { backendLogger as logger } from '@/server/logger' import i18n from 'i18n' -import { Context, getUser, getClientTimezoneOffset } from '@/server/context' +import { v4 as uuidv4 } from 'uuid' import { Resolver, Query, @@ -14,19 +13,31 @@ import { Int, } from 'type-graphql' import { getConnection, getCustomRepository, IsNull, Not } from '@dbTools/typeorm' -import CONFIG from '@/config' -import { User } from '@model/User' + import { User as DbUser } from '@entity/User' import { UserContact as DbUserContact } from '@entity/UserContact' -import { communityDbUser } from '@/util/communityUser' -import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' -import { ContributionLink as dbContributionLink } from '@entity/ContributionLink' -import { encode } from '@/auth/JWT' +import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' +import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' +import { UserRepository } from '@repository/User' + +import { User } from '@model/User' +import { SearchAdminUsersResult } from '@model/AdminUser' +import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' +import { OptInType } from '@enum/OptInType' +import { Order } from '@enum/Order' +import { UserContactType } from '@enum/UserContactType' import CreateUserArgs from '@arg/CreateUserArgs' import UnsecureLoginArgs from '@arg/UnsecureLoginArgs' import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs' +import Paginated from '@arg/Paginated' +import SearchUsersArgs from '@arg/SearchUsersArgs' + +import { backendLogger as logger } from '@/server/logger' +import { Context, getUser, getClientTimezoneOffset } from '@/server/context' +import CONFIG from '@/config' +import { communityDbUser } from '@/util/communityUser' +import { encode } from '@/auth/JWT' import { klicktippNewsletterStateMiddleware } from '@/middleware/klicktippMiddleware' -import { OptInType } from '@enum/OptInType' import { sendResetPasswordEmail as sendResetPasswordEmailMailer } from '@/mailer/sendResetPasswordEmail' import { sendAccountActivationEmail } from '@/mailer/sendAccountActivationEmail' import { sendAccountMultiRegistrationEmail } from '@/emails/sendEmailVariants' @@ -44,14 +55,6 @@ import { EventActivateAccount, } from '@/event/Event' import { getUserCreation, getUserCreations } from './util/creations' -import { UserContactType } from '../enum/UserContactType' -import { UserRepository } from '@/typeorm/repository/User' -import { SearchAdminUsersResult } from '@model/AdminUser' -import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' -import Paginated from '@arg/Paginated' -import { Order } from '@enum/Order' -import { v4 as uuidv4 } from 'uuid' -import SearchUsersArgs from '@arg/SearchUsersArgs' import { FULL_CREATION_AVAILABLE } from './const/const' // eslint-disable-next-line @typescript-eslint/no-var-requires @@ -498,7 +501,7 @@ export class UserResolver { logger.debug('new dbUser=' + dbUser) if (redeemCode) { if (redeemCode.match(/^CL-/)) { - const contributionLink = await dbContributionLink.findOne({ + const contributionLink = await DbContributionLink.findOne({ code: redeemCode.replace('CL-', ''), }) logger.info('redeemCode found contributionLink=' + contributionLink) @@ -507,7 +510,7 @@ export class UserResolver { eventRedeemRegister.contributionId = contributionLink.id } } else { - const transactionLink = await dbTransactionLink.findOne({ code: redeemCode }) + const transactionLink = await DbTransactionLink.findOne({ code: redeemCode }) logger.info('redeemCode found transactionLink=' + transactionLink) if (transactionLink) { dbUser.referrerId = transactionLink.userId