Merge f365aee into 40b4f7b

account/account.go

@@ -51,6 +51,8 @@ func accountRecordsToAccountAttributeRecords(accountRecords []redis.AccountRecor
 	return cashBalanceRecords
 }
 
+// collapseAccountAttributeRecords collapses the records in a slice to remove
+// sequences where the value does not change between adjacent records.
 func collapseAccountAttributeRecords(r []AccountAttributeRecord) []AccountAttributeRecord {
 	if len(r) <= 1 {
 		return r

account/handlers.go

@@ -6,17 +6,25 @@ import (
 	"net/http"
 )
 
-type accountInfoFunc func(m accountInfoManager) (interface{}, error)
+type (
+	accountInfoFunc func(m accountInfoManager) (interface{}, error)
 
-func accountAttributeHandler(f accountInfoFunc) http.Handler {
+	Handlers struct {
+		AccountInfoManager accountInfoManager
+	}
+)
+
+func NewHandlers() (Handlers, error) {
+	m, err := NewAccountInfoManager()
+	if err != nil {
+		return Handlers{}, err
+	}
+	return Handlers{AccountInfoManager: m}, nil
+}
+
+func (h Handlers) accountAttributeHandler(f accountInfoFunc) http.Handler {
 	fn := func(w http.ResponseWriter, r *http.Request) {
-		cbm, err := NewAccountInfoManager()
-		if err != nil {
-			w.Write([]byte(fmt.Sprintf("failed to get account information: %v", err)))
-			return
-		}
-		defer cbm.Close()
-		b, err := f(cbm)
+		b, err := f(h.AccountInfoManager)
 		if err != nil {
 			w.Write([]byte(fmt.Sprintf("failed to get account information: %v", err)))
 			return
@@ -31,16 +39,20 @@ func accountAttributeHandler(f accountInfoFunc) http.Handler {
 	return http.HandlerFunc(fn)
 }
 
-func CashBalanceHistoryHandler() http.Handler {
-	return accountAttributeHandler(
+func (h Handlers) CashBalanceHistoryHandler() http.Handler {
+	return h.accountAttributeHandler(
 		func(m accountInfoManager) (interface{}, error) {
 			return m.CashBalanceHistory()
 		})
 }
 
-func AccountValueHistoryHandler() http.Handler {
-	return accountAttributeHandler(
+func (h Handlers) AccountValueHistoryHandler() http.Handler {
+	return h.accountAttributeHandler(
 		func(m accountInfoManager) (interface{}, error) {
 			return m.AccountValueHistory()
 		})
 }
+
+func (h *Handlers) Close() {
+	h.AccountInfoManager.Close()
+}

main.go

@@ -15,8 +15,13 @@ func main() {
 	flag.Parse()
 	log.Printf("starting up dashboard on port %d", *p)
 
-	http.Handle("/cashBalanceHistory", account.CashBalanceHistoryHandler())
-	http.Handle("/accountValueHistory", account.AccountValueHistoryHandler())
+	h, err := account.NewHandlers()
+	if err != nil {
+		log.Fatal(fmt.Sprintf("failed to initialize handlers: %v", err))
+	}
+	defer h.Close()
+	http.Handle("/cashBalanceHistory", h.CashBalanceHistoryHandler())
+	http.Handle("/accountValueHistory", h.AccountValueHistoryHandler())
 	http.Handle("/notes.json", notes.NotesHandler())
 
 	log.Fatal(http.ListenAndServe(fmt.Sprintf(":%d", *p), nil))