Skip to content

fix: filter third-party bank_tx and fix receiver trimming in pending balance #3484

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 4 commits into
base: develop
Choose a base branch
from
Open

fix: filter third-party bank_tx and fix receiver trimming in pending balance #3484

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
978a6dd
fix: filter third-party transactions and fix receiver trimming in pen…
TaprootFreak Mar 20, 2026
52e016b
fix: replace sum-based Scrypt pending balance with 1:1 transaction ma…
TaprootFreak Mar 20, 2026
a6d9533
fix: add 21-day filter on senders in getUnmatchedSenders
TaprootFreak Mar 20, 2026
a849c42
fix: match CHF and EUR separately in unfiltered non-ScryptEur path
TaprootFreak Mar 20, 2026
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
160 changes: 77 additions & 83 deletions src/subdomains/supporting/log/log-job.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,10 @@ export class LogJobService {

// EUR: Bank -> Scrypt
const eurSenderScryptBankTx = recentScryptBankTx.filter(
(b) => eurBankIbans.includes(b.accountIban) && b.creditDebitIndicator === BankTxIndicator.DEBIT,
(b) =>
eurBankIbans.includes(b.accountIban) &&
b.creditDebitIndicator === BankTxIndicator.DEBIT &&
b.instructedCurrency,
);
const eurReceiverScryptExchangeTx = recentScryptExchangeTx.filter(
(k) => k.type === ExchangeTxType.DEPOSIT && k.status === 'ok' && k.currency === 'EUR' && k.txId,
Expand All @@ -417,25 +420,13 @@ export class LogJobService {
(b) => eurBankIbans.includes(b.accountIban) && b.creditDebitIndicator === BankTxIndicator.CREDIT,
);

// sender and receiver data for Bank -> Scrypt
const { sender: recentChfYapealScryptTx, receiver: recentChfBankTxScrypt } = this.filterSenderPendingList(
chfSenderScryptBankTx,
chfReceiverScryptExchangeTx,
);
const { sender: recentEurBankToScryptTx, receiver: recentEurBankTxScrypt } = this.filterSenderPendingList(
eurSenderScryptBankTx,
eurReceiverScryptExchangeTx,
);
// Bank -> Scrypt: 1:1 matching, unmatched senders only
const recentChfYapealScryptTx = this.getUnmatchedSenders(chfSenderScryptBankTx, chfReceiverScryptExchangeTx);
const recentEurBankToScryptTx = this.getUnmatchedSenders(eurSenderScryptBankTx, eurReceiverScryptExchangeTx);

// sender and receiver data for Scrypt -> Bank
const { sender: recentChfScryptYapealTx, receiver: recentChfScryptBankTx } = this.filterSenderPendingList(
chfSenderScryptExchangeTx,
chfReceiverScryptBankTx,
);
const { sender: recentEurScryptToBankTx, receiver: recentEurScryptBankTx } = this.filterSenderPendingList(
eurSenderScryptExchangeTx,
eurReceiverScryptBankTx,
);
// Scrypt -> Bank: 1:1 matching, unmatched senders only
const recentChfScryptYapealTx = this.getUnmatchedSenders(chfSenderScryptExchangeTx, chfReceiverScryptBankTx);
const recentEurScryptToBankTx = this.getUnmatchedSenders(eurSenderScryptExchangeTx, eurReceiverScryptBankTx);

// assetLog
return assets.reduce((prev, curr) => {
Expand Down Expand Up @@ -593,55 +584,38 @@ export class LogJobService {
[...recentChfYapealScryptTx, ...recentEurBankToScryptTx],
BankTxType.SCRYPT,
);
const pendingChfBankScryptMinusAmount = this.getPendingBankAmount(
[curr],
recentChfBankTxScrypt,
ExchangeTxType.DEPOSIT,
yapealChfBank.iban,
);
const pendingEurBankScryptMinusAmount = isScryptEurAsset
? this.getPendingBankAmount([curr], recentEurBankTxScrypt, ExchangeTxType.DEPOSIT)
: isEurBankAsset
? 0
: this.getPendingBankAmount([curr], recentEurBankTxScrypt, ExchangeTxType.DEPOSIT, yapealEurBank.iban);
// With 1:1 matching, matched receivers are already excluded from sender lists — no minus needed
const pendingChfBankScryptMinusAmount = 0;
const pendingEurBankScryptMinusAmount = 0;

// unfiltered lists
// unfiltered lists (1:1 matching)
const pendingBankScryptPlusAmountUnfiltered = isScryptEurAsset
? this.getPendingBankAmount(
eurBankAssets,
eurSenderScryptBankTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.bankTxId),
this.getUnmatchedSenders(
eurSenderScryptBankTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.bankTxId),
eurReceiverScryptExchangeTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.exchangeTxId),
),
BankTxType.SCRYPT,
)
: isEurBankAsset
? 0
: this.getPendingBankAmount(
[curr],
[
...chfSenderScryptBankTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.chf?.bankTxId),
...eurSenderScryptBankTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.bankTxId),
...this.getUnmatchedSenders(
chfSenderScryptBankTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.chf?.bankTxId),
chfReceiverScryptExchangeTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.chf?.exchangeTxId),
),
...this.getUnmatchedSenders(
eurSenderScryptBankTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.bankTxId),
eurReceiverScryptExchangeTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.exchangeTxId),
),
],
BankTxType.SCRYPT,
);
const pendingChfBankScryptMinusAmountUnfiltered = this.getPendingBankAmount(
[curr],
chfReceiverScryptExchangeTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.chf?.exchangeTxId),
ExchangeTxType.DEPOSIT,
yapealChfBank.iban,
);
const pendingEurBankScryptMinusAmountUnfiltered = isScryptEurAsset
? this.getPendingBankAmount(
[curr],
eurReceiverScryptExchangeTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.exchangeTxId),
ExchangeTxType.DEPOSIT,
)
: isEurBankAsset
? 0
: this.getPendingBankAmount(
[curr],
eurReceiverScryptExchangeTx.filter((t) => t.id >= financeLogPairIds?.toScrypt?.eur?.exchangeTxId),
ExchangeTxType.DEPOSIT,
yapealEurBank.iban,
);
const pendingChfBankScryptMinusAmountUnfiltered = 0;
const pendingEurBankScryptMinusAmountUnfiltered = 0;

// Scrypt to Bank //

Expand All @@ -657,17 +631,16 @@ export class LogJobService {
: isEurBankAsset
? 0
: this.getPendingBankAmount([curr], recentEurScryptToBankTx, ExchangeTxType.WITHDRAWAL, yapealEurBank.iban);
const pendingScryptBankMinusAmount = isScryptEurAsset
? this.getPendingBankAmount(eurBankAssets, recentEurScryptBankTx, BankTxType.SCRYPT)
: isEurBankAsset
? 0
: this.getPendingBankAmount([curr], [...recentChfScryptBankTx, ...recentEurScryptBankTx], BankTxType.SCRYPT);
const pendingScryptBankMinusAmount = 0;

// unfiltered lists
// unfiltered lists (1:1 matching)
const pendingChfScryptBankPlusAmountUnfiltered = financeLogPairIds?.fromScrypt?.chf?.exchangeTxId
? this.getPendingBankAmount(
[curr],
chfSenderScryptExchangeTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.chf.exchangeTxId),
this.getUnmatchedSenders(
chfSenderScryptExchangeTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.chf.exchangeTxId),
chfReceiverScryptBankTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.chf.bankTxId),
),
ExchangeTxType.WITHDRAWAL,
yapealChfBank.iban,
)
Expand All @@ -676,7 +649,10 @@ export class LogJobService {
? financeLogPairIds?.fromScrypt?.eur?.exchangeTxId
? this.getPendingBankAmount(
[curr],
eurSenderScryptExchangeTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.exchangeTxId),
this.getUnmatchedSenders(
eurSenderScryptExchangeTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.exchangeTxId),
eurReceiverScryptBankTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.bankTxId),
),
ExchangeTxType.WITHDRAWAL,
)
: 0
Expand All @@ -685,31 +661,15 @@ export class LogJobService {
: financeLogPairIds?.fromScrypt?.eur?.exchangeTxId
? this.getPendingBankAmount(
[curr],
eurSenderScryptExchangeTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.exchangeTxId),
this.getUnmatchedSenders(
eurSenderScryptExchangeTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.exchangeTxId),
eurReceiverScryptBankTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.bankTxId),
),
ExchangeTxType.WITHDRAWAL,
yapealEurBank.iban,
)
: 0;
const pendingScryptBankMinusAmountUnfiltered = isScryptEurAsset
? financeLogPairIds?.fromScrypt?.eur?.bankTxId
? this.getPendingBankAmount(
eurBankAssets,
eurReceiverScryptBankTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.bankTxId),
BankTxType.SCRYPT,
)
: 0
: isEurBankAsset
? 0
: financeLogPairIds?.fromScrypt?.chf?.bankTxId || financeLogPairIds?.fromScrypt?.eur?.bankTxId
? this.getPendingBankAmount(
[curr],
[
...chfReceiverScryptBankTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.chf.bankTxId),
...eurReceiverScryptBankTx.filter((t) => t.id >= financeLogPairIds.fromScrypt.eur.bankTxId),
],
BankTxType.SCRYPT,
)
: 0;
const pendingScryptBankMinusAmountUnfiltered = 0;

const fromKrakenUnfiltered =
pendingChfKrakenYapealPlusAmountUnfiltered +
Expand Down Expand Up @@ -1097,6 +1057,40 @@ export class LogJobService {
);
}

public getUnmatchedSenders(
senderTx: (BankTx | ExchangeTx)[],
receiverTx: (BankTx | ExchangeTx)[],
): (BankTx | ExchangeTx)[] {
const before21Days = Util.daysBefore(21);
const recentSenders = senderTx.filter((s) => s.created > before21Days);

if (!recentSenders.length || !receiverTx.length) return [...recentSenders];

const sortedSenders = [...recentSenders].sort((a, b) => a.id - b.id);
const sortedReceivers = [...receiverTx].sort((a, b) => a.id - b.id);
const matchedSenderIds = new Set<number>();

for (const receiver of sortedReceivers) {
const receiverAmount = receiver instanceof BankTx ? receiver.instructedAmount : receiver.amount;

const match = sortedSenders.find((s) => {
if (matchedSenderIds.has(s.id)) return false;

const senderAmount = s instanceof BankTx ? s.instructedAmount : s.amount;
const senderDate = s instanceof BankTx ? s.valueDate : s.created;
const daysDiff = Math.abs(Util.daysDiff(senderDate, receiver.created));

return s instanceof BankTx
? senderAmount === receiverAmount && daysDiff <= 5 && receiver.created > s.created
: senderAmount === receiverAmount && receiver.created > s.created;
});

if (match) matchedSenderIds.add(match.id);
}

return sortedSenders.filter((s) => !matchedSenderIds.has(s.id));
}

public filterSenderPendingList(
senderTx: (BankTx | ExchangeTx)[],
receiverTx: (BankTx | ExchangeTx)[] | undefined,
Expand Down
Loading