diff --git a/backend/src/apis/dltConnector/DltConnectorClient.test.ts b/backend/src/apis/dltConnector/DltConnectorClient.test.ts index e2f6b792c..5a2e7008a 100644 --- a/backend/src/apis/dltConnector/DltConnectorClient.test.ts +++ b/backend/src/apis/dltConnector/DltConnectorClient.test.ts @@ -3,9 +3,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { Connection } from '@typeorm/connection' import { Transaction as DbTransaction } from 'database' import { Decimal } from 'decimal.js-light' +import { Connection } from 'typeorm' import { cleanDB, testEnvironment } from '@test/helpers' diff --git a/backend/src/apis/humhub/ExportUsers.ts b/backend/src/apis/humhub/ExportUsers.ts index 6868945e8..24beab223 100644 --- a/backend/src/apis/humhub/ExportUsers.ts +++ b/backend/src/apis/humhub/ExportUsers.ts @@ -1,5 +1,5 @@ -import { IsNull, Not } from 'typeorm' import { User } from 'database' +import { IsNull, Not } from 'typeorm' import { CONFIG } from '@/config' import { LogError } from '@/server/LogError' diff --git a/backend/src/apis/humhub/__mocks__/HumHubClient.ts b/backend/src/apis/humhub/__mocks__/HumHubClient.ts index 3d8d61540..e1d29a5b3 100644 --- a/backend/src/apis/humhub/__mocks__/HumHubClient.ts +++ b/backend/src/apis/humhub/__mocks__/HumHubClient.ts @@ -1,5 +1,4 @@ -import { User } from 'database' -import { UserContact } from 'database' +import { User, UserContact } from 'database' import { IRestResponse } from 'typed-rest-client' import { GetUser } from '@/apis/humhub/model/GetUser' diff --git a/backend/src/apis/humhub/logging/AccountLogging.view.ts b/backend/src/apis/humhub/logging/AccountLogging.view.ts index d076cccc4..a2236ccaa 100644 --- a/backend/src/apis/humhub/logging/AccountLogging.view.ts +++ b/backend/src/apis/humhub/logging/AccountLogging.view.ts @@ -1,4 +1,5 @@ import { AbstractLoggingView } from 'database' + import { Account } from '@/apis/humhub/model/Account' export class AccountLoggingView extends AbstractLoggingView { diff --git a/backend/src/apis/humhub/logging/PostUserLogging.view.ts b/backend/src/apis/humhub/logging/PostUserLogging.view.ts index dd2d193d8..4ed5d2642 100644 --- a/backend/src/apis/humhub/logging/PostUserLogging.view.ts +++ b/backend/src/apis/humhub/logging/PostUserLogging.view.ts @@ -1,4 +1,5 @@ import { AbstractLoggingView } from 'database' + import { PostUser } from '@/apis/humhub/model/PostUser' import { AccountLoggingView } from './AccountLogging.view' diff --git a/backend/src/apis/humhub/logging/ProfileLogging.view.ts b/backend/src/apis/humhub/logging/ProfileLogging.view.ts index 9819a6b96..3b3f07b91 100644 --- a/backend/src/apis/humhub/logging/ProfileLogging.view.ts +++ b/backend/src/apis/humhub/logging/ProfileLogging.view.ts @@ -1,4 +1,5 @@ import { AbstractLoggingView } from 'database' + import { Profile } from '@/apis/humhub/model/Profile' export class ProfileLoggingView extends AbstractLoggingView { diff --git a/backend/src/apis/humhub/model/PostUser.test.ts b/backend/src/apis/humhub/model/PostUser.test.ts index 47e0a0640..b3aa8a091 100644 --- a/backend/src/apis/humhub/model/PostUser.test.ts +++ b/backend/src/apis/humhub/model/PostUser.test.ts @@ -1,5 +1,4 @@ -import { User } from 'database' -import { UserContact } from 'database' +import { User, UserContact } from 'database' import { v4 as uuidv4 } from 'uuid' import { PublishNameType } from '@/graphql/enum/PublishNameType' diff --git a/backend/src/apis/humhub/syncUser.test.ts b/backend/src/apis/humhub/syncUser.test.ts index 09ed551c5..857e3c911 100644 --- a/backend/src/apis/humhub/syncUser.test.ts +++ b/backend/src/apis/humhub/syncUser.test.ts @@ -1,6 +1,5 @@ /* eslint-disable @typescript-eslint/no-empty-function */ -import { User } from 'database' -import { UserContact } from 'database' +import { User, UserContact } from 'database' import { GetUser } from './model/GetUser' import { syncUser, ExecutedHumhubAction } from './syncUser' diff --git a/backend/src/apis/openai/OpenaiClient.ts b/backend/src/apis/openai/OpenaiClient.ts index 89d9d1cb6..843064c7c 100644 --- a/backend/src/apis/openai/OpenaiClient.ts +++ b/backend/src/apis/openai/OpenaiClient.ts @@ -1,6 +1,5 @@ /* eslint-disable camelcase */ -import { OpenaiThreads } from 'database' -import { User } from 'database' +import { OpenaiThreads, User } from 'database' import { OpenAI } from 'openai' import { Message } from 'openai/resources/beta/threads/messages' diff --git a/backend/src/config/index.ts b/backend/src/config/index.ts index 79c088dc9..0e74848ad 100644 --- a/backend/src/config/index.ts +++ b/backend/src/config/index.ts @@ -100,11 +100,11 @@ const email = { EMAIL_LINK_OVERVIEW: COMMUNITY_URL + (process.env.EMAIL_LINK_OVERVIEW_PATH ?? '/overview'), // time in minutes a optin code is valid EMAIL_CODE_VALID_TIME: process.env.EMAIL_CODE_VALID_TIME - ? parseInt(process.env.EMAIL_CODE_VALID_TIME) ?? 1440 + ? (parseInt(process.env.EMAIL_CODE_VALID_TIME) ?? 1440) : 1440, // time in minutes that must pass to request a new optin code EMAIL_CODE_REQUEST_TIME: process.env.EMAIL_CODE_REQUEST_TIME - ? parseInt(process.env.EMAIL_CODE_REQUEST_TIME) ?? 10 + ? (parseInt(process.env.EMAIL_CODE_REQUEST_TIME) ?? 10) : 10, } diff --git a/backend/src/data/ContributionMessage.builder.ts b/backend/src/data/ContributionMessage.builder.ts index 70181c726..62ab5f35c 100644 --- a/backend/src/data/ContributionMessage.builder.ts +++ b/backend/src/data/ContributionMessage.builder.ts @@ -1,6 +1,4 @@ -import { Contribution } from 'database' -import { ContributionMessage } from 'database' -import { User } from 'database' +import { Contribution, ContributionMessage, User } from 'database' import { ContributionMessageType } from '@/graphql/enum/ContributionMessageType' diff --git a/backend/src/data/PublishName.logic.ts b/backend/src/data/PublishName.logic.ts index 9113415ff..31b0ca17a 100644 --- a/backend/src/data/PublishName.logic.ts +++ b/backend/src/data/PublishName.logic.ts @@ -54,8 +54,8 @@ export class PublishNameLogic { return publishNameType === PublishNameType.PUBLISH_NAME_FULL ? this.user.lastName : publishNameType === PublishNameType.PUBLISH_NAME_FIRST_INITIAL - ? this.user.lastName.charAt(0) - : '' + ? this.user.lastName.charAt(0) + : '' } /** @@ -84,8 +84,8 @@ export class PublishNameLogic { return this.isUsernameFromAlias(publishNameType) ? this.getUsernameFromAlias() : this.isUsernameFromInitials(publishNameType) - ? this.getUsernameFromInitials() - : (this.getFirstName(publishNameType) + ' ' + this.getLastName(publishNameType)).trim() + ? this.getUsernameFromInitials() + : (this.getFirstName(publishNameType) + ' ' + this.getLastName(publishNameType)).trim() } public getUsernameFromInitials(): string { diff --git a/backend/src/data/UserLogic.ts b/backend/src/data/UserLogic.ts index 3c958d120..68fb538d3 100644 --- a/backend/src/data/UserLogic.ts +++ b/backend/src/data/UserLogic.ts @@ -1,5 +1,4 @@ -import { User } from 'database' -import { UserRole } from 'database' +import { User, UserRole } from 'database' import { RoleNames } from '@enum/RoleNames' diff --git a/backend/src/emails/sendEmailVariants.test.ts b/backend/src/emails/sendEmailVariants.test.ts index af81ffd2b..bdaf50cd3 100644 --- a/backend/src/emails/sendEmailVariants.test.ts +++ b/backend/src/emails/sendEmailVariants.test.ts @@ -2,9 +2,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { Connection } from 'typeorm' import { ApolloServerTestClient } from 'apollo-server-testing' import { Decimal } from 'decimal.js-light' +import { Connection } from 'typeorm' import { testEnvironment } from '@test/helpers' import { logger, i18n as localization } from '@test/testSetup' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts index c523a430f..d44c72212 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CONFIRM.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts index 3e25a6912..3d9a16b2c 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_CREATE.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts index 091853dda..940891978 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DELETE.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts index 9d8cbffa3..366df8d75 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_DENY.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts index 468a64c95..bc6ea3a2d 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_CREATE.ts @@ -1,6 +1,4 @@ -import { ContributionLink as DbContributionLink } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { ContributionLink as DbContributionLink, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts index f766f3504..b0d40bfe4 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_DELETE.ts @@ -1,6 +1,4 @@ -import { ContributionLink as DbContributionLink } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { ContributionLink as DbContributionLink, Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts index 1d7ba2720..05b94d3c9 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_LINK_UPDATE.ts @@ -1,6 +1,4 @@ -import { ContributionLink as DbContributionLink } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { ContributionLink as DbContributionLink, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts index 78e133b5b..40182bd82 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_MESSAGE_CREATE.ts @@ -1,7 +1,9 @@ -import { Contribution as DbContribution } from 'database' -import { ContributionMessage as DbContributionMessage } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { + Contribution as DbContribution, + ContributionMessage as DbContributionMessage, + Event as DbEvent, + User as DbUser, +} from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts index 0067ca82c..db03c0acb 100644 --- a/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts +++ b/backend/src/event/EVENT_ADMIN_CONTRIBUTION_UPDATE.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts index 20df16c34..a0fa869a9 100644 --- a/backend/src/event/EVENT_ADMIN_USER_DELETE.ts +++ b/backend/src/event/EVENT_ADMIN_USER_DELETE.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts index c4e113d0e..c9a626319 100644 --- a/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts +++ b/backend/src/event/EVENT_ADMIN_USER_ROLE_SET.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts index c96426bd5..e291de0a7 100644 --- a/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts +++ b/backend/src/event/EVENT_ADMIN_USER_UNDELETE.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts index 297fd6355..e3ee3ed8a 100644 --- a/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts +++ b/backend/src/event/EVENT_CONTRIBUTION_CREATE.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts index 4d68bd754..b1efdfad0 100644 --- a/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts +++ b/backend/src/event/EVENT_CONTRIBUTION_DELETE.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts index 521f2d17c..69573cc99 100644 --- a/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts +++ b/backend/src/event/EVENT_CONTRIBUTION_LINK_REDEEM.ts @@ -1,8 +1,10 @@ -import { Contribution as DbContribution } from 'database' -import { ContributionLink as DbContributionLink } from 'database' -import { Event as DbEvent } from 'database' -import { Transaction as DbTransaction } from 'database' -import { User as DbUser } from 'database' +import { + Contribution as DbContribution, + ContributionLink as DbContributionLink, + Event as DbEvent, + Transaction as DbTransaction, + User as DbUser, +} from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts index ed9cdda3b..4af2ae1d2 100644 --- a/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts +++ b/backend/src/event/EVENT_CONTRIBUTION_MESSAGE_CREATE.ts @@ -1,7 +1,9 @@ -import { Contribution as DbContribution } from 'database' -import { ContributionMessage as DbContributionMessage } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { + Contribution as DbContribution, + ContributionMessage as DbContributionMessage, + Event as DbEvent, + User as DbUser, +} from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts index bd5095fda..0f73f3bda 100644 --- a/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts +++ b/backend/src/event/EVENT_CONTRIBUTION_UPDATE.ts @@ -1,6 +1,4 @@ -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Contribution as DbContribution, Event as DbEvent, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts index 2dda24879..400f4e95f 100644 --- a/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts +++ b/backend/src/event/EVENT_EMAIL_ACCOUNT_MULTIREGISTRATION.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts index 00f799736..eb0396079 100644 --- a/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts +++ b/backend/src/event/EVENT_EMAIL_ADMIN_CONFIRMATION.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts index 327a04af4..b44b22f2c 100644 --- a/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts +++ b/backend/src/event/EVENT_EMAIL_CONFIRMATION.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts index 959e1b67e..c04b2ee1f 100644 --- a/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts +++ b/backend/src/event/EVENT_EMAIL_FORGOT_PASSWORD.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts b/backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts index 72efa8077..fd6c1b566 100644 --- a/backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts +++ b/backend/src/event/EVENT_NEWSLETTER_SUBSCRIBE.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts b/backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts index 46bd3c52c..25afda28c 100644 --- a/backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts +++ b/backend/src/event/EVENT_NEWSLETTER_UNSUBSCRIBE.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts index fdb6967cd..8a1298d2f 100644 --- a/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts +++ b/backend/src/event/EVENT_TRANSACTION_LINK_CREATE.ts @@ -1,6 +1,4 @@ -import { Event as DbEvent } from 'database' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, TransactionLink as DbTransactionLink, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts index 3deb895ed..c5e6b2e8a 100644 --- a/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts +++ b/backend/src/event/EVENT_TRANSACTION_LINK_DELETE.ts @@ -1,6 +1,4 @@ -import { Event as DbEvent } from 'database' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, TransactionLink as DbTransactionLink, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts index 6f29741a0..30f3e1358 100644 --- a/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts +++ b/backend/src/event/EVENT_TRANSACTION_LINK_REDEEM.ts @@ -1,6 +1,4 @@ -import { Event as DbEvent } from 'database' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, TransactionLink as DbTransactionLink, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts index cecb59e6a..7d3a635f2 100644 --- a/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts +++ b/backend/src/event/EVENT_TRANSACTION_RECEIVE.ts @@ -1,6 +1,4 @@ -import { Event as DbEvent } from 'database' -import { Transaction as DbTransaction } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, Transaction as DbTransaction, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_TRANSACTION_SEND.ts b/backend/src/event/EVENT_TRANSACTION_SEND.ts index bcc5d8a67..066873110 100644 --- a/backend/src/event/EVENT_TRANSACTION_SEND.ts +++ b/backend/src/event/EVENT_TRANSACTION_SEND.ts @@ -1,6 +1,4 @@ -import { Event as DbEvent } from 'database' -import { Transaction as DbTransaction } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, Transaction as DbTransaction, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Event } from './Event' diff --git a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts index 3bc95fa08..37cffdb23 100644 --- a/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts +++ b/backend/src/event/EVENT_USER_ACTIVATE_ACCOUNT.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_USER_INFO_UPDATE.ts b/backend/src/event/EVENT_USER_INFO_UPDATE.ts index ecc0c3aa1..46d1af394 100644 --- a/backend/src/event/EVENT_USER_INFO_UPDATE.ts +++ b/backend/src/event/EVENT_USER_INFO_UPDATE.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_USER_LOGIN.ts b/backend/src/event/EVENT_USER_LOGIN.ts index b4413c423..5ba6b5829 100644 --- a/backend/src/event/EVENT_USER_LOGIN.ts +++ b/backend/src/event/EVENT_USER_LOGIN.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_USER_LOGOUT.ts b/backend/src/event/EVENT_USER_LOGOUT.ts index 450bca010..ad424ab07 100644 --- a/backend/src/event/EVENT_USER_LOGOUT.ts +++ b/backend/src/event/EVENT_USER_LOGOUT.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/EVENT_USER_REGISTER.ts b/backend/src/event/EVENT_USER_REGISTER.ts index 3068d68b4..89323c566 100644 --- a/backend/src/event/EVENT_USER_REGISTER.ts +++ b/backend/src/event/EVENT_USER_REGISTER.ts @@ -1,5 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User as DbUser } from 'database' +import { Event as DbEvent, User as DbUser } from 'database' import { Event } from './Event' import { EventType } from './EventType' diff --git a/backend/src/event/Event.ts b/backend/src/event/Event.ts index 0553fc945..3d01deb7d 100644 --- a/backend/src/event/Event.ts +++ b/backend/src/event/Event.ts @@ -1,10 +1,12 @@ -import { Contribution as DbContribution } from 'database' -import { ContributionLink as DbContributionLink } from 'database' -import { ContributionMessage as DbContributionMessage } from 'database' -import { Event as DbEvent } from 'database' -import { Transaction as DbTransaction } from 'database' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' +import { + Contribution as DbContribution, + ContributionLink as DbContributionLink, + ContributionMessage as DbContributionMessage, + Event as DbEvent, + Transaction as DbTransaction, + TransactionLink as DbTransactionLink, + User as DbUser, +} from 'database' import { Decimal } from 'decimal.js-light' import { EventType } from './EventType' diff --git a/backend/src/federation/authenticateCommunities.ts b/backend/src/federation/authenticateCommunities.ts index c31e1e113..2d5a5b0d5 100644 --- a/backend/src/federation/authenticateCommunities.ts +++ b/backend/src/federation/authenticateCommunities.ts @@ -1,5 +1,4 @@ -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' +import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from 'database' import { validate as validateUUID, version as versionUUID } from 'uuid' import { CONFIG } from '@/config' diff --git a/backend/src/federation/validateCommunities.test.ts b/backend/src/federation/validateCommunities.test.ts index db215eec0..1c95f3928 100644 --- a/backend/src/federation/validateCommunities.test.ts +++ b/backend/src/federation/validateCommunities.test.ts @@ -5,11 +5,11 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { Connection } from 'typeorm' -import { FederatedCommunity as DbFederatedCommunity } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { FederatedCommunity as DbFederatedCommunity } from 'database' import { GraphQLClient } from 'graphql-request' import { Response } from 'graphql-request/dist/types' +import { Connection } from 'typeorm' import { testEnvironment, cleanDB } from '@test/helpers' import { logger } from '@test/testSetup' diff --git a/backend/src/federation/validateCommunities.ts b/backend/src/federation/validateCommunities.ts index 8d64fbb24..396709ceb 100644 --- a/backend/src/federation/validateCommunities.ts +++ b/backend/src/federation/validateCommunities.ts @@ -1,9 +1,12 @@ /** eslint-disable @typescript-eslint/no-unsafe-assignment */ /** eslint-disable @typescript-eslint/no-unsafe-call */ +import { + Community as DbCommunity, + FederatedCommunity as DbFederatedCommunity, + FederatedCommunityLoggingView, +} from 'database' import { IsNull } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' -import { FederatedCommunityLoggingView } from 'database' + import { FederationClient as V1_0_FederationClient } from '@/federation/client/1_0/FederationClient' import { PublicCommunityInfo } from '@/federation/client/1_0/model/PublicCommunityInfo' import { FederationClientFactory } from '@/federation/client/FederationClientFactory' diff --git a/backend/src/graphql/model/AdminCommunityView.ts b/backend/src/graphql/model/AdminCommunityView.ts index 5c5cbdc56..baa5f9937 100644 --- a/backend/src/graphql/model/AdminCommunityView.ts +++ b/backend/src/graphql/model/AdminCommunityView.ts @@ -1,7 +1,6 @@ -import { Point } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' +import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from 'database' import { ObjectType, Field } from 'type-graphql' +import { Point } from 'typeorm' import { Point2Location } from '@/graphql/resolver/util/Location2Point' diff --git a/backend/src/graphql/model/Contribution.ts b/backend/src/graphql/model/Contribution.ts index fe865308d..c011fa897 100644 --- a/backend/src/graphql/model/Contribution.ts +++ b/backend/src/graphql/model/Contribution.ts @@ -1,5 +1,4 @@ -import { Contribution as dbContribution } from 'database' -import { User as DbUser } from 'database' +import { Contribution as dbContribution, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { ObjectType, Field, Int } from 'type-graphql' diff --git a/backend/src/graphql/model/ContributionMessage.ts b/backend/src/graphql/model/ContributionMessage.ts index 1936f4f79..919384502 100644 --- a/backend/src/graphql/model/ContributionMessage.ts +++ b/backend/src/graphql/model/ContributionMessage.ts @@ -1,5 +1,4 @@ -import { ContributionMessage as DbContributionMessage } from 'database' -import { User } from 'database' +import { ContributionMessage as DbContributionMessage, User } from 'database' import { Field, Int, ObjectType } from 'type-graphql' @ObjectType() diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 7a87a1795..6dd8c22ae 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -46,7 +46,7 @@ export class Transaction { this.linkedTransactionId = transaction.linkedTransactionId ?? null this.linkId = transaction.contribution ? transaction.contribution.contributionLinkId - : transaction.transactionLinkId ?? null + : (transaction.transactionLinkId ?? null) this.previousBalance = transaction.previousTransaction?.balance.toDecimalPlaces(2, Decimal.ROUND_DOWN) ?? new Decimal(0) diff --git a/backend/src/graphql/model/UnconfirmedContribution.ts b/backend/src/graphql/model/UnconfirmedContribution.ts index 84eb0329e..31afd00cf 100644 --- a/backend/src/graphql/model/UnconfirmedContribution.ts +++ b/backend/src/graphql/model/UnconfirmedContribution.ts @@ -1,5 +1,4 @@ -import { Contribution } from 'database' -import { User } from 'database' +import { Contribution, User } from 'database' import { Decimal } from 'decimal.js-light' import { ObjectType, Field, Int } from 'type-graphql' diff --git a/backend/src/graphql/model/User.ts b/backend/src/graphql/model/User.ts index f18eda764..9a4946ebd 100644 --- a/backend/src/graphql/model/User.ts +++ b/backend/src/graphql/model/User.ts @@ -1,6 +1,6 @@ -import { Point } from 'typeorm' import { User as dbUser } from 'database' import { ObjectType, Field, Int } from 'type-graphql' +import { Point } from 'typeorm' import { GmsPublishLocationType } from '@enum/GmsPublishLocationType' import { PublishNameType } from '@enum/PublishNameType' diff --git a/backend/src/graphql/resolver/BalanceResolver.ts b/backend/src/graphql/resolver/BalanceResolver.ts index 3baefa1cf..1f65f8e4f 100644 --- a/backend/src/graphql/resolver/BalanceResolver.ts +++ b/backend/src/graphql/resolver/BalanceResolver.ts @@ -1,9 +1,8 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { IsNull } from 'typeorm' -import { Transaction as dbTransaction } from 'database' -import { TransactionLink as dbTransactionLink } from 'database' +import { Transaction as dbTransaction, TransactionLink as dbTransactionLink } from 'database' import { Decimal } from 'decimal.js-light' import { Resolver, Query, Ctx, Authorized } from 'type-graphql' +import { IsNull } from 'typeorm' import { Balance } from '@model/Balance' diff --git a/backend/src/graphql/resolver/CommunityResolver.test.ts b/backend/src/graphql/resolver/CommunityResolver.test.ts index 201dddf43..2cd4b9616 100644 --- a/backend/src/graphql/resolver/CommunityResolver.test.ts +++ b/backend/src/graphql/resolver/CommunityResolver.test.ts @@ -5,11 +5,10 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { Connection } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from 'database' import { GraphQLError } from 'graphql/error/GraphQLError' +import { Connection } from 'typeorm' import { v4 as uuidv4 } from 'uuid' import { cleanDB, testEnvironment } from '@test/helpers' diff --git a/backend/src/graphql/resolver/CommunityResolver.ts b/backend/src/graphql/resolver/CommunityResolver.ts index 25bc2bd54..452b7a77d 100644 --- a/backend/src/graphql/resolver/CommunityResolver.ts +++ b/backend/src/graphql/resolver/CommunityResolver.ts @@ -1,7 +1,6 @@ -import { IsNull, Not } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' +import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from 'database' import { Resolver, Query, Authorized, Mutation, Args, Arg } from 'type-graphql' +import { IsNull, Not } from 'typeorm' import { Paginated } from '@arg/Paginated' import { EditCommunityInput } from '@input/EditCommunityInput' diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts index d900c7582..e92505c01 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.test.ts @@ -1,11 +1,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import { Connection } from 'typeorm' -import { ContributionLink as DbContributionLink } from 'database' -import { Event as DbEvent } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { ContributionLink as DbContributionLink, Event as DbEvent } from 'database' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { Connection } from 'typeorm' import { cleanDB, testEnvironment, resetToken } from '@test/helpers' import { logger } from '@test/testSetup' diff --git a/backend/src/graphql/resolver/ContributionLinkResolver.ts b/backend/src/graphql/resolver/ContributionLinkResolver.ts index 6b5e54246..a88708b2d 100644 --- a/backend/src/graphql/resolver/ContributionLinkResolver.ts +++ b/backend/src/graphql/resolver/ContributionLinkResolver.ts @@ -1,6 +1,6 @@ -import { MoreThan, IsNull } from 'typeorm' import { ContributionLink as DbContributionLink } from 'database' import { Resolver, Args, Arg, Authorized, Mutation, Query, Int, Ctx } from 'type-graphql' +import { MoreThan, IsNull } from 'typeorm' import { ContributionLinkArgs } from '@arg/ContributionLinkArgs' import { Paginated } from '@arg/Paginated' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts index f3b6f1949..3cb427ce0 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts @@ -3,11 +3,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { Connection } from 'typeorm' -import { Contribution as DbContribution } from 'database' -import { Event as DbEvent } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Contribution as DbContribution, Event as DbEvent } from 'database' import { GraphQLError } from 'graphql' +import { Connection } from 'typeorm' import { ContributionStatus } from '@enum/ContributionStatus' import { cleanDB, resetToken, testEnvironment } from '@test/helpers' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.ts b/backend/src/graphql/resolver/ContributionMessageResolver.ts index 9c33121cc..75fd0ef13 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.ts @@ -1,9 +1,11 @@ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { EntityManager, FindOptionsRelations, getConnection } from 'typeorm' -import { Contribution as DbContribution } from 'database' -import { ContributionMessage as DbContributionMessage } from 'database' -import { User as DbUser } from 'database' +import { + Contribution as DbContribution, + ContributionMessage as DbContributionMessage, + User as DbUser, +} from 'database' import { Arg, Args, Authorized, Ctx, Int, Mutation, Query, Resolver } from 'type-graphql' +import { EntityManager, FindOptionsRelations, getConnection } from 'typeorm' import { ContributionMessageArgs } from '@arg/ContributionMessageArgs' import { Paginated } from '@arg/Paginated' diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index def2a12f5..20283e170 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -1,15 +1,12 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-explicit-any */ -import { Connection, Equal } from 'typeorm' -import { Contribution } from 'database' -import { Event as DbEvent } from 'database' -import { Transaction as DbTransaction } from 'database' -import { User } from 'database' import { UserInputError } from 'apollo-server-express' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Contribution, Event as DbEvent, Transaction as DbTransaction, User } from 'database' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { Connection, Equal } from 'typeorm' import { ContributionMessageType } from '@enum/ContributionMessageType' import { ContributionStatus } from '@enum/ContributionStatus' diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index c416f906b..27488a48b 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -1,8 +1,9 @@ -import { EntityManager, IsNull, getConnection } from 'typeorm' -import { Contribution as DbContribution } from 'database' -import { Transaction as DbTransaction } from 'database' -import { User as DbUser } from 'database' -import { UserContact } from 'database' +import { + Contribution as DbContribution, + Transaction as DbTransaction, + User as DbUser, + UserContact, +} from 'database' import { Decimal } from 'decimal.js-light' import { GraphQLResolveInfo } from 'graphql' import { @@ -18,6 +19,7 @@ import { Resolver, Root, } from 'type-graphql' +import { EntityManager, IsNull, getConnection } from 'typeorm' import { AdminCreateContributionArgs } from '@arg/AdminCreateContributionArgs' import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs' diff --git a/backend/src/graphql/resolver/EmailOptinCodes.test.ts b/backend/src/graphql/resolver/EmailOptinCodes.test.ts index e0614279c..d746d1ac8 100644 --- a/backend/src/graphql/resolver/EmailOptinCodes.test.ts +++ b/backend/src/graphql/resolver/EmailOptinCodes.test.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { Connection } from 'typeorm' -import { User as DbUser } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { User as DbUser } from 'database' import { GraphQLError } from 'graphql' +import { Connection } from 'typeorm' import { testEnvironment, cleanDB } from '@test/helpers' diff --git a/backend/src/graphql/resolver/KlicktippResolver.test.ts b/backend/src/graphql/resolver/KlicktippResolver.test.ts index 80943d9c9..725cd110c 100644 --- a/backend/src/graphql/resolver/KlicktippResolver.test.ts +++ b/backend/src/graphql/resolver/KlicktippResolver.test.ts @@ -3,8 +3,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ -import { Event as DbEvent } from 'database' -import { UserContact } from 'database' +import { Event as DbEvent, UserContact } from 'database' import { GraphQLError } from 'graphql' import { cleanDB, resetToken, testEnvironment } from '@test/helpers' diff --git a/backend/src/graphql/resolver/StatisticsResolver.ts b/backend/src/graphql/resolver/StatisticsResolver.ts index 44ab28c63..6dd693a17 100644 --- a/backend/src/graphql/resolver/StatisticsResolver.ts +++ b/backend/src/graphql/resolver/StatisticsResolver.ts @@ -1,11 +1,10 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { getConnection } from 'typeorm' -import { Transaction as DbTransaction } from 'database' -import { User as DbUser } from 'database' +import { Transaction as DbTransaction, User as DbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Resolver, Query, Authorized, FieldResolver } from 'type-graphql' +import { getConnection } from 'typeorm' import { CommunityStatistics, DynamicStatisticsFields } from '@model/CommunityStatistics' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts index 37a53e7f5..c482271fd 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.test.ts @@ -1,15 +1,17 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { Connection } from 'typeorm' -import { ContributionLink as DbContributionLink } from 'database' -import { Event as DbEvent } from 'database' -import { Transaction } from 'database' -import { User } from 'database' -import { UserContact } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { + ContributionLink as DbContributionLink, + Event as DbEvent, + Transaction, + User, + UserContact, +} from 'database' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { Connection } from 'typeorm' import { UnconfirmedContribution } from '@model/UnconfirmedContribution' 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 017fe02a5..a84208604 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -1,13 +1,15 @@ import { randomBytes } from 'crypto' -import { getConnection } from 'typeorm' -import { Contribution as DbContribution } from 'database' -import { ContributionLink as DbContributionLink } from 'database' -import { Transaction as DbTransaction } from 'database' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' +import { + Contribution as DbContribution, + ContributionLink as DbContributionLink, + Transaction as DbTransaction, + TransactionLink as DbTransactionLink, + User as DbUser, +} from 'database' import { Decimal } from 'decimal.js-light' import { Resolver, Args, Arg, Authorized, Ctx, Mutation, Query, Int } from 'type-graphql' +import { getConnection } from 'typeorm' import { Paginated } from '@arg/Paginated' import { TransactionLinkArgs } from '@arg/TransactionLinkArgs' diff --git a/backend/src/graphql/resolver/TransactionResolver.test.ts b/backend/src/graphql/resolver/TransactionResolver.test.ts index 06a760ff0..4abad0ffd 100644 --- a/backend/src/graphql/resolver/TransactionResolver.test.ts +++ b/backend/src/graphql/resolver/TransactionResolver.test.ts @@ -4,15 +4,17 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { Connection, In } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { DltTransaction } from 'database' -import { Event as DbEvent } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' -import { Transaction } from 'database' -import { User } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { + Community as DbCommunity, + DltTransaction, + Event as DbEvent, + FederatedCommunity as DbFederatedCommunity, + Transaction, + User, +} from 'database' import { GraphQLError } from 'graphql' +import { Connection, In } from 'typeorm' import { v4 as uuidv4 } from 'uuid' import { cleanDB, testEnvironment } from '@test/helpers' diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 19162b394..6f15201da 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -2,14 +2,16 @@ /* eslint-disable new-cap */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { getConnection, In, IsNull } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { PendingTransaction as DbPendingTransaction } from 'database' -import { Transaction as dbTransaction } from 'database' -import { TransactionLink as dbTransactionLink } from 'database' -import { User as dbUser } from 'database' +import { + Community as DbCommunity, + PendingTransaction as DbPendingTransaction, + Transaction as dbTransaction, + TransactionLink as dbTransactionLink, + User as dbUser, +} from 'database' import { Decimal } from 'decimal.js-light' import { Resolver, Query, Args, Authorized, Ctx, Mutation } from 'type-graphql' +import { getConnection, In, IsNull } from 'typeorm' import { Paginated } from '@arg/Paginated' import { TransactionSendArgs } from '@arg/TransactionSendArgs' diff --git a/backend/src/graphql/resolver/UserResolver.test.ts b/backend/src/graphql/resolver/UserResolver.test.ts index d19057d62..1c331a9a9 100644 --- a/backend/src/graphql/resolver/UserResolver.test.ts +++ b/backend/src/graphql/resolver/UserResolver.test.ts @@ -4,16 +4,18 @@ /* eslint-disable @typescript-eslint/no-unsafe-return */ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { Connection } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { Event as DbEvent } from 'database' -import { TransactionLink } from 'database' -import { User } from 'database' -import { UserContact } from 'database' -import { UserRole } from 'database' import { UserInputError } from 'apollo-server-express' import { ApolloServerTestClient } from 'apollo-server-testing' +import { + Community as DbCommunity, + Event as DbEvent, + TransactionLink, + User, + UserContact, + UserRole, +} from 'database' import { GraphQLError } from 'graphql' +import { Connection } from 'typeorm' import { v4 as uuidv4, validate as validateUUID, version as versionUUID } from 'uuid' import { GmsPublishLocationType } from '@enum/GmsPublishLocationType' diff --git a/backend/src/graphql/resolver/UserResolver.ts b/backend/src/graphql/resolver/UserResolver.ts index 8b8c12134..e89fbf80a 100644 --- a/backend/src/graphql/resolver/UserResolver.ts +++ b/backend/src/graphql/resolver/UserResolver.ts @@ -2,13 +2,14 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { getConnection, In, Point } from 'typeorm' -import { ContributionLink as DbContributionLink } from 'database' -import { ProjectBranding } from 'database' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' -import { UserContact as DbUserContact } from 'database' -import { UserLoggingView } from 'database' +import { + ContributionLink as DbContributionLink, + ProjectBranding, + TransactionLink as DbTransactionLink, + User as DbUser, + UserContact as DbUserContact, + UserLoggingView, +} from 'database' import { GraphQLResolveInfo } from 'graphql' import i18n from 'i18n' import { @@ -25,6 +26,7 @@ import { Info, } from 'type-graphql' import { IRestResponse } from 'typed-rest-client' +import { getConnection, In, Point } from 'typeorm' import { v4 as uuidv4 } from 'uuid' import { UserArgs } from '@arg//UserArgs' diff --git a/backend/src/graphql/resolver/semaphore.test.ts b/backend/src/graphql/resolver/semaphore.test.ts index 72aa416a8..839aaae3d 100644 --- a/backend/src/graphql/resolver/semaphore.test.ts +++ b/backend/src/graphql/resolver/semaphore.test.ts @@ -1,11 +1,11 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { Connection } from 'typeorm' -import { Community as DbCommunity } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Community as DbCommunity } from 'database' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' +import { Connection } from 'typeorm' import { v4 as uuidv4 } from 'uuid' import { cleanDB, testEnvironment, contributionDateFormatter } from '@test/helpers' diff --git a/backend/src/graphql/resolver/util/Location2Point.ts b/backend/src/graphql/resolver/util/Location2Point.ts index 661fa4184..40fb0b19b 100644 --- a/backend/src/graphql/resolver/util/Location2Point.ts +++ b/backend/src/graphql/resolver/util/Location2Point.ts @@ -1,4 +1,5 @@ import { Point } from 'typeorm' + import { Location } from '@model/Location' export function Location2Point(location: Location): Point { diff --git a/backend/src/graphql/resolver/util/communities.ts b/backend/src/graphql/resolver/util/communities.ts index 039bfa48c..1461f093b 100644 --- a/backend/src/graphql/resolver/util/communities.ts +++ b/backend/src/graphql/resolver/util/communities.ts @@ -1,6 +1,5 @@ +import { Community as DbCommunity, FederatedCommunity as DbFederatedCommunity } from 'database' import { FindOneOptions } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' import { Paginated } from '@arg/Paginated' diff --git a/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts b/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts index 781758577..cc53ff5a1 100644 --- a/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts +++ b/backend/src/graphql/resolver/util/compareGmsRelevantUserSettings.ts @@ -1,6 +1,6 @@ +import { User as DbUser, UserLoggingView } from 'database' import { Point } from 'typeorm' -import { User as DbUser } from 'database' -import { UserLoggingView } from 'database' + import { UpdateUserInfosArgs } from '@/graphql/arg/UpdateUserInfosArgs' import { GmsPublishLocationType } from '@/graphql/enum/GmsPublishLocationType' import { PublishNameType } from '@/graphql/enum/PublishNameType' diff --git a/backend/src/graphql/resolver/util/creations.test.ts b/backend/src/graphql/resolver/util/creations.test.ts index 06536f9a7..3236d7d1c 100644 --- a/backend/src/graphql/resolver/util/creations.test.ts +++ b/backend/src/graphql/resolver/util/creations.test.ts @@ -1,7 +1,6 @@ -import { Connection } from 'typeorm' -import { Contribution } from 'database' -import { User } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Contribution, User } from 'database' +import { Connection } from 'typeorm' import { testEnvironment, cleanDB, contributionDateFormatter } from '@test/helpers' diff --git a/backend/src/graphql/resolver/util/creations.ts b/backend/src/graphql/resolver/util/creations.ts index a2c0b222a..3ce627b6b 100644 --- a/backend/src/graphql/resolver/util/creations.ts +++ b/backend/src/graphql/resolver/util/creations.ts @@ -1,9 +1,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { getConnection } from 'typeorm' import { Contribution } from 'database' import { Decimal } from 'decimal.js-light' +import { getConnection } from 'typeorm' import { OpenCreation } from '@model/OpenCreation' diff --git a/backend/src/graphql/resolver/util/eventList.ts b/backend/src/graphql/resolver/util/eventList.ts index 3aa5cf63e..a3aa5a667 100644 --- a/backend/src/graphql/resolver/util/eventList.ts +++ b/backend/src/graphql/resolver/util/eventList.ts @@ -1,6 +1,4 @@ -import { Event as DbEvent } from 'database' -import { User } from 'database' -import { UserContact } from 'database' +import { Event as DbEvent, User, UserContact } from 'database' export const lastDateTimeEvents = async ( eventType: string, diff --git a/backend/src/graphql/resolver/util/extractGraphQLFields.ts b/backend/src/graphql/resolver/util/extractGraphQLFields.ts index dfef6cd85..e6cba554c 100644 --- a/backend/src/graphql/resolver/util/extractGraphQLFields.ts +++ b/backend/src/graphql/resolver/util/extractGraphQLFields.ts @@ -1,10 +1,10 @@ -import { ObjectLiteral, SelectQueryBuilder } from 'typeorm' import { GraphQLResolveInfo } from 'graphql' import { parseResolveInfo, ResolveTree, simplifyParsedResolveInfoFragmentWithType, } from 'graphql-parse-resolve-info' +import { ObjectLiteral, SelectQueryBuilder } from 'typeorm' /** * Extracts the requested fields from GraphQL diff --git a/backend/src/graphql/resolver/util/findContributionMessages.ts b/backend/src/graphql/resolver/util/findContributionMessages.ts index 18b8a51dc..458c1d9d3 100644 --- a/backend/src/graphql/resolver/util/findContributionMessages.ts +++ b/backend/src/graphql/resolver/util/findContributionMessages.ts @@ -1,5 +1,5 @@ -import { In } from 'typeorm' import { ContributionMessage as DbContributionMessage } from 'database' +import { In } from 'typeorm' import { ContributionMessageType } from '@enum/ContributionMessageType' import { Order } from '@enum/Order' diff --git a/backend/src/graphql/resolver/util/findContributions.ts b/backend/src/graphql/resolver/util/findContributions.ts index a0e6dcd81..d481dac3b 100644 --- a/backend/src/graphql/resolver/util/findContributions.ts +++ b/backend/src/graphql/resolver/util/findContributions.ts @@ -1,14 +1,6 @@ /* eslint-disable security/detect-object-injection */ -import { - Brackets, - In, - IsNull, - LessThanOrEqual, - Like, - Not, - SelectQueryBuilder, -} from 'typeorm' import { Contribution as DbContribution } from 'database' +import { Brackets, In, IsNull, LessThanOrEqual, Like, Not, SelectQueryBuilder } from 'typeorm' import { Paginated } from '@arg/Paginated' import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs' diff --git a/backend/src/graphql/resolver/util/findUserByIdentifier.ts b/backend/src/graphql/resolver/util/findUserByIdentifier.ts index 6a5c40fb8..1bdb186ce 100644 --- a/backend/src/graphql/resolver/util/findUserByIdentifier.ts +++ b/backend/src/graphql/resolver/util/findUserByIdentifier.ts @@ -1,8 +1,6 @@ -import { FindOptionsWhere } from 'typeorm' -import { Community } from 'database' -import { User as DbUser } from 'database' -import { UserContact as DbUserContact } from 'database' import { isURL } from 'class-validator' +import { Community, User as DbUser, UserContact as DbUserContact } from 'database' +import { FindOptionsWhere } from 'typeorm' import { validate, version } from 'uuid' import { LogError } from '@/server/LogError' @@ -24,8 +22,8 @@ export const findUserByIdentifier = async ( const communityWhere: FindOptionsWhere = isURL(communityIdentifier) ? { url: communityIdentifier } : isUUID4(communityIdentifier) - ? { communityUuid: communityIdentifier } - : { name: communityIdentifier } + ? { communityUuid: communityIdentifier } + : { name: communityIdentifier } if (validate(identifier) && version(identifier) === 4) { user = await DbUser.findOne({ diff --git a/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts b/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts index af6a9d15e..698424a18 100644 --- a/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts +++ b/backend/src/graphql/resolver/util/findUserByIdentifiers.test.ts @@ -1,10 +1,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ -import { Connection } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { User as DbUser } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Community as DbCommunity, User as DbUser } from 'database' +import { Connection } from 'typeorm' import { cleanDB, testEnvironment } from '@test/helpers' diff --git a/backend/src/graphql/resolver/util/findUsers.ts b/backend/src/graphql/resolver/util/findUsers.ts index d6f2e8b6e..88fc6f9ec 100644 --- a/backend/src/graphql/resolver/util/findUsers.ts +++ b/backend/src/graphql/resolver/util/findUsers.ts @@ -1,5 +1,5 @@ -import { IsNull, Not, Like } from 'typeorm' import { User as DbUser } from 'database' +import { IsNull, Not, Like } from 'typeorm' import { SearchUsersFilters } from '@arg/SearchUsersFilters' import { Order } from '@enum/Order' diff --git a/backend/src/graphql/resolver/util/modifyUserRole.ts b/backend/src/graphql/resolver/util/modifyUserRole.ts index b22d0dabd..84f8fc347 100644 --- a/backend/src/graphql/resolver/util/modifyUserRole.ts +++ b/backend/src/graphql/resolver/util/modifyUserRole.ts @@ -1,5 +1,4 @@ -import { User as DbUser } from 'database' -import { UserRole } from 'database' +import { User as DbUser, UserRole } from 'database' import { LogError } from '@/server/LogError' diff --git a/backend/src/graphql/resolver/util/processXComSendCoins.ts b/backend/src/graphql/resolver/util/processXComSendCoins.ts index 3ef0c59ea..534733c54 100644 --- a/backend/src/graphql/resolver/util/processXComSendCoins.ts +++ b/backend/src/graphql/resolver/util/processXComSendCoins.ts @@ -1,7 +1,9 @@ -import { Community as DbCommunity } from 'database' -import { FederatedCommunity as DbFederatedCommunity } from 'database' -import { PendingTransaction as DbPendingTransaction } from 'database' -import { User as dbUser } from 'database' +import { + Community as DbCommunity, + FederatedCommunity as DbFederatedCommunity, + PendingTransaction as DbPendingTransaction, + User as dbUser, +} from 'database' import { Decimal } from 'decimal.js-light' import { CONFIG } from '@/config' diff --git a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts index 56cc23478..0fede78bb 100644 --- a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts +++ b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.test.ts @@ -5,16 +5,14 @@ /* eslint-disable @typescript-eslint/no-explicit-any */ /* eslint-disable @typescript-eslint/explicit-module-boundary-types */ -import { Connection } from 'typeorm' -import { Community } from 'database' -import { DltTransaction } from 'database' -import { Transaction } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Community, DltTransaction, Transaction } from 'database' import { Decimal } from 'decimal.js-light' // import { GraphQLClient } from 'graphql-request' // import { Response } from 'graphql-request/dist/types' import { GraphQLClient } from 'graphql-request' import { Response } from 'graphql-request/dist/types' +import { Connection } from 'typeorm' import { v4 as uuidv4 } from 'uuid' import { testEnvironment, cleanDB } from '@test/helpers' diff --git a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.ts b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.ts index 187f0a7c0..8e8c814a6 100644 --- a/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.ts +++ b/backend/src/graphql/resolver/util/sendTransactionsToDltConnector.ts @@ -1,6 +1,5 @@ +import { DltTransaction, Transaction } from 'database' import { IsNull } from 'typeorm' -import { DltTransaction } from 'database' -import { Transaction } from 'database' import { DltConnectorClient } from '@dltConnector/DltConnectorClient' diff --git a/backend/src/graphql/resolver/util/sendUserToGms.ts b/backend/src/graphql/resolver/util/sendUserToGms.ts index ab6ca8c4c..9aac13815 100644 --- a/backend/src/graphql/resolver/util/sendUserToGms.ts +++ b/backend/src/graphql/resolver/util/sendUserToGms.ts @@ -1,5 +1,4 @@ -import { Community as DbCommunity } from 'database' -import { User as DbUser } from 'database' +import { Community as DbCommunity, User as DbUser } from 'database' import { createGmsUser, updateGmsUser } from '@/apis/gms/GmsClient' import { GmsUser } from '@/apis/gms/model/GmsUser' diff --git a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts index e26ba06fb..cafacc6e6 100644 --- a/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts +++ b/backend/src/graphql/resolver/util/settlePendingSenderTransaction.ts @@ -2,12 +2,14 @@ /* eslint-disable new-cap */ /* eslint-disable @typescript-eslint/no-non-null-assertion */ -import { getConnection } from 'typeorm' -import { Community as DbCommunity } from 'database' -import { PendingTransaction as DbPendingTransaction } from 'database' -import { Transaction as dbTransaction } from 'database' -import { User as DbUser } from 'database' +import { + Community as DbCommunity, + PendingTransaction as DbPendingTransaction, + Transaction as dbTransaction, + User as DbUser, +} from 'database' import { Decimal } from 'decimal.js-light' +import { getConnection } from 'typeorm' import { PendingTransactionState } from '@/graphql/enum/PendingTransactionState' import { LogError } from '@/server/LogError' diff --git a/backend/src/graphql/resolver/util/storeForeignUser.ts b/backend/src/graphql/resolver/util/storeForeignUser.ts index db34fd70b..929aa9cca 100644 --- a/backend/src/graphql/resolver/util/storeForeignUser.ts +++ b/backend/src/graphql/resolver/util/storeForeignUser.ts @@ -1,5 +1,4 @@ -import { Community as DbCommunity } from 'database' -import { User as DbUser } from 'database' +import { Community as DbCommunity, User as DbUser } from 'database' import { SendCoinsResult } from '@/federation/client/1_0/model/SendCoinsResult' import { backendLogger as logger } from '@/server/logger' diff --git a/backend/src/graphql/resolver/util/syncHumhub.test.ts b/backend/src/graphql/resolver/util/syncHumhub.test.ts index 1f0620095..1f2153d40 100644 --- a/backend/src/graphql/resolver/util/syncHumhub.test.ts +++ b/backend/src/graphql/resolver/util/syncHumhub.test.ts @@ -1,5 +1,4 @@ -import { User } from 'database' -import { UserContact } from 'database' +import { User, UserContact } from 'database' import { HumHubClient } from '@/apis/humhub/HumHubClient' import { GetUser } from '@/apis/humhub/model/GetUser' diff --git a/backend/src/graphql/resolver/util/transactionLinkList.ts b/backend/src/graphql/resolver/util/transactionLinkList.ts index 81c7985d5..7ab7e649c 100644 --- a/backend/src/graphql/resolver/util/transactionLinkList.ts +++ b/backend/src/graphql/resolver/util/transactionLinkList.ts @@ -1,6 +1,5 @@ +import { TransactionLink as DbTransactionLink, User as DbUser } from 'database' import { MoreThan, IsNull } from 'typeorm' -import { TransactionLink as DbTransactionLink } from 'database' -import { User as DbUser } from 'database' import { Paginated } from '@arg/Paginated' import { TransactionLinkFilters } from '@arg/TransactionLinkFilters' diff --git a/backend/src/graphql/resolver/util/transactionLinkSummary.ts b/backend/src/graphql/resolver/util/transactionLinkSummary.ts index 7d038eaf3..27477544c 100644 --- a/backend/src/graphql/resolver/util/transactionLinkSummary.ts +++ b/backend/src/graphql/resolver/util/transactionLinkSummary.ts @@ -1,8 +1,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-argument */ -import { getConnection } from 'typeorm' import { TransactionLink as DbTransactionLink } from 'database' import { Decimal } from 'decimal.js-light' +import { getConnection } from 'typeorm' import { LogError } from '@/server/LogError' diff --git a/backend/src/graphql/resolver/util/validateAlias.test.ts b/backend/src/graphql/resolver/util/validateAlias.test.ts index 32a401682..a05496edf 100644 --- a/backend/src/graphql/resolver/util/validateAlias.test.ts +++ b/backend/src/graphql/resolver/util/validateAlias.test.ts @@ -1,6 +1,6 @@ -import { Connection } from 'typeorm' -import { User } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { User } from 'database' +import { Connection } from 'typeorm' import { testEnvironment, cleanDB } from '@test/helpers' import { logger, i18n as localization } from '@test/testSetup' diff --git a/backend/src/graphql/resolver/util/validateAlias.ts b/backend/src/graphql/resolver/util/validateAlias.ts index 773cf4085..6a3502883 100644 --- a/backend/src/graphql/resolver/util/validateAlias.ts +++ b/backend/src/graphql/resolver/util/validateAlias.ts @@ -1,5 +1,5 @@ -import { Raw } from 'typeorm' import { User as DbUser } from 'database' +import { Raw } from 'typeorm' import { LogError } from '@/server/LogError' diff --git a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts index 1d0b38eab..0caa71618 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts @@ -1,5 +1,4 @@ -import { Contribution } from 'database' -import { User } from 'database' +import { Contribution, User } from 'database' import { Decimal } from 'decimal.js-light' import { Role } from '@/auth/Role' diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts index a2060bab7..45fee04cf 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts @@ -1,5 +1,4 @@ -import { Contribution } from 'database' -import { User } from 'database' +import { Contribution, User } from 'database' import { RIGHTS } from '@/auth/RIGHTS' import { Role } from '@/auth/Role' diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts index 80307f69f..42bb75e00 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts @@ -1,5 +1,4 @@ -import { Contribution } from 'database' -import { User } from 'database' +import { Contribution, User } from 'database' import { RIGHTS } from '@/auth/RIGHTS' import { Role } from '@/auth/Role' @@ -17,7 +16,10 @@ import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContri * Admins and Moderators are currently not allowed to comment her own contributions with the admin/moderator role */ export class UnconfirmedContributionAdminAddMessageRole extends AbstractUnconfirmedContributionRole { - public constructor(contribution: Contribution, private updateData: ContributionMessageArgs) { + public constructor( + contribution: Contribution, + private updateData: ContributionMessageArgs, + ) { super(contribution, contribution.amount, contribution.contributionDate) logger.debug('use UnconfirmedContributionAdminAddMessageRole') } diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts index 01f8b74f7..75b859020 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts @@ -1,5 +1,4 @@ -import { Contribution } from 'database' -import { User } from 'database' +import { Contribution, User } from 'database' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { ContributionArgs } from '@/graphql/arg/ContributionArgs' @@ -14,7 +13,10 @@ import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContri * independent from there role, because the own contribution can only be edited in user role */ export class UnconfirmedContributionUserRole extends AbstractUnconfirmedContributionRole { - public constructor(contribution: Contribution, private updateData: ContributionArgs) { + public constructor( + contribution: Contribution, + private updateData: ContributionArgs, + ) { super(contribution, updateData.amount, new Date(updateData.creationDate)) logger.debug('use UnconfirmedContributionUserRole') } diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts index 04125afff..77d89ac2b 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts @@ -1,5 +1,4 @@ -import { Contribution } from 'database' -import { User } from 'database' +import { Contribution, User } from 'database' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { ContributionMessageArgs } from '@/graphql/arg/ContributionMessageArgs' @@ -15,7 +14,10 @@ import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContri * independent from there role, because the own contribution can only be commented in user role */ export class UnconfirmedContributionUserAddMessageRole extends AbstractUnconfirmedContributionRole { - public constructor(contribution: Contribution, private updateData: ContributionMessageArgs) { + public constructor( + contribution: Contribution, + private updateData: ContributionMessageArgs, + ) { super(contribution, contribution.amount, contribution.contributionDate) logger.debug('use UnconfirmedContributionUserAddMessageRole') } diff --git a/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts b/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts index 4931779e6..7e0295ef9 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UpdateUnconfirmedContribution.context.ts @@ -1,7 +1,6 @@ -import { EntityManager, FindOneOptions, FindOptionsRelations } from 'typeorm' -import { Contribution } from 'database' -import { ContributionMessage } from 'database' +import { Contribution, ContributionMessage } from 'database' import { Decimal } from 'decimal.js-light' +import { EntityManager, FindOneOptions, FindOptionsRelations } from 'typeorm' import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs' import { ContributionArgs } from '@arg/ContributionArgs' diff --git a/backend/src/logging/BalanceLogging.view.ts b/backend/src/logging/BalanceLogging.view.ts index 6cd4806d8..eeb4eab56 100644 --- a/backend/src/logging/BalanceLogging.view.ts +++ b/backend/src/logging/BalanceLogging.view.ts @@ -1,4 +1,5 @@ import { AbstractLoggingView } from 'database' + import { Balance } from '@/graphql/model/Balance' export class BalanceLoggingView extends AbstractLoggingView { diff --git a/backend/src/logging/DecayLogging.view.ts b/backend/src/logging/DecayLogging.view.ts index bc6b8e691..ade50cea7 100644 --- a/backend/src/logging/DecayLogging.view.ts +++ b/backend/src/logging/DecayLogging.view.ts @@ -1,4 +1,5 @@ import { AbstractLoggingView } from 'database' + import { Decay } from '@/graphql/model/Decay' export class DecayLoggingView extends AbstractLoggingView { diff --git a/backend/src/seeds/factory/creation.ts b/backend/src/seeds/factory/creation.ts index 032b66f14..8fcb1b8de 100644 --- a/backend/src/seeds/factory/creation.ts +++ b/backend/src/seeds/factory/creation.ts @@ -2,9 +2,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/unbound-method */ -import { Contribution } from 'database' -import { Transaction } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Contribution, Transaction } from 'database' import { findUserByEmail } from '@/graphql/resolver/UserResolver' import { CreationInterface } from '@/seeds/creation/CreationInterface' diff --git a/backend/src/seeds/factory/transactionLink.ts b/backend/src/seeds/factory/transactionLink.ts index ae8b50d58..773860933 100644 --- a/backend/src/seeds/factory/transactionLink.ts +++ b/backend/src/seeds/factory/transactionLink.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/unbound-method */ -import { TransactionLink } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { TransactionLink } from 'database' import { transactionLinkExpireDate } from '@/graphql/resolver/TransactionLinkResolver' import { login, createTransactionLink } from '@/seeds/graphql/mutations' diff --git a/backend/src/seeds/factory/user.ts b/backend/src/seeds/factory/user.ts index 8d77ca2bc..01523cfa3 100644 --- a/backend/src/seeds/factory/user.ts +++ b/backend/src/seeds/factory/user.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/unbound-method */ -import { User } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { User } from 'database' import { RoleNames } from '@enum/RoleNames' diff --git a/backend/src/seeds/index.ts b/backend/src/seeds/index.ts index 0e3bb6db9..71c026d0d 100644 --- a/backend/src/seeds/index.ts +++ b/backend/src/seeds/index.ts @@ -4,8 +4,8 @@ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-return */ -import { entities } from 'database' import { createTestClient } from 'apollo-server-testing' +import { entities } from 'database' import { name, internet, datatype } from 'faker' import { CONFIG } from '@/config' diff --git a/backend/src/server/context.ts b/backend/src/server/context.ts index 603b1ef98..e375d04f4 100644 --- a/backend/src/server/context.ts +++ b/backend/src/server/context.ts @@ -1,6 +1,5 @@ -import { Transaction as dbTransaction } from 'database' -import { User as dbUser } from 'database' import { ExpressContext } from 'apollo-server-express' +import { Transaction as dbTransaction, User as dbUser } from 'database' import { Decimal } from 'decimal.js-light' import { Role } from '@/auth/Role' diff --git a/backend/src/server/createServer.ts b/backend/src/server/createServer.ts index 8b6e9a61d..b85f7ccc6 100644 --- a/backend/src/server/createServer.ts +++ b/backend/src/server/createServer.ts @@ -1,12 +1,12 @@ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ /* eslint-disable @typescript-eslint/restrict-template-expressions */ /* eslint-disable @typescript-eslint/unbound-method */ -import { Connection as DbConnection } from 'typeorm' import { ApolloServer } from 'apollo-server-express' import express, { Express, json, urlencoded } from 'express' import { slowDown } from 'express-slow-down' import helmet from 'helmet' import { Logger } from 'log4js' +import { Connection as DbConnection } from 'typeorm' import { CONFIG } from '@/config' import { schema } from '@/graphql/schema' diff --git a/backend/src/typeorm/connection.ts b/backend/src/typeorm/connection.ts index 63af47c5e..6ac211068 100644 --- a/backend/src/typeorm/connection.ts +++ b/backend/src/typeorm/connection.ts @@ -1,7 +1,7 @@ // TODO This is super weird - since the entities are defined in another project they have their own globals. // We cannot use our connection here, but must use the external typeorm installation -import { Connection as DbConnection, createConnection, FileLogger } from 'typeorm' import { entities } from 'database' +import { Connection as DbConnection, createConnection, FileLogger } from 'typeorm' import { CONFIG } from '@/config' diff --git a/backend/src/util/communityUser.ts b/backend/src/util/communityUser.ts index c966b4e27..9e50a978f 100644 --- a/backend/src/util/communityUser.ts +++ b/backend/src/util/communityUser.ts @@ -1,8 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ +import { User as dbUser, UserContact } from 'database' import { SaveOptions, RemoveOptions } from 'typeorm' -import { User as dbUser } from 'database' -import { UserContact } from 'database' import { User } from '@model/User' diff --git a/backend/src/util/klicktipp.test.ts b/backend/src/util/klicktipp.test.ts index b2eac7180..d935edc0a 100644 --- a/backend/src/util/klicktipp.test.ts +++ b/backend/src/util/klicktipp.test.ts @@ -2,9 +2,9 @@ /* eslint-disable @typescript-eslint/no-unsafe-call */ /* eslint-disable @typescript-eslint/no-unsafe-member-access */ /* eslint-disable @typescript-eslint/no-unsafe-assignment */ -import { Connection } from 'typeorm' -import { Event as DbEvent } from 'database' import { ApolloServerTestClient } from 'apollo-server-testing' +import { Event as DbEvent } from 'database' +import { Connection } from 'typeorm' import { testEnvironment, cleanDB, resetToken } from '@test/helpers' diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts index 20c3c6d24..27538181c 100644 --- a/backend/src/util/virtualTransactions.ts +++ b/backend/src/util/virtualTransactions.ts @@ -1,7 +1,7 @@ /* eslint-disable @typescript-eslint/no-unused-vars */ -import { SaveOptions, RemoveOptions } from 'typeorm' import { Transaction as dbTransaction } from 'database' import { Decimal } from 'decimal.js-light' +import { SaveOptions, RemoveOptions } from 'typeorm' import { TransactionTypeId } from '@enum/TransactionTypeId' import { Transaction } from '@model/Transaction' diff --git a/backend/src/webhook/elopage.ts b/backend/src/webhook/elopage.ts index f8b5929eb..337e98475 100644 --- a/backend/src/webhook/elopage.ts +++ b/backend/src/webhook/elopage.ts @@ -32,8 +32,7 @@ I assume that the webhook arrives via POST and transmits a string as shown above */ -import { LoginElopageBuys } from 'database' -import { UserContact as dbUserContact } from 'database' +import { LoginElopageBuys, UserContact as dbUserContact } from 'database' import { UserResolver } from '@/graphql/resolver/UserResolver'