diff --git a/backend/src/graphql/model/Transaction.ts b/backend/src/graphql/model/Transaction.ts index 3cec757e2..cf2e899b2 100644 --- a/backend/src/graphql/model/Transaction.ts +++ b/backend/src/graphql/model/Transaction.ts @@ -2,7 +2,7 @@ import { ObjectType, Field } from 'type-graphql' import { Decay } from './Decay' import { Transaction as dbTransaction } from '@entity/Transaction' import Decimal from 'decimal.js-light' -import { TypeId } from '../enum/TypeId' +import { TransactionTypeId } from '../enum/TransactionTypeId' import { User } from './User' @ObjectType() @@ -41,8 +41,8 @@ export class Transaction { @Field(() => Number, { nullable: true }) previous: number | null - @Field(() => TypeId) - typeId: TypeId + @Field(() => TransactionTypeId) + typeId: TransactionTypeId @Field(() => Decimal) amount: Decimal diff --git a/backend/src/graphql/resolver/AdminResolver.ts b/backend/src/graphql/resolver/AdminResolver.ts index 3ce052be4..39e6dab3c 100644 --- a/backend/src/graphql/resolver/AdminResolver.ts +++ b/backend/src/graphql/resolver/AdminResolver.ts @@ -26,7 +26,7 @@ import { AdminPendingCreation } from '@entity/AdminPendingCreation' import { hasElopageBuys } from '../../util/hasElopageBuys' import { LoginEmailOptIn } from '@entity/LoginEmailOptIn' import { User } from '@entity/User' -import { TypeId } from '../enum/TypeId' +import { TransactionTypeId } from '../enum/TransactionTypeId' import Decimal from 'decimal.js-light' // const EMAIL_OPT_IN_REGISTER = 1 @@ -321,7 +321,7 @@ export class AdminResolver { newBalance = newBalance.add(new Decimal(Number(pendingCreation.amount))) const transaction = new Transaction() - transaction.typeId = TypeId.CREATION + transaction.typeId = TransactionTypeId.CREATION transaction.memo = pendingCreation.memo transaction.userId = pendingCreation.userId // TODO pending creations decimal diff --git a/backend/src/graphql/resolver/TransactionResolver.ts b/backend/src/graphql/resolver/TransactionResolver.ts index 1451609ad..14b80a5ea 100644 --- a/backend/src/graphql/resolver/TransactionResolver.ts +++ b/backend/src/graphql/resolver/TransactionResolver.ts @@ -24,7 +24,7 @@ import { User as dbUser } from '@entity/User' import { Transaction as dbTransaction } from '@entity/Transaction' import { apiPost } from '../../apis/HttpRequest' -import { TypeId } from '../enum/TypeId' +import { TransactionTypeId } from '../enum/TransactionTypeId' import { calculateBalance, isHexPublicKey } from '../../util/validate' import { RIGHTS } from '../../auth/RIGHTS' import { User } from '../model/User' @@ -173,7 +173,7 @@ export class TransactionResolver { try { // transaction const transactionSend = new dbTransaction() - transactionSend.typeId = TypeId.SEND + transactionSend.typeId = TransactionTypeId.SEND transactionSend.memo = memo transactionSend.userId = senderUser.id transactionSend.linkedUserId = recipientUser.id @@ -186,7 +186,7 @@ export class TransactionResolver { await queryRunner.manager.insert(dbTransaction, transactionSend) const transactionReceive = new dbTransaction() - transactionReceive.typeId = TypeId.RECEIVE + transactionReceive.typeId = TransactionTypeId.RECEIVE transactionReceive.memo = memo transactionReceive.userId = recipientUser.id transactionReceive.linkedUserId = senderUser.id diff --git a/backend/src/typeorm/repository/Transaction.ts b/backend/src/typeorm/repository/Transaction.ts index 4353aa981..e1af105f8 100644 --- a/backend/src/typeorm/repository/Transaction.ts +++ b/backend/src/typeorm/repository/Transaction.ts @@ -1,7 +1,7 @@ import { EntityRepository, Repository } from '@dbTools/typeorm' import { Transaction } from '@entity/Transaction' import { Order } from '../../graphql/enum/Order' -import { TypeId } from '../../graphql/enum/TypeId' +import { TransactionTypeId } from '../../graphql/enum/TransactionTypeId' @EntityRepository(Transaction) export class TransactionRepository extends Repository { @@ -16,7 +16,7 @@ export class TransactionRepository extends Repository { return this.createQueryBuilder('userTransaction') .where('userTransaction.userId = :userId', { userId }) .andWhere('userTransaction.typeId = :typeId', { - typeId: TypeId.CREATION, + typeId: TransactionTypeId.CREATION, }) .orderBy('userTransaction.balanceDate', order) .limit(limit) diff --git a/backend/src/util/virtualDecayTransaction.ts b/backend/src/util/virtualDecayTransaction.ts index 31e9e9258..df3482716 100644 --- a/backend/src/util/virtualDecayTransaction.ts +++ b/backend/src/util/virtualDecayTransaction.ts @@ -3,7 +3,7 @@ import Decimal from 'decimal.js-light' import { SaveOptions, RemoveOptions } from '@dbTools/typeorm' import { Transaction as dbTransaction } from '@entity/Transaction' import { calculateDecay } from './decay' -import { TypeId } from '../graphql/enum/TypeId' +import { TransactionTypeId } from '../graphql/enum/TransactionTypeId' import { Transaction } from '../graphql/model/Transaction' import { User } from '../graphql/model/User' @@ -19,7 +19,7 @@ const virtualDecayTransaction = ( id: -1, userId: -1, previous: -1, - typeId: TypeId.DECAY, + typeId: TransactionTypeId.DECAY, amount: decay.decay ? decay.decay : new Decimal(0), // new Decimal(0), // this kinda is wrong, but helps with the frontend query balance: decay.balance, balanceDate: time,