From 1f59bf7f6fd2e741bf42e283d389b455c9596cb1 Mon Sep 17 00:00:00 2001 From: Kirisu <56469224+rubenkristian@users.noreply.github.com> Date: Tue, 6 Dec 2022 04:29:06 +0700 Subject: [PATCH] fix: amount transaction log menstrual subscription (#229) fix amount transaction log menstrual subscription --- .../dto/transaction-logging.dto.ts | 6 ++- .../transaction-logging.service.ts | 37 +++++++++++++++++-- .../models/transaction-status.entity.ts | 14 +++++++ .../models/transaction-status.list.ts | 27 ++++++++++++++ .../transaction-status.module.ts | 12 ++++++ .../transaction-status.service.ts | 25 +++++++++++++ .../models/transaction-type.entity.ts | 11 ++++++ .../models/transaction-type.list.ts | 11 ++++++ .../transaction-type.module.ts | 12 ++++++ .../transaction-type.service.ts | 21 +++++++++++ ...enetic-analysis-order-cancelled.handler.ts | 6 ++- ...enetic-analysis-order-fulfilled.handler.ts | 10 +++-- .../genetic-analysis-order-paid.handler.ts | 6 ++- ...genetic-analysis-order-refunded.handler.ts | 6 ++- .../genetic-analysis-order-created.handler.ts | 6 ++- .../genetic-analyst-staked.handler.ts | 6 ++- .../genetic-analyst-unstaked.handler.ts | 6 ++- ...tic-analyst-verification-status.handler.ts | 12 +++--- .../data-staked/data-staked.handler.ts | 6 ++- .../labs/registered/lab-registered.handler.ts | 6 ++- .../retrieve-unstake-amount.handler.ts | 6 ++- .../stake-successful.handler.ts | 6 ++- .../unstaked-successful.handler.ts | 6 ++- .../menstrual-subscription-added.handler.ts | 11 ++++-- .../menstrual-subscription-paid.handler.ts | 11 ++++-- .../order-cancelled.handler.ts | 6 ++- .../order-created/order-created.handler.ts | 6 ++- .../order-fulfilled.handler.ts | 14 ++++--- .../orders/order-paid/order-paid.handler.ts | 6 ++- .../order-refunded/order-refunded.handler.ts | 6 ++- .../service-request-created.handler.ts | 6 ++- .../service-request-excess.handler.ts | 6 ++- .../service-request-updated.handler.ts | 10 +++-- ...nalyst-verification-status.handler.spec.ts | 14 ++++--- .../order-fulfilled.handler.spec.ts | 6 ++- .../order-paid/order-paid.handler.spec.ts | 6 ++- .../order-refunded.handler.spec.ts | 6 ++- 37 files changed, 302 insertions(+), 76 deletions(-) create mode 100644 src/common/transaction-status/models/transaction-status.entity.ts create mode 100644 src/common/transaction-status/models/transaction-status.list.ts create mode 100644 src/common/transaction-status/transaction-status.module.ts create mode 100644 src/common/transaction-status/transaction-status.service.ts create mode 100644 src/common/transaction-type/models/transaction-type.entity.ts create mode 100644 src/common/transaction-type/models/transaction-type.list.ts create mode 100644 src/common/transaction-type/transaction-type.module.ts create mode 100644 src/common/transaction-type/transaction-type.service.ts diff --git a/src/common/transaction-logging/dto/transaction-logging.dto.ts b/src/common/transaction-logging/dto/transaction-logging.dto.ts index c009bc65..f1e75c9a 100644 --- a/src/common/transaction-logging/dto/transaction-logging.dto.ts +++ b/src/common/transaction-logging/dto/transaction-logging.dto.ts @@ -1,3 +1,5 @@ +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; import { Transform } from 'class-transformer'; export class TransactionLoggingDto { @@ -14,9 +16,9 @@ export class TransactionLoggingDto { ref_number: string; - transaction_status: number; + transaction_status: TransactionStatusList; - transaction_type: number; + transaction_type: TransactionTypeList; transaction_hash?: string; } diff --git a/src/common/transaction-logging/transaction-logging.service.ts b/src/common/transaction-logging/transaction-logging.service.ts index c15e9730..0fa8e295 100644 --- a/src/common/transaction-logging/transaction-logging.service.ts +++ b/src/common/transaction-logging/transaction-logging.service.ts @@ -1,3 +1,7 @@ +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; +import { TransactionStatusService } from '@common/transaction-status/transaction-status.service'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionTypeService } from '@common/transaction-type/transaction-type.service'; import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; import { Repository } from 'typeorm'; @@ -9,9 +13,36 @@ export class TransactionLoggingService { constructor( @InjectRepository(TransactionRequest) private readonly transactionRequestRepository: Repository, + private readonly transactionStatusService: TransactionStatusService, + private readonly transactionTypeService: TransactionTypeService, ) {} - create(data: TransactionLoggingDto) { + private async getTransactionStatus( + status: TransactionStatusList, + type: number, + ) { + const transactionStatusDb = + await this.transactionStatusService.getTransactionStatus(type, status); + + return transactionStatusDb.id; + } + + private async getTransactionType(type: TransactionTypeList) { + const transactionTypeDb = + await this.transactionTypeService.getTransactionType(type); + + return transactionTypeDb.id; + } + + async create(data: TransactionLoggingDto) { + const transactionType = await this.getTransactionType( + data.transaction_type, + ); + const transactionStatus = await this.getTransactionStatus( + data.transaction_status, + transactionType, + ); + const logging = new TransactionRequest(); logging.address = data.address; logging.amount = +data.amount; @@ -19,8 +50,8 @@ export class TransactionLoggingService { logging.currency = data.currency; logging.parent_id = data.parent_id.toString(); logging.ref_number = data.ref_number; - logging.transaction_type = data.transaction_type; - logging.transaction_status = data.transaction_status; + logging.transaction_type = transactionType; + logging.transaction_status = transactionStatus; return this.transactionRequestRepository.save(logging); } diff --git a/src/common/transaction-status/models/transaction-status.entity.ts b/src/common/transaction-status/models/transaction-status.entity.ts new file mode 100644 index 00000000..d4c4b9ff --- /dev/null +++ b/src/common/transaction-status/models/transaction-status.entity.ts @@ -0,0 +1,14 @@ +import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm'; +import { TransactionStatusList } from './transaction-status.list'; + +@Entity({ name: 'transaction_status' }) +export class TransactionStatus { + @PrimaryGeneratedColumn() + id: number; + + @Column() + id_type: number; + + @Column() + transaction_status: TransactionStatusList; +} diff --git a/src/common/transaction-status/models/transaction-status.list.ts b/src/common/transaction-status/models/transaction-status.list.ts new file mode 100644 index 00000000..1b1b1e63 --- /dev/null +++ b/src/common/transaction-status/models/transaction-status.list.ts @@ -0,0 +1,27 @@ +export enum TransactionStatusList { + Cancelled = 'Cancelled', + CustomerAddDataAsBounty = 'Customer Add Data as Bounty', + CustomerStakeRequestService = 'Customer Stake Request Service', + Excess = 'Excess', + Failed = 'Failed', + Finalized = 'Finalized', + Fulfilled = 'Fulfilled', + LabProvideRequestedService = 'Lab Provide Requested Service', + LabVerified = 'Lab Verified', + Paid = 'Paid', + Partial = 'Partial', + Refunded = 'Refunded', + RegisteredUser = 'Registered User', + Rejected = 'Rejected', + Revoked = 'Revoked', + ServiceCharge = 'Service Charge', + Stake = 'Stake', + Staked = 'Staked', + Unpaid = 'Unpaid', + Unstake = 'Unstake', + Unstaked = 'Unstaked', + Unverified = 'Unverified', + Verified = 'Verified', + WaitingForUnstake = 'Waiting For Unstake', + WaitingForUnstaked = 'Waiting For Unstaked', +} diff --git a/src/common/transaction-status/transaction-status.module.ts b/src/common/transaction-status/transaction-status.module.ts new file mode 100644 index 00000000..46fe2430 --- /dev/null +++ b/src/common/transaction-status/transaction-status.module.ts @@ -0,0 +1,12 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { TransactionStatus } from './models/transaction-status.entity'; +import { TransactionStatusService } from './transaction-status.service'; + +@Module({ + imports: [TypeOrmModule.forFeature([TransactionStatus])], + exports: [TypeOrmModule, TransactionStatusService], + controllers: [], + providers: [TransactionStatusService], +}) +export class TransactionStatusModule {} diff --git a/src/common/transaction-status/transaction-status.service.ts b/src/common/transaction-status/transaction-status.service.ts new file mode 100644 index 00000000..bd6a9178 --- /dev/null +++ b/src/common/transaction-status/transaction-status.service.ts @@ -0,0 +1,25 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { TransactionStatus } from './models/transaction-status.entity'; +import { TransactionStatusList } from './models/transaction-status.list'; + +@Injectable() +export class TransactionStatusService { + constructor( + @InjectRepository(TransactionStatus) + private readonly transactionStatusRepository: Repository, + ) {} + + async getTransactionStatus( + idType: number, + transactionStatus: TransactionStatusList, + ) { + return await this.transactionStatusRepository.findOne({ + where: { + id_type: idType, + transaction_status: transactionStatus, + }, + }); + } +} diff --git a/src/common/transaction-type/models/transaction-type.entity.ts b/src/common/transaction-type/models/transaction-type.entity.ts new file mode 100644 index 00000000..1f80f7f5 --- /dev/null +++ b/src/common/transaction-type/models/transaction-type.entity.ts @@ -0,0 +1,11 @@ +import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm'; +import { TransactionTypeList } from './transaction-type.list'; + +@Entity({ name: 'transaction_types' }) +export class TransactionType { + @PrimaryGeneratedColumn() + id: number; + + @Column() + type: TransactionTypeList; +} diff --git a/src/common/transaction-type/models/transaction-type.list.ts b/src/common/transaction-type/models/transaction-type.list.ts new file mode 100644 index 00000000..f8ec1d36 --- /dev/null +++ b/src/common/transaction-type/models/transaction-type.list.ts @@ -0,0 +1,11 @@ +export enum TransactionTypeList { + GeneticAnalysisOrder = 'Genetic Analysis Order', + GeneticAnalyst = 'Genetic Analyst', + Lab = 'Lab', + Order = 'Order', + Reward = 'Reward', + StakingGeneticAnalyst = 'Staking Genetic Analyst', + StakingLab = 'Staking Lab', + StakingRequestService = 'Staking Request Service', + MenstrualCalendar = 'Menstrual Calendar', +} diff --git a/src/common/transaction-type/transaction-type.module.ts b/src/common/transaction-type/transaction-type.module.ts new file mode 100644 index 00000000..541a4341 --- /dev/null +++ b/src/common/transaction-type/transaction-type.module.ts @@ -0,0 +1,12 @@ +import { Module } from '@nestjs/common'; +import { TypeOrmModule } from '@nestjs/typeorm'; +import { TransactionType } from './models/transaction-type.entity'; +import { TransactionTypeService } from './transaction-type.service'; + +@Module({ + imports: [TypeOrmModule.forFeature([TransactionType])], + exports: [TypeOrmModule, TransactionTypeService], + controllers: [], + providers: [TransactionTypeService], +}) +export class TransactionTypeModule {} diff --git a/src/common/transaction-type/transaction-type.service.ts b/src/common/transaction-type/transaction-type.service.ts new file mode 100644 index 00000000..b77a1d91 --- /dev/null +++ b/src/common/transaction-type/transaction-type.service.ts @@ -0,0 +1,21 @@ +import { Injectable } from '@nestjs/common'; +import { InjectRepository } from '@nestjs/typeorm'; +import { Repository } from 'typeorm'; +import { TransactionType } from './models/transaction-type.entity'; +import { TransactionTypeList } from './models/transaction-type.list'; + +@Injectable() +export class TransactionTypeService { + constructor( + @InjectRepository(TransactionType) + private readonly transactionTypeRepository: Repository, + ) {} + + async getTransactionType(type: TransactionTypeList) { + return await this.transactionTypeRepository.findOne({ + where: { + type: type, + }, + }); + } +} diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts index 98d2f94e..e777d1f2 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-cancelled/genetic-analysis-order-cancelled.handler.ts @@ -3,6 +3,8 @@ import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { TransactionLoggingService } from '@common/index'; import { GeneticAnalysisOrderCancelledCommand } from './genetic-analysis-order-cancelled.command'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalysisOrderCancelledCommand) @@ -41,8 +43,8 @@ export class GeneticAnalysisOrderCancelledHandler currency: geneticAnalysisOrder.currency.toUpperCase(), parent_id: BigInt(geneticAnalysisOrderHistory.id), ref_number: geneticAnalysisOrder.id, - transaction_status: 17, - transaction_type: 3, + transaction_type: TransactionTypeList.GeneticAnalysisOrder, + transaction_status: TransactionStatusList.Cancelled, }; if ( diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts index d2ed8b7b..cb171495 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-fulfilled/genetic-analysis-order-fulfilled.handler.ts @@ -9,6 +9,8 @@ import { import { GeneticAnalysisOrderFulfilledCommand } from './genetic-analysis-order-fulfilled.command'; import { NotificationDto } from '@common/notification/dto/notification.dto'; import currencyUnit from '../../../models/currencyUnit'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalysisOrderFulfilledCommand) @@ -63,8 +65,8 @@ export class GeneticAnalysisOrderFulfilledHandler currency: geneticAnalysisOrder.currency.toUpperCase(), parent_id: BigInt(geneticAnalysisOrderHistory.id), ref_number: geneticAnalysisOrder.id, - transaction_status: 15, - transaction_type: 3, + transaction_type: TransactionTypeList.GeneticAnalysisOrder, + transaction_status: TransactionStatusList.Fulfilled, }; const serviceChargeLogging: TransactionLoggingDto = { @@ -74,8 +76,8 @@ export class GeneticAnalysisOrderFulfilledHandler currency: geneticAnalysisOrder.currency.toUpperCase(), parent_id: BigInt(geneticAnalysisOrderHistory.id), ref_number: geneticAnalysisOrder.id, - transaction_status: 32, - transaction_type: 3, + transaction_type: TransactionTypeList.GeneticAnalysisOrder, + transaction_status: TransactionStatusList.Fulfilled, }; if (!isGeneticAnalysisOrderHasBeenInsert) { diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts index 27196529..8bf0a379 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-paid/genetic-analysis-order-paid.handler.ts @@ -16,6 +16,8 @@ import { } from '@debionetwork/polkadot-provider'; import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '@common/secrets'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalysisOrderPaidCommand) @@ -59,8 +61,8 @@ export class GeneticAnalysisOrderPaidHandler currency: geneticAnalysisOrder.currency.toUpperCase(), parent_id: BigInt(geneticAnalysisOrderHistory.id ?? 0), ref_number: geneticAnalysisOrder.id, - transaction_status: 14, - transaction_type: 3, + transaction_type: TransactionTypeList.GeneticAnalysisOrder, + transaction_status: TransactionStatusList.Paid, }; await this.loggingService.create(geneticAnalysisOrderLogging); diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts index ee1125f5..dc433d1c 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysis-order-refunded/genetic-analysis-order-refunded.handler.ts @@ -8,6 +8,8 @@ import { } from '@common/index'; import { GeneticAnalysisOrderRefundedCommand } from './genetic-analysis-order-refunded.command'; import { NotificationDto } from '@common/notification/dto/notification.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalysisOrderRefundedCommand) export class GeneticAnalysisOrderRefundedHandler @@ -44,8 +46,8 @@ export class GeneticAnalysisOrderRefundedHandler currency: geneticAnalysisOrder.currency.toUpperCase(), parent_id: BigInt(geneticAnalysisOrderHistory.id), ref_number: geneticAnalysisOrder.id, - transaction_status: 16, - transaction_type: 3, + transaction_type: TransactionTypeList.GeneticAnalysisOrder, + transaction_status: TransactionStatusList.Refunded, }; if (!isGeneticAnalysisOrderHasBeenInsert) { diff --git a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts index d1519984..3bd58e6c 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysis-order/genetic-analysys-order-created/genetic-analysis-order-created.handler.ts @@ -8,6 +8,8 @@ import { } from '@common/index'; import { GeneticAnalysisOrderCreatedCommand } from './genetic-analysis-order-created.command'; import { NotificationDto } from '@common/notification/dto/notification.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalysisOrderCreatedCommand) @@ -44,8 +46,8 @@ export class GeneticAnalysisOrderCreatedHandler currency: geneticAnalysisOrder.currency.toUpperCase(), parent_id: BigInt(0), ref_number: geneticAnalysisOrder.id, - transaction_status: 13, - transaction_type: 3, + transaction_type: TransactionTypeList.GeneticAnalysisOrder, + transaction_status: TransactionStatusList.Unpaid, }; const currDateTime = this.dateTimeProxy.new(); const notificationInput: NotificationDto = { diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts index 3021b3ff..49821aad 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-staked/genetic-analyst-staked.handler.ts @@ -3,6 +3,8 @@ import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { DateTimeProxy, TransactionLoggingService } from '@common/index'; import { GeneticAnalystStakedCommand } from './genetic-analyst-staked.command'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalystStakedCommand) @@ -37,8 +39,8 @@ export class GeneticAnalystStakedHandler parent_id: BigInt(Number(isGeneticAnalystHasBeenInsert.id)) || BigInt(0), ref_number: geneticAnalyst.accountId, - transaction_status: 23, - transaction_type: 5, + transaction_type: TransactionTypeList.StakingGeneticAnalyst, + transaction_status: TransactionStatusList.Staked, }; await this.loggingService.create(geneticAnalystLogging); } catch (error) { diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts index 303e3bd0..7c0befec 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-unstake/genetic-analyst-unstaked.handler.ts @@ -3,6 +3,8 @@ import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { DateTimeProxy, TransactionLoggingService } from '@common/index'; import { GeneticAnalystUnstakedCommand } from './genetic-analyst-unstaked.command'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalystUnstakedCommand) @@ -37,8 +39,8 @@ export class GeneticAnalystUnstakedHandler currency: 'DBIO', parent_id: BigInt(Number(isGeneticAnalystHasBeenInsert.id)), ref_number: geneticAnalyst.accountId, - transaction_status: 24, - transaction_type: 5, + transaction_type: TransactionTypeList.StakingGeneticAnalyst, + transaction_status: TransactionStatusList.Unstaked, }; await this.loggingService.create(geneticAnalystLogging); diff --git a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts index c4eb1f1b..4d91e68e 100644 --- a/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.ts @@ -9,6 +9,8 @@ import { import { GeneticAnalystVerificationStatusCommand } from './genetic-analyst-verification-status.command'; import { NotificationDto } from '@common/notification/dto/notification.dto'; import { VerificationStatus } from '@debionetwork/polkadot-provider/lib/primitives/verification-status'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(GeneticAnalystVerificationStatusCommand) @@ -44,20 +46,20 @@ export class GeneticAnalystVerificationStatusHandler geneticAnalyst.accountId, 21, ); - let transactionStatus; + let transactionStatus: TransactionStatusList; if (geneticAnalyst.verificationStatus === 'Verified') { - transactionStatus = 20; + transactionStatus = TransactionStatusList.Verified; entity = 'Account verified'; notificationDescription = 'Congrats! Your account has been verified.'; } if (geneticAnalyst.verificationStatus === 'Rejected') { - transactionStatus = 21; + transactionStatus = TransactionStatusList.Rejected; entity = 'Account rejected'; notificationDescription = 'Your account verification has been rejected.'; } if (geneticAnalyst.verificationStatus === 'Revoked') { - transactionStatus = 22; + transactionStatus = TransactionStatusList.Revoked; entity = 'Account revoked'; notificationDescription = 'Your account has been revoked.'; } @@ -75,8 +77,8 @@ export class GeneticAnalystVerificationStatusHandler currency: 'DBIO', parent_id: BigInt(geneticAnalystHistory?.id ?? 0), ref_number: geneticAnalyst.accountId, + transaction_type: TransactionTypeList.GeneticAnalyst, transaction_status: transactionStatus, - transaction_type: 4, }; await this.loggingService.create(geneticAnalystLogging); diff --git a/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts b/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts index 3f28af41..f9f0a293 100644 --- a/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts +++ b/src/listeners/substrate-listener/commands/genetic-testing/data-staked/data-staked.handler.ts @@ -12,6 +12,8 @@ import { } from '@debionetwork/polkadot-provider'; import { DataStakedCommand } from './data-staked.command'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(DataStakedCommand) @@ -67,8 +69,8 @@ export class DataStakedHandler implements ICommandHandler { currency: 'DBIO', parent_id: BigInt(0), ref_number: dataOrder.id, - transaction_type: 8, - transaction_status: 34, + transaction_type: TransactionTypeList.Reward, + transaction_status: TransactionStatusList.CustomerAddDataAsBounty, }; await this.transactionLoggingService.create(dataCustomerLoggingInput); } catch (err) { diff --git a/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts b/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts index 147f280f..3719125c 100644 --- a/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts +++ b/src/listeners/substrate-listener/commands/labs/registered/lab-registered.handler.ts @@ -8,6 +8,8 @@ import { TransactionLoggingService, } from '@common/index'; import { NotificationDto } from '@common/notification/dto/notification.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(LabRegisteredCommand) @@ -33,8 +35,8 @@ export class LabRegisteredHandler currency: 'DBIO', parent_id: BigInt(0), ref_number: lab.accountId, - transaction_status: 28, // Lab Unverified - transaction_type: 7, // Lab + transaction_type: TransactionTypeList.Lab, // Lab + transaction_status: TransactionStatusList.Unverified, // Lab Unverified }; try { diff --git a/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts b/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts index 379a48ae..b857b337 100644 --- a/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts +++ b/src/listeners/substrate-listener/commands/labs/retrieve-unstake-amount/retrieve-unstake-amount.handler.ts @@ -3,6 +3,8 @@ import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { DateTimeProxy, TransactionLoggingService } from '@common/index'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { LabRetrieveUnstakeAmountCommand } from './retrieve-unstake-amount.command'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(LabRetrieveUnstakeAmountCommand) @@ -42,8 +44,8 @@ export class LabRetrieveUnstakeAmountHandler currency: 'DBIO', parent_id: BigInt(labParent.id), ref_number: labParent.address, - transaction_status: 25, // Lab Unstaked - transaction_type: 6, // Staking Lab + transaction_type: TransactionTypeList.StakingLab, // Staking Lab + transaction_status: TransactionStatusList.Unstaked, // Lab Unstaked }; if (!islabHasBeenInsert) { await this.loggingService.create(stakingLogging); diff --git a/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts b/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts index e405270f..51df0974 100644 --- a/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts +++ b/src/listeners/substrate-listener/commands/labs/stake-successfull/stake-successful.handler.ts @@ -3,6 +3,8 @@ import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { TransactionLoggingService, DateTimeProxy } from '@common/index'; import { LabStakeSuccessfulCommand } from './stake-successful.command'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(LabStakeSuccessfulCommand) @@ -36,8 +38,8 @@ export class LabStakeSuccessfullHandler currency: 'DBIO', parent_id: labParent?.id ? BigInt(Number(labParent?.id)) : BigInt(0), ref_number: lab.accountId, - transaction_status: 26, // Lab Staked - transaction_type: 6, // Staking Lab + transaction_type: TransactionTypeList.StakingLab, // Staking Lab + transaction_status: TransactionStatusList.Staked, // Lab Staked }; let isLabHasBeenInsertTenMinuteAgo = false; diff --git a/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts b/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts index 50ecf227..a818d189 100644 --- a/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts +++ b/src/listeners/substrate-listener/commands/labs/unstake-successfull/unstaked-successful.handler.ts @@ -3,6 +3,8 @@ import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { DateTimeProxy, TransactionLoggingService } from '@common/index'; import { LabUnstakedCommand } from './unstaked-successful.command'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(LabUnstakedCommand) @@ -34,8 +36,8 @@ export class labUnstakedHandler implements ICommandHandler { currency: 'DBIO', parent_id: BigInt(Number(labParent.id)), ref_number: lab.accountId, - transaction_status: 27, // Lab Waiting For Unstaked - transaction_type: 6, // Staking Lab + transaction_type: TransactionTypeList.StakingLab, // Staking Lab + transaction_status: TransactionStatusList.WaitingForUnstaked, // Lab Waiting For Unstaked }; let isLabHasBeenInsertTenMinuteAgo = false; diff --git a/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-added/menstrual-subscription-added.handler.ts b/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-added/menstrual-subscription-added.handler.ts index 18f30e7d..fa807814 100644 --- a/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-added/menstrual-subscription-added.handler.ts +++ b/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-added/menstrual-subscription-added.handler.ts @@ -1,6 +1,9 @@ import { SubstrateService } from '@common/substrate'; import { TransactionLoggingService } from '@common/transaction-logging'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import currencyUnit from '@listeners/substrate-listener/models/currencyUnit'; import { MenstrualSubscriptionPrice } from '@listeners/substrate-listener/models/menstrual-subscription-price'; import { Injectable, Logger } from '@nestjs/common'; import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; @@ -40,13 +43,15 @@ export class MenstrualSubscriptionAddedHandler const menstrualSubscriptionLogging: TransactionLoggingDto = { address: menstrualSubscription.addressId, - amount: menstrualSubscriptionPrice.amount, + amount: + menstrualSubscriptionPrice.amount / + currencyUnit[menstrualSubscription.currency], created_at: menstrualSubscription.createdAt, currency: menstrualSubscription.currency, parent_id: BigInt(0), ref_number: menstrualSubscription.id, - transaction_status: 38, - transaction_type: 9, + transaction_type: TransactionTypeList.MenstrualCalendar, + transaction_status: TransactionStatusList.Unpaid, transaction_hash: blockMetaData.blockHash, }; diff --git a/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-paid/menstrual-subscription-paid.handler.ts b/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-paid/menstrual-subscription-paid.handler.ts index d14f0a4c..19f91502 100644 --- a/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-paid/menstrual-subscription-paid.handler.ts +++ b/src/listeners/substrate-listener/commands/menstrual-subscription/menstrual-subscription-paid/menstrual-subscription-paid.handler.ts @@ -1,6 +1,9 @@ import { SubstrateService } from '@common/substrate'; import { TransactionLoggingService } from '@common/transaction-logging'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import currencyUnit from '@listeners/substrate-listener/models/currencyUnit'; import { MenstrualSubscriptionPrice } from '@listeners/substrate-listener/models/menstrual-subscription-price'; import { Injectable, Logger } from '@nestjs/common'; import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; @@ -40,13 +43,15 @@ export class MenstrualSubscriptionPaidAddedHandler const menstrualSubscriptionLogging: TransactionLoggingDto = { address: menstrualSubscription.addressId, - amount: menstrualSubscriptionPrice.amount, + amount: + menstrualSubscriptionPrice.amount / + currencyUnit[menstrualSubscription.currency], created_at: menstrualSubscription.createdAt, currency: menstrualSubscription.currency, parent_id: BigInt(0), ref_number: menstrualSubscription.id, - transaction_status: 39, - transaction_type: 9, + transaction_type: TransactionTypeList.MenstrualCalendar, + transaction_status: TransactionStatusList.Paid, transaction_hash: blockMetaData.blockHash, }; diff --git a/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts b/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts index 4d86b66e..8b8de378 100644 --- a/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts +++ b/src/listeners/substrate-listener/commands/orders/order-cancelled/order-cancelled.handler.ts @@ -5,6 +5,8 @@ import { TransactionLoggingService } from '@common/index'; import { EscrowService } from '@common/escrow/escrow.service'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { Order } from '@debionetwork/polkadot-provider'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(OrderCancelledCommand) @@ -37,8 +39,8 @@ export class OrderCancelledHandler currency: order.currency.toUpperCase(), parent_id: BigInt(orderHistory.id), ref_number: order.id, - transaction_status: 5, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Cancelled, }; await this.escrowService.cancelOrder(order); if (!isOrderHasBeenInsert) { diff --git a/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts b/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts index 81c4476e..9a0d3972 100644 --- a/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts +++ b/src/listeners/substrate-listener/commands/orders/order-created/order-created.handler.ts @@ -9,6 +9,8 @@ import { import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { Order } from '@debionetwork/polkadot-provider'; import { NotificationDto } from '@common/notification/dto/notification.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(OrderCreatedCommand) @@ -40,8 +42,8 @@ export class OrderCreatedHandler currency: order.currency.toUpperCase(), parent_id: BigInt(0), ref_number: order.id, - transaction_status: 1, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Unpaid, }; if (!isOrderHasBeenInsert) { diff --git a/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts b/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts index 19b7e397..b3b4707e 100644 --- a/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts +++ b/src/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.ts @@ -21,6 +21,8 @@ import { EscrowService } from '@common/escrow/escrow.service'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { NotificationDto } from '@common/notification/dto/notification.dto'; import currencyUnit from '../../../models/currencyUnit'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(OrderFulfilledCommand) @@ -70,8 +72,8 @@ export class OrderFulfilledHandler currency: order.currency.toUpperCase(), parent_id: orderHistory?.id ? BigInt(orderHistory.id) : BigInt(0), ref_number: order.id, - transaction_status: 3, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Fulfilled, }; // Logging transaction @@ -203,8 +205,8 @@ export class OrderFulfilledHandler currency: 'DBIO', parent_id: BigInt(0), ref_number: order.id, - transaction_type: 8, - transaction_status: 36, + transaction_type: TransactionTypeList.Reward, + transaction_status: TransactionStatusList.CustomerStakeRequestService, }; await this.loggingService.create(dataCustomerLoggingInput); @@ -242,8 +244,8 @@ export class OrderFulfilledHandler currency: 'DBIO', parent_id: BigInt(0), ref_number: order.id, - transaction_type: 8, - transaction_status: 37, + transaction_type: TransactionTypeList.Reward, + transaction_status: TransactionStatusList.LabProvideRequestedService, }; await this.loggingService.create(dataLabLoggingInput); } diff --git a/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts b/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts index a4e1d403..3595b26f 100644 --- a/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts +++ b/src/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.ts @@ -18,6 +18,8 @@ import { NotificationDto } from '@common/notification/dto/notification.dto'; import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '@common/secrets'; import currencyUnit from '../../../models/currencyUnit'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(OrderPaidCommand) @@ -64,8 +66,8 @@ export class OrderPaidHandler implements ICommandHandler { currency: order.currency.toUpperCase(), parent_id: orderHistory?.id ? BigInt(orderHistory.id) : BigInt(0), ref_number: order.id, - transaction_status: 2, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Paid, }; await this.loggingService.create(orderLogging); diff --git a/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts b/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts index b70e0566..d99d0d32 100644 --- a/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts +++ b/src/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.ts @@ -10,6 +10,8 @@ import { TransactionLoggingDto } from '@common/transaction-logging/dto/transacti import { Order } from '@debionetwork/polkadot-provider'; import { NotificationDto } from '@common/notification/dto/notification.dto'; import currencyUnit from '../../../models/currencyUnit'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(OrderRefundedCommand) @@ -46,8 +48,8 @@ export class OrderRefundedHandler currency: order.currency.toUpperCase(), parent_id: BigInt(orderHistory.id), ref_number: order.id, - transaction_status: 4, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Refunded, }; if (!isOrderHasBeenInsert) { await this.loggingService.create(orderLogging); diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts index 7f6a690b..84ee7e90 100644 --- a/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts +++ b/src/listeners/substrate-listener/commands/service-request/service-request-created/service-request-created.handler.ts @@ -13,6 +13,8 @@ import { StateService } from '@common/location/state.service'; import { NotificationDto } from '@common/notification/dto/notification.dto'; import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; import { keyList } from '@common/secrets'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(ServiceRequestCreatedCommand) @@ -46,8 +48,8 @@ export class ServiceRequestCreatedHandler currency: 'DBIO', parent_id: BigInt(0), ref_number: serviceRequest.hash, - transaction_status: 7, - transaction_type: 2, + transaction_type: TransactionTypeList.StakingRequestService, + transaction_status: TransactionStatusList.Stake, }; try { diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts index 8f18d026..c4bb9e30 100644 --- a/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts +++ b/src/listeners/substrate-listener/commands/service-request/service-request-excess/service-request-excess.handler.ts @@ -8,6 +8,8 @@ import { TransactionLoggingService, } from '@common/index'; import { NotificationDto } from '@common/notification/dto/notification.dto'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(ServiceRequestStakingAmountExcessRefundedCommand) @@ -41,8 +43,8 @@ export class ServiceRequestStakingAmountExcessRefunded ? loggingServiceRequest.id : BigInt(0), ref_number: requestId.toString(), - transaction_status: 9, - transaction_type: 2, + transaction_type: TransactionTypeList.StakingRequestService, + transaction_status: TransactionStatusList.Excess, }; try { diff --git a/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts b/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts index 7c26b7b7..bd72eddb 100644 --- a/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts +++ b/src/listeners/substrate-listener/commands/service-request/service-request-updated/service-request-updated.handler.ts @@ -15,6 +15,8 @@ import { } from '@common/index'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { ServiceRequestUpdatedCommand } from './service-request-updated.command'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; @Injectable() @CommandHandler(ServiceRequestUpdatedCommand) @@ -76,8 +78,8 @@ export class ServiceRequestUpdatedHandler currency: 'DBIO', parent_id: BigInt(serviceRequestParent.id), ref_number: serviceRequest.hash, - transaction_status: 11, - transaction_type: 2, + transaction_type: TransactionTypeList.StakingRequestService, + transaction_status: TransactionStatusList.WaitingForUnstake, }; if (!isServiceRequestHasBeenInsert) { @@ -104,8 +106,8 @@ export class ServiceRequestUpdatedHandler currency: 'DBIO', parent_id: BigInt(serviceRequestParent.id), ref_number: serviceRequest.hash, - transaction_status: 8, - transaction_type: 2, + transaction_type: TransactionTypeList.StakingRequestService, + transaction_status: TransactionStatusList.Unstake, }; if (!isServiceRequestHasBeenInsert) { await this.loggingService.create(stakingLogging); diff --git a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts index 5bce15f1..3578d9f5 100644 --- a/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts +++ b/test/unit/listeners/substrate-listener/commands/genetic-analyst/genetic-analyst-verification-status/genetic-analyst-verification-status.handler.spec.ts @@ -15,6 +15,8 @@ import { } from '../../../../../mock'; import { GeneticAnalystVerificationStatusHandler } from '@listeners/substrate-listener/commands/genetic-analysts/genetic-analyst-verification-status/genetic-analyst-verification-status.handler'; import { when } from 'jest-when'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; describe('Genetic Analyst Verification Status Handler Event', () => { let geneticAnalystVerificationStatusHandler: GeneticAnalystVerificationStatusHandler; @@ -109,8 +111,8 @@ describe('Genetic Analyst Verification Status Handler Event', () => { expect(transactionLoggingServiceMock.create).toHaveBeenCalledWith( expect.objectContaining({ address: ACCOUNT_ID, - transaction_type: 4, - transaction_status: 21, + transaction_type: TransactionTypeList.GeneticAnalyst, + transaction_status: TransactionStatusList.Rejected, currency: 'DBIO', }), ); @@ -144,8 +146,8 @@ describe('Genetic Analyst Verification Status Handler Event', () => { expect(transactionLoggingServiceMock.create).toHaveBeenCalledWith( expect.objectContaining({ address: ACCOUNT_ID, - transaction_type: 4, - transaction_status: 20, + transaction_type: TransactionTypeList.GeneticAnalyst, + transaction_status: TransactionStatusList.Verified, currency: 'DBIO', }), ); @@ -179,8 +181,8 @@ describe('Genetic Analyst Verification Status Handler Event', () => { expect(transactionLoggingServiceMock.create).toHaveBeenCalledWith( expect.objectContaining({ address: ACCOUNT_ID, - transaction_type: 4, - transaction_status: 22, + transaction_type: TransactionTypeList.GeneticAnalyst, + transaction_status: TransactionStatusList.Revoked, currency: 'DBIO', }), ); diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts index 3292e3cf..49dcf7e7 100644 --- a/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts +++ b/test/unit/listeners/substrate-listener/commands/orders/order-fulfilled/order-fulfilled.handler.spec.ts @@ -32,6 +32,8 @@ import * as userProfileQuery from '@debionetwork/polkadot-provider/lib/query/use import * as serviceRequestQuery from '@debionetwork/polkadot-provider/lib/query/service-request'; import * as ordersQuery from '@debionetwork/polkadot-provider/lib/query/labs/orders'; import * as servicesQuery from '@debionetwork/polkadot-provider/lib/query/labs/services'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; describe('Order Fulfilled Handler Event', () => { let orderFulfilledHandler: OrderFulfilledHandler; @@ -452,8 +454,8 @@ describe('Order Fulfilled Handler Event', () => { currency: orderCancelledCommand.orders.currency.toUpperCase(), parent_id: BigInt(RESULT_TRANSACTION.id), ref_number: orderCancelledCommand.orders.id, - transaction_status: 3, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Fulfilled, }; await orderFulfilledHandler.execute(orderCancelledCommand); diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts index f708ed58..e6859b63 100644 --- a/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts +++ b/test/unit/listeners/substrate-listener/commands/orders/order-paid/order-paid.handler.spec.ts @@ -24,6 +24,8 @@ import { TransactionLoggingDto } from '@common/transaction-logging/dto/transacti import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity'; import { NotificationService } from '@common/notification/notification.service'; import { GCloudSecretManagerService } from '@debionetwork/nestjs-gcloud-secret-manager'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; describe('Order Paid Handler Event', () => { let orderPaidHandler: OrderPaidHandler; @@ -170,8 +172,8 @@ describe('Order Paid Handler Event', () => { currency: orderPaidCommand.orders.currency.toUpperCase(), parent_id: BigInt(RESULT_TRANSACTION.id), ref_number: orderPaidCommand.orders.id, - transaction_status: 2, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Paid, }; await orderPaidHandler.execute(orderPaidCommand); diff --git a/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts b/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts index b051ace2..f47cf9d5 100644 --- a/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts +++ b/test/unit/listeners/substrate-listener/commands/orders/order-refunded/order-refunded.handler.spec.ts @@ -15,6 +15,8 @@ import { when } from 'jest-when'; import { TransactionLoggingDto } from '@common/transaction-logging/dto/transaction-logging.dto'; import { TransactionRequest } from '@common/transaction-logging/models/transaction-request.entity'; import { NotificationService } from '@common/notification/notification.service'; +import { TransactionTypeList } from '@common/transaction-type/models/transaction-type.list'; +import { TransactionStatusList } from '@common/transaction-status/models/transaction-status.list'; describe('Order Refunded Handler Event', () => { let orderRefundedHandler: OrderRefundedHandler; @@ -131,8 +133,8 @@ describe('Order Refunded Handler Event', () => { currency: orderRefundedCommand.orders.currency.toUpperCase(), parent_id: BigInt(RESULT_TRANSACTION.id), ref_number: orderRefundedCommand.orders.id, - transaction_status: 4, - transaction_type: 1, + transaction_type: TransactionTypeList.Order, + transaction_status: TransactionStatusList.Refunded, }; await orderRefundedHandler.execute(orderRefundedCommand);