QT/sure
1
0
Fork 0
mirror of https://github.com/we-promise/sure.git synced 2026-09-05 23:01:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(enable-banking): tighten date-stamp regex and clean up the merchant line

Browse Source 
Addresses two review threads on this PR:

1. jjmata (PR review): technical_remittance_line?'s date-stamp check required
   exactly 2-digit day/month (\d{2}[./]\d{2}), so an un-padded date ("1.07."
   instead of "01.07.") wasn't recognized as technical and the line would
   resurface as the transaction name -- reproducing the original #2935 bug for
   that date shape. Now accepts 1-2 digits for both.

2. john-frandsen (issue #2935 comment): suggested cleaning up the merchant line
   further (e.g. "BILLA DANKT 0007114 SIEGENDORF 7011" -> "Billa"). Checked
   point 1 (structured remittance fields) against Enable Banking's own API
   docs -- no such field exists there, not applicable. Points 2/3/5 already
   match current behavior. Point 4 (loyalty-marker cleanup) implemented as two
   layers:
   - Primary: match the line against merchants the family already knows
     (Family#known_merchant_names) -- self-maintaining, no pattern-guessing,
     and now also assigns the transaction's merchant when matched (previously
     out of scope for blank-counterparty EB transactions). Case-insensitive,
     regex-escaped, longest-match-wins, with a minimum length guard against
     spurious short-name matches.
   - Fallback (no known merchant yet): remove only the "DANKT"/"DANKE"
     thank-you marker word itself, not a directional truncation -- the marker
     can precede or follow the merchant name depending on phrasing ("X DANKT"
     vs. "DANKE ... bei X"), so truncating at it risked deleting the real
     merchant name in one of the two phrasings.

Verified against the full test suite, RuboCop, and Brakeman on a test-stack
Rails instance (0 RuboCop offenses, 0 Brakeman warnings; full-suite failures
present on that instance are pre-existing/environmental and unrelated to
these files).

Disclosure: this fix (investigation, implementation, and tests) was written
by Claude Code.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
This commit is contained in:
Gerald
2026-08-12 10:14:26 +02:00
co-authored by Claude Sonnet 5
parent a4a1029d34
commit 5e39ee6b1c
4 changed files with 242 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/models/enable_banking_entry/processor_test.rb
+154 -7
View File
@@ -1,4 +1,5 @@
require "test_helper"
require "ostruct"
class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
setup do
@@ -220,17 +221,118 @@ class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
credit_debit_indicator: "DBIT",
remittance_information: [
"POS 45,13 AT D6 31.07. 10:27",
"BILLA DANKT 0007114 SIEGENDORF 7011"
"BILLA DANKT 0007114"
],
status: "BOOK"
}
EnableBankingEntry::Processor.new(tx, enable_banking_account: @enable_banking_account).process
entry = @account.entries.find_by!(external_id: "enable_banking_ref_pos_2935")
assert_equal "BILLA DANKT 0007114 SIEGENDORF 7011", entry.name
assert_equal "BILLA 0007114", entry.name
assert_includes entry.notes, "POS 45,13 AT D6 31.07. 10:27"
end
test "uses the family's known merchant name instead of the raw remittance line when it matches, and assigns the merchant" do
@family.merchants.create!(name: "Billa")
tx = {
entry_reference: "ref_known_merchant",
transaction_id: nil,
booking_date: Date.current.to_s,
transaction_amount: { amount: "45.13", currency: "EUR" },
creditor: { name: "" },
bank_transaction_code: nil,
credit_debit_indicator: "DBIT",
remittance_information: [
"POS 45,13 AT D6 31.07. 10:27",
"BILLA DANKT 0007114"
],
status: "BOOK"
}
EnableBankingEntry::Processor.new(tx, enable_banking_account: @enable_banking_account).process
entry = @account.entries.find_by!(external_id: "enable_banking_ref_known_merchant")
assert_equal "Billa", entry.name
assert_equal "Billa", entry.transaction.merchant&.name
end
test "matches known merchants regardless of retailer chain" do
%w[Bipa Spar Hofer Lidl Penny].each do |chain_name|
@family.merchants.create!(name: chain_name)
end
[
[ "bipa", "BIPA DANKT 0001234", "Bipa" ],
[ "spar", "SPAR DANKT 0005678", "Spar" ],
[ "hofer", "HOFER DANKT 0009876", "Hofer" ],
[ "lidl", "LIDL DANKT 0004321", "Lidl" ],
[ "penny", "DANKE 0009999 PENNY", "Penny" ]
].each do |ref_suffix, raw_line, expected_name|
tx = {
entry_reference: "ref_known_#{ref_suffix}",
transaction_id: nil,
booking_date: Date.current.to_s,
transaction_amount: { amount: "12.34", currency: "EUR" },
creditor: { name: "" },
bank_transaction_code: nil,
credit_debit_indicator: "DBIT",
remittance_information: [
"POS 12,34 AT D6 01.01. 09:00",
raw_line
],
status: "BOOK"
}
EnableBankingEntry::Processor.new(tx, enable_banking_account: @enable_banking_account).process
entry = @account.entries.find_by!(external_id: "enable_banking_ref_known_#{ref_suffix}")
assert_equal expected_name, entry.name, "expected #{raw_line.inspect} to resolve to #{expected_name.inspect}"
end
end
test "does not match a known merchant name shorter than the minimum match length" do
@family.merchants.create!(name: "IT")
name = build_name_with_family(
credit_debit_indicator: "DBIT",
creditor: { name: "" },
bank_transaction_code: nil,
remittance_information: [ "NAME IT 1234" ]
)
# No known merchant match attempted ("IT" is below MIN_KNOWN_MERCHANT_MATCH_LENGTH),
# and no DANKT/DANKE marker present, so the line passes through unchanged.
assert_equal "NAME IT 1234", name
end
test "prefers the longest matching known merchant name when multiple match" do
@family.merchants.create!(name: "Billa")
@family.merchants.create!(name: "Billa Corso")
name = build_name_with_family(
credit_debit_indicator: "DBIT",
creditor: { name: "" },
bank_transaction_code: nil,
remittance_information: [ "Billa Corso 0001234" ]
)
assert_equal "Billa Corso", name
end
test "escapes regex metacharacters in a known merchant name so matching never raises" do
@family.merchants.create!(name: "A+B (Café)")
name = build_name_with_family(
credit_debit_indicator: "DBIT",
creditor: { name: "" },
bank_transaction_code: nil,
remittance_information: [ "A+B (Café) 0001234" ]
)
assert_equal "A+B (Café)", name
end
test "stores exchange_rate in extra when present" do
tx = {
entry_reference: "ref_fx",
@@ -305,13 +407,24 @@ class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
end
def build_processor(data)
EnableBankingEntry::Processor.new(data, enable_banking_account: Object.new)
# A minimal stand-in that responds to current_account (real EnableBankingAccount
# always does) so `account`/`known_merchant_names` resolve safely to nil/[] instead
# of raising -- these unit-level tests aren't wired to a real family, so they always
# exercise the "no known merchant" fallback path.
EnableBankingEntry::Processor.new(data, enable_banking_account: OpenStruct.new(current_account: nil))
end
def build_name(data)
build_processor(data).send(:name)
end
# Unlike build_name/build_processor, wires up the real @enable_banking_account
# (and thus the real @family) so known-merchant matching has something to match
# against -- used by tests that create FamilyMerchant records via @family first.
def build_name_with_family(data)
EnableBankingEntry::Processor.new(data, enable_banking_account: @enable_banking_account).send(:name)
end
test "skips technical card counterparty and falls back to remittance_information" do
name = build_name(
credit_debit_indicator: "CRDT",
@@ -463,11 +576,11 @@ class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
bank_transaction_code: nil,
remittance_information: [
"POS 45,13 AT D6 31.07. 10:27",
"BILLA DANKT 0007114 SIEGENDORF 7011"
"BILLA DANKT 0007114"
]
)
assert_equal "BILLA DANKT 0007114 SIEGENDORF 7011", name
assert_equal "BILLA 0007114", name
end
test "skips generic ATM terminal line and uses real merchant from remittance_information" do
@@ -490,12 +603,12 @@ class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
creditor: { name: "" },
bank_transaction_code: nil,
remittance_information: [
"POS 45,13 BILLA DANKT 0007114 SIEGENDORF 7011",
"POS 45,13 BILLA DANKT 0007114",
"Reference 0394676"
]
)
assert_equal "POS 45,13 BILLA DANKT 0007114 SIEGENDORF 7011", name
assert_equal "POS 45,13 BILLA 0007114", name
end
test "does not treat a legitimate line as technical just because it ends with a date+time stamp" do
@@ -526,6 +639,40 @@ class EnableBankingEntry::ProcessorTest < ActiveSupport::TestCase
assert_equal "HERR DR. EISENSTADT 7000", name
end
test "removes the DANKT/DANKE thank-you marker regardless of retailer chain or its position in the line" do
[
[ "BIPA DANKT 0001234", "BIPA 0001234" ],
[ "SPAR DANKT 0005678", "SPAR 0005678" ],
[ "HOFER DANKT 0009876", "HOFER 0009876" ],
[ "LIDL DANKT 0004321", "LIDL 0004321" ],
[ "PENNY DANKE 0002468", "PENNY 0002468" ],
[ "DANKE 0009999 PENNY", "0009999 PENNY" ]
].each do |raw_line, expected_name|
name = build_name(
credit_debit_indicator: "DBIT",
creditor: { name: "" },
bank_transaction_code: nil,
remittance_information: [
"POS 12,34 AT D6 01.01. 09:00",
raw_line
]
)
assert_equal expected_name, name, "expected #{raw_line.inspect} to normalize to #{expected_name.inspect}"
end
end
test "does not alter a name that merely contains 'dank' as a substring" do
name = build_name(
credit_debit_indicator: "DBIT",
creditor: { name: "" },
bank_transaction_code: nil,
remittance_information: [ "STEFAN DANKL GMBH" ]
)
assert_equal "STEFAN DANKL GMBH", name
end
test "falls back to the technical line when remittance_information has no descriptive line" do
name = build_name(
credit_debit_indicator: "DBIT",