order and correct imports of resolvers

backend/src/graphql/resolver/BalanceResolver.ts

@@ -1,16 +1,19 @@
-import { backendLogger as logger } from '@/server/logger'
+import Decimal from 'decimal.js-light'
-
-import { Context, getUser } from '@/server/context'
 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 {

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 {

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'
 

backend/src/graphql/resolver/ContributionResolver.ts

@@ -1,16 +1,31 @@
-import { RIGHTS } from '@/auth/RIGHTS'
+import Decimal from 'decimal.js-light'
-import { Context, getUser, getClientTimezoneOffset } from '@/server/context'
-import { backendLogger as logger } from '@/server/logger'
-import { Contribution as DbContribution } from '@entity/Contribution'
 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 { ContributionMessageType } from '@enum/MessageType'
-import { UnconfirmedContribution } from '@model/UnconfirmedContribution'
+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'
 

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()

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 {

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 */

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<TransactionLinkResult> {
-    const user = await dbUser.findOneOrFail({ id: userId })
+    const user = await DbUser.findOneOrFail({ id: userId })
     const where: {
       userId: number
       redeemedBy?: number | null

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 Decimal from 'decimal.js-light'
-import CONFIG from '@/config'
-
-import { Context, getUser } from '@/server/context'
 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,

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 { TransactionLink as dbTransactionLink } from '@entity/TransactionLink'
+import { ContributionLink as DbContributionLink } from '@entity/ContributionLink'
-import { ContributionLink as dbContributionLink } from '@entity/ContributionLink'
+import { UserRepository } from '@repository/User'
-import { encode } from '@/auth/JWT'
+
+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