jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Continue migration to echo

Browse Source
This commit is contained in:
Jan Bader
2022-08-20 22:23:42 +00:00
parent b573553424
commit 1a11555075
10 changed files with 168 additions and 199 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
server/account.go
View File

@@ -5,7 +5,6 @@ import (
"time"
"git.javil.eu/jacob1123/budgeteer/postgres"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
)
@@ -18,19 +17,17 @@ type FilterTransactionsRequest struct {
ToDate time.Time `json:"to_date"`
}
func (h *Handler) filteredTransactions(c *echo.Context) {
func (h *Handler) filteredTransactions(c echo.Context) error {
budgetID := c.Param("budgetid")
budgetUUID, err := uuid.Parse(budgetID)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
return echo.NewHTTPError(http.StatusBadRequest, err)
}
var request FilterTransactionsRequest
err = c.BindJSON(&request)
err = c.Bind(&request)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
return echo.NewHTTPError(http.StatusBadRequest, err)
}
params := postgres.GetFilteredTransactionsParams{
@@ -43,13 +40,12 @@ func (h *Handler) filteredTransactions(c *echo.Context) {
params.AccountID, params.FilterAccount = accountID.UUID, filterAccount
params.PayeeID, params.FilterPayee = parseEmptyUUID(request.PayeeID)
transactions, err := h.Service.GetFilteredTransactions(c.Request.Context(), params)
transactions, err := h.Service.GetFilteredTransactions(c.Request().Context(), params)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
return echo.NewHTTPError(http.StatusInternalServerError, err)
}
c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
return c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
}
func parseEmptyUUID(value string) (uuid.NullUUID, bool) {
@@ -65,21 +61,19 @@ func parseEmptyUUID(value string) (uuid.NullUUID, bool) {
return uuid.NullUUID{val, true}, true
}
func (h *Handler) problematicTransactions(c *gin.Context) {
func (h *Handler) problematicTransactions(c echo.Context) error {
budgetID := c.Param("budgetid")
budgetUUID, err := uuid.Parse(budgetID)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
return echo.NewHTTPError(http.StatusBadRequest, err)
}
transactions, err := h.Service.GetProblematicTransactions(c.Request.Context(), budgetUUID)
transactions, err := h.Service.GetProblematicTransactions(c.Request().Context(), budgetUUID)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
return err
}
c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
return c.JSON(http.StatusOK, TransactionsResponse{nil, transactions})
}
func (h *Handler) transactionsForAccount(c echo.Context) error {
@@ -113,19 +107,17 @@ type EditAccountRequest struct {
IsOpen bool `json:"isOpen"`
}
func (h *Handler) editAccount(c *gin.Context) {
func (h *Handler) editAccount(c echo.Context) error {
accountID := c.Param("accountid")
accountUUID, err := uuid.Parse(accountID)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
return echo.NewHTTPError(http.StatusBadRequest, err)
}
var request EditAccountRequest
err = c.BindJSON(&request)
err = c.Bind(&request)
if err != nil {
c.AbortWithError(http.StatusBadRequest, err)
return
return echo.NewHTTPError(http.StatusBadRequest, err)
}
updateParams := postgres.UpdateAccountParams{
@@ -134,11 +126,10 @@ func (h *Handler) editAccount(c *gin.Context) {
IsOpen: request.IsOpen,
ID: accountUUID,
}
account, err := h.Service.UpdateAccount(c.Request.Context(), updateParams)
account, err := h.Service.UpdateAccount(c.Request().Context(), updateParams)
if err != nil {
c.AbortWithError(http.StatusNotFound, err)
return
return echo.NewHTTPError(http.StatusNotFound, err)
}
h.getBudget(c, account.BudgetID)
return h.getBudget(c, account.BudgetID)
}