From 41fb4596807680ad5a5beb5fbb521db42e0de12d Mon Sep 17 00:00:00 2001 From: Aaron Lindsay Date: Sat, 21 Oct 2017 06:50:31 -0400 Subject: [PATCH] testing: Add tests for updating transactions/splits --- internal/handlers/transactions.go | 8 + internal/handlers/transactions_test.go | 193 +++++++++++++++---------- 2 files changed, 127 insertions(+), 74 deletions(-) diff --git a/internal/handlers/transactions.go b/internal/handlers/transactions.go index e77d7b8..c30aab2 100644 --- a/internal/handlers/transactions.go +++ b/internal/handlers/transactions.go @@ -410,6 +410,10 @@ func TransactionHandler(r *http.Request, tx *Tx) ResponseWriterWriter { transaction.TransactionId = -1 transaction.UserId = user.UserId + if len(transaction.Splits) == 0 { + return NewError(3 /*Invalid Request*/) + } + for i := range transaction.Splits { transaction.Splits[i].SplitId = -1 _, err := GetAccount(tx, transaction.Splits[i].AccountId, user.UserId) @@ -485,6 +489,10 @@ func TransactionHandler(r *http.Request, tx *Tx) ResponseWriterWriter { return NewError(3 /*Invalid Request*/) } + if len(transaction.Splits) == 0 { + return NewError(3 /*Invalid Request*/) + } + for i := range transaction.Splits { _, err := GetAccount(tx, transaction.Splits[i].AccountId, user.UserId) if err != nil { diff --git a/internal/handlers/transactions_test.go b/internal/handlers/transactions_test.go index fa794b0..408e2e5 100644 --- a/internal/handlers/transactions_test.go +++ b/internal/handlers/transactions_test.go @@ -5,6 +5,7 @@ import ( "net/http" "strconv" "testing" + "time" ) func createTransaction(client *http.Client, transaction *handlers.Transaction) (*handlers.Transaction, error) { @@ -39,48 +40,74 @@ func deleteTransaction(client *http.Client, s *handlers.Transaction) error { return nil } +func ensureTransactionsMatch(t *testing.T, expected, tran *handlers.Transaction, accounts *[]handlers.Account, matchtransactionids, matchsplitids bool) { + t.Helper() + + if tran.TransactionId == 0 { + t.Errorf("TransactionId is 0") + } + + if matchtransactionids && tran.TransactionId != expected.TransactionId { + t.Errorf("TransactionId (%d) doesn't match what's expected (%d)", tran.TransactionId, expected.TransactionId) + } + if tran.Description != expected.Description { + t.Errorf("Description doesn't match") + } + if tran.Date != expected.Date { + t.Errorf("Date doesn't match") + } + + if len(tran.Splits) != len(expected.Splits) { + t.Fatalf("Expected %d splits, received %d", len(expected.Splits), len(tran.Splits)) + } + + foundIds := make(map[int64]bool) + for j := 0; j < len(expected.Splits); j++ { + origsplit := expected.Splits[j] + + if tran.Splits[j].TransactionId != tran.TransactionId { + t.Fatalf("Split TransactionId doesn't match transaction's") + } + + found := false + for _, s := range tran.Splits { + if s.SplitId == 0 { + t.Errorf("Found SplitId that's 0") + } + accountid := origsplit.AccountId + if accounts != nil { + accountid = (*accounts)[accountid].AccountId + } + if origsplit.Status == s.Status && + origsplit.ImportSplitType == s.ImportSplitType && + s.AccountId == accountid && + s.SecurityId == -1 && + origsplit.RemoteId == origsplit.RemoteId && + origsplit.Number == s.Number && + origsplit.Memo == s.Memo && + origsplit.Amount == s.Amount && + (!matchsplitids || origsplit.SplitId == s.SplitId) { + + if _, ok := foundIds[s.SplitId]; ok { + continue + } + foundIds[s.SplitId] = true + found = true + break + } + } + if !found { + t.Errorf("Unable to find matching split: %+v", origsplit) + } + } +} + func TestCreateTransaction(t *testing.T) { RunWith(t, &data[0], func(t *testing.T, d *TestData) { for i, orig := range data[0].transactions { transaction := d.transactions[i] - if transaction.TransactionId == 0 { - t.Errorf("Unable to create transaction: %+v", transaction) - } - if transaction.Description != orig.Description { - t.Errorf("Description doesn't match") - } - if transaction.Date != orig.Date { - t.Errorf("Date doesn't match") - } - - if len(transaction.Splits) != len(orig.Splits) { - t.Fatalf("Expected %d splits, received %d", len(orig.Splits), len(transaction.Splits)) - } - - foundIds := make(map[int64]bool) - for j := 0; j < len(orig.Splits); j++ { - origsplit := orig.Splits[j] - - if transaction.Splits[j].TransactionId != transaction.TransactionId { - t.Fatalf("Split TransactionId doesn't match transaction's") - } - - found := false - for _, s := range transaction.Splits { - if origsplit.Status == s.Status && origsplit.ImportSplitType == s.ImportSplitType && s.AccountId == d.accounts[origsplit.AccountId].AccountId && s.SecurityId == -1 && origsplit.RemoteId == origsplit.RemoteId && origsplit.Number == s.Number && origsplit.Memo == s.Memo && origsplit.Amount == s.Amount { - if _, ok := foundIds[s.SplitId]; ok { - continue - } - foundIds[s.SplitId] = true - found = true - break - } - } - if !found { - t.Errorf("Unable to find matching split: %+v", origsplit) - } - } + ensureTransactionsMatch(t, &orig, &transaction, &d.accounts, false, false) } }) } @@ -95,44 +122,62 @@ func TestGetTransaction(t *testing.T) { if err != nil { t.Fatalf("Error fetching transaction: %s\n", err) } - if tran.TransactionId != curr.TransactionId { - t.Errorf("TransactionId doesn't match") - } - if tran.Description != orig.Description { - t.Errorf("Description doesn't match") - } - if tran.Date != orig.Date { - t.Errorf("Date doesn't match") - } - if len(tran.Splits) != len(orig.Splits) { - t.Fatalf("Expected %d splits, received %d", len(orig.Splits), len(tran.Splits)) - } - - foundIds := make(map[int64]bool) - for j := 0; j < len(orig.Splits); j++ { - origsplit := orig.Splits[j] - currsplit := curr.Splits[j] - - if tran.Splits[j].TransactionId != tran.TransactionId { - t.Fatalf("Split TransactionId doesn't match transaction's") - } - - found := false - for _, s := range tran.Splits { - if origsplit.Status == s.Status && origsplit.ImportSplitType == s.ImportSplitType && currsplit.AccountId == s.AccountId && currsplit.SecurityId == s.SecurityId && origsplit.RemoteId == origsplit.RemoteId && origsplit.Number == s.Number && origsplit.Memo == s.Memo && origsplit.Amount == s.Amount { - if _, ok := foundIds[s.SplitId]; ok { - continue - } - foundIds[s.SplitId] = true - found = true - break - } - } - if !found { - t.Errorf("Unable to find matching split: %+v", curr) - } - } + ensureTransactionsMatch(t, &curr, tran, nil, true, true) + } + }) +} + +func TestUpdateTransaction(t *testing.T) { + RunWith(t, &data[0], func(t *testing.T, d *TestData) { + for i := 0; i < len(data[0].transactions); i++ { + orig := data[0].transactions[i] + curr := d.transactions[i] + + curr.Description = "more money" + curr.Date = time.Date(2017, time.October, 18, 10, 41, 40, 0, time.UTC) + + tran, err := updateTransaction(d.clients[orig.UserId], &curr) + if err != nil { + t.Fatalf("Error updating transaction: %s\n", err) + } + + ensureTransactionsMatch(t, &curr, tran, nil, true, true) + + // Make sure we can't create an unbalanced transaction + tran.Splits = []*handlers.Split{} + for _, s := range curr.Splits { + var split handlers.Split + split = *s + tran.Splits = append(tran.Splits, &split) + } + tran.Splits[len(tran.Splits)-1].Amount = "42" + _, err = updateTransaction(d.clients[orig.UserId], tran) + if err == nil { + t.Fatalf("Expected error updating imbalanced splits") + } + if herr, ok := err.(*handlers.Error); ok { + if herr.ErrorId != 3 { // Invalid requeset + t.Fatalf("Unexpected API error updating imbalanced splits: %s", herr) + } + } else { + t.Fatalf("Unexpected error updating imbalanced splits") + } + + // Don't allow transactions with 0 splits + tran.Splits = []*handlers.Split{} + _, err = updateTransaction(d.clients[orig.UserId], tran) + if err == nil { + t.Fatalf("Expected error updating with zero splits") + } + if herr, ok := err.(*handlers.Error); ok { + if herr.ErrorId != 3 { // Invalid requeset + t.Fatalf("Unexpected API error updating with zero splits: %s", herr) + } + } else { + t.Fatalf("Unexpected error updating zero splits") + } + } }) }