Skip to content

Remove Maerki Baumann integration and set Yapeal as default bank #2747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
TaprootFreak wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Remove Maerki Baumann integration and set Yapeal as default bank #2747

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion src/shared/models/country/__mocks__/country.entity.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ const defaultCountry: Partial<Country> = {
dfxEnable: true,
lockEnable: true,
ipEnable: true,
maerkiBaumannEnable: true,
yapealEnable: true,
updated: undefined,
created: undefined,
Expand Down
3 changes: 0 additions & 3 deletions src/shared/models/country/country.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,6 @@ export class Country extends IEntity {
@Column({ default: true })
ipEnable: boolean;

@Column({ default: false })
maerkiBaumannEnable: boolean;

@Column({ default: false })
yapealEnable: boolean;

Expand Down
4 changes: 2 additions & 2 deletions src/subdomains/core/history/__tests__/transaction-helper.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ describe('TransactionHelper', () => {
txHelper.getRefundData(
transaction.refundTargetEntity,
defaultUserData,
IbanBankName.MAERKI,
IbanBankName.YAPEAL,
'DE12500105170648489890',
!transaction.cryptoInput,
),
Expand Down Expand Up @@ -135,7 +135,7 @@ describe('TransactionHelper', () => {
txHelper.getRefundData(
transaction.refundTargetEntity,
defaultUserData,
IbanBankName.MAERKI,
IbanBankName.YAPEAL,
'DE12500105170648489890',
!transaction.cryptoInput,
),
Expand Down
2 changes: 1 addition & 1 deletion src/subdomains/core/sell-crypto/process/services/buy-fiat-preparation.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ export class BuyFiatPreparationService {
CryptoPaymentMethod.CRYPTO,
FiatPaymentMethod.BANK,
undefined,
IbanBankName.MAERKI,
IbanBankName.YAPEAL,
entity.user,
);

Expand Down
20 changes: 10 additions & 10 deletions src/subdomains/supporting/bank/bank/__mocks__/bank.entity.mock.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ export const olkyEUR = createCustomBank({
sctInst: true,
});

export const maerkiEUR = createCustomBank({
name: IbanBankName.MAERKI,
export const yapealEUR = createCustomBank({
name: IbanBankName.YAPEAL,
currency: 'EUR',
iban: 'CH6808573177975201814',
bic: 'MAEBCHZZ',
iban: 'CH1234567890123456789',
bic: 'YAPECHCHXXX',
receive: true,
});

export const maerkiCHF = createCustomBank({
name: IbanBankName.MAERKI,
export const yapealCHF = createCustomBank({
name: IbanBankName.YAPEAL,
currency: 'CHF',
iban: 'CH3408573177975200001',
bic: 'MAEBCHZZ',
iban: 'CH9876543210987654321',
bic: 'YAPECHCHXXX',
receive: true,
});

Expand All @@ -44,10 +44,10 @@ export function createCustomBank(customValues: Partial<Bank>): Bank {
}

export function createDefaultBanks(): Bank[] {
return [olkyEUR, maerkiEUR, maerkiCHF];
return [olkyEUR, yapealEUR, yapealCHF];
}

export function createDefaultDisabledBanks(): Bank[] {
olkyEUR.receive = false;
return [olkyEUR, maerkiEUR, maerkiCHF];
return [olkyEUR, yapealEUR, yapealCHF];
}
20 changes: 10 additions & 10 deletions src/subdomains/supporting/bank/bank/__tests__/bank.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ import { FiatPaymentMethod } from 'src/subdomains/supporting/payment/dto/payment
import {
createDefaultBanks,
createDefaultDisabledBanks,
maerkiCHF,
maerkiEUR,
yapealCHF,
yapealEUR,
olkyEUR,
} from '../__mocks__/bank.entity.mock';
import { BankRepository } from '../bank.repository';
Expand Down Expand Up @@ -70,10 +70,10 @@ describe('BankService', () => {
service = module.get<BankService>(BankService);
});

function defaultSetup(maerkiBaumannEnable = true, disabledBank = false) {
function defaultSetup(yapealEnable = true, disabledBank = false) {
jest
.spyOn(countryService, 'getCountryWithSymbol')
.mockResolvedValue(createCustomCountry({ maerkiBaumannEnable: maerkiBaumannEnable }));
.mockResolvedValue(createCustomCountry({ yapealEnable: yapealEnable }));

const allBanks = disabledBank ? createDefaultDisabledBanks() : createDefaultBanks();
jest.spyOn(bankRepo, 'findCachedBy').mockImplementation(async (_key: string, filter?: any) => {
Expand All @@ -91,8 +91,8 @@ describe('BankService', () => {
it('should return first matching bank for CHF currency', async () => {
defaultSetup();
const result = await service.getBank(createBankSelectorInput('CHF', 10000));
expect(result.iban).toBe(maerkiCHF.iban);
expect(result.bic).toBe(maerkiCHF.bic);
expect(result.iban).toBe(yapealCHF.iban);
expect(result.bic).toBe(yapealCHF.bic);
});

it('should return matching bank for EUR currency', async () => {
Expand All @@ -112,8 +112,8 @@ describe('BankService', () => {
it('should return first matching bank for CHF currency with standard payment', async () => {
defaultSetup(true);
const result = await service.getBank(createBankSelectorInput('CHF'));
expect(result.iban).toBe(maerkiCHF.iban);
expect(result.bic).toBe(maerkiCHF.bic);
expect(result.iban).toBe(yapealCHF.iban);
expect(result.bic).toBe(yapealCHF.bic);
});

it('should fallback to EUR for unsupported currency', async () => {
Expand All @@ -126,7 +126,7 @@ describe('BankService', () => {
it('should fallback to first EUR bank when sctInst bank is disabled', async () => {
defaultSetup(true, true);
const result = await service.getBank(createBankSelectorInput('EUR', undefined, FiatPaymentMethod.INSTANT));
expect(result.iban).toBe(maerkiEUR.iban);
expect(result.bic).toBe(maerkiEUR.bic);
expect(result.iban).toBe(yapealEUR.iban);
expect(result.bic).toBe(yapealEUR.bic);
});
});
5 changes: 1 addition & 4 deletions src/subdomains/supporting/bank/bank/bank.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,6 @@ export class Bank extends IEntity {
// --- ENTITY METHODS --- //

isCountryEnabled(country: Country): boolean {
return (
(this.name === IbanBankName.YAPEAL && country.yapealEnable) ||
(this.name === IbanBankName.MAERKI && country.maerkiBaumannEnable)
);
return this.name === IbanBankName.YAPEAL && country.yapealEnable;
}
}
2 changes: 0 additions & 2 deletions src/subdomains/supporting/bank/bank/bank.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,8 +107,6 @@ export class BankService implements OnModuleInit {

private static blockchainToBankName(blockchain: Blockchain): IbanBankName | undefined {
switch (blockchain) {
case Blockchain.MAERKI_BAUMANN:
return IbanBankName.MAERKI;
case Blockchain.OLKYPAY:
return IbanBankName.OLKY;
case Blockchain.YAPEAL:
Expand Down
18 changes: 9 additions & 9 deletions src/subdomains/supporting/fiat-output/__tests__/fiat-output-job.service.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { BankTxService } from 'src/subdomains/supporting/bank-tx/bank-tx/service
import { BankTxRepeatService } from '../../bank-tx/bank-tx-repeat/bank-tx-repeat.service';
import { BankTxReturnService } from '../../bank-tx/bank-tx-return/bank-tx-return.service';
import { createDefaultBankTx } from '../../bank-tx/bank-tx/__mocks__/bank-tx.entity.mock';
import { createCustomBank, maerkiEUR } from '../../bank/bank/__mocks__/bank.entity.mock';
import { createCustomBank, yapealEUR } from '../../bank/bank/__mocks__/bank.entity.mock';
import { BankService } from '../../bank/bank/bank.service';
import { IbanBankName } from '../../bank/bank/dto/bank.dto';
import { createCustomVirtualIban } from '../../bank/virtual-iban/__mocks__/virtual-iban.entity.mock';
Expand Down Expand Up @@ -119,18 +119,18 @@ describe('FiatOutputJobService', () => {

jest
.spyOn(countryService, 'getCountryWithSymbol')
.mockResolvedValue(createCustomCountry({ maerkiBaumannEnable: true }));
.mockResolvedValue(createCustomCountry({ yapealEnable: true }));

jest.spyOn(bankService, 'getSenderBank').mockResolvedValue(maerkiEUR);
jest.spyOn(bankService, 'getSenderBank').mockResolvedValue(yapealEUR);

await service['assignBankAccount']();

const updateCalls = (fiatOutputRepo.update as jest.Mock).mock.calls;
expect(updateCalls[0][0]).toBe(1);
expect(updateCalls[0][1]).toMatchObject({ originEntityId: 100, accountIban: maerkiEUR.iban });
expect(updateCalls[0][1]).toMatchObject({ originEntityId: 100, accountIban: yapealEUR.iban });

expect(updateCalls[1][0]).toBe(3);
expect(updateCalls[1][1]).toMatchObject({ originEntityId: 102, accountIban: maerkiEUR.iban });
expect(updateCalls[1][1]).toMatchObject({ originEntityId: 102, accountIban: yapealEUR.iban });
});

it('should use virtual IBAN when user has one for BuyFiat', async () => {
Expand All @@ -147,12 +147,12 @@ describe('FiatOutputJobService', () => {

jest
.spyOn(countryService, 'getCountryWithSymbol')
.mockResolvedValue(createCustomCountry({ maerkiBaumannEnable: true }));
.mockResolvedValue(createCustomCountry({ yapealEnable: true }));

// Mock virtual IBAN for user
jest
.spyOn(virtualIbanService, 'getActiveForUserAndCurrency')
.mockResolvedValue(createCustomVirtualIban({ iban: virtualIban, bank: maerkiEUR }));
.mockResolvedValue(createCustomVirtualIban({ iban: virtualIban, bank: yapealEUR }));

await service['assignBankAccount']();

Expand All @@ -175,12 +175,12 @@ describe('FiatOutputJobService', () => {

jest
.spyOn(countryService, 'getCountryWithSymbol')
.mockResolvedValue(createCustomCountry({ maerkiBaumannEnable: true }));
.mockResolvedValue(createCustomCountry({ yapealEnable: true }));

// Mock virtual IBAN for user
jest
.spyOn(virtualIbanService, 'getActiveForUserAndCurrency')
.mockResolvedValue(createCustomVirtualIban({ iban: virtualIban, bank: maerkiEUR }));
.mockResolvedValue(createCustomVirtualIban({ iban: virtualIban, bank: yapealEUR }));

await service['assignBankAccount']();

Expand Down
2 changes: 1 addition & 1 deletion src/subdomains/supporting/payment/services/transaction-helper.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ export class TransactionHelper implements OnModuleInit {
static getDefaultBankByPaymentMethod(paymentMethod: PaymentMethod): CardBankName | IbanBankName {
switch (paymentMethod) {
case FiatPaymentMethod.BANK:
return IbanBankName.MAERKI;
return IbanBankName.YAPEAL;
case FiatPaymentMethod.CARD:
return CardBankName.CHECKOUT;
case FiatPaymentMethod.INSTANT:
Expand Down
Loading