diff --git a/transaction.go b/transaction.go index 53a8a40..aa1e320 100755 --- a/transaction.go +++ b/transaction.go @@ -9,15 +9,15 @@ import ( ) type Transaction struct { - ID string - Bank Bank - Amount string - Account string - Date string + ID string + Bank Bank + Amount string + Vendor string + Date string } func (t *Transaction) Format() string { - return fmt.Sprintf("(%s) %v: %s @ %s", cleanDate(t.Date), t.Bank, t.Amount, t.Account) + return fmt.Sprintf("(%s) %v: %s @ %s", cleanDate(t.Date), t.Bank, t.Amount, t.Vendor) } func (t *Transaction) String() string { @@ -27,10 +27,10 @@ func (t *Transaction) String() string { func NewTransaction(amount, account, date string, bank Bank) *Transaction { regexp := regexp.MustCompile(`\s\s+`) t := &Transaction{ - Amount: regexp.ReplaceAllString(amount, " "), - Account: regexp.ReplaceAllString(account, " "), - Bank: bank, - Date: date, + Amount: regexp.ReplaceAllString(amount, " "), + Vendor: regexp.ReplaceAllString(account, " "), + Bank: bank, + Date: date, } t.ID = fmt.Sprintf("%x", md5.Sum([]byte(fmt.Sprint(t)))) return t diff --git a/upload.go b/upload.go index 0041e53..8998b15 100755 --- a/upload.go +++ b/upload.go @@ -60,8 +60,8 @@ func uploadLedger(config Config, transaction *Transaction) error { if amount > 0 { remote = "Deposit:" } - remote += strings.ReplaceAll(transaction.Account, " ", "") - fmt.Fprintf(f, "%-50s%-s\n", formatGMailDate(transaction.Date), transaction.Account) + remote += strings.ReplaceAll(transaction.Vendor, " ", "") + fmt.Fprintf(f, "%-50s%-s\n", formatGMailDate(transaction.Date), transaction.Vendor) fmt.Fprintf(f, "%-50s%-50s$%.2f\n", "", "AssetAccount:"+transaction.Bank.String(), amount) fmt.Fprintf(f, "%-50s%-s\n", "", remote) return nil diff --git a/upload_test.go b/upload_test.go index f27f4ad..7e6f47d 100644 --- a/upload_test.go +++ b/upload_test.go @@ -15,11 +15,11 @@ func TestUploadLedger(t *testing.T) { }{ "simple": { transaction: Transaction{ - ID: uuid.New().String(), - Bank: Chase, - Amount: "1.10", - Account: "account", - Date: "today", + ID: uuid.New().String(), + Bank: Chase, + Amount: "1.10", + Vendor: "vendor", + Date: "today", }, }, }