diff --git a/backend/.eslintrc.js b/backend/.eslintrc.js index 4cb3d3cf1..99b8baa24 100644 --- a/backend/.eslintrc.js +++ b/backend/.eslintrc.js @@ -83,7 +83,12 @@ module.exports = { 'newlines-between': 'always', pathGroups: [ { - pattern: '@*/**', + pattern: '@?*/**', + group: 'external', + position: 'after', + }, + { + pattern: '@/**', group: 'external', position: 'after', }, diff --git a/backend/src/emails/sendEmailTranslated.test.ts b/backend/src/emails/sendEmailTranslated.test.ts index b930939cf..85074344a 100644 --- a/backend/src/emails/sendEmailTranslated.test.ts +++ b/backend/src/emails/sendEmailTranslated.test.ts @@ -2,9 +2,10 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { createTransport } from 'nodemailer' -import CONFIG from '@/config' import { logger, i18n } from '@test/testSetup' +import CONFIG from '@/config' + import { sendEmailTranslated } from './sendEmailTranslated' CONFIG.EMAIL = false diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index 141319ac0..44d996fa8 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -5,10 +5,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { Decimal } from 'decimal.js-light' -import CONFIG from '@/config' import { testEnvironment } from '@test/helpers' import { logger, i18n as localization } from '@test/testSetup' +import CONFIG from '@/config' + import { sendEmailTranslated } from './sendEmailTranslated' import { sendAddedContributionMessageEmail, diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index ff1fee9f6..deedb9dff 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -5,12 +5,13 @@ import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { Decimal } from 'decimal.js-light' import { Resolver, Query, Ctx, Authorized } from 'type-graphql' +import { Balance } from '@model/Balance' +import { TransactionLinkRepository } from '@repository/TransactionLink' + import { RIGHTS } from '@/auth/RIGHTS' import { Context, getUser } from '@/server/context' import { backendLogger as logger } from '@/server/logger' import { calculateDecay } from '@/util/decay' -import { Balance } from '@model/Balance' -import { TransactionLinkRepository } from '@repository/TransactionLink' import { GdtResolver } from './GdtResolver' import { getLastTransaction } from './util/getLastTransaction' diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index b78d419f9..5b4b26cad 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -7,9 +7,10 @@ import { Community as DbCommunity } from '@entity/Community' -import { getCommunities } from '@/seeds/graphql/queries' import { testEnvironment } from '@test/helpers' +import { getCommunities } from '@/seeds/graphql/queries' + let query: any // to do: We need a setup for the tests that closes the connection diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index 5ffbe77c8..86e55ad1f 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -1,9 +1,10 @@ import { Community as DbCommunity } from '@entity/Community' import { Resolver, Query, Authorized } from 'type-graphql' -import { RIGHTS } from '@/auth/RIGHTS' import { Community } from '@model/Community' +import { RIGHTS } from '@/auth/RIGHTS' + @Resolver() export class CommunityResolver { @Authorized([RIGHTS.COMMUNITIES]) diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts index 66c678be1..2247318a3 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts @@ -9,6 +9,9 @@ import { Event as DbEvent } from '@entity/Event' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { cleanDB, testEnvironment, resetToken } from '@test/helpers' +import { logger } from '@test/testSetup' + import { EventType } from '@/event/Event' import { userFactory } from '@/seeds/factory/user' import { @@ -20,8 +23,6 @@ import { import { listContributionLinks } from '@/seeds/graphql/queries' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' -import { cleanDB, testEnvironment, resetToken } from '@test/helpers' -import { logger } from '@test/testSetup' let mutate: any, query: any, con: any let testEnv: any diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts index aca291e5d..af76856c4 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts @@ -3,20 +3,21 @@ import { ContributionLink as DbContributionLink } from '@entity/ContributionLink import { Decimal } from 'decimal.js-light' import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql' +// TODO: this is a strange construct +import ContributionLinkArgs from '@arg/ContributionLinkArgs' +import Paginated from '@arg/Paginated' +import { Order } from '@enum/Order' +import { ContributionLink } from '@model/ContributionLink' +import { ContributionLinkList } from '@model/ContributionLinkList' + import { RIGHTS } from '@/auth/RIGHTS' import { EVENT_ADMIN_CONTRIBUTION_LINK_CREATE, EVENT_ADMIN_CONTRIBUTION_LINK_DELETE, EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE, } from '@/event/Event' -// TODO: this is a strange construct import { Context, getUser } from '@/server/context' import LogError from '@/server/LogError' -import ContributionLinkArgs from '@arg/ContributionLinkArgs' -import Paginated from '@arg/Paginated' -import { Order } from '@enum/Order' -import { ContributionLink } from '@model/ContributionLink' -import { ContributionLinkList } from '@model/ContributionLinkList' import { CONTRIBUTIONLINK_NAME_MAX_CHARS, diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts index dd8c61cf2..189cb6e44 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts @@ -9,6 +9,9 @@ import { Event as DbEvent } from '@entity/Event' import { GraphQLError } from 'graphql' +import { cleanDB, resetToken, testEnvironment } from '@test/helpers' +import { logger, i18n as localization } from '@test/testSetup' + import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants' import { EventType } from '@/event/Event' import { userFactory } from '@/seeds/factory/user' @@ -21,8 +24,6 @@ import { import { listContributionMessages } from '@/seeds/graphql/queries' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' -import { cleanDB, resetToken, testEnvironment } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' jest.mock('@/emails/sendEmailVariants', () => { const originalModule = jest.requireActual('@/emails/sendEmailVariants') diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 346f8b39c..adfb40f89 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -6,6 +6,13 @@ import { User as DbUser } from '@entity/User' import { UserContact as DbUserContact } from '@entity/UserContact' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' +import ContributionMessageArgs from '@arg/ContributionMessageArgs' +import Paginated from '@arg/Paginated' +import { ContributionStatus } from '@enum/ContributionStatus' +import { ContributionMessageType } from '@enum/MessageType' +import { Order } from '@enum/Order' +import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage' + import { RIGHTS } from '@/auth/RIGHTS' import { sendAddedContributionMessageEmail } from '@/emails/sendEmailVariants' import { @@ -14,12 +21,6 @@ import { } from '@/event/Event' import { Context, getUser } from '@/server/context' import LogError from '@/server/LogError' -import ContributionMessageArgs from '@arg/ContributionMessageArgs' -import Paginated from '@arg/Paginated' -import { ContributionStatus } from '@enum/ContributionStatus' -import { ContributionMessageType } from '@enum/MessageType' -import { Order } from '@enum/Order' -import { ContributionMessage, ContributionMessageListResult } from '@model/ContributionMessage' @Resolver() export class ContributionMessageResolver { diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index 5291259b7..14d3fe73e 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -14,6 +14,19 @@ import { UserInputError } from 'apollo-server-express' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { ContributionStatus } from '@enum/ContributionStatus' +import { Order } from '@enum/Order' +import { ContributionListResult } from '@model/Contribution' +import { UnconfirmedContribution } from '@model/UnconfirmedContribution' +import { + cleanDB, + resetToken, + testEnvironment, + contributionDateFormatter, + resetEntity, +} from '@test/helpers' +import { logger, i18n as localization } from '@test/testSetup' + import { sendContributionConfirmedEmail, sendContributionDeletedEmail, @@ -47,18 +60,6 @@ import { garrickOllivander } from '@/seeds/users/garrick-ollivander' import { peterLustig } from '@/seeds/users/peter-lustig' import { raeuberHotzenplotz } from '@/seeds/users/raeuber-hotzenplotz' import { stephenHawking } from '@/seeds/users/stephen-hawking' -import { ContributionStatus } from '@enum/ContributionStatus' -import { Order } from '@enum/Order' -import { ContributionListResult } from '@model/Contribution' -import { UnconfirmedContribution } from '@model/UnconfirmedContribution' -import { - cleanDB, - resetToken, - testEnvironment, - contributionDateFormatter, - resetEntity, -} from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' jest.mock('@/emails/sendEmailVariants') diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 5fdbd1a12..79e21b49e 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -8,6 +8,21 @@ import { UserContact } from '@entity/UserContact' import { Decimal } from 'decimal.js-light' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' +import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' +import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs' +import ContributionArgs from '@arg/ContributionArgs' +import Paginated from '@arg/Paginated' +import { ContributionStatus } from '@enum/ContributionStatus' +import { ContributionType } from '@enum/ContributionType' +import { ContributionMessageType } from '@enum/MessageType' +import { Order } from '@enum/Order' +import { TransactionTypeId } from '@enum/TransactionTypeId' +import { AdminUpdateContribution } from '@model/AdminUpdateContribution' +import { Contribution, ContributionListResult } from '@model/Contribution' +import { Decay } from '@model/Decay' +import { OpenCreation } from '@model/OpenCreation' +import { UnconfirmedContribution } from '@model/UnconfirmedContribution' + import { RIGHTS } from '@/auth/RIGHTS' import { sendContributionConfirmedEmail, @@ -29,20 +44,6 @@ import LogError from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' import { calculateDecay } from '@/util/decay' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' -import AdminCreateContributionArgs from '@arg/AdminCreateContributionArgs' -import AdminUpdateContributionArgs from '@arg/AdminUpdateContributionArgs' -import ContributionArgs from '@arg/ContributionArgs' -import Paginated from '@arg/Paginated' -import { ContributionStatus } from '@enum/ContributionStatus' -import { ContributionType } from '@enum/ContributionType' -import { ContributionMessageType } from '@enum/MessageType' -import { Order } from '@enum/Order' -import { TransactionTypeId } from '@enum/TransactionTypeId' -import { AdminUpdateContribution } from '@model/AdminUpdateContribution' -import { Contribution, ContributionListResult } from '@model/Contribution' -import { Decay } from '@model/Decay' -import { OpenCreation } from '@model/OpenCreation' -import { UnconfirmedContribution } from '@model/UnconfirmedContribution' import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const' import { diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts index 9f234e73f..cc8d4e534 100644 --- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts +++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts @@ -7,10 +7,11 @@ import { User as DbUser } from '@entity/User' import { GraphQLError } from 'graphql' +import { testEnvironment, cleanDB } from '@test/helpers' + import CONFIG from '@/config' import { createUser, setPassword, forgotPassword } from '@/seeds/graphql/mutations' import { queryOptIn } from '@/seeds/graphql/queries' -import { testEnvironment, cleanDB } from '@test/helpers' let mutate: any, query: any, con: any let testEnv: any diff --git a/backend/src/graphql/resolver/GdtResolver.ts b/backend/src/graphql/resolver/GdtResolver.ts index 68a2c2275..53fc23295 100644 --- a/backend/src/graphql/resolver/GdtResolver.ts +++ b/backend/src/graphql/resolver/GdtResolver.ts @@ -3,14 +3,15 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ import { Resolver, Query, Args, Ctx, Authorized, Arg, Int, Float } from 'type-graphql' +import Paginated from '@arg/Paginated' +import { Order } from '@enum/Order' +import { GdtEntryList } from '@model/GdtEntryList' + import { apiGet, apiPost } from '@/apis/HttpRequest' import { RIGHTS } from '@/auth/RIGHTS' import CONFIG from '@/config' import { Context, getUser } from '@/server/context' import LogError from '@/server/LogError' -import Paginated from '@arg/Paginated' -import { Order } from '@enum/Order' -import { GdtEntryList } from '@model/GdtEntryList' @Resolver() export class GdtResolver { diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts index 056163811..21cf81e97 100644 --- a/backend/src/graphql/resolver/StatisticsResolver.ts +++ b/backend/src/graphql/resolver/StatisticsResolver.ts @@ -6,9 +6,10 @@ import { User as DbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql' +import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics' + import { RIGHTS } from '@/auth/RIGHTS' import { calculateDecay } from '@/util/decay' -import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics' /* eslint-disable-next-line @typescript-eslint/no-unused-vars */ @Resolver((of) => CommunityStatistics) diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts index 13bb2c431..8fd5c35de 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts @@ -14,6 +14,10 @@ import { UserContact } from '@entity/UserContact' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { UnconfirmedContribution } from '@model/UnconfirmedContribution' +import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers' +import { logger } from '@test/testSetup' + import { EventType } from '@/event/Event' import { creations } from '@/seeds/creation/index' import { creationFactory } from '@/seeds/factory/creation' @@ -34,9 +38,6 @@ import { transactionLinks } from '@/seeds/transactionLink/index' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' -import { UnconfirmedContribution } from '@model/UnconfirmedContribution' -import { cleanDB, testEnvironment, resetToken, resetEntity } from '@test/helpers' -import { logger } from '@test/testSetup' import { transactionLinkCode } from './TransactionLinkResolver' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 6365096cf..a5f8c0ee6 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -9,6 +9,19 @@ import { User as DbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql' +import Paginated from '@arg/Paginated' +import TransactionLinkArgs from '@arg/TransactionLinkArgs' +import TransactionLinkFilters from '@arg/TransactionLinkFilters' +import { ContributionCycleType } from '@enum/ContributionCycleType' +import { ContributionStatus } from '@enum/ContributionStatus' +import { ContributionType } from '@enum/ContributionType' +import { TransactionTypeId } from '@enum/TransactionTypeId' +import { ContributionLink } from '@model/ContributionLink' +import { Decay } from '@model/Decay' +import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' +import { User } from '@model/User' +import QueryLinkResult from '@union/QueryLinkResult' + import { RIGHTS } from '@/auth/RIGHTS' import { EVENT_CONTRIBUTION_LINK_REDEEM, @@ -22,18 +35,6 @@ import { backendLogger as logger } from '@/server/logger' import { calculateDecay } from '@/util/decay' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' import { calculateBalance } from '@/util/validate' -import Paginated from '@arg/Paginated' -import TransactionLinkArgs from '@arg/TransactionLinkArgs' -import TransactionLinkFilters from '@arg/TransactionLinkFilters' -import { ContributionCycleType } from '@enum/ContributionCycleType' -import { ContributionStatus } from '@enum/ContributionStatus' -import { ContributionType } from '@enum/ContributionType' -import { TransactionTypeId } from '@enum/TransactionTypeId' -import { ContributionLink } from '@model/ContributionLink' -import { Decay } from '@model/Decay' -import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' -import { User } from '@model/User' -import QueryLinkResult from '@union/QueryLinkResult' import { executeTransaction } from './TransactionResolver' import { getUserCreation, validateContribution } from './util/creations' diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts index 7d855a1e6..a2e2e7e75 100644 --- a/backend/src/graphql/resolver/TransactionResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionResolver.test.ts @@ -11,6 +11,9 @@ import { User } from '@entity/User' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { cleanDB, testEnvironment } from '@test/helpers' +import { logger } from '@test/testSetup' + import { EventType } from '@/event/Event' import { userFactory } from '@/seeds/factory/user' import { @@ -23,8 +26,6 @@ import { bobBaumeister } from '@/seeds/users/bob-baumeister' import { garrickOllivander } from '@/seeds/users/garrick-ollivander' import { peterLustig } from '@/seeds/users/peter-lustig' import { stephenHawking } from '@/seeds/users/stephen-hawking' -import { cleanDB, testEnvironment } from '@test/helpers' -import { logger } from '@test/testSetup' import { findUserByEmail } from './UserResolver' diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 6e81a01c8..430cdb363 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -9,6 +9,16 @@ import { User as dbUser } from '@entity/User' import { Decimal } from 'decimal.js-light' import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' +import Paginated from '@arg/Paginated' +import TransactionSendArgs from '@arg/TransactionSendArgs' +import { Order } from '@enum/Order' +import { TransactionTypeId } from '@enum/TransactionTypeId' +import { Transaction } from '@model/Transaction' +import { TransactionList } from '@model/TransactionList' +import { User } from '@model/User' +import { TransactionRepository } from '@repository/Transaction' +import { TransactionLinkRepository } from '@repository/TransactionLink' + import { RIGHTS } from '@/auth/RIGHTS' import { sendTransactionLinkRedeemedEmail, @@ -22,15 +32,6 @@ import { communityUser } from '@/util/communityUser' import { TRANSACTIONS_LOCK } from '@/util/TRANSACTIONS_LOCK' import { calculateBalance } from '@/util/validate' import { virtualLinkTransaction, virtualDecayTransaction } from '@/util/virtualTransactions' -import Paginated from '@arg/Paginated' -import TransactionSendArgs from '@arg/TransactionSendArgs' -import { Order } from '@enum/Order' -import { TransactionTypeId } from '@enum/TransactionTypeId' -import { Transaction } from '@model/Transaction' -import { TransactionList } from '@model/TransactionList' -import { User } from '@model/User' -import { TransactionRepository } from '@repository/Transaction' -import { TransactionLinkRepository } from '@repository/TransactionLink' import { BalanceResolver } from './BalanceResolver' import { MEMO_MAX_CHARS, MEMO_MIN_CHARS } from './const/const' diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index f9f0dcdb3..69a5f824f 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -13,6 +13,13 @@ import { UserContact } from '@entity/UserContact' import { GraphQLError } from 'graphql' import { validate as validateUUID, version as versionUUID } from 'uuid' +import { OptInType } from '@enum/OptInType' +import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' +import { UserContactType } from '@enum/UserContactType' +import { ContributionLink } from '@model/ContributionLink' +import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers' +import { logger, i18n as localization } from '@test/testSetup' + import CONFIG from '@/config' import { sendAccountActivationEmail, @@ -47,12 +54,6 @@ import { peterLustig } from '@/seeds/users/peter-lustig' import { stephenHawking } from '@/seeds/users/stephen-hawking' import { printTimeDuration } from '@/util/time' import { objectValuesToArray } from '@/util/utilities' -import { OptInType } from '@enum/OptInType' -import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' -import { UserContactType } from '@enum/UserContactType' -import { ContributionLink } from '@model/ContributionLink' -import { testEnvironment, headerPushMock, resetToken, cleanDB } from '@test/helpers' -import { logger, i18n as localization } from '@test/testSetup' // import { klicktippSignIn } from '@/apis/KlicktippController' diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index fb8f7568c..a01719775 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -21,6 +21,20 @@ import { } from 'type-graphql' import { v4 as uuidv4 } from 'uuid' +import CreateUserArgs from '@arg/CreateUserArgs' +import Paginated from '@arg/Paginated' +import SearchUsersArgs from '@arg/SearchUsersArgs' +import UnsecureLoginArgs from '@arg/UnsecureLoginArgs' +import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs' +import { OptInType } from '@enum/OptInType' +import { Order } from '@enum/Order' +import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' +import { UserContactType } from '@enum/UserContactType' +import { SearchAdminUsersResult } from '@model/AdminUser' +import { User } from '@model/User' +import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' +import { UserRepository } from '@repository/User' + import { klicktippSignIn } from '@/apis/KlicktippController' import { encode } from '@/auth/JWT' import { RIGHTS } from '@/auth/RIGHTS' @@ -55,19 +69,6 @@ import { backendLogger as logger } from '@/server/logger' import { communityDbUser } from '@/util/communityUser' import { hasElopageBuys } from '@/util/hasElopageBuys' import { getTimeDurationObject, printTimeDuration } from '@/util/time' -import CreateUserArgs from '@arg/CreateUserArgs' -import Paginated from '@arg/Paginated' -import SearchUsersArgs from '@arg/SearchUsersArgs' -import UnsecureLoginArgs from '@arg/UnsecureLoginArgs' -import UpdateUserInfosArgs from '@arg/UpdateUserInfosArgs' -import { OptInType } from '@enum/OptInType' -import { Order } from '@enum/Order' -import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' -import { UserContactType } from '@enum/UserContactType' -import { SearchAdminUsersResult } from '@model/AdminUser' -import { User } from '@model/User' -import { UserAdmin, SearchUsersResult } from '@model/UserAdmin' -import { UserRepository } from '@repository/User' import { FULL_CREATION_AVAILABLE } from './const/const' import { getUserCreations } from './util/creations' diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts index 4aa76ab01..6963c980e 100644 --- a/backend/src/graphql/resolver/semaphore.test.ts +++ b/backend/src/graphql/resolver/semaphore.test.ts @@ -6,6 +6,8 @@ import { Decimal } from 'decimal.js-light' +import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers' + import { creationFactory, nMonthsBefore } from '@/seeds/factory/creation' import { userFactory } from '@/seeds/factory/user' import { @@ -20,7 +22,6 @@ import { import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { bobBaumeister } from '@/seeds/users/bob-baumeister' import { peterLustig } from '@/seeds/users/peter-lustig' -import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers' let mutate: any, con: any let testEnv: any diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts index 56e37a39b..1e3460b30 100644 --- a/backend/src/graphql/resolver/util/creations.test.ts +++ b/backend/src/graphql/resolver/util/creations.test.ts @@ -7,11 +7,12 @@ import { Contribution } from '@entity/Contribution' import { User } from '@entity/User' +import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers' + import { userFactory } from '@/seeds/factory/user' import { login, createContribution, adminCreateContribution } from '@/seeds/graphql/mutations' import { bibiBloxberg } from '@/seeds/users/bibi-bloxberg' import { peterLustig } from '@/seeds/users/peter-lustig' -import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers' import { getUserCreation } from './creations' diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts index 3903eef19..dbf0650a6 100644 --- a/backend/src/graphql/resolver/util/creations.ts +++ b/backend/src/graphql/resolver/util/creations.ts @@ -4,10 +4,11 @@ import { getConnection } from '@dbTools/typeorm' import { Contribution } from '@entity/Contribution' import { Decimal } from 'decimal.js-light' +import { OpenCreation } from '@model/OpenCreation' + import { FULL_CREATION_AVAILABLE, MAX_CREATION_AMOUNT } from '@/graphql/resolver/const/const' import LogError from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' -import { OpenCreation } from '@model/OpenCreation' interface CreationMap { id: number diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts index b7bf9eb5e..544d35114 100644 --- a/backend/src/graphql/resolver/util/transactionLinkList.ts +++ b/backend/src/graphql/resolver/util/transactionLinkList.ts @@ -2,12 +2,13 @@ import { MoreThan } from '@dbTools/typeorm' import { TransactionLink as DbTransactionLink } from '@entity/TransactionLink' import { User as DbUser } from '@entity/User' -import { User } from '@/graphql/model/User' import Paginated from '@arg/Paginated' import TransactionLinkFilters from '@arg/TransactionLinkFilters' import { Order } from '@enum/Order' import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' +import { User } from '@/graphql/model/User' + export default async function transactionLinkList( { currentPage = 1, pageSize = 5, order = Order.DESC }: Paginated, filters: TransactionLinkFilters | null, diff --git a/backend/src/middleware/klicktippMiddleware.ts b/backend/src/middleware/klicktippMiddleware.ts index ac0dff0d9..481094752 100644 --- a/backend/src/middleware/klicktippMiddleware.ts +++ b/backend/src/middleware/klicktippMiddleware.ts @@ -4,10 +4,11 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ import { MiddlewareFn } from 'type-graphql' +import { KlickTipp } from '@model/KlickTipp' + import { /* klicktippSignIn, */ getKlickTippUser } from '@/apis/KlicktippController' import CONFIG from '@/config' import { klickTippLogger as logger } from '@/server/logger' -import { KlickTipp } from '@model/KlickTipp' // export const klicktippRegistrationMiddleware: MiddlewareFn = async ( // // Only for demo diff --git a/backend/src/password/EncryptorUtils.ts b/backend/src/password/EncryptorUtils.ts index 9537fb59e..eb25edda6 100644 --- a/backend/src/password/EncryptorUtils.ts +++ b/backend/src/password/EncryptorUtils.ts @@ -3,10 +3,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ import { User } from '@entity/User' +import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' + import CONFIG from '@/config' import LogError from '@/server/LogError' import { backendLogger as logger } from '@/server/logger' -import { PasswordEncryptionType } from '@enum/PasswordEncryptionType' // eslint-disable-next-line @typescript-eslint/no-var-requires, import/no-commonjs const sodium = require('sodium-native') diff --git a/backend/src/seeds/factory/contributionLink.ts b/backend/src/seeds/factory/contributionLink.ts index 865e844b2..51e970a5c 100644 --- a/backend/src/seeds/factory/contributionLink.ts +++ b/backend/src/seeds/factory/contributionLink.ts @@ -3,9 +3,10 @@ /* eslint-disable @typescript-eslint/unbound-method */ import { ApolloServerTestClient } from 'apollo-server-testing' +import { ContributionLink } from '@model/ContributionLink' + import { ContributionLinkInterface } from '@/seeds/contributionLink/ContributionLinkInterface' import { login, createContributionLink } from '@/seeds/graphql/mutations' -import { ContributionLink } from '@model/ContributionLink' export const contributionLinkFactory = async ( client: ApolloServerTestClient, diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts index 0c9480118..f96c33470 100644 --- a/backend/src/util/communityUser.ts +++ b/backend/src/util/communityUser.ts @@ -4,9 +4,10 @@ import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { User as dbUser } from '@entity/User' import { UserContact } from '@entity/UserContact' +import { User } from '@model/User' + import { PasswordEncryptionType } from '@/graphql/enum/PasswordEncryptionType' // import { UserContact as EmailContact } from '@entity/UserContact' -import { User } from '@model/User' const communityDbUser: dbUser = { id: -1, diff --git a/backend/src/util/decay.ts b/backend/src/util/decay.ts index 924e64895..77157e203 100644 --- a/backend/src/util/decay.ts +++ b/backend/src/util/decay.ts @@ -1,8 +1,9 @@ import { Decimal } from 'decimal.js-light' +import { Decay } from '@model/Decay' + import CONFIG from '@/config' import LogError from '@/server/LogError' -import { Decay } from '@model/Decay' // TODO: externalize all those definitions and functions into an external decay library diff --git a/backend/src/util/validate.ts b/backend/src/util/validate.ts index cd4841b9b..22a6ee5db 100644 --- a/backend/src/util/validate.ts +++ b/backend/src/util/validate.ts @@ -2,10 +2,11 @@ import { getCustomRepository } from '@dbTools/typeorm' import { TransactionLink as dbTransactionLink } from '@entity/TransactionLink' import { Decimal } from 'decimal.js-light' -import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction' import { Decay } from '@model/Decay' import { TransactionLinkRepository } from '@repository/TransactionLink' +import { getLastTransaction } from '@/graphql/resolver/util/getLastTransaction' + import { calculateDecay } from './decay' function isStringBoolean(value: string): boolean {