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

69
server/autocomplete.go
View File

@ -5,63 +5,58 @@ import (
"strings"
"git.javil.eu/jacob1123/budgeteer/postgres"
"github.com/gin-gonic/gin"
"github.com/google/uuid"
"github.com/labstack/echo/v4"
)
func (h *Handler) autocompleteAccounts(c *gin.Context) {
func (h *Handler) autocompleteAccounts(c echo.Context) error {
budgetID := c.Param("budgetid")
budgetUUID, err := uuid.Parse(budgetID)
if err != nil {
c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
return
return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
}
query := c.Request.URL.Query().Get("s")
query := c.Request().URL.Query().Get("s")
searchParams := postgres.SearchAccountsParams{
BudgetID: budgetUUID,
Search: "%" + query + "%",
}
categories, err := h.Service.SearchAccounts(c.Request.Context(), searchParams)
categories, err := h.Service.SearchAccounts(c.Request().Context(), searchParams)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
return err
}
c.JSON(http.StatusOK, categories)
return c.JSON(http.StatusOK, categories)
}
func (h *Handler) autocompleteCategories(c *gin.Context) {
func (h *Handler) autocompleteCategories(c echo.Context) error {
budgetID := c.Param("budgetid")
budgetUUID, err := uuid.Parse(budgetID)
if err != nil {
c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
return
return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
}
query := c.Request.URL.Query().Get("s")
query := c.Request().URL.Query().Get("s")
searchParams := postgres.SearchCategoriesParams{
BudgetID: budgetUUID,
Search: "%" + query + "%",
}
categories, err := h.Service.SearchCategories(c.Request.Context(), searchParams)
categories, err := h.Service.SearchCategories(c.Request().Context(), searchParams)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
return echo.NewHTTPError(http.StatusInternalServerError, err)
}
c.JSON(http.StatusOK, categories)
return c.JSON(http.StatusOK, categories)
}
func (h *Handler) autocompletePayee(c *gin.Context) {
func (h *Handler) autocompletePayee(c echo.Context) error {
budgetID := c.Param("budgetid")
budgetUUID, err := uuid.Parse(budgetID)
if err != nil {
c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budgetid missing from URL"})
return
return echo.NewHTTPError(http.StatusBadRequest, "budgetid missing from URL")
}
query := c.Request.URL.Query().Get("s")
query := c.Request().URL.Query().Get("s")
transferPrefix := "Transfer"
if strings.HasPrefix(query, transferPrefix) {
@ -70,25 +65,23 @@ func (h *Handler) autocompletePayee(c *gin.Context) {
Search: "%" + strings.Trim(query[len(transferPrefix):], " \t\n:") + "%",
}
accounts, err := h.Service.SearchAccounts(c.Request.Context(), searchParams)
accounts, err := h.Service.SearchAccounts(c.Request().Context(), searchParams)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
return err
}
c.JSON(http.StatusOK, accounts)
} else {
searchParams := postgres.SearchPayeesParams{
BudgetID: budgetUUID,
Search: query + "%",
}
payees, err := h.Service.SearchPayees(c.Request.Context(), searchParams)
if err != nil {
c.AbortWithError(http.StatusInternalServerError, err)
return
}
c.JSON(http.StatusOK, payees)
return c.JSON(http.StatusOK, accounts)
}
searchParams := postgres.SearchPayeesParams{
BudgetID: budgetUUID,
Search: query + "%",
}
payees, err := h.Service.SearchPayees(c.Request().Context(), searchParams)
if err != nil {
return err
}
return c.JSON(http.StatusOK, payees)
}