fix: p24 parser (#107)

Author: skynet2

pkg/importers/privat24.go

@@ -37,6 +37,7 @@ var (
 	incomeTransferRegex       = simpleExpenseRegex
 	internalTransferToRegex   = regexp.MustCompile(`(\d+.?\d+)([A-Z]{3}) (Переказ на свою карт[^ ]+ (?:(\d+\*\*\d+) )?(.*))$`)
 	internalTransferFromRegex = regexp.MustCompile(`(\d+.?\d+)([A-Z]{3}) (Переказ зі своєї карт[^ ]+ (\*?\d+\*?\*?\d+) ?(.*)?)$`)
+	newFormatHeaderRegex      = regexp.MustCompile(`^\[\d+/\d+/\d+ \d+:\d+ [AP]M\] PrivatBank: `)
 )
 
 type Privat24 struct {
@@ -68,9 +69,16 @@ func (p *Privat24) ExtractMessages(
 		line := strings.TrimSpace(r)
 
 		if line == "\n" || line == "" {
+			if builder.Len() != 0 {
+				messages = append(messages, builder.String())
+				builder.Reset()
+			}
+			continue // end of message
+		}
+
+		if newFormatHeaderRegex.MatchString(line) && builder.Len() != 0 {
 			messages = append(messages, builder.String())
 			builder.Reset()
-			continue // end of message
 		}
 
 		builder.WriteString(line)
@@ -95,7 +103,16 @@ func (p *Privat24) Parse(
 	for _, message := range messages {
 		lines := toLines(message)
 
-		header := lines[0] // is header in format PrivatBank, [10/1/2025 9:50 AM]
+		header := lines[0]
+		dataLines := lines[1:]
+
+		// new format: [2/16/2026 4:16 AM] PrivatBank: 22.23EUR Description
+		if strings.HasPrefix(header, "[") && strings.Contains(header, "] PrivatBank: ") {
+			endIdx := strings.Index(header, "] PrivatBank: ")
+			dataLine := header[endIdx+len("] PrivatBank: "):]
+			header = header[:endIdx+1]
+			dataLines = append([]string{dataLine}, dataLines...)
+		}
 
 		createdAt, err := p.ParseHeaderDate(header)
 		if err != nil {
@@ -105,7 +122,7 @@ func (p *Privat24) Parse(
 		}
 
 		records = append(records, &Record{
-			Data: []byte(strings.Join(lines[1:], "\n")),
+			Data: []byte(strings.Join(dataLines, "\n")),
 			Message: &Message{
 				CreatedAt: createdAt,
 			},

pkg/importers/privat24_test.go

@@ -44,6 +44,11 @@ func TestParseHeaderDate_Success(t *testing.T) {
 			header:   "PrivatBank, [12/31/2025 11:59 PM]",
 			wantTime: time.Date(2025, 12, 31, 23, 59, 0, 0, time.UTC),
 		},
+		{
+			name:     "new format header - date only bracket",
+			header:   "[2/16/2026 4:16 AM]",
+			wantTime: time.Date(2026, 2, 16, 4, 16, 0, 0, time.UTC),
+		},
 	}
 
 	for _, c := range cases {
@@ -1508,3 +1513,125 @@ func TestImportExpenseWithDoubleConversion(t *testing.T) {
 	assert.EqualValues(t, uahAccount.ID, expense.Expense.SourceAccountId)
 	assert.EqualValues(t, expenseAccount.ID, expense.Expense.DestinationAccountId)
 }
+
+func TestImportNewFormatExpense(t *testing.T) {
+	p := importers.NewPrivat24(importers.NewBaseParser(nil, nil, nil))
+
+	uahAccount := &database.Account{
+		ID:            1,
+		Currency:      "UAH",
+		AccountNumber: "4*03",
+		Type:          v1.AccountType_ACCOUNT_TYPE_ASSET,
+	}
+	expenseAccount := &database.Account{
+		ID:            2,
+		Currency:      "EUR",
+		Type:          v1.AccountType_ACCOUNT_TYPE_EXPENSE,
+		Name:          "_default_expense",
+		Flags:         database.AccountFlagIsDefault,
+		AccountNumber: "_default_expense_eur",
+	}
+
+	data := []byte(`[3/10/2026 8:30 AM] PrivatBank: 50.00EUR Комуналка та Інтернет. Test Merchant
+4*03 09:30
+Бал. 10000.00UAH
+Курс 40.0000 UAH/EUR
+Кред. ліміт 50000.0UAH`)
+
+	result, err := p.Parse(context.TODO(), &importers.ParseRequest{
+		ImportRequest: importers.ImportRequest{
+			Data:     []string{string(data)},
+			Accounts: []*database.Account{uahAccount, expenseAccount},
+		},
+	})
+
+	assert.NoError(t, err)
+	assert.NotNil(t, result)
+	assert.Len(t, result.CreateRequests, 1)
+
+	req := result.CreateRequests[0]
+	assert.Equal(t, "Комуналка та Інтернет. Test Merchant", req.Title)
+	expense := req.Transaction.(*transactionsv1.CreateTransactionRequest_Expense)
+	assert.EqualValues(t, "EUR", expense.Expense.DestinationCurrency)
+	assert.EqualValues(t, uahAccount.ID, expense.Expense.SourceAccountId)
+	assert.EqualValues(t, expenseAccount.ID, expense.Expense.DestinationAccountId)
+}
+
+func TestImportNewFormatMultipleMessages(t *testing.T) {
+	p := importers.NewPrivat24(importers.NewBaseParser(nil, nil, nil))
+
+	uahAccount := &database.Account{
+		ID:            1,
+		Currency:      "UAH",
+		AccountNumber: "4*03",
+		Type:          v1.AccountType_ACCOUNT_TYPE_ASSET,
+	}
+	expenseAccount := &database.Account{
+		ID:            2,
+		Currency:      "UAH",
+		Type:          v1.AccountType_ACCOUNT_TYPE_EXPENSE,
+		Name:          "_default_expense",
+		Flags:         database.AccountFlagIsDefault,
+		AccountNumber: "_default_expense_uah",
+	}
+
+	data := []byte(`[3/10/2026 8:30 AM] PrivatBank: 50.00UAH Комуналка та Інтернет. Test Merchant
+4*03 09:30
+Бал. 10000.00UAH
+Кред. ліміт 50000.0UAH
+[3/10/2026 2:00 PM] PrivatBank: 100.00UAH Ресторани, кафе, бари. Test Cafe
+4*03 15:00
+Бал. 9000.00UAH
+Кред. ліміт 50000.0UAH
+[3/11/2026 10:00 AM] PrivatBank: 25.00UAH Авто. Test Auto Service
+4*03 11:00
+Бал. 8500.00UAH
+Кред. ліміт 50000.0UAH`)
+
+	result, err := p.Parse(context.TODO(), &importers.ParseRequest{
+		ImportRequest: importers.ImportRequest{
+			Data:     []string{string(data)},
+			Accounts: []*database.Account{uahAccount, expenseAccount},
+		},
+	})
+
+	assert.NoError(t, err)
+	assert.NotNil(t, result)
+	assert.Len(t, result.CreateRequests, 3)
+}
+
+func TestImportNewFormatWithCashback(t *testing.T) {
+	p := importers.NewPrivat24(importers.NewBaseParser(nil, nil, nil))
+
+	uahAccount := &database.Account{
+		ID:            1,
+		Currency:      "UAH",
+		AccountNumber: "4*03",
+		Type:          v1.AccountType_ACCOUNT_TYPE_ASSET,
+	}
+	expenseAccount := &database.Account{
+		ID:            2,
+		Currency:      "UAH",
+		Type:          v1.AccountType_ACCOUNT_TYPE_EXPENSE,
+		Name:          "_default_expense",
+		Flags:         database.AccountFlagIsDefault,
+		AccountNumber: "_default_expense_uah",
+	}
+
+	data := []byte(`[3/10/2026 5:48 PM] PrivatBank: 200.00UAH Розваги. Test Game Store
+4*03 18:48
+Кешбек 30.00UAH
+Бал. 10000.00UAH
+Кред. ліміт 50000.0UAH`)
+
+	result, err := p.Parse(context.TODO(), &importers.ParseRequest{
+		ImportRequest: importers.ImportRequest{
+			Data:     []string{string(data)},
+			Accounts: []*database.Account{uahAccount, expenseAccount},
+		},
+	})
+
+	assert.NoError(t, err)
+	assert.NotNil(t, result)
+	assert.Len(t, result.CreateRequests, 1)
+}