Improve handling of context

http/always-needed-data.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"context"
 	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer/postgres"
@@ -23,7 +22,7 @@ func (h *Handler) getImportantData(c *gin.Context) {
 		return
 	}
 
-	budget, err := h.Service.DB.GetBudget(context.Background(), budgetUUID)
+	budget, err := h.Service.DB.GetBudget(c.Request.Context(), budgetUUID)
 	if err != nil {
 		c.AbortWithError(http.StatusNotFound, err)
 		return

http/budget.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"context"
 	"net/http"
 
 	"git.javil.eu/jacob1123/budgeteer"
@@ -23,7 +22,7 @@ func (h *Handler) budget(c *gin.Context) {
 		return
 	}
 
-	transactions, err := h.Service.DB.GetTransactionsForBudget(context.Background(), budgetUUID)
+	transactions, err := h.Service.DB.GetTransactionsForBudget(c.Request.Context(), budgetUUID)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return
@@ -45,7 +44,7 @@ func (h *Handler) newBudget(c *gin.Context) {
 	}
 
 	userID := c.MustGet("token").(budgeteer.Token).GetID()
-	_, err := h.Service.NewBudget(budgetName, userID)
+	_, err := h.Service.NewBudget(c.Request.Context(), budgetName, userID)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return

http/budgeting.go

@@ -1,7 +1,6 @@
 package http
 
 import (
-	"context"
 	"net/http"
 	"strconv"
 	"time"
@@ -59,7 +58,7 @@ func (h *Handler) budgeting(c *gin.Context) {
 		FromDate: firstOfMonth,
 		ToDate:   firstOfNextMonth,
 	}
-	categories, err := h.Service.DB.GetCategoriesWithBalance(context.Background(), params)
+	categories, err := h.Service.DB.GetCategoriesWithBalance(c.Request.Context(), params)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return

http/dashboard.go

@@ -10,7 +10,7 @@ import (
 
 func (h *Handler) dashboard(c *gin.Context) {
 	userID := c.MustGet("token").(budgeteer.Token).GetID()
-	budgets, err := h.Service.BudgetsForUser(userID)
+	budgets, err := h.Service.DB.GetBudgetsForUser(c.Request.Context(), userID)
 	if err != nil {
 		return
 	}

http/session.go

@@ -68,7 +68,7 @@ func (h *Handler) loginPost(c *gin.Context) {
 	username, _ := c.GetPostForm("username")
 	password, _ := c.GetPostForm("password")
 
-	user, err := h.Service.DB.GetUserByUsername(context.Background(), username)
+	user, err := h.Service.DB.GetUserByUsername(c.Request.Context(), username)
 	if err != nil {
 		c.AbortWithError(http.StatusUnauthorized, err)
 		return
@@ -84,7 +84,8 @@ func (h *Handler) loginPost(c *gin.Context) {
 		c.AbortWithError(http.StatusUnauthorized, err)
 	}
 
-	_, _ = h.Service.DB.UpdateLastLogin(context.Background(), user.ID)
+	go h.Service.DB.UpdateLastLogin(context.Background(), user.ID)
+
 	maxAge := (int)((expiration * time.Hour).Seconds())
 	c.SetCookie(authCookie, t, maxAge, "", "", false, true)
 	c.JSON(http.StatusOK, map[string]string{
@@ -97,7 +98,7 @@ func (h *Handler) registerPost(c *gin.Context) {
 	password, _ := c.GetPostForm("password")
 	name, _ := c.GetPostForm("name")
 
-	_, err := h.Service.DB.GetUserByUsername(context.Background(), email)
+	_, err := h.Service.DB.GetUserByUsername(c.Request.Context(), email)
 	if err == nil {
 		c.AbortWithStatus(http.StatusUnauthorized)
 		return
@@ -114,7 +115,7 @@ func (h *Handler) registerPost(c *gin.Context) {
 		Password: hash,
 		Email:    email,
 	}
-	_, err = h.Service.DB.CreateUser(context.Background(), createUser)
+	_, err = h.Service.DB.CreateUser(c.Request.Context(), createUser)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 	}

http/ynab-import.go

@@ -22,7 +22,7 @@ func (h *Handler) importYNAB(c *gin.Context) {
 		return
 	}
 
-	ynab, err := postgres.NewYNABImport(h.Service.DB, budgetUUID)
+	ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.DB, budgetUUID)
 	if err != nil {
 		c.AbortWithError(http.StatusInternalServerError, err)
 		return

postgres/budgetservice.go

@@ -6,32 +6,15 @@ import (
 	"github.com/google/uuid"
 )
 
-// Budget returns a budget for a given id.
+// NewBudget creates a budget and adds it to the current user
-func (s *Repository) Budget(id uuid.UUID) (*Budget, error) {
+func (s *Repository) NewBudget(context context.Context, name string, userID uuid.UUID) (*Budget, error) {
-	budget, err := s.DB.GetBudget(context.Background(), id)
+	budget, err := s.DB.CreateBudget(context, name)
-	if err != nil {
-		return nil, err
-	}
-	return &budget, nil
-}
-
-func (s *Repository) BudgetsForUser(id uuid.UUID) ([]Budget, error) {
-	budgets, err := s.DB.GetBudgetsForUser(context.Background(), id)
-	if err != nil {
-		return nil, err
-	}
-	return budgets, nil
-
-}
-
-func (s *Repository) NewBudget(name string, userID uuid.UUID) (*Budget, error) {
-	budget, err := s.DB.CreateBudget(context.Background(), name)
 	if err != nil {
 		return nil, err
 	}
 
 	ub := LinkBudgetToUserParams{UserID: userID, BudgetID: budget.ID}
-	_, err = s.DB.LinkBudgetToUser(context.Background(), ub)
+	_, err = s.DB.LinkBudgetToUser(context, ub)
 	if err != nil {
 		return nil, err
 	}

postgres/ynab-import.go

@@ -22,29 +22,29 @@ type YNABImport struct {
 	budgetID       uuid.UUID
 }
 
-func NewYNABImport(q *Queries, budgetID uuid.UUID) (*YNABImport, error) {
+func NewYNABImport(context context.Context, q *Queries, budgetID uuid.UUID) (*YNABImport, error) {
-	accounts, err := q.GetAccounts(context.Background(), budgetID)
+	accounts, err := q.GetAccounts(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
-	payees, err := q.GetPayees(context.Background(), budgetID)
+	payees, err := q.GetPayees(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
-	categories, err := q.GetCategories(context.Background(), budgetID)
+	categories, err := q.GetCategories(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
-	categoryGroups, err := q.GetCategoryGroups(context.Background(), budgetID)
+	categoryGroups, err := q.GetCategoryGroups(context, budgetID)
 	if err != nil {
 		return nil, err
 	}
 
 	return &YNABImport{
-		Context:        context.Background(),
+		Context:        context,
 		accounts:       accounts,
 		payees:         payees,
 		categories:     categories,