jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Small refactorings

Browse Source
This commit is contained in:
Jan Bader 2022-02-19 21:38:57 +00:00
parent c5a0f49719
commit 46b9b82f30
2 changed files with 79 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
postgres/conn.go
View File

@ -5,7 +5,7 @@ import (
"embed" "embed"
"fmt" "fmt"
_ "github.com/jackc/pgx/v4/stdlib" _ "github.com/jackc/pgx/v4/stdlib" // needed for pg connection
"github.com/pressly/goose/v3" "github.com/pressly/goose/v3"
) )

54
postgres/ynab-import.go
View File

@ -70,7 +70,6 @@ func (ynab *YNABImport) ImportAssignments(context context.Context, r io.Reader)
count := 0 count := 0
for _, record := range csvData[1:] { for _, record := range csvData[1:] {
dateString := record[0] dateString := record[0]
date, err := time.Parse("Jan 2006", dateString) date, err := time.Parse("Jan 2006", dateString)
if err != nil { if err != nil {
@ -183,12 +182,37 @@ func (ynab *YNABImport) ImportTransactions(context context.Context, r io.Reader)
} }
payeeName := record[3] payeeName := record[3]
if strings.HasPrefix(payeeName, "Transfer : ") {
// Transaction is a transfer to // Transaction is a transfer to
var shouldReturn bool
var returnValue error
openTransfers, shouldReturn, returnValue = ynab.ImportTransaction(payeeName, context, transaction, accountName, openTransfers, account, amount)
if shouldReturn {
return returnValue
}
count++
}
for _, openTransfer := range openTransfers {
fmt.Printf("Saving unmatched transfer from %s to %s on %s over %f as regular transaction\n",
openTransfer.FromAccount, openTransfer.ToAccount, openTransfer.Date, openTransfer.Amount.GetFloat64())
_, err = ynab.queries.CreateTransaction(context, openTransfer.CreateTransactionParams)
if err != nil {
return fmt.Errorf("save transaction %v: %w", openTransfer.CreateTransactionParams, err)
}
}
fmt.Printf("Imported %d transactions\n", count)
return nil
}
func (ynab *YNABImport) ImportTransaction(payeeName string, context context.Context, transaction CreateTransactionParams, accountName string, openTransfers []Transfer, account *Account, amount Numeric) ([]Transfer, bool, error) {
if strings.HasPrefix(payeeName, "Transfer : ") {
transferToAccountName := payeeName[11:] transferToAccountName := payeeName[11:]
transferToAccount, err := ynab.GetAccount(context, transferToAccountName) transferToAccount, err := ynab.GetAccount(context, transferToAccountName)
if err != nil { if err != nil {
return fmt.Errorf("get transfer account %s: %w", transferToAccountName, err) return nil, true, fmt.Errorf("get transfer account %s: %w", transferToAccountName, err)
} }
transfer := Transfer{ transfer := Transfer{
@ -221,11 +245,11 @@ func (ynab *YNABImport) ImportTransactions(context context.Context, r io.Reader)
_, err = ynab.queries.CreateTransaction(context, transfer.CreateTransactionParams) _, err = ynab.queries.CreateTransaction(context, transfer.CreateTransactionParams)
if err != nil { if err != nil {
return fmt.Errorf("save transaction %v: %w", transfer.CreateTransactionParams, err) return nil, true, fmt.Errorf("save transaction %v: %w", transfer.CreateTransactionParams, err)
} }
_, err = ynab.queries.CreateTransaction(context, openTransfer.CreateTransactionParams) _, err = ynab.queries.CreateTransaction(context, openTransfer.CreateTransactionParams)
if err != nil { if err != nil {
return fmt.Errorf("save transaction %v: %w", openTransfer.CreateTransactionParams, err) return nil, true, fmt.Errorf("save transaction %v: %w", openTransfer.CreateTransactionParams, err)
} }
break break
} }
@ -236,30 +260,16 @@ func (ynab *YNABImport) ImportTransactions(context context.Context, r io.Reader)
} else { } else {
payeeID, err := ynab.GetPayee(context, payeeName) payeeID, err := ynab.GetPayee(context, payeeName)
if err != nil { if err != nil {
return fmt.Errorf("get payee %s: %w", payeeName, err) return nil, true, fmt.Errorf("get payee %s: %w", payeeName, err)
} }
transaction.PayeeID = payeeID transaction.PayeeID = payeeID
_, err = ynab.queries.CreateTransaction(context, transaction) _, err = ynab.queries.CreateTransaction(context, transaction)
if err != nil { if err != nil {
return fmt.Errorf("save transaction %v: %w", transaction, err) return nil, true, fmt.Errorf("save transaction %v: %w", transaction, err)
} }
} }
return openTransfers, false, nil
count++
}
for _, openTransfer := range openTransfers {
fmt.Printf("Saving unmatched transfer from %s to %s on %s over %f as regular transaction\n", openTransfer.FromAccount, openTransfer.ToAccount, openTransfer.Date, openTransfer.Amount.GetFloat64())
_, err = ynab.queries.CreateTransaction(context, openTransfer.CreateTransactionParams)
if err != nil {
return fmt.Errorf("save transaction %v: %w", openTransfer.CreateTransactionParams, err)
}
}
fmt.Printf("Imported %d transactions\n", count)
return nil
} }
func trimLastChar(s string) string { func trimLastChar(s string) string {