Fix barclaycard format (#22)

sercxanto · Sep 10, 2024 · b4308aa · b4308aa
1 parent 899ae6e
commit b4308aa
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 13 deletions.
diff --git a/.changes/unreleased/Fixed-20240910-195727.yaml b/.changes/unreleased/Fixed-20240910-195727.yaml
@@ -0,0 +1,3 @@
+kind: Fixed
+body: 'Update dependencies: go-yaml, adrg/xdg, x/text'
+time: 2024-09-10T19:57:27.129084907+02:00
diff --git a/.changes/unreleased/Fixed-20240910-195846.yaml b/.changes/unreleased/Fixed-20240910-195846.yaml
@@ -0,0 +1,3 @@
+kind: Fixed
+body: Adapt to new barclaycard format (additional payee field)
+time: 2024-09-10T19:58:46.902626699+02:00
diff --git a/.changes/unreleased/Fixed-20240910-195916.yaml b/.changes/unreleased/Fixed-20240910-195916.yaml
@@ -0,0 +1,3 @@
+kind: Fixed
+body: Skip barclaycard entries with empty date ("vorgemerkt")
+time: 2024-09-10T19:59:16.638026314+02:00
diff --git a/internal/pkg/batchconvert/testfiles/expected_output/mixed/Umsaetze.csv b/internal/pkg/batchconvert/testfiles/expected_output/mixed/Umsaetze.csv
@@ -1,7 +1,7 @@
 date;payment;info;payee;memo;amount;category;tags
-2020-09-28;1;PAYPAL *DEALER    98765432   DE;;;-64.140000;;
-2020-09-19;1;XYZ  ROTTERDAM     NL;;;-15.000000;;
-2020-09-12;1;Abc *Abc def 12345 DE;;;-3.980000;;
-2020-09-12;1;DB FERNVERKEHR AG      FRANKFURT     DE;;;-4.970000;;
-2020-09-11;1;BANK ORT 1 PORT 2 >    DE;;;-250.000000;;
-2020-09-09;1;DB BAHN  A-BC 123ZOO   INTERNET      DE;;;-13.100000;;
+2020-09-28;1;PAYPAL *DEALER    98765432   DE;Händler1;;-64.140000;;
+2020-09-19;1;XYZ  ROTTERDAM     NL;Händler2;;-15.000000;;
+2020-09-12;1;Abc *Abc def 12345 DE;Händler3;;-3.980000;;
+2020-09-12;1;DB FERNVERKEHR AG      FRANKFURT     DE;Händler4;;-4.970000;;
+2020-09-11;1;BANK ORT 1 PORT 2 >    DE;Händler5;;-250.000000;;
+2020-09-09;1;DB BAHN  A-BC 123ZOO   INTERNET      DE;Händler6;;-13.100000;;
diff --git a/internal/pkg/batchconvert/testfiles/input/mixed/Umsaetze.xlsx b/internal/pkg/batchconvert/testfiles/input/mixed/Umsaetze.xlsx
diff --git a/pkg/parser/barclaycard.go b/pkg/parser/barclaycard.go
@@ -15,6 +15,7 @@ type barclaycardRecord struct {
 	bookingDate     time.Time
 	value           float64
 	description     string
+	payee           string
 }
 
 type barclaycardParser struct {
@@ -45,6 +46,7 @@ func isValidBarclaycardHeader(record []string) bool {
 		"Name des Karteninhabers",
 		"Kartennetzwerk",
 		"Kontaktlose Bezahlung",
+		"Händlerdetails",
 	}
 	return reflect.DeepEqual(record, expected)
 }
@@ -76,6 +78,13 @@ func (b *barclaycardParser) ParseFile(filepath string) error {
 					Field:     "Buchungsdatum(1)/Transaktionsdatum",
 				}
 			}
+
+			// Entries with an empty "Buchungsdatum" are "vorgemerkt", not "Berechnet"
+			// and need to be skipped
+			if len(row[2]) == 0 {
+				continue
+			}
+
 			bDate, err := time.Parse("02.01.2006", row[2])
 			if err != nil {
 				return &ParserError{
@@ -103,6 +112,7 @@ func (b *barclaycardParser) ParseFile(filepath string) error {
 				bookingDate:     bDate,
 				value:           value,
 				description:     row[4],
+				payee:           row[14],
 			}
 			b.entries = append(b.entries, bRecord)
 		} else {
@@ -125,7 +135,7 @@ func (b *barclaycardRecord) convertRecord() homebankRecord {
 		date:     b.transactionDate.Format("2006-01-02"),
 		payment:  1, // Credit card
 		info:     b.description,
-		payee:    "",
+		payee:    b.payee,
 		memo:     "",
 		amount:   b.value,
 		category: "",

diff --git a/pkg/parser/testfiles/barclaycard/Umsaetze.csv b/pkg/parser/testfiles/barclaycard/Umsaetze.csv
@@ -1,7 +1,7 @@
 date;payment;info;payee;memo;amount;category;tags
-2020-09-28;1;PAYPAL *DEALER    98765432   DE;;;-64.140000;;
-2020-09-19;1;XYZ  ROTTERDAM     NL;;;-15.000000;;
-2020-09-12;1;Abc *Abc def 12345 DE;;;-3.980000;;
-2020-09-12;1;DB FERNVERKEHR AG      FRANKFURT     DE;;;-4.970000;;
-2020-09-11;1;BANK ORT 1 PORT 2 >    DE;;;-250.000000;;
-2020-09-09;1;DB BAHN  A-BC 123ZOO   INTERNET      DE;;;-13.100000;;
+2020-09-28;1;PAYPAL *DEALER    98765432   DE;Händler1;;-64.140000;;
+2020-09-19;1;XYZ  ROTTERDAM     NL;Händler2;;-15.000000;;
+2020-09-12;1;Abc *Abc def 12345 DE;Händler3;;-3.980000;;
+2020-09-12;1;DB FERNVERKEHR AG      FRANKFURT     DE;Händler4;;-4.970000;;
+2020-09-11;1;BANK ORT 1 PORT 2 >    DE;Händler5;;-250.000000;;
+2020-09-09;1;DB BAHN  A-BC 123ZOO   INTERNET      DE;Händler6;;-13.100000;;
diff --git a/pkg/parser/testfiles/barclaycard/Umsaetze.xlsx b/pkg/parser/testfiles/barclaycard/Umsaetze.xlsx
diff --git a/pkg/parser/testfiles/barclaycard/Umsaetze_nok_wrongamount.xlsx b/pkg/parser/testfiles/barclaycard/Umsaetze_nok_wrongamount.xlsx
diff --git a/pkg/parser/testfiles/barclaycard/Umsaetze_nok_wrongdate1.xlsx b/pkg/parser/testfiles/barclaycard/Umsaetze_nok_wrongdate1.xlsx
diff --git a/pkg/parser/testfiles/barclaycard/Umsaetze_nok_wrongdate2.xlsx b/pkg/parser/testfiles/barclaycard/Umsaetze_nok_wrongdate2.xlsx