[DEV-3957] partner fee

migration/1761754328324-AddBuyCryptoBuyFiatPlatformFeeAmount.js

@@ -0,0 +1,21 @@
+/**
+ * @typedef {import('typeorm').MigrationInterface} MigrationInterface
+ */
+
+/**
+ * @class
+ * @implements {MigrationInterface}
+ */
+module.exports = class AddBuyCryptoBuyFiatPlatformFeeAmount1761754328324 {
+    name = 'AddBuyCryptoBuyFiatPlatformFeeAmount1761754328324'
+
+    async up(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "buy_fiat" ADD "partnerFeeAmount" float`);
+        await queryRunner.query(`ALTER TABLE "buy_crypto" ADD "partnerFeeAmount" float`);
+    }
+
+    async down(queryRunner) {
+        await queryRunner.query(`ALTER TABLE "buy_crypto" DROP COLUMN "partnerFeeAmount"`);
+        await queryRunner.query(`ALTER TABLE "buy_fiat" DROP COLUMN "partnerFeeAmount"`);
+    }
+}

src/subdomains/core/buy-crypto/process/entities/buy-crypto.entity.ts

@@ -23,12 +23,13 @@ import { FiatOutput } from 'src/subdomains/supporting/fiat-output/fiat-output.en
 import { CheckoutTx } from 'src/subdomains/supporting/fiat-payin/entities/checkout-tx.entity';
 import { MailTranslationKey } from 'src/subdomains/supporting/notification/factories/mail.factory';
 import { CryptoInput } from 'src/subdomains/supporting/payin/entities/crypto-input.entity';
-import { FeeDto, InternalFeeDto } from 'src/subdomains/supporting/payment/dto/fee.dto';
+import { InternalFeeDto } from 'src/subdomains/supporting/payment/dto/fee.dto';
 import {
   CryptoPaymentMethod,
   FiatPaymentMethod,
   PaymentMethod,
 } from 'src/subdomains/supporting/payment/dto/payment-method.enum';
+import { FeeType } from 'src/subdomains/supporting/payment/entities/fee.entity';
 import { SpecialExternalAccount } from 'src/subdomains/supporting/payment/entities/special-external-account.entity';
 import { Transaction } from 'src/subdomains/supporting/payment/entities/transaction.entity';
 import { Price, PriceStep } from 'src/subdomains/supporting/pricing/domain/entities/price';
@@ -121,6 +122,9 @@ export class BuyCrypto extends IEntity {
   @Column({ length: 256, nullable: true })
   usedRef?: string;
 
+  @Column({ length: 256, nullable: true })
+  usedPartnerFeeRef?: string;
+
   @Column({ type: 'float', nullable: true })
   refProvision?: number;
 
@@ -150,6 +154,9 @@ export class BuyCrypto extends IEntity {
   @Column({ type: 'float', nullable: true })
   bankFeeAmount?: number; //inputReferenceAsset
 
+  @Column({ type: 'float', nullable: true })
+  partnerFeeAmount?: number; //inputReferenceAsset
+
   @Column({ type: 'float', nullable: true })
   percentFeeAmount?: number; //inputReferenceAsset
 
@@ -475,11 +482,11 @@ export class BuyCrypto extends IEntity {
   }
 
   setFeeAndFiatReference(
-    fee: InternalFeeDto & FeeDto,
+    fee: InternalFeeDto,
     minFeeAmountFiat: number,
     totalFeeAmountChf: number,
   ): UpdateResult<BuyCrypto> {
-    const { usedRef, refProvision } = this.user.specifiedRef;
+    const partnerFee = fee.partner ? fee.fees.find((f) => f.type === FeeType.PARTNER) : undefined;
     const inputReferenceAmountMinusFee = this.inputReferenceAmount - fee.total;
 
     const update: Partial<BuyCrypto> =
@@ -495,10 +502,12 @@ export class BuyCrypto extends IEntity {
             totalFeeAmountChf,
             blockchainFee: fee.network,
             bankFeeAmount: fee.bank,
+            partnerFeeAmount: fee.partner,
+            usedPartnerFeeRef: fee.partner ? partnerFee.wallet.owner.ref : undefined,
             inputReferenceAmountMinusFee,
-            usedRef,
-            refProvision,
-            refFactor: !fee.payoutRefBonus || usedRef === Config.defaultRef ? 0 : 1,
+            usedRef: this.user.usedRef,
+            refProvision: this.user.refFeePercent,
+            refFactor: !fee.payoutRefBonus || this.user.usedRef === Config.defaultRef ? 0 : 1,
             usedFees: fee.fees?.map((fee) => fee.id).join(';'),
             networkStartFeeAmount: fee.networkStart,
             status: this.status === BuyCryptoStatus.WAITING_FOR_LOWER_FEE ? BuyCryptoStatus.CREATED : undefined,
@@ -595,6 +604,8 @@ export class BuyCrypto extends IEntity {
       chargebackAllowedBy: null,
       chargebackOutput: null,
       priceDefinitionAllowedDate: null,
+      partnerFeeAmount: null,
+      usedPartnerFeeRef: null,
     };
 
     Object.assign(this, update);

src/subdomains/core/buy-crypto/process/services/buy-crypto.service.ts

@@ -883,13 +883,18 @@ export class BuyCryptoService {
 
     for (const ref of refs) {
       const { volume: buyCryptoVolume, credit: buyCryptoCredit } = await this.getRefVolume(ref);
+      const { volume: buyCryptoPartnerVolume, credit: buyCryptoPartnerCredit } = await this.getPartnerFeeRefVolume(ref);
       const { volume: buyFiatVolume, credit: buyFiatCredit } = await this.buyFiatService.getRefVolume(ref);
+      const { volume: buyFiatPartnerVolume, credit: buyFiatPartnerCredit } =
+        await this.buyFiatService.getPartnerFeeRefVolume(ref);
       const { volume: manualVolume, credit: manualCredit } = await this.transactionService.getManualRefVolume(ref);
 
       await this.userService.updateRefVolume(
         ref,
         buyCryptoVolume + buyFiatVolume + manualVolume,
         buyCryptoCredit + buyFiatCredit + manualCredit,
+        buyCryptoPartnerVolume + buyFiatPartnerVolume,
+        buyCryptoPartnerCredit + buyFiatPartnerCredit,
       );
     }
   }
@@ -906,6 +911,18 @@ export class BuyCryptoService {
     return { volume: volume ?? 0, credit: credit ?? 0 };
   }
 
+  async getPartnerFeeRefVolume(ref: string): Promise<{ volume: number; credit: number }> {
+    const { volume, credit } = await this.buyCryptoRepo
+      .createQueryBuilder('buyCrypto')
+      .select('SUM(amountInEur)', 'volume')
+      .addSelect('SUM(partnerFeeAmount * (amountInEur/amountInChf ))', 'credit')
+      .where('usedPartnerFeeRef = :ref', { ref })
+      .andWhere('amlCheck = :check', { check: CheckStatus.PASS })
+      .getRawOne<{ volume: number; credit: number }>();
+
+    return { volume: volume ?? 0, credit: credit ?? 0 };
+  }
+
   // Admin Support Tool methods
 
   async getAllRefTransactions(refCodes: string[]): Promise<BuyCrypto[]> {

src/subdomains/core/buy-crypto/routes/buy/buy.controller.ts

@@ -283,7 +283,7 @@ export class BuyController {
       annualVolume: buy.annualVolume,
       bankUsage: buy.active ? buy.bankUsage : undefined,
       asset: AssetDtoMapper.toDto(buy.asset),
-      fee: Util.round(fee.rate * 100, Config.defaultPercentageDecimal),
+      fee: Util.round(fee.dfx.rate * 100, Config.defaultPercentageDecimal),
       minDeposits: [minDeposit],
       minFee: { amount: fee.network, asset: 'CHF' },
     };

src/subdomains/core/buy-crypto/routes/swap/swap.controller.ts

@@ -217,7 +217,7 @@ export class SwapController {
       deposit: swap.active ? DepositDtoMapper.entityToDto(swap.deposit) : undefined,
       asset: AssetDtoMapper.toDto(swap.asset),
       blockchain: swap.deposit.blockchainList[0],
-      fee: Util.round(fee.rate * 100, Config.defaultPercentageDecimal),
+      fee: Util.round(fee.dfx.rate * 100, Config.defaultPercentageDecimal),
       minDeposits: [minDeposit],
       minFee: { amount: fee.network, asset: 'CHF' },
     };

src/subdomains/core/history/__tests__/transaction-helper.spec.ts

@@ -16,9 +16,9 @@ import { CardBankName, IbanBankName } from 'src/subdomains/supporting/bank/bank/
 import { createDefaultCheckoutTx } from 'src/subdomains/supporting/fiat-payin/__mocks__/checkout-tx.entity.mock';
 import { createDefaultCryptoInput } from 'src/subdomains/supporting/payin/entities/__mocks__/crypto-input.entity.mock';
 import {
-  createCustomInternalChargebackFeeDto,
-  createInternalChargebackFeeDto,
-} from 'src/subdomains/supporting/payment/__mocks__/internal-fee.dto.mock';
+  createChargebackFeeInfo,
+  createCustomChargebackFeeInfo,
+} from 'src/subdomains/supporting/payment/__mocks__/fee.dto.mock';
 import { createCustomTransaction } from 'src/subdomains/supporting/payment/__mocks__/transaction.entity.mock';
 import { TransactionSpecificationRepository } from 'src/subdomains/supporting/payment/repositories/transaction-specification.repository';
 import { FeeService } from 'src/subdomains/supporting/payment/services/fee.service';
@@ -97,7 +97,7 @@ describe('TransactionHelper', () => {
     });
 
     jest.spyOn(fiatService, 'getFiatByName').mockResolvedValue(createCustomFiat({ name: 'CHF' }));
-    jest.spyOn(feeService, 'getChargebackFee').mockResolvedValue(createInternalChargebackFeeDto());
+    jest.spyOn(feeService, 'getChargebackFee').mockResolvedValue(createChargebackFeeInfo());
     jest
       .spyOn(pricingService, 'getPrice')
       .mockResolvedValue(createCustomPrice({ source: 'CHF', target: 'CHF', price: 1 }));
@@ -156,7 +156,7 @@ describe('TransactionHelper', () => {
 
     jest.spyOn(feeService, 'getBlockchainFee').mockResolvedValue(0.01);
     jest.spyOn(fiatService, 'getFiatByName').mockResolvedValue(createDefaultFiat());
-    jest.spyOn(feeService, 'getChargebackFee').mockResolvedValue(createInternalChargebackFeeDto());
+    jest.spyOn(feeService, 'getChargebackFee').mockResolvedValue(createChargebackFeeInfo());
     jest.spyOn(pricingService, 'getPrice').mockResolvedValue(createCustomPrice({ price: 1 }));
 
     await expect(
@@ -184,9 +184,7 @@ describe('TransactionHelper', () => {
 
     jest.spyOn(feeService, 'getBlockchainFee').mockResolvedValue(0.01);
     jest.spyOn(fiatService, 'getFiatByName').mockResolvedValue(createDefaultFiat());
-    jest
-      .spyOn(feeService, 'getChargebackFee')
-      .mockResolvedValue(createCustomInternalChargebackFeeDto({ network: 0.01 }));
+    jest.spyOn(feeService, 'getChargebackFee').mockResolvedValue(createCustomChargebackFeeInfo({ network: 0.01 }));
     jest.spyOn(pricingService, 'getPrice').mockResolvedValue(createCustomPrice({ price: 1 }));
 
     await expect(
@@ -215,9 +213,7 @@ describe('TransactionHelper', () => {
 
     jest.spyOn(feeService, 'getBlockchainFee').mockResolvedValue(0.01);
     jest.spyOn(fiatService, 'getFiatByName').mockResolvedValue(createDefaultFiat());
-    jest
-      .spyOn(feeService, 'getChargebackFee')
-      .mockResolvedValue(createCustomInternalChargebackFeeDto({ network: 0.01 }));
+    jest.spyOn(feeService, 'getChargebackFee').mockResolvedValue(createCustomChargebackFeeInfo({ network: 0.01 }));
     jest.spyOn(pricingService, 'getPrice').mockResolvedValue(createCustomPrice({ price: 1 }));
 
     await expect(

src/subdomains/core/history/mappers/transaction-dto.mapper.ts

@@ -357,6 +357,10 @@ export class TransactionDtoMapper {
               feeAmountType(entity.inputAssetEntity),
             )
           : null,
+      platform:
+        entity.partnerFeeAmount != null
+          ? Util.roundReadable(entity.partnerFeeAmount * referencePrice, feeAmountType(entity.inputAssetEntity))
+          : null,
       total:
         entity.totalFeeAmount != null
           ? Util.roundReadable(totalFee * referencePrice, feeAmountType(entity.inputAssetEntity))

src/subdomains/core/referral/reward/services/ref-reward.service.ts

@@ -147,7 +147,7 @@ export class RefRewardService {
           : await this.assetService.getNativeAsset(blockchain);
 
       for (const user of users) {
-        const refCreditEur = user.refCredit - user.paidRefCredit;
+        const refCreditEur = user.completeRefCredit - user.paidRefCredit;
         const minCredit = PayoutLimits[blockchain];
 
         if (!(refCreditEur >= minCredit)) continue;

src/subdomains/core/sell-crypto/process/buy-fiat.entity.ts

@@ -14,12 +14,13 @@ import { Wallet } from 'src/subdomains/generic/user/models/wallet/wallet.entity'
 import { BankTx } from 'src/subdomains/supporting/bank-tx/bank-tx/entities/bank-tx.entity';
 import { MailTranslationKey } from 'src/subdomains/supporting/notification/factories/mail.factory';
 import { CryptoInput } from 'src/subdomains/supporting/payin/entities/crypto-input.entity';
-import { FeeDto, InternalFeeDto } from 'src/subdomains/supporting/payment/dto/fee.dto';
+import { InternalFeeDto } from 'src/subdomains/supporting/payment/dto/fee.dto';
 import {
   CryptoPaymentMethod,
   FiatPaymentMethod,
   PaymentMethod,
 } from 'src/subdomains/supporting/payment/dto/payment-method.enum';
+import { FeeType } from 'src/subdomains/supporting/payment/entities/fee.entity';
 import { SpecialExternalAccount } from 'src/subdomains/supporting/payment/entities/special-external-account.entity';
 import { Price, PriceStep } from 'src/subdomains/supporting/pricing/domain/entities/price';
 import { PriceCurrency } from 'src/subdomains/supporting/pricing/services/pricing.service';
@@ -87,6 +88,9 @@ export class BuyFiat extends IEntity {
   @Column({ length: 256, nullable: true })
   usedRef?: string;
 
+  @Column({ length: 256, nullable: true })
+  usedPartnerFeeRef?: string;
+
   @Column({ type: 'float', nullable: true })
   refProvision?: number;
 
@@ -116,6 +120,9 @@ export class BuyFiat extends IEntity {
   @Column({ type: 'float', nullable: true })
   bankFeeAmount?: number; //inputAsset
 
+  @Column({ type: 'float', nullable: true })
+  partnerFeeAmount?: number; //inputAsset
+
   @Column({ type: 'float', nullable: true })
   percentFeeAmount?: number; //inputAsset
 
@@ -283,11 +290,11 @@ export class BuyFiat extends IEntity {
   }
 
   setFeeAndFiatReference(
-    fee: InternalFeeDto & FeeDto,
+    fee: InternalFeeDto,
     minFeeAmountFiat: number,
     totalFeeAmountChf: number,
   ): UpdateResult<BuyFiat> {
-    const { usedRef, refProvision } = this.user.specifiedRef;
+    const partnerFee = fee.partner ? fee.fees.find((f) => f.type === FeeType.PARTNER) : undefined;
     const inputReferenceAmountMinusFee = this.inputReferenceAmount - fee.total;
 
     const update: Partial<BuyFiat> =
@@ -303,10 +310,12 @@ export class BuyFiat extends IEntity {
             totalFeeAmountChf,
             blockchainFee: fee.network,
             bankFeeAmount: fee.bank,
+            partnerFeeAmount: fee.partner,
+            usedPartnerFeeRef: fee.partner ? partnerFee.wallet.owner.ref : undefined,
             inputReferenceAmountMinusFee,
-            usedRef,
-            refProvision,
-            refFactor: !fee.payoutRefBonus || usedRef === Config.defaultRef ? 0 : 1,
+            usedRef: this.user.usedRef,
+            refProvision: this.user.refFeePercent,
+            refFactor: !fee.payoutRefBonus || this.user.usedRef === Config.defaultRef ? 0 : 1,
             usedFees: fee.fees?.map((fee) => fee.id).join(';'),
           };
 
@@ -469,6 +478,8 @@ export class BuyFiat extends IEntity {
       chargebackAllowedDateUser: null,
       chargebackAmount: null,
       chargebackAllowedBy: null,
+      partnerFeeAmount: null,
+      usedPartnerFeeRef: null,
     };
 
     Object.assign(this, update);

src/subdomains/core/sell-crypto/process/services/buy-fiat.service.ts

@@ -483,13 +483,18 @@ export class BuyFiatService {
 
     for (const ref of refs) {
       const { volume: buyFiatVolume, credit: buyFiatCredit } = await this.getRefVolume(ref);
+      const { volume: buyFiatPartnerVolume, credit: buyFiatPartnerCredit } = await this.getPartnerFeeRefVolume(ref);
       const { volume: buyCryptoVolume, credit: buyCryptoCredit } = await this.buyCryptoService.getRefVolume(ref);
+      const { volume: buyCryptoPartnerVolume, credit: buyCryptoPartnerCredit } =
+        await this.buyCryptoService.getPartnerFeeRefVolume(ref);
       const { volume: manualVolume, credit: manualCredit } = await this.transactionService.getManualRefVolume(ref);
 
       await this.userService.updateRefVolume(
         ref,
         buyFiatVolume + buyCryptoVolume + manualVolume,
         buyFiatCredit + buyCryptoCredit + manualCredit,
+        buyFiatPartnerVolume + buyCryptoPartnerVolume,
+        buyFiatPartnerCredit + buyCryptoPartnerCredit,
       );
     }
   }
@@ -506,6 +511,18 @@ export class BuyFiatService {
     return { volume: volume ?? 0, credit: credit ?? 0 };
   }
 
+  async getPartnerFeeRefVolume(ref: string): Promise<{ volume: number; credit: number }> {
+    const { volume, credit } = await this.buyFiatRepo
+      .createQueryBuilder('buyFiat')
+      .select('SUM(amountInEur)', 'volume')
+      .addSelect('SUM(partnerFeeAmount * (amountInEur/amountInChf ))', 'credit')
+      .where('usedPartnerFeeRef = :ref', { ref })
+      .andWhere('amlCheck = :check', { check: CheckStatus.PASS })
+      .getRawOne<{ volume: number; credit: number }>();
+
+    return { volume: volume ?? 0, credit: credit ?? 0 };
+  }
+
   // Statistics
 
   async getTransactions(dateFrom: Date = new Date(0), dateTo: Date = new Date()): Promise<TransactionDetailsDto[]> {

src/subdomains/core/sell-crypto/route/sell.controller.ts

@@ -246,7 +246,7 @@ export class SellController {
       fiat: FiatDtoMapper.toDto(sell.fiat),
       currency: FiatDtoMapper.toDto(sell.fiat),
       deposit: sell.active ? DepositDtoMapper.entityToDto(sell.deposit) : undefined,
-      fee: Util.round(fee.rate * 100, Config.defaultPercentageDecimal),
+      fee: Util.round(fee.dfx.rate * 100, Config.defaultPercentageDecimal),
       blockchain: sell.deposit.blockchainList[0],
       minFee: { amount: fee.network, asset: 'CHF' },
       minDeposits: [minDeposit],

src/subdomains/generic/user/models/user/dto/user-dto.mapper.ts

@@ -74,8 +74,8 @@ export class UserDtoMapper {
     const dto: ReferralDto = {
       code: user.ref,
       commission: Util.round(user.refFeePercent / 100, 4),
-      volume: user.refVolume,
-      credit: user.refCredit,
+      volume: user.completeRefVolume,
+      credit: user.completeRefCredit,
       paidCredit: user.paidRefCredit,
       userCount: userCount,
       activeUserCount: activeUserCount,