fix: amount transaction log menstrual subscription (#229)

fix amount transaction log menstrual subscription

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;
 }

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,18 +13,45 @@ export class TransactionLoggingService {
   constructor(
     @InjectRepository(TransactionRequest)
     private readonly transactionRequestRepository: Repository<TransactionRequest>,
+    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;
     logging.created_at = data.created_at;
     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);
   }
 

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;
+}

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',
+}

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 {}

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<TransactionStatus>,
+  ) {}
+
+  async getTransactionStatus(
+    idType: number,
+    transactionStatus: TransactionStatusList,
+  ) {
+    return await this.transactionStatusRepository.findOne({
+      where: {
+        id_type: idType,
+        transaction_status: transactionStatus,
+      },
+    });
+  }
+}

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;
+}

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',
+}

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 {}

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<TransactionType>,
+  ) {}
+
+  async getTransactionType(type: TransactionTypeList) {
+    return await this.transactionTypeRepository.findOne({
+      where: {
+        type: type,
+      },
+    });
+  }
+}

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 (

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) {

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);

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) {

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 = {

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) {

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);