From bea80dbae634fb63cbff1d28b141af1e0a5db358 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Fri, 28 Nov 2025 19:13:22 +0100 Subject: [PATCH] update imports from moved enums --- .../graphql/arg/SearchContributionsFilterArgs.ts | 2 +- backend/src/graphql/model/Transaction.ts | 4 ++-- .../resolver/ContributionMessageResolver.test.ts | 3 +-- .../graphql/resolver/ContributionResolver.test.ts | 3 +-- .../src/graphql/resolver/ContributionResolver.ts | 9 ++++----- .../graphql/resolver/TransactionLinkResolver.ts | 13 ++++++------- .../src/graphql/resolver/TransactionResolver.ts | 6 ++---- .../graphql/validator/ContributionStatusArray.ts | 2 +- .../AbstractUnconfirmedContribution.role.ts | 3 +-- .../UnconfirmedContributionAdmin.role.ts | 3 +-- .../UnconfirmedContributionAdminAddMessage.role.ts | 3 +-- .../UnconfirmedContributionUser.role.ts | 3 +-- .../UnconfirmedContributionUserAddMessage.role.ts | 3 +-- backend/src/util/virtualTransactions.ts | 3 +-- core/src/graphql/logic/processXComSendCoins.ts | 14 ++++++++++---- 15 files changed, 34 insertions(+), 40 deletions(-) diff --git a/backend/src/graphql/arg/SearchContributionsFilterArgs.ts b/backend/src/graphql/arg/SearchContributionsFilterArgs.ts index ad8b7747e..727940dac 100644 --- a/backend/src/graphql/arg/SearchContributionsFilterArgs.ts +++ b/backend/src/graphql/arg/SearchContributionsFilterArgs.ts @@ -1,7 +1,7 @@ import { IsBoolean, IsPositive, IsString } from 'class-validator' import { ArgsType, Field, InputType, Int } from 'type-graphql' -import { ContributionStatus } from '@enum/ContributionStatus' +import { ContributionStatus } from 'database' import { isContributionStatusArray } from '@/graphql/validator/ContributionStatusArray' diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 0560cef54..312c67b15 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -1,8 +1,8 @@ -import { Transaction as dbTransaction } from 'database' +import { Transaction as dbTransaction, TransactionTypeId } from 'database' import { Decimal } from 'decimal.js-light' import { Field, Int, ObjectType } from 'type-graphql' -import { Decay, TransactionTypeId } from 'core' +import { Decay } from 'core' import { User } from './User' diff --git a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts index 483747b90..673ffae15 100644 --- a/backend/src/graphql/resolver/ContributionMessageResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionMessageResolver.test.ts @@ -1,9 +1,8 @@ import { ApolloServerTestClient } from 'apollo-server-testing' -import { Contribution as DbContribution, Event as DbEvent } from 'database' +import { Contribution as DbContribution, Event as DbEvent, ContributionStatus } from 'database' import { GraphQLError } from 'graphql' import { DataSource } from 'typeorm' -import { ContributionStatus } from '@enum/ContributionStatus' import { cleanDB, resetToken, testEnvironment } from '@test/helpers' import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const' diff --git a/backend/src/graphql/resolver/ContributionResolver.test.ts b/backend/src/graphql/resolver/ContributionResolver.test.ts index 31d405942..98b273763 100644 --- a/backend/src/graphql/resolver/ContributionResolver.test.ts +++ b/backend/src/graphql/resolver/ContributionResolver.test.ts @@ -1,11 +1,10 @@ import { ApolloServerTestClient } from 'apollo-server-testing' -import { Contribution, Event as DbEvent, Transaction as DbTransaction, User } from 'database' +import { Contribution, Event as DbEvent, Transaction as DbTransaction, User, ContributionStatus } from 'database' import { Decimal } from 'decimal.js-light' import { GraphQLError } from 'graphql' import { DataSource, Equal } from 'typeorm' import { ContributionMessageType } from '@enum/ContributionMessageType' -import { ContributionStatus } from '@enum/ContributionStatus' import { Order } from '@enum/Order' import { cleanDB, diff --git a/backend/src/graphql/resolver/ContributionResolver.ts b/backend/src/graphql/resolver/ContributionResolver.ts index 180c22cfb..7c451b5bf 100644 --- a/backend/src/graphql/resolver/ContributionResolver.ts +++ b/backend/src/graphql/resolver/ContributionResolver.ts @@ -1,6 +1,9 @@ import { Contribution as DbContribution, + ContributionStatus, + ContributionType, Transaction as DbTransaction, + TransactionTypeId, User as DbUser, DltTransaction as DbDltTransaction, UserContact, @@ -15,20 +18,16 @@ import { AdminUpdateContributionArgs } from '@arg/AdminUpdateContributionArgs' import { ContributionArgs } from '@arg/ContributionArgs' import { Paginated } from '@arg/Paginated' import { SearchContributionsFilterArgs } from '@arg/SearchContributionsFilterArgs' -import { ContributionStatus } from '@enum/ContributionStatus' -import { ContributionType } from '@enum/ContributionType' import { AdminUpdateContribution } from '@model/AdminUpdateContribution' import { Contribution, ContributionListResult } from '@model/Contribution' import { OpenCreation } from '@model/OpenCreation' import { UnconfirmedContribution } from '@model/UnconfirmedContribution' import { RIGHTS } from '@/auth/RIGHTS' import { - fullName, sendContributionChangedByModeratorEmail, sendContributionConfirmedEmail, sendContributionDeletedEmail, sendContributionDeniedEmail, - TransactionTypeId } from 'core' import { EVENT_ADMIN_CONTRIBUTION_CONFIRM, @@ -44,7 +43,7 @@ import { UpdateUnconfirmedContributionContext } from '@/interactions/updateUncon import { LogError } from '@/server/LogError' import { Context, getClientTimezoneOffset, getUser } from '@/server/context' import { TRANSACTIONS_LOCK } from 'database' -import { calculateDecay, Decay } from 'shared' +import { calculateDecay, Decay, fullName } from 'shared' import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const' import { ContributionMessageType } from '@enum/ContributionMessageType' diff --git a/backend/src/graphql/resolver/TransactionLinkResolver.ts b/backend/src/graphql/resolver/TransactionLinkResolver.ts index 869104bae..b6b8f822f 100644 --- a/backend/src/graphql/resolver/TransactionLinkResolver.ts +++ b/backend/src/graphql/resolver/TransactionLinkResolver.ts @@ -3,23 +3,24 @@ import { randomBytes } from 'crypto' 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 { Community } from '@model/Community' import { ContributionLink } from '@model/ContributionLink' import { RedeemJwtLink } from '@model/RedeemJwtLink' import { TransactionLink, TransactionLinkResult } from '@model/TransactionLink' import { User } from '@model/User' import { QueryLinkResult } from '@union/QueryLinkResult' -import { Decay, interpretEncryptedTransferArgs, TransactionTypeId } from 'core' +import { Decay, interpretEncryptedTransferArgs, EncryptedTransferArgs } from 'core' import { AppDatabase, Contribution as DbContribution, + ContributionCycleType, + ContributionStatus, + ContributionType, ContributionLink as DbContributionLink, FederatedCommunity as DbFederatedCommunity, DltTransaction as DbDltTransaction, Transaction as DbTransaction, TransactionLink as DbTransactionLink, + TransactionTypeId, User as DbUser, findModeratorCreatingContributionLink, findTransactionLinkByCode, @@ -38,7 +39,6 @@ import { import { LogError } from '@/server/LogError' import { Context, getClientTimezoneOffset, getUser } from '@/server/context' import { calculateBalance } from '@/util/validate' -import { fullName } from 'core' import { TRANSACTION_LINK_LOCK, TRANSACTIONS_LOCK } from 'database' import { calculateDecay, @@ -53,7 +53,6 @@ import { import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const' import { DisbursementClient as V1_0_DisbursementClient } from '@/federation/client/1_0/DisbursementClient' import { DisbursementClientFactory } from '@/federation/client/DisbursementClientFactory' -import { EncryptedTransferArgs } from 'core' import { getLastTransaction } from 'database' import { getLogger, Logger } from 'log4js' import { randombytes_random } from 'sodium-native' @@ -65,7 +64,7 @@ import { } from './util/communities' import { getUserCreation, validateContribution } from './util/creations' import { transactionLinkList } from './util/transactionLinkList' -import { SignedTransferPayloadType } from 'shared' +import { fullName, SignedTransferPayloadType } from 'shared' import { contributionTransaction, deferredTransferTransaction, redeemDeferredTransferTransaction } from '@/apis/dltConnector' import { CODE_VALID_DAYS_DURATION } from './const/const' diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 923971743..c82eabf8b 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -18,11 +18,9 @@ import { Transaction } from '@model/Transaction' import { TransactionList } from '@model/TransactionList' import { User } from '@model/User' import { - fullName, processXComCompleteTransaction, sendTransactionLinkRedeemedEmail, sendTransactionReceivedEmail, - TransactionTypeId } from 'core' import { RIGHTS } from '@/auth/RIGHTS' import { CONFIG } from '@/config' @@ -33,10 +31,10 @@ import { Context, getUser } from '@/server/context' import { communityUser } from '@/util/communityUser' import { calculateBalance } from '@/util/validate' import { virtualDecayTransaction, virtualLinkTransaction } from '@/util/virtualTransactions' -import { TRANSACTIONS_LOCK } from 'database' +import { fullName } from 'shared' import { LOG4JS_BASE_CATEGORY_NAME } from '@/config/const' -import { getLastTransaction } from 'database' +import { getLastTransaction, TRANSACTIONS_LOCK, TransactionTypeId } from 'database' import { getLogger, Logger } from 'log4js' import { BalanceResolver } from './BalanceResolver' import { GdtResolver } from './GdtResolver' diff --git a/backend/src/graphql/validator/ContributionStatusArray.ts b/backend/src/graphql/validator/ContributionStatusArray.ts index dd7c93277..65f61ec9e 100644 --- a/backend/src/graphql/validator/ContributionStatusArray.ts +++ b/backend/src/graphql/validator/ContributionStatusArray.ts @@ -1,6 +1,6 @@ import { ValidationOptions, registerDecorator } from 'class-validator' -import { ContributionStatus } from '@enum/ContributionStatus' +import { ContributionStatus } from 'database' export function isContributionStatusArray(validationOptions?: ValidationOptions) { return function (object: Object, propertyName: string) { diff --git a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts index dd85e3fb6..0f83821df 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/AbstractUnconfirmedContribution.role.ts @@ -1,10 +1,9 @@ -import { Contribution, User } from 'database' +import { Contribution, ContributionStatus, User } from 'database' import { Decimal } from 'decimal.js-light' import { Role } from '@/auth/Role' import { ContributionLogic } from '@/data/Contribution.logic' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' -import { ContributionStatus } from '@/graphql/enum/ContributionStatus' import { LogError } from '@/server/LogError' import { Context, getClientTimezoneOffset } from '@/server/context' import { Logger, getLogger } from 'log4js' diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts index f160966d3..d95edf240 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdmin.role.ts @@ -1,10 +1,9 @@ -import { Contribution, User } from 'database' +import { Contribution, ContributionStatus, User } from 'database' import { RIGHTS } from '@/auth/RIGHTS' import { Role } from '@/auth/Role' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { AdminUpdateContributionArgs } from '@/graphql/arg/AdminUpdateContributionArgs' -import { ContributionStatus } from '@/graphql/enum/ContributionStatus' import { LogError } from '@/server/LogError' import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContribution.role' diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts index dcc10091f..780b2e401 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionAdminAddMessage.role.ts @@ -1,11 +1,10 @@ -import { Contribution, User } from 'database' +import { Contribution, ContributionStatus, User } from 'database' import { RIGHTS } from '@/auth/RIGHTS' import { Role } from '@/auth/Role' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { ContributionMessageArgs } from '@/graphql/arg/ContributionMessageArgs' import { ContributionMessageType } from '@/graphql/enum/ContributionMessageType' -import { ContributionStatus } from '@/graphql/enum/ContributionStatus' import { LogError } from '@/server/LogError' import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContribution.role' diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts index 6955cbfa7..e32e6f413 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUser.role.ts @@ -1,8 +1,7 @@ -import { Contribution, User } from 'database' +import { Contribution, ContributionStatus, User } from 'database' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { ContributionArgs } from '@/graphql/arg/ContributionArgs' -import { ContributionStatus } from '@/graphql/enum/ContributionStatus' import { LogError } from '@/server/LogError' import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContribution.role' diff --git a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts index 0440762f3..e88c1f2ce 100644 --- a/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts +++ b/backend/src/interactions/updateUnconfirmedContribution/UnconfirmedContributionUserAddMessage.role.ts @@ -1,9 +1,8 @@ -import { Contribution, User } from 'database' +import { Contribution, ContributionStatus, User } from 'database' import { ContributionMessageBuilder } from '@/data/ContributionMessage.builder' import { ContributionMessageArgs } from '@/graphql/arg/ContributionMessageArgs' import { ContributionMessageType } from '@/graphql/enum/ContributionMessageType' -import { ContributionStatus } from '@/graphql/enum/ContributionStatus' import { LogError } from '@/server/LogError' import { AbstractUnconfirmedContributionRole } from './AbstractUnconfirmedContribution.role' diff --git a/backend/src/util/virtualTransactions.ts b/backend/src/util/virtualTransactions.ts index a3bbbe042..c54e265cd 100644 --- a/backend/src/util/virtualTransactions.ts +++ b/backend/src/util/virtualTransactions.ts @@ -1,8 +1,7 @@ -import { Transaction as dbTransaction } from 'database' +import { Transaction as dbTransaction, TransactionTypeId } from 'database' import { Decimal } from 'decimal.js-light' import { RemoveOptions, SaveOptions } from 'typeorm' -import { TransactionTypeId } from 'core' import { Transaction } from '@model/Transaction' import { User } from '@model/User' diff --git a/core/src/graphql/logic/processXComSendCoins.ts b/core/src/graphql/logic/processXComSendCoins.ts index bdbf24928..51ddcda73 100644 --- a/core/src/graphql/logic/processXComSendCoins.ts +++ b/core/src/graphql/logic/processXComSendCoins.ts @@ -10,22 +10,28 @@ import { findUserByIdentifier, getCommunityByUuid, PendingTransactionLoggingView, - UserLoggingView + UserLoggingView, + TransactionTypeId, } from 'database' import { Decimal } from 'decimal.js-light' import { CONFIG as CONFIG_CORE } from '../../config' import { LOG4JS_BASE_CATEGORY_NAME } from '../../config/const' -import { encryptAndSign, PendingTransactionState, SendCoinsJwtPayloadType, SendCoinsResponseJwtPayloadType, verifyAndDecrypt } from 'shared' +import { + encryptAndSign, + fullName, + PendingTransactionState, + SendCoinsJwtPayloadType, + SendCoinsResponseJwtPayloadType, + verifyAndDecrypt +} from 'shared' import { SendCoinsClient as V1_0_SendCoinsClient } from '../../federation/client/1_0/SendCoinsClient' import { SendCoinsResult } from '../../federation/client/1_0/model/SendCoinsResult' import { SendCoinsClientFactory } from '../../federation/client/SendCoinsClientFactory' -import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId' // import { LogError } from '@server/LogError' import { getLogger } from 'log4js' import { calculateSenderBalance } from '../../util/calculateSenderBalance' -import { fullName } from '../../util/utilities' import { randombytes_random } from 'sodium-native' import { SendCoinsResultLoggingView } from '../../federation/client/1_0/logging/SendCoinsResultLogging.view'