Split budget and dashboard routes into own files

http/budget.go

@@ -0,0 +1,52 @@
+package http
+
+import (
+	"context"
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+	"github.com/google/uuid"
+)
+
+type BudgetData struct {
+	Token        budgeteer.Token
+	Budget       *postgres.Budget
+	Transactions []postgres.Transaction
+}
+
+func (h *Handler) budget(c *gin.Context) {
+	token, err := h.verifyLogin(c)
+	if err != nil {
+		c.Redirect(http.StatusTemporaryRedirect, "/login")
+		return
+	}
+
+	budgetID := c.Param("budgetid")
+	budgetUUID, err := uuid.Parse(budgetID)
+	if err != nil {
+		c.Redirect(http.StatusTemporaryRedirect, "/login")
+		return
+	}
+
+	budget, err := h.Service.DB.GetBudget(context.Background(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusNotFound, err)
+		return
+	}
+
+	transactions, err := h.Service.DB.GetTransactionsForBudget(context.Background(), budgetUUID)
+	if err != nil {
+		c.AbortWithError(http.StatusInternalServerError, err)
+		return
+	}
+
+	d := BudgetData{
+		Token:        token,
+		Budget:       &budget,
+		Transactions: transactions,
+	}
+
+	c.HTML(http.StatusOK, "budget", d)
+}

http/dashboard.go

@@ -0,0 +1,34 @@
+package http
+
+import (
+	"net/http"
+
+	"git.javil.eu/jacob1123/budgeteer"
+	"git.javil.eu/jacob1123/budgeteer/postgres"
+	"github.com/gin-gonic/gin"
+)
+
+func (h *Handler) dashboard(c *gin.Context) {
+	token, err := h.verifyLogin(c)
+	if err != nil {
+		c.Redirect(http.StatusTemporaryRedirect, "/login")
+		return
+	}
+
+	userID := token.GetID()
+	budgets, err := h.Service.BudgetsForUser(userID)
+	if err != nil {
+		return
+	}
+
+	d := DashboardData{
+		Token:   token,
+		Budgets: budgets,
+	}
+	c.HTML(http.StatusOK, "dashboard", d)
+}
+
+type DashboardData struct {
+	Token   budgeteer.Token
+	Budgets []postgres.Budget
+}

http/data.go

@@ -1,22 +0,0 @@
-package http
-
-import (
-	"git.javil.eu/jacob1123/budgeteer"
-	"git.javil.eu/jacob1123/budgeteer/postgres"
-)
-
-type TemplateData struct {
-	Token         budgeteer.Token
-	Budget        *postgres.Budget
-	budgetService *postgres.Repository
-}
-
-func (d TemplateData) GetBudgets() []postgres.Budget {
-	userID := d.Token.GetID()
-	budgets, err := d.budgetService.BudgetsForUser(userID)
-	if err != nil {
-		return nil
-	}
-
-	return budgets
-}

http/http.go

@@ -14,7 +14,6 @@ import (
 	"git.javil.eu/jacob1123/budgeteer/web"
 
 	"github.com/gin-gonic/gin"
-	"github.com/google/uuid"
 )
 
 // Handler handles incoming requests
@@ -65,35 +64,6 @@ func (h *Handler) Serve() {
 	router.Run(":1323")
 }
 
-func (h *Handler) budget(c *gin.Context) {
-	token, err := h.verifyLogin(c)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/login")
-		return
-	}
-
-	budgetID := c.Param("budgetid")
-	budgetUUID, err := uuid.Parse(budgetID)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/login")
-		return
-	}
-
-	budget, err := h.Service.DB.GetBudget(context.Background(), budgetUUID)
-	if err != nil {
-		c.AbortWithError(http.StatusUnauthorized, err)
-		return
-	}
-
-	d := TemplateData{
-		Token:         token,
-		Budget:        &budget,
-		budgetService: h.Service,
-	}
-
-	c.HTML(http.StatusOK, "budget", d)
-}
-
 func (h *Handler) newBudget(c *gin.Context) {
 	token, err := h.verifyLogin(c)
 	if err != nil {
@@ -114,20 +84,6 @@ func (h *Handler) newBudget(c *gin.Context) {
 	}
 }
 
-func (h *Handler) dashboard(c *gin.Context) {
-	token, err := h.verifyLogin(c)
-	if err != nil {
-		c.Redirect(http.StatusTemporaryRedirect, "/login")
-		return
-	}
-
-	d := TemplateData{
-		Token:         token,
-		budgetService: h.Service,
-	}
-	c.HTML(http.StatusOK, "dashboard", d)
-}
-
 func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, error) {
 	tokenString, err := c.Cookie(authCookie)
 	if err != nil {