Merge pull request #319 from harmony-one/invoice_amount_varchar

Invoice refactoring

src/database/entities/Invoice.ts

@@ -17,8 +17,8 @@ export class Invoice {
   @Column()
     itemId!: string
 
-  @Column()
-    amount!: number
+  @Column({ type: 'varchar' })
+    amount!: string
 
   @Column({ nullable: true })
     telegramPaymentChargeId!: string

src/database/invoice.service.ts

@@ -6,7 +6,7 @@ const invoiceRepository = AppDataSource.getRepository(Invoice)
 export interface InvoiceParams {
   tgUserId: number
   accountId: number
-  amount: number
+  amount: string
   itemId: string
   currency?: string
 }

src/database/migrations/1695920334202-ChangeInvoiceAmountType.ts

@@ -0,0 +1,13 @@
+import { type MigrationInterface, type QueryRunner } from 'typeorm'
+
+export class ChangeInvoiceAmountType1695920334202 implements MigrationInterface {
+  name = 'ChangeInvoiceAmountType1695920334202'
+
+  public async up (queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE "invoice" ALTER COLUMN "amount" TYPE varchar')
+  }
+
+  public async down (queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.query('ALTER TABLE "invoice" ALTER COLUMN "amount" TYPE integer')
+  }
+}

src/database/stats.service.ts

@@ -129,6 +129,7 @@ export class StatsService {
     const queryBuilder = logRepository.createQueryBuilder('logs')
       .select('distinct(logs.accountId)')
       .where(`logs.createdAt >= TO_TIMESTAMP(${dateStart})`)
+      .orderBy('logs.createdAt desc')
       .limit(20)
 
     return await queryBuilder.execute()

src/modules/payment/index.ts

@@ -4,7 +4,7 @@ import { type Account, type TransactionReceipt } from 'web3-core'
 import axios from 'axios'
 import bn, { BigNumber } from 'bignumber.js'
 import config from '../../config'
-import { chatService, statsService } from '../../database/services'
+import { chatService, invoiceService, statsService } from '../../database/services'
 import { type OnCallBackQueryData, type OnMessageContext } from '../types'
 import { LRUCache } from 'lru-cache'
 import { freeCreditsFeeCounter } from '../../metrics/prometheus'
@@ -13,6 +13,7 @@ import { sendMessage } from '../open-ai/helpers'
 import * as Sentry from '@sentry/node'
 import { InlineKeyboard } from 'grammy'
 import { Callbacks } from '../types'
+import { type InvoiceParams } from '../../database/invoice.service'
 
 interface CoinGeckoResponse {
   harmony: {
@@ -66,17 +67,17 @@ export class BotPayments {
     userAccount: Account,
     amount: BigNumber
   ): Promise<void> {
-    // const invoiceData: InvoiceParams = {
-    //   tgUserId: accountId,
-    //   accountId,
-    //   amount: this.convertBigNumber(amount),
-    //   itemId: 'deposit_one',
-    //   currency: 'ONE'
-    // }
-    // const invoice = await invoiceService.create(invoiceData)
+    const invoiceData: InvoiceParams = {
+      tgUserId: accountId,
+      accountId,
+      amount: amount.toFixed(),
+      itemId: 'deposit_one',
+      currency: 'ONE'
+    }
+    const invoice = await invoiceService.create(invoiceData)
     await this.transferFunds(userAccount, this.holderAddress, amount)
     await chatService.depositOneCredits(accountId, amount.toFixed())
-    // await invoiceService.setSuccessStatus({ uuid: invoice.uuid, providerPaymentChargeId: '', telegramPaymentChargeId: '' })
+    await invoiceService.setSuccessStatus({ uuid: invoice.uuid, providerPaymentChargeId: '', telegramPaymentChargeId: '' })
   }
 
   private async runHotWalletsTask (): Promise<void> {

src/modules/telegram_payment/index.ts

@@ -65,11 +65,11 @@ export class TelegramPayments {
     const providerPaymentChargeId = provider_payment_charge_id
 
     const invoice = await invoiceService.setSuccessStatus({ uuid, telegramPaymentChargeId, providerPaymentChargeId })
-    const fiatCredits = await this.payments.getPriceInONE(invoice.amount)
+    const fiatCredits = await this.payments.getPriceInONE(+invoice.amount)
 
     await chatService.depositFiatCredits(invoice.accountId, fiatCredits.toString())
 
-    this.logger.info(`Payment from @${ctx.message.from.username} $${invoice.amount / 100} was completed!`)
+    this.logger.info(`Payment from @${ctx.message.from.username} $${+invoice.amount / 100} was completed!`)
   }
 
   public async createPaymentInvoice (ctx: OnMessageContext | OnCallBackQueryData): Promise<void> {
@@ -133,7 +133,7 @@ export class TelegramPayments {
       amount
     }]
 
-    const invoice = await invoiceService.create({ tgUserId, accountId, itemId, amount })
+    const invoice = await invoiceService.create({ tgUserId, accountId, itemId, amount: amount.toString() })
     const payload = JSON.stringify({ uuid: invoice.uuid })
     this.logger.info(`Send invoice: ${JSON.stringify({ tgUserId, accountId, itemId, amount })}`)
     // const photoUrl = 'https://pbs.twimg.com/media/F5SofMsbgAApd2Y?format=png&name=small'