feat(transaction-recurring): #100 implement editing of recurring transactions based on treasure chests

handler/account.go

@@ -17,14 +17,12 @@ type Account interface {
 
 type AccountImpl struct {
 	s service.Account
-	a service.Auth
 	r *Render
 }
 
-func NewAccount(s service.Account, a service.Auth, r *Render) Account {
+func NewAccount(s service.Account, r *Render) Account {
 	return AccountImpl{
 		s: s,
-		a: a,
 		r: r,
 	}
 }

handler/root_and_404.go

@@ -3,7 +3,6 @@ package handler
 import (
 	"net/http"
 	"spend-sparrow/handler/middleware"
-	"spend-sparrow/service"
 	"spend-sparrow/template"
 
 	"github.com/a-h/templ"
@@ -14,14 +13,12 @@ type Index interface {
 }
 
 type IndexImpl struct {
-	service service.Auth
-	render  *Render
+	render *Render
 }
 
-func NewIndex(service service.Auth, render *Render) Index {
+func NewIndex(render *Render) Index {
 	return IndexImpl{
-		service: service,
-		render:  render,
+		render: render,
 	}
 }
 

handler/transaction.go

@@ -20,16 +20,14 @@ type TransactionImpl struct {
 	s             service.Transaction
 	account       service.Account
 	treasureChest service.TreasureChest
-	a             service.Auth
 	r             *Render
 }
 
-func NewTransaction(s service.Transaction, account service.Account, treasureChest service.TreasureChest, a service.Auth, r *Render) Transaction {
+func NewTransaction(s service.Transaction, account service.Account, treasureChest service.TreasureChest, r *Render) Transaction {
 	return TransactionImpl{
 		s:             s,
 		account:       account,
 		treasureChest: treasureChest,
-		a:             a,
 		r:             r,
 	}
 }

handler/transaction_recurring.go

@@ -0,0 +1,131 @@
+package handler
+
+import (
+	"net/http"
+	"spend-sparrow/handler/middleware"
+	"spend-sparrow/service"
+	t "spend-sparrow/template/transaction_recurring"
+	"spend-sparrow/types"
+	"spend-sparrow/utils"
+)
+
+type TransactionRecurring interface {
+	Handle(router *http.ServeMux)
+}
+
+type TransactionRecurringImpl struct {
+	s service.TransactionRecurring
+	r *Render
+}
+
+func NewTransactionRecurring(s service.TransactionRecurring, r *Render) TransactionRecurring {
+	return TransactionRecurringImpl{
+		s: s,
+		r: r,
+	}
+}
+
+func (h TransactionRecurringImpl) Handle(r *http.ServeMux) {
+	r.Handle("GET /transaction-recurring", h.handleTransactionRecurringItemComp())
+	r.Handle("POST /transaction-recurring/{id}", h.handleUpdateTransactionRecurring())
+	r.Handle("DELETE /transaction-recurring/{id}", h.handleDeleteTransactionRecurring())
+}
+
+func (h TransactionRecurringImpl) handleTransactionRecurringItemComp() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		user := middleware.GetUser(r)
+		if user == nil {
+			utils.DoRedirect(w, r, "/auth/signin")
+			return
+		}
+
+		id := r.URL.Query().Get("id")
+		accountId := r.URL.Query().Get("account-id")
+		treasureChestId := r.URL.Query().Get("treasure-chest-id")
+		h.renderItems(w, r, user, id, accountId, treasureChestId)
+	}
+}
+
+func (h TransactionRecurringImpl) handleUpdateTransactionRecurring() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		user := middleware.GetUser(r)
+		if user == nil {
+			utils.DoRedirect(w, r, "/auth/signin")
+			return
+		}
+
+		input := types.TransactionRecurringInput{
+			Id:              r.PathValue("id"),
+			IntervalMonths:  r.FormValue("interval-months"),
+			Active:          r.FormValue("active"),
+			Party:           r.FormValue("party"),
+			Description:     r.FormValue("description"),
+			AccountId:       r.FormValue("account-id"),
+			TreasureChestId: r.FormValue("treasure-chest-id"),
+			Value:           r.FormValue("value"),
+		}
+
+		if input.Id == "new" {
+			_, err := h.s.Add(user, input)
+			if err != nil {
+				handleError(w, r, err)
+				return
+			}
+		} else {
+			_, err := h.s.Update(user, input)
+			if err != nil {
+				handleError(w, r, err)
+				return
+			}
+		}
+
+		h.renderItems(w, r, user, "", input.AccountId, input.TreasureChestId)
+	}
+}
+
+func (h TransactionRecurringImpl) handleDeleteTransactionRecurring() http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		user := middleware.GetUser(r)
+		if user == nil {
+			utils.DoRedirect(w, r, "/auth/signin")
+			return
+		}
+
+		id := r.PathValue("id")
+		accountId := r.URL.Query().Get("account-id")
+		treasureChestId := r.URL.Query().Get("treasure-chest-id")
+
+		err := h.s.Delete(user, id)
+		if err != nil {
+			handleError(w, r, err)
+			return
+		}
+
+		h.renderItems(w, r, user, "", accountId, treasureChestId)
+	}
+}
+
+func (h TransactionRecurringImpl) renderItems(w http.ResponseWriter, r *http.Request, user *types.User, id, accountId, treasureChestId string) {
+
+	var transactionsRecurring []*types.TransactionRecurring
+	var err error
+	if accountId == "" && treasureChestId == "" {
+		utils.TriggerToastWithStatus(w, r, "error", "Please select an account or treasure chest", http.StatusBadRequest)
+	}
+	if accountId != "" {
+		transactionsRecurring, err = h.s.GetAllByAccount(user, accountId)
+		if err != nil {
+			handleError(w, r, err)
+			return
+		}
+	} else {
+		transactionsRecurring, err = h.s.GetAllByTreasureChest(user, treasureChestId)
+		if err != nil {
+			handleError(w, r, err)
+			return
+		}
+	}
+
+	comp := t.TransactionRecurringItems(transactionsRecurring, id, accountId, treasureChestId)
+	h.r.Render(r, w, comp)
+}

handler/treasure_chest.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 	"spend-sparrow/handler/middleware"
 	"spend-sparrow/service"
+	tr "spend-sparrow/template/transaction_recurring"
 	t "spend-sparrow/template/treasurechest"
 	"spend-sparrow/types"
 	"spend-sparrow/utils"
@@ -16,16 +17,16 @@ type TreasureChest interface {
 }
 
 type TreasureChestImpl struct {
-	s service.TreasureChest
-	a service.Auth
-	r *Render
+	s                    service.TreasureChest
+	transactionRecurring service.TransactionRecurring
+	r                    *Render
 }
 
-func NewTreasureChest(s service.TreasureChest, a service.Auth, r *Render) TreasureChest {
+func NewTreasureChest(s service.TreasureChest, transactionRecurring service.TransactionRecurring, r *Render) TreasureChest {
 	return TreasureChestImpl{
-		s: s,
-		a: a,
-		r: r,
+		s:                    s,
+		transactionRecurring: transactionRecurring,
+		r:                    r,
 	}
 }
 
@@ -71,7 +72,7 @@ func (h TreasureChestImpl) handleTreasureChestItemComp() http.HandlerFunc {
 
 		id := r.PathValue("id")
 		if id == "new" {
-			comp := t.EditTreasureChest(nil, treasureChests)
+			comp := t.EditTreasureChest(nil, treasureChests, nil)
 			h.r.Render(r, w, comp)
 			return
 		}
@@ -82,9 +83,16 @@ func (h TreasureChestImpl) handleTreasureChestItemComp() http.HandlerFunc {
 			return
 		}
 
+		transactionsRecurring, err := h.transactionRecurring.GetAllByTreasureChest(user, treasureChest.Id.String())
+		if err != nil {
+			handleError(w, r, err)
+			return
+		}
+		transactionsRec := tr.TransactionRecurringItems(transactionsRecurring, "", "", treasureChest.Id.String())
+
 		var comp templ.Component
 		if r.URL.Query().Get("edit") == "true" {
-			comp = t.EditTreasureChest(treasureChest, treasureChests)
+			comp = t.EditTreasureChest(treasureChest, treasureChests, transactionsRec)
 		} else {
 			comp = t.TreasureChestItem(treasureChest)
 		}