Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions migration/1664656167454-addBankTxReturnTable.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const { MigrationInterface, QueryRunner } = require("typeorm");

module.exports = class addBankTxReturnTable1664656167454 {
name = 'addBankTxReturnTable1664656167454'

async up(queryRunner) {
await queryRunner.query(`CREATE TABLE "bank_tx_return" ("id" int NOT NULL IDENTITY(1,1), "updated" datetime2 NOT NULL CONSTRAINT "DF_97c17871757f1cecf7121391ed4" DEFAULT getdate(), "created" datetime2 NOT NULL CONSTRAINT "DF_ffeebf01a96f36dc46bde504555" DEFAULT getdate(), "bankTxId" int NOT NULL, CONSTRAINT "PK_c0df73191eed7dea2d8b8bbdfde" PRIMARY KEY ("id"))`);
await queryRunner.query(`CREATE UNIQUE INDEX "REL_d9e22bdf9beb60838373b829e9" ON "bank_tx_return" ("bankTxId") WHERE "bankTxId" IS NOT NULL`);
await queryRunner.query(`ALTER TABLE "bank_tx_return" ADD CONSTRAINT "FK_d9e22bdf9beb60838373b829e9c" FOREIGN KEY ("bankTxId") REFERENCES "bank_tx"("id") ON DELETE NO ACTION ON UPDATE NO ACTION`);
}

async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "bank_tx_return" DROP CONSTRAINT "FK_d9e22bdf9beb60838373b829e9c"`);
await queryRunner.query(`DROP INDEX "REL_d9e22bdf9beb60838373b829e9" ON "bank_tx_return"`);
await queryRunner.query(`DROP TABLE "bank_tx_return"`);
}
}
10 changes: 10 additions & 0 deletions src/payment/models/bank-tx-return/bank-tx-return.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import { Entity, OneToOne, JoinColumn } from 'typeorm';
import { IEntity } from 'src/shared/models/entity';
import { BankTx } from '../bank-tx/bank-tx.entity';

@Entity()
export class BankTxReturn extends IEntity {
@OneToOne(() => BankTx, { nullable: false })
@JoinColumn()
bankTx: BankTx;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { EntityRepository, Repository } from 'typeorm';
import { BankTxReturn } from './bank-tx-return.entity';

@EntityRepository(BankTxReturn)
export class BankTxReturnRepository extends Repository<BankTxReturn> {}
15 changes: 15 additions & 0 deletions src/payment/models/bank-tx-return/bank-tx-return.service.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import { Injectable } from '@nestjs/common';
import { BankTx } from '../bank-tx/bank-tx.entity';
import { BankTxReturn } from './bank-tx-return.entity';
import { BankTxReturnRepository } from './bank-tx-return.repository';

@Injectable()
export class BankTxReturnService {
constructor(private readonly bankTxReturnRepo: BankTxReturnRepository) {}

async create(bankTx: BankTx): Promise<BankTxReturn> {
const entity = this.bankTxReturnRepo.create({ bankTx });

return await this.bankTxReturnRepo.save(entity);
}
}
11 changes: 10 additions & 1 deletion src/payment/models/bank-tx/bank-tx.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Interval } from '@nestjs/schedule';
import { SettingService } from 'src/shared/models/setting/setting.service';
import { FrickService } from './frick.service';
import { OlkypayService } from './olkypay.service';
import { BankTxReturnService } from '../bank-tx-return/bank-tx-return.service';

@Injectable()
export class BankTxService {
Expand All @@ -23,6 +24,7 @@ export class BankTxService {
private readonly settingService: SettingService,
private readonly frickService: FrickService,
private readonly olkyService: OlkypayService,
private readonly bankTxReturnService: BankTxReturnService,
) {}

// --- TRANSACTION HANDLING --- //
Expand Down Expand Up @@ -73,7 +75,14 @@ export class BankTxService {

bankTx.type = dto.type;

if (bankTx.type === BankTxType.BUY_CRYPTO) await this.buyCryptoService.createFromFiat(bankTxId, dto.buyId);
switch (bankTx.type) {
case BankTxType.BUY_CRYPTO:
await this.buyCryptoService.createFromFiat(bankTxId, dto.buyId);
break;
case BankTxType.BANK_TX_RETURN:
await this.bankTxReturnService.create(bankTx);
break;
}

return await this.bankTxRepo.save(bankTx);
}
Expand Down
5 changes: 4 additions & 1 deletion src/payment/payment.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ import { FrickService } from './models/bank-tx/frick.service';
import { BankAccountController } from './models/bank-account/bank-account.controller';
import { ExchangeModule } from './models/exchange/exchange.module';
import { PricingModule } from './models/pricing/pricing.module';
import { BankTxReturnRepository } from './models/bank-tx-return/bank-tx-return.repository';
import { BankTxReturnService } from './models/bank-tx-return/bank-tx-return.service';

@Module({
imports: [
Expand All @@ -97,6 +99,7 @@ import { PricingModule } from './models/pricing/pricing.module';
StakingRefRewardRepository,
BankAccountRepository,
CryptoRouteRepository,
BankTxReturnRepository,
]),
SharedModule,
AinModule,
Expand Down Expand Up @@ -143,7 +146,6 @@ import { PricingModule } from './models/pricing/pricing.module';
OlkypayService,
FrickService,
BankService,

HistoryService,
BuyService,
SellService,
Expand All @@ -162,6 +164,7 @@ import { PricingModule } from './models/pricing/pricing.module';
CryptoRouteController,
CryptoRouteService,
ChainalysisService,
BankTxReturnService,
],
exports: [
BuyService,
Expand Down