From 80ff97e72a552a07c5e622b98b5932c5d7198532 Mon Sep 17 00:00:00 2001 From: Ulf Gebhardt Date: Thu, 30 Mar 2023 17:39:09 +0200 Subject: [PATCH] more lint fixes --- backend/.eslintrc.js | 2 +- backend/src/apis/HttpRequest.ts | 1 + backend/src/auth/JWT.ts | 1 + backend/src/emails/sendEmailTranslated.test.ts | 1 + backend/src/emails/sendEmailTranslated.ts | 1 + backend/src/emails/sendEmailVariants.test.ts | 1 + backend/src/emails/sendEmailVariants.ts | 1 + backend/src/federation/client/1_0/FederationClient.ts | 1 + backend/src/federation/client/1_1/FederationClient.ts | 1 + backend/src/federation/validateCommunities.test.ts | 1 + backend/src/federation/validateCommunities.ts | 1 + backend/src/graphql/arg/Paginated.ts | 1 + backend/src/graphql/arg/SearchUsersArgs.ts | 1 + backend/src/graphql/directive/isAuthorized.ts | 1 + backend/src/graphql/model/ContributionLink.ts | 1 + backend/src/graphql/model/ContributionLinkList.ts | 1 + backend/src/graphql/model/GdtEntry.ts | 1 + backend/src/graphql/model/Transaction.ts | 1 + backend/src/graphql/model/TransactionLink.ts | 1 + backend/src/graphql/resolver/BalanceResolver.ts | 1 + backend/src/graphql/resolver/CommunityResolver.test.ts | 1 + backend/src/graphql/resolver/CommunityResolver.ts | 1 + backend/src/graphql/resolver/ContributionLinkResolver.test.ts | 1 + backend/src/graphql/resolver/ContributionLinkResolver.ts | 1 + .../src/graphql/resolver/ContributionMessageResolver.test.ts | 1 + backend/src/graphql/resolver/ContributionMessageResolver.ts | 1 + backend/src/graphql/resolver/ContributionResolver.test.ts | 1 + backend/src/graphql/resolver/ContributionResolver.ts | 1 + backend/src/graphql/resolver/EmailOptinCodes.test.ts | 1 + backend/src/graphql/resolver/GdtResolver.ts | 1 + backend/src/graphql/resolver/KlicktippResolver.ts | 1 + backend/src/graphql/resolver/StatisticsResolver.ts | 1 + backend/src/graphql/resolver/TransactionLinkResolver.test.ts | 1 + backend/src/graphql/resolver/TransactionLinkResolver.ts | 1 + backend/src/graphql/resolver/TransactionResolver.test.ts | 1 + backend/src/graphql/resolver/TransactionResolver.ts | 1 + backend/src/graphql/resolver/UserResolver.test.ts | 1 + backend/src/graphql/resolver/UserResolver.ts | 1 + backend/src/graphql/resolver/semaphore.test.ts | 1 + backend/src/graphql/resolver/util/creations.test.ts | 1 + backend/src/graphql/resolver/util/creations.ts | 1 + backend/src/graphql/resolver/util/findContributions.ts | 1 + backend/src/graphql/resolver/util/transactionLinkList.ts | 1 + backend/src/graphql/union/QueryLinkResult.ts | 1 + backend/src/middleware/klicktippMiddleware.ts | 1 + backend/src/password/EncryptorUtils.ts | 1 + backend/src/seeds/factory/contributionLink.ts | 1 + backend/src/seeds/factory/creation.ts | 1 + backend/src/seeds/factory/transactionLink.ts | 1 + backend/src/seeds/factory/user.ts | 1 + backend/src/seeds/index.ts | 1 + backend/src/server/context.ts | 1 + backend/src/server/createServer.ts | 1 + backend/src/server/logger.ts | 1 + backend/src/typeorm/DBVersion.ts | 1 + backend/src/typeorm/connection.ts | 1 + backend/src/typeorm/repository/Transaction.ts | 1 + backend/src/typeorm/repository/User.ts | 1 + backend/src/util/communityUser.ts | 1 + backend/src/util/decay.ts | 1 + backend/src/util/klicktipp.ts | 1 + backend/src/util/validate.ts | 1 + backend/src/util/virtualTransactions.ts | 1 + backend/src/webhook/elopage.ts | 1 + backend/test/helpers.ts | 1 + 65 files changed, 65 insertions(+), 1 deletion(-) diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index 59bd53ca6..6b6db0486 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -88,7 +88,7 @@ module.exports = { position: 'after', }, ], - distinctGroup: false, + distinctGroup: true, }, ], 'import/prefer-default-export': 'off', // TODO diff --git a/backend/src/apis/HttpRequest.ts b/backend/src/apis/HttpRequest.ts index af7e40dd7..eff0c408a 100644 --- a/backend/src/apis/HttpRequest.ts +++ b/backend/src/apis/HttpRequest.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import axios from 'axios' + import { backendLogger as logger } from '@/server/logger' import LogError from '@/server/LogError' diff --git a/backend/src/auth/JWT.ts b/backend/src/auth/JWT.ts index f0a320efb..93a6a8868 100644 --- a/backend/src/auth/JWT.ts +++ b/backend/src/auth/JWT.ts @@ -1,4 +1,5 @@ import { verify, sign } from 'jsonwebtoken' + import CONFIG from '@/config/' import LogError from '@/server/LogError' diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index 5eea352fb..5a095f563 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -1,6 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/unbound-method */ import { createTransport } from 'nodemailer' + import { logger, i18n } from '@test/testSetup' import CONFIG from '@/config' diff --git a/backend/src/emails/sendEmailTranslated.ts b/backend/src/emails/sendEmailTranslated.ts index 5cc136edc..96fd27d83 100644 --- a/backend/src/emails/sendEmailTranslated.ts +++ b/backend/src/emails/sendEmailTranslated.ts @@ -4,6 +4,7 @@ import path from 'path' import { createTransport } from 'nodemailer' import Email from 'email-templates' import i18n from 'i18n' + import { backendLogger as logger } from '@/server/logger' import CONFIG from '@/config' import LogError from '@/server/LogError' diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 76d8f9a26..849b9d7f1 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -4,6 +4,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { Decimal } from 'decimal.js-light' + import { testEnvironment } from '@test/helpers' import { logger, i18n as localization } from '@test/testSetup' import CONFIG from '@/config' diff --git a/backend/src/emails/sendEmailVariants.ts b/backend/src/emails/sendEmailVariants.ts index 7da0424dc..b45e7fc67 100644 --- a/backend/src/emails/sendEmailVariants.ts +++ b/backend/src/emails/sendEmailVariants.ts @@ -1,4 +1,5 @@ import { Decimal } from 'decimal.js-light' + import CONFIG from '@/config' import { decimalSeparatorByLanguage } from '@/util/utilities' diff --git a/backend/src/federation/client/1_0/FederationClient.ts b/backend/src/federation/client/1_0/FederationClient.ts index ce0d708bc..7261bae45 100644 --- a/backend/src/federation/client/1_0/FederationClient.ts +++ b/backend/src/federation/client/1_0/FederationClient.ts @@ -3,6 +3,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { gql } from 'graphql-request' import { Community as DbCommunity } from '@entity/Community' + import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient' import { backendLogger as logger } from '@/server/logger' import LogError from '@/server/LogError' diff --git a/backend/src/federation/client/1_1/FederationClient.ts b/backend/src/federation/client/1_1/FederationClient.ts index 579a9701c..7dca9b465 100644 --- a/backend/src/federation/client/1_1/FederationClient.ts +++ b/backend/src/federation/client/1_1/FederationClient.ts @@ -3,6 +3,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ import { gql } from 'graphql-request' import { Community as DbCommunity } from '@entity/Community' + import { GraphQLGetClient } from '@/federation/client/GraphQLGetClient' import { backendLogger as logger } from '@/server/logger' import LogError from '@/server/LogError' diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts index 919a99547..d46720ff8 100644 --- a/backend/src/federation/validateCommunities.test.ts +++ b/backend/src/federation/validateCommunities.test.ts @@ -6,6 +6,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Community as DbCommunity } from '@entity/Community' + import { logger } from '@test/testSetup' import { testEnvironment, cleanDB } from '@test/helpers' diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts index c4a9f3b1d..642e59929 100644 --- a/backend/src/federation/validateCommunities.ts +++ b/backend/src/federation/validateCommunities.ts @@ -1,5 +1,6 @@ import { Community as DbCommunity } from '@entity/Community' import { IsNull } from '@dbTools/typeorm' + import { backendLogger as logger } from '@/server/logger' import LogError from '@/server/LogError' diff --git a/backend/src/graphql/arg/Paginated.ts b/backend/src/graphql/arg/Paginated.ts index 290dba337..e605c49d4 100644 --- a/backend/src/graphql/arg/Paginated.ts +++ b/backend/src/graphql/arg/Paginated.ts @@ -1,5 +1,6 @@ /* eslint-disable type-graphql/invalid-nullable-input-type */ import { ArgsType, Field, Int } from 'type-graphql' + import { Order } from '@enum/Order' @ArgsType() diff --git a/backend/src/graphql/arg/SearchUsersArgs.ts b/backend/src/graphql/arg/SearchUsersArgs.ts index 39996efca..de7275f63 100644 --- a/backend/src/graphql/arg/SearchUsersArgs.ts +++ b/backend/src/graphql/arg/SearchUsersArgs.ts @@ -1,4 +1,5 @@ import { ArgsType, Field, Int } from 'type-graphql' + import SearchUsersFilters from '@arg/SearchUsersFilters' @ArgsType() diff --git a/backend/src/graphql/directive/isAuthorized.ts b/backend/src/graphql/directive/isAuthorized.ts index 845593de6..09eac70a9 100644 --- a/backend/src/graphql/directive/isAuthorized.ts +++ b/backend/src/graphql/directive/isAuthorized.ts @@ -4,6 +4,7 @@ import { AuthChecker } from 'type-graphql' import { User } from '@entity/User' + import { decode, encode } from '@/auth/JWT' import { ROLE_UNAUTHORIZED, ROLE_USER, ROLE_ADMIN } from '@/auth/ROLES' import { RIGHTS } from '@/auth/RIGHTS' diff --git a/backend/src/graphql/model/ContributionLink.ts b/backend/src/graphql/model/ContributionLink.ts index 13ae31692..0da2fd430 100644 --- a/backend/src/graphql/model/ContributionLink.ts +++ b/backend/src/graphql/model/ContributionLink.ts @@ -1,6 +1,7 @@ import { ObjectType, Field, Int } from 'type-graphql' import { Decimal } from 'decimal.js-light' import { ContributionLink as dbContributionLink } from '@entity/ContributionLink' + import CONFIG from '@/config' @ObjectType() diff --git a/backend/src/graphql/model/ContributionLinkList.ts b/backend/src/graphql/model/ContributionLinkList.ts index d2c347b27..c35f6fae6 100644 --- a/backend/src/graphql/model/ContributionLinkList.ts +++ b/backend/src/graphql/model/ContributionLinkList.ts @@ -1,4 +1,5 @@ import { ObjectType, Field, Int } from 'type-graphql' + import { ContributionLink } from '@model/ContributionLink' @ObjectType() diff --git a/backend/src/graphql/model/GdtEntry.ts b/backend/src/graphql/model/GdtEntry.ts index bbf1cceef..81dda0ca7 100644 --- a/backend/src/graphql/model/GdtEntry.ts +++ b/backend/src/graphql/model/GdtEntry.ts @@ -3,6 +3,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { ObjectType, Field, Float, Int } from 'type-graphql' + import { GdtEntryType } from '@enum/GdtEntryType' @ObjectType() diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 0a31cd8d6..3538260a5 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -1,6 +1,7 @@ import { ObjectType, Field, Int } from 'type-graphql' import { Transaction as dbTransaction } from '@entity/Transaction' import { Decimal } from 'decimal.js-light' + import { TransactionTypeId } from '@enum/TransactionTypeId' import { Decay } from './Decay' diff --git a/backend/src/graphql/model/TransactionLink.ts b/backend/src/graphql/model/TransactionLink.ts index 1ed02b476..1e9c1a64d 100644 --- a/backend/src/graphql/model/TransactionLink.ts +++ b/backend/src/graphql/model/TransactionLink.ts @@ -1,6 +1,7 @@ import { ObjectType, Field, Int } from 'type-graphql' import { Decimal } from 'decimal.js-light' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' + import CONFIG from '@/config' import { User } from './User' diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 0a9b651a9..aca10ed0f 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -4,6 +4,7 @@ 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' diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index f4352c095..b78d419f9 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -6,6 +6,7 @@ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ import { Community as DbCommunity } from '@entity/Community' + import { getCommunities } from '@/seeds/graphql/queries' import { testEnvironment } from '@test/helpers' diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index 37c42dd89..74ba0e57b 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -1,5 +1,6 @@ import { Resolver, Query, Authorized } from 'type-graphql' import { Community as DbCommunity } from '@entity/Community' + import { Community } from '@model/Community' import { RIGHTS } from '@/auth/RIGHTS' diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts index 6a69e257e..6bd62fd9f 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts @@ -8,6 +8,7 @@ import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' import { Event as DbEvent } from '@entity/Event' + import { logger } from '@test/testSetup' import { login, diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts index 5febb95c5..815901f16 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts @@ -2,6 +2,7 @@ import { Decimal } from 'decimal.js-light' import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql' import { MoreThan, IsNull } from '@dbTools/typeorm' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' + import { ContributionLinkList } from '@model/ContributionLinkList' import { ContributionLink } from '@model/ContributionLink' import ContributionLinkArgs from '@arg/ContributionLinkArgs' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts index 6b2c7c4d8..357455250 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts @@ -8,6 +8,7 @@ import { GraphQLError } from 'graphql' import { Event as DbEvent } from '@entity/Event' + import { cleanDB, resetToken, testEnvironment } from '@test/helpers' import { logger, i18n as localization } from '@test/testSetup' import { diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 63cf2fd9c..b78f441d5 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -5,6 +5,7 @@ import { ContributionMessage as DbContributionMessage } from '@entity/Contributi import { Contribution as DbContribution } from '@entity/Contribution' import { UserContact as DbUserContact } from '@entity/UserContact' import { User as DbUser } from '@entity/User' + import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage' import ContributionMessageArgs from '@arg/ContributionMessageArgs' import { ContributionMessageType } from '@enum/MessageType' diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index df8524a0c..d05060c7e 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -13,6 +13,7 @@ import { Transaction as DbTransaction } from '@entity/Transaction' import { User } from '@entity/User' import { UserInputError } from 'apollo-server-express' import { Event as DbEvent } from '@entity/Event' + import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bobBaumeister } from '@/seeds/users/bob-baumeister' import { stephenHawking } from '@/seeds/users/stephen-hawking' diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 026793b5f..28b393be5 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -7,6 +7,7 @@ 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 { AdminUpdateContribution } from '@model/AdminUpdateContribution' import { Contribution, ContributionListResult } from '@model/Contribution' import { Decay } from '@model/Decay' diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts index e9f9bc052..0b6ebfbe4 100644 --- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts +++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts @@ -6,6 +6,7 @@ import { User as DbUser } from '@entity/User' import { GraphQLError } from 'graphql' + import { testEnvironment, cleanDB } from '@test/helpers' import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations' import { queryOptIn } from '@/seeds/graphql/queries' diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index e5ad56f2d..00b0aa1bf 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql' + import { GdtEntryList } from '@model/GdtEntryList' import { Order } from '@enum/Order' import Paginated from '@arg/Paginated' diff --git a/backend/src/graphql/resolver/KlicktippResolver.ts b/backend/src/graphql/resolver/KlicktippResolver.ts index f8aee5e2c..31bde0581 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.ts @@ -1,5 +1,6 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { Resolver, Query, Authorized, Arg, Mutation, Ctx } from 'type-graphql' + import { getKlickTippUser, getKlicktippTagMap, diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts index f16a2fd56..3ddc8bfbc 100644 --- a/backend/src/graphql/resolver/StatisticsResolver.ts +++ b/backend/src/graphql/resolver/StatisticsResolver.ts @@ -5,6 +5,7 @@ import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql' import { getConnection } from '@dbTools/typeorm' import { Transaction as DbTransaction } from '@entity/Transaction' import { User as DbUser } from '@entity/User' + import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics' import { RIGHTS } from '@/auth/RIGHTS' import { calculateDecay } from '@/util/decay' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts index 0ac73cbcf..d9010b57a 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts @@ -13,6 +13,7 @@ import { GraphQLError } from 'graphql' import { Transaction } from '@entity/Transaction' import { Event as DbEvent } from '@entity/Event' import { UserContact } from '@entity/UserContact' + import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index e9a388cde..2131439d5 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -8,6 +8,7 @@ import { Transaction as DbTransaction } from '@entity/Transaction' import { Contribution as DbContribution } from '@entity/Contribution' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql' + import { User } from '@model/User' import { ContributionLink } from '@model/ContributionLink' import { Decay } from '@model/Decay' diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts index baa50e171..558f0c315 100644 --- a/backend/src/graphql/resolver/TransactionResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionResolver.test.ts @@ -10,6 +10,7 @@ import { Transaction } from '@entity/Transaction' import { User } from '@entity/User' import { GraphQLError } from 'graphql' import { Event as DbEvent } from '@entity/Event' + import { EventType } from '@/event/Event' import { userFactory } from '@/seeds/factory/user' import { diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 7f3f1c5f1..f36ac3d68 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -8,6 +8,7 @@ import { getCustomRepository, getConnection, In } from '@dbTools/typeorm' 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 { User } from '@model/User' diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index aebd0f0eb..ccf56a285 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -12,6 +12,7 @@ import { TransactionLink } from '@entity/TransactionLink' import { validate as validateUUID, version as versionUUID } from 'uuid' import { UserContact } from '@entity/UserContact' import { Event as DbEvent } from '@entity/Event' + import { OptInType } from '@enum/OptInType' import { UserContactType } from '@enum/UserContactType' import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 5f66e7725..0be376bd6 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -20,6 +20,7 @@ import { User as DbUser } from '@entity/User' import { UserContact as DbUserContact } from '@entity/UserContact' import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' import { ContributionLink as DbContributionLink } from '@entity/ContributionLink' + import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' import { UserRepository } from '@repository/User' import { User } from '@model/User' diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts index 6b1976021..0fb355676 100644 --- a/backend/src/graphql/resolver/semaphore.test.ts +++ b/backend/src/graphql/resolver/semaphore.test.ts @@ -5,6 +5,7 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ import { Decimal } from 'decimal.js-light' + import { userFactory } from '@/seeds/factory/user' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bobBaumeister } from '@/seeds/users/bob-baumeister' diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts index a35b37891..37bdb742c 100644 --- a/backend/src/graphql/resolver/util/creations.test.ts +++ b/backend/src/graphql/resolver/util/creations.test.ts @@ -6,6 +6,7 @@ import { User } from '@entity/User' import { Contribution } from '@entity/Contribution' + import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts index 6ebeae8b9..44b675de4 100644 --- a/backend/src/graphql/resolver/util/creations.ts +++ b/backend/src/graphql/resolver/util/creations.ts @@ -3,6 +3,7 @@ import { getConnection } from '@dbTools/typeorm' import { Contribution } from '@entity/Contribution' import { Decimal } from 'decimal.js-light' + import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const' import { backendLogger as logger } from '@/server/logger' import { OpenCreation } from '@model/OpenCreation' diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts index a40279e9c..5c70fafe7 100644 --- a/backend/src/graphql/resolver/util/findContributions.ts +++ b/backend/src/graphql/resolver/util/findContributions.ts @@ -1,5 +1,6 @@ import { Contribution as DbContribution } from '@entity/Contribution' import { In } from '@dbTools/typeorm' + import { ContributionStatus } from '@enum/ContributionStatus' import { Order } from '@enum/Order' diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts index 2d151b94a..ed90cc852 100644 --- a/backend/src/graphql/resolver/util/transactionLinkList.ts +++ b/backend/src/graphql/resolver/util/transactionLinkList.ts @@ -1,6 +1,7 @@ import { MoreThan } from '@dbTools/typeorm' import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' import { User as DbUser } from '@entity/User' + import { Order } from '@enum/Order' import Paginated from '@arg/Paginated' import TransactionLinkFilters from '@arg/TransactionLinkFilters' diff --git a/backend/src/graphql/union/QueryLinkResult.ts b/backend/src/graphql/union/QueryLinkResult.ts index 9a35fbc71..775320bdd 100644 --- a/backend/src/graphql/union/QueryLinkResult.ts +++ b/backend/src/graphql/union/QueryLinkResult.ts @@ -1,4 +1,5 @@ import { createUnionType } from 'type-graphql' + import { TransactionLink } from '@model/TransactionLink' import { ContributionLink } from '@model/ContributionLink' diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts index 0469b4ccc..e133977ee 100644 --- a/backend/src/middleware/klicktippMiddleware.ts +++ b/backend/src/middleware/klicktippMiddleware.ts @@ -3,6 +3,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ import { MiddlewareFn } from 'type-graphql' + import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController' import { KlickTipp } from '@model/KlickTipp' import CONFIG from '@/config' diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts index b4531b3bb..9537fb59e 100644 --- a/backend/src/password/EncryptorUtils.ts +++ b/backend/src/password/EncryptorUtils.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { User } from '@entity/User' + import CONFIG from '@/config' import LogError from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts index 5925cdcfe..565669dad 100644 --- a/backend/src/seeds/factory/contributionLink.ts +++ b/backend/src/seeds/factory/contributionLink.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/unbound-method */ import { ApolloServerTestClient } from 'apollo-server-testing' + import { login, createContributionLink } from '@/seeds/graphql/mutations' import { ContributionLink } from '@model/ContributionLink' import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface' diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts index ba46f4c09..d0ca131c7 100644 --- a/backend/src/seeds/factory/creation.ts +++ b/backend/src/seeds/factory/creation.ts @@ -8,6 +8,7 @@ import { ApolloServerTestClient } from 'apollo-server-testing' import { Transaction } from '@entity/Transaction' import { Contribution } from '@entity/Contribution' + import { CreationInterface } from '@/seeds/creation/CreationInterface' import { login, createContribution, confirmContribution } from '@/seeds/graphql/mutations' import { findUserByEmail } from '@/graphql/resolver/UserResolver' diff --git a/backend/src/seeds/factory/transactionLink.ts b/backend/src/seeds/factory/transactionLink.ts index c6ed68839..fa4478074 100644 --- a/backend/src/seeds/factory/transactionLink.ts +++ b/backend/src/seeds/factory/transactionLink.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { ApolloServerTestClient } from 'apollo-server-testing' import { TransactionLink } from '@entity/TransactionLink' + import { login, createTransactionLink } from '@/seeds/graphql/mutations' import { TransactionLinkInterface } from '@/seeds/transactionLink/TransactionLinkInterface' import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver' diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts index c82c56648..13a274911 100644 --- a/backend/src/seeds/factory/user.ts +++ b/backend/src/seeds/factory/user.ts @@ -2,6 +2,7 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { User } from '@entity/User' import { ApolloServerTestClient } from 'apollo-server-testing' + import { createUser, setPassword } from '@/seeds/graphql/mutations' import { UserInterface } from '@/seeds/users/UserInterface' diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts index 9f945086c..0d972abb3 100644 --- a/backend/src/seeds/index.ts +++ b/backend/src/seeds/index.ts @@ -8,6 +8,7 @@ import { createTestClient } from 'apollo-server-testing' import { name, internet, datatype } from 'faker' import { entities } from '@entity/index' + import createServer from '@/server/createServer' import { backendLogger as logger } from '@/server/logger' import CONFIG from '@/config' diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts index 1990100dd..4b631bd9c 100644 --- a/backend/src/server/context.ts +++ b/backend/src/server/context.ts @@ -2,6 +2,7 @@ import { User as dbUser } from '@entity/User' import { Transaction as dbTransaction } from '@entity/Transaction' import { Decimal } from 'decimal.js-light' import { ExpressContext } from 'apollo-server-express' + import { Role } from '@/auth/Role' import LogError from './LogError' diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 23e1ad0d2..6ffd18c50 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -5,6 +5,7 @@ import { ApolloServer } from 'apollo-server-express' import express, { Express, json, urlencoded } from 'express' import { Connection } from '@dbTools/typeorm' import { Logger } from 'log4js' + import connection from '@/typeorm/connection' import { checkDBVersion } from '@/typeorm/DBVersion' import CONFIG from '@/config' diff --git a/backend/src/server/logger.ts b/backend/src/server/logger.ts index 35587e9c6..89f292ab7 100644 --- a/backend/src/server/logger.ts +++ b/backend/src/server/logger.ts @@ -3,6 +3,7 @@ import { readFileSync } from 'fs' import { configure, getLogger } from 'log4js' + import CONFIG from '@/config' const options = JSON.parse(readFileSync(CONFIG.LOG4JS_CONFIG, 'utf-8')) diff --git a/backend/src/typeorm/DBVersion.ts b/backend/src/typeorm/DBVersion.ts index cb53c49f1..c4c8d6c78 100644 --- a/backend/src/typeorm/DBVersion.ts +++ b/backend/src/typeorm/DBVersion.ts @@ -1,4 +1,5 @@ import { Migration } from '@entity/Migration' + import { backendLogger as logger } from '@/server/logger' const getDBVersion = async (): Promise => { diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts index 54b951a79..a3a20450b 100644 --- a/backend/src/typeorm/connection.ts +++ b/backend/src/typeorm/connection.ts @@ -2,6 +2,7 @@ // We cannot use our connection here, but must use the external typeorm installation import { Connection, createConnection, FileLogger } from '@dbTools/typeorm' import { entities } from '@entity/index' + import CONFIG from '@/config' const connection = async (): Promise => { diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index 58e9ca30b..61e87b3c8 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -1,5 +1,6 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { Transaction } from '@entity/Transaction' + import { Order } from '@enum/Order' import { TransactionTypeId } from '@enum/TransactionTypeId' diff --git a/backend/src/typeorm/repository/User.ts b/backend/src/typeorm/repository/User.ts index 4928b0cc8..71e43329b 100644 --- a/backend/src/typeorm/repository/User.ts +++ b/backend/src/typeorm/repository/User.ts @@ -1,5 +1,6 @@ import { Brackets, EntityRepository, IsNull, Not, Repository } from '@dbTools/typeorm' import { User as DbUser } from '@entity/User' + import SearchUsersFilters from '@/graphql/arg/SearchUsersFilters' @EntityRepository(DbUser) diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts index dfa477da9..0c9480118 100644 --- a/backend/src/util/communityUser.ts +++ b/backend/src/util/communityUser.ts @@ -3,6 +3,7 @@ import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { User as dbUser } from '@entity/User' import { UserContact } from '@entity/UserContact' + import { PasswordEncryptionType } from '@/graphql/enum/PasswordEncryptionType' // import { UserContact as EmailContact } from '@entity/UserContact' import { User } from '@model/User' diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts index d35eb83a4..5e2bdb5c6 100644 --- a/backend/src/util/decay.ts +++ b/backend/src/util/decay.ts @@ -1,4 +1,5 @@ import { Decimal } from 'decimal.js-light' + import CONFIG from '@/config' import { Decay } from '@model/Decay' import LogError from '@/server/LogError' diff --git a/backend/src/util/klicktipp.ts b/backend/src/util/klicktipp.ts index 6444d20f6..02bfa1044 100644 --- a/backend/src/util/klicktipp.ts +++ b/backend/src/util/klicktipp.ts @@ -1,4 +1,5 @@ import { User } from '@entity/User' + import connection from '@/typeorm/connection' import { getKlickTippUser } from '@/apis/KlicktippController' import LogError from '@/server/LogError' diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index 02128cb87..628b00d43 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -1,6 +1,7 @@ import { Decimal } from 'decimal.js-light' import { getCustomRepository } from '@dbTools/typeorm' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' + import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction' import { TransactionLinkRepository } from '@repository/TransactionLink' import { Decay } from '@model/Decay' diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts index 442c06b21..f9f13afbc 100644 --- a/backend/src/util/virtualTransactions.ts +++ b/backend/src/util/virtualTransactions.ts @@ -2,6 +2,7 @@ import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { Decimal } from 'decimal.js-light' + import { Transaction } from '@model/Transaction' import { TransactionTypeId } from '@enum/TransactionTypeId' import { User } from '@model/User' diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index 6f3e3cbdb..404f2696a 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -33,6 +33,7 @@ import { LoginElopageBuys } from '@entity/LoginElopageBuys' import { UserContact as dbUserContact } from '@entity/UserContact' + import { UserResolver } from '@/graphql/resolver/UserResolver' export const elopageWebhook = async (req: any, res: any): Promise => { diff --git a/backend/test/helpers.ts b/backend/test/helpers.ts index b118f7b9d..f68c15cb8 100644 --- a/backend/test/helpers.ts +++ b/backend/test/helpers.ts @@ -9,6 +9,7 @@ import { createTestClient } from 'apollo-server-testing' import { initialize } from '@dbTools/helpers' import { entities } from '@entity/index' + import createServer from '@/server/createServer' import { i18n, logger } from './testSetup'