From b5735534242c70798fb4e2be99d18d3e33c96a58 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sat, 20 Aug 2022 22:08:41 +0000 Subject: [PATCH 01/11] Start migration to echo --- go.mod | 15 ++++++++-- go.sum | 21 +++++++++++++ server/account.go | 20 ++++++------- server/http.go | 38 ++++++++++++++---------- server/session.go | 76 ++++++++++++++++++++++------------------------- 5 files changed, 101 insertions(+), 69 deletions(-) diff --git a/go.mod b/go.mod index 957b246..756a310 100644 --- a/go.mod +++ b/go.mod @@ -13,6 +13,15 @@ require ( require github.com/DATA-DOG/go-txdb v0.1.5 +require ( + github.com/labstack/echo/v4 v4.8.0 // indirect + github.com/labstack/gommon v0.3.1 // indirect + github.com/mattn/go-colorable v0.1.11 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + github.com/valyala/fasttemplate v1.2.1 // indirect + golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect +) + require ( github.com/gin-contrib/sse v0.1.0 // indirect github.com/go-playground/locales v0.13.0 // indirect @@ -28,14 +37,14 @@ require ( github.com/jackc/pgtype v1.8.1 // direct github.com/json-iterator/go v1.1.9 // indirect github.com/leodido/go-urn v1.2.0 // indirect - github.com/mattn/go-isatty v0.0.12 // indirect + github.com/mattn/go-isatty v0.0.14 // indirect github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect github.com/ugorji/go/codec v1.1.7 // indirect - golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect - golang.org/x/text v0.3.6 // indirect + golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect + golang.org/x/text v0.3.7 // indirect google.golang.org/protobuf v1.26.0 // indirect gopkg.in/yaml.v2 v2.3.0 // indirect ) diff --git a/go.sum b/go.sum index 20995cb..2603286 100644 --- a/go.sum +++ b/go.sum @@ -184,6 +184,10 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= +github.com/labstack/echo/v4 v4.8.0 h1:wdc6yKVaHxkNOEdz4cRZs1pQkwSXPiRjq69yWP4QQS8= +github.com/labstack/echo/v4 v4.8.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= +github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= +github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -198,10 +202,14 @@ github.com/matryer/is v1.4.0 h1:sosSmIWwkYITGrxZ25ULNDeKiMNzFSr4V/eqBQP0PeE= github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.1.1/go.mod h1:FuOcm+DKB9mbwrcAfNl7/TZVBZ6rcnceauSikq3lYCQ= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= +github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHRmPYs= +github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= +github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= +github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.8 h1:gDp86IdQsN/xWjIEmr9MF6o9mpksUgh0fu+9ByFxzIU= github.com/mattn/go-sqlite3 v1.14.8/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= @@ -288,6 +296,10 @@ github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVM github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= +github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= +github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= +github.com/valyala/fasttemplate v1.2.1 h1:TVEnxayobAdVkhQfrfes2IzOB6o+z4roRkPF52WA1u4= +github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ= github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYppBueQtXaqoE= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= @@ -343,6 +355,7 @@ golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20201224014010-6772e930b67b/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= +golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f h1:OfiFi4JbukWwe3lzw+xunroH1mnC1e2Gy5cxNJApiSY= golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -378,6 +391,10 @@ golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.0.0-20211103235746-7861aae1554b h1:1VkfZQv42XQlA/jchYumAnv1UPo6RgF9rJFkTgZIxO4= +golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= @@ -386,6 +403,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= +golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= +golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -436,6 +455,8 @@ gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= +gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk= gotest.tools/v3 v3.0.3/go.mod h1:Z7Lb0S5l+klDB31fvDQX8ss/FlKDxtlFlw3Oa8Ymbl8= honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= diff --git a/server/account.go b/server/account.go index d1e9eae..6de2af0 100644 --- a/server/account.go +++ b/server/account.go @@ -7,6 +7,7 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) type FilterTransactionsRequest struct { @@ -17,7 +18,7 @@ type FilterTransactionsRequest struct { ToDate time.Time `json:"to_date"` } -func (h *Handler) filteredTransactions(c *gin.Context) { +func (h *Handler) filteredTransactions(c *echo.Context) { budgetID := c.Param("budgetid") budgetUUID, err := uuid.Parse(budgetID) if err != nil { @@ -81,27 +82,24 @@ func (h *Handler) problematicTransactions(c *gin.Context) { c.JSON(http.StatusOK, TransactionsResponse{nil, transactions}) } -func (h *Handler) transactionsForAccount(c *gin.Context) { +func (h *Handler) transactionsForAccount(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) } - account, err := h.Service.GetAccount(c.Request.Context(), accountUUID) + account, err := h.Service.GetAccount(c.Request().Context(), accountUUID) if err != nil { - c.AbortWithError(http.StatusNotFound, err) - return + return echo.NewHTTPError(http.StatusNotFound, err) } - transactions, err := h.Service.GetTransactionsForAccount(c.Request.Context(), accountUUID) + transactions, err := h.Service.GetTransactionsForAccount(c.Request().Context(), accountUUID) if err != nil { - c.AbortWithError(http.StatusNotFound, err) - return + return echo.NewHTTPError(http.StatusNotFound, err) } - c.JSON(http.StatusOK, TransactionsResponse{&account, transactions}) + return c.JSON(http.StatusOK, TransactionsResponse{&account, transactions}) } type TransactionsResponse struct { diff --git a/server/http.go b/server/http.go index 34bcf0a..fdade1f 100644 --- a/server/http.go +++ b/server/http.go @@ -11,7 +11,8 @@ import ( "git.javil.eu/jacob1123/budgeteer" "git.javil.eu/jacob1123/budgeteer/bcrypt" "git.javil.eu/jacob1123/budgeteer/postgres" - "github.com/gin-gonic/gin" + + "github.com/labstack/echo/v4" ) // Handler handles incoming requests. @@ -24,10 +25,10 @@ type Handler struct { // Serve starts the http server. func (h *Handler) Serve() { - router := gin.Default() + router := echo.New() h.LoadRoutes(router) - if err := router.Run(":1323"); err != nil { + if err := router.Start(":1323"); err != nil { panic(err) } } @@ -41,9 +42,9 @@ type SuccessResponse struct { } // LoadRoutes initializes all the routes. -func (h *Handler) LoadRoutes(router *gin.Engine) { +func (h *Handler) LoadRoutes(router *echo.Echo) { router.Use(enableCachingForStaticFiles()) - router.NoRoute(h.ServeStatic) + router.Use(h.ServeStatic) api := router.Group("/api/v1") @@ -81,11 +82,14 @@ func (h *Handler) LoadRoutes(router *gin.Engine) { } } -func (h *Handler) ServeStatic(c *gin.Context) { - h.ServeStaticFile(c, c.Request.URL.Path) +func (h *Handler) ServeStatic(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + h.ServeStaticFile(c, c.Path()) + return nil + } } -func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) { +func (h *Handler) ServeStaticFile(c echo.Context, fullPath string) { file, err := h.StaticFS.Open(fullPath) if errors.Is(err, fs.ErrNotExist) { h.ServeStaticFile(c, path.Join("/", "/index.html")) @@ -93,13 +97,13 @@ func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) { } if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + c.Error(err) return } stat, err := file.Stat() if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + c.Error(err) return } @@ -109,16 +113,20 @@ func (h *Handler) ServeStaticFile(c *gin.Context, fullPath string) { } if file, ok := file.(io.ReadSeeker); ok { - http.ServeContent(c.Writer, c.Request, stat.Name(), stat.ModTime(), file) + http.ServeContent(c.Response().Writer, c.Request(), stat.Name(), stat.ModTime(), file) } else { panic("File does not implement ReadSeeker") } } -func enableCachingForStaticFiles() gin.HandlerFunc { - return func(c *gin.Context) { - if strings.HasPrefix(c.Request.RequestURI, "/static/") { - c.Header("Cache-Control", "max-age=86400") +func enableCachingForStaticFiles() echo.MiddlewareFunc { + return func(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + if strings.HasPrefix(c.Path(), "/static/") { + c.Response().Header().Set("Cache-Control", "max-age=86400") + } + + return next(c) } } } diff --git a/server/session.go b/server/session.go index 12af8e1..86bd910 100644 --- a/server/session.go +++ b/server/session.go @@ -9,6 +9,7 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) const ( @@ -26,8 +27,8 @@ func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn panic("Token is not a valid Token") } -func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn - tokenString := c.GetHeader(HeaderName) +func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn + tokenString := c.Request().Header.Get(HeaderName) if len(tokenString) <= len(Bearer) { return nil, &ErrorResponse{"no authorization header supplied"} } @@ -41,16 +42,17 @@ func (h *Handler) verifyLogin(c *gin.Context) (budgeteer.Token, *ErrorResponse) return token, nil } -func (h *Handler) verifyLoginWithForbidden(c *gin.Context) { - token, err := h.verifyLogin(c) - if err != nil { - // c.Header("WWW-Authenticate", "Bearer") - c.AbortWithStatusJSON(http.StatusForbidden, err) - return - } +func (h *Handler) verifyLoginWithForbidden(next echo.HandlerFunc) echo.HandlerFunc { + return func(c echo.Context) error { + token, err := h.verifyLogin(c) + if err != nil { + // c.Header("WWW-Authenticate", "Bearer") + return echo.NewHTTPError(http.StatusForbidden, err) + } - c.Set(ParamName, token) - c.Next() + c.Set(ParamName, token) + return next(c) + } } type loginInformation struct { @@ -58,37 +60,35 @@ type loginInformation struct { User string `json:"user"` } -func (h *Handler) loginPost(c *gin.Context) { +func (h *Handler) loginPost(c echo.Context) error { var login loginInformation - err := c.BindJSON(&login) + err := c.Bind(&login) if err != nil { - return + return err } - user, err := h.Service.GetUserByUsername(c.Request.Context(), login.User) + user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User) if err != nil { - c.AbortWithError(http.StatusUnauthorized, err) - return + return err } if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil { - c.AbortWithError(http.StatusUnauthorized, err) - return + return err } token, err := h.TokenVerifier.CreateToken(&user) if err != nil { - c.AbortWithError(http.StatusUnauthorized, err) + return err } go h.UpdateLastLogin(user.ID) - budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID) + budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID) if err != nil { - return + return err } - c.JSON(http.StatusOK, LoginResponse{token, user, budgets}) + return c.JSON(http.StatusOK, LoginResponse{token, user, budgets}) } type LoginResponse struct { @@ -103,29 +103,25 @@ type registerInformation struct { Name string `json:"name"` } -func (h *Handler) registerPost(c *gin.Context) { +func (h *Handler) registerPost(c echo.Context) error { var register registerInformation - err := c.BindJSON(®ister) + err := c.Bind(®ister) if err != nil { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"error parsing body"}) - return + return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"error parsing body"}) } if register.Email == "" || register.Password == "" || register.Name == "" { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"}) - return + return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"}) } - _, err = h.Service.GetUserByUsername(c.Request.Context(), register.Email) + _, err = h.Service.GetUserByUsername(c.Request().Context(), register.Email) if err == nil { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"email is already taken"}) - return + return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"email is already taken"}) } hash, err := h.CredentialsVerifier.Hash(register.Password) if err != nil { - c.AbortWithError(http.StatusBadRequest, err) - return + return err } createUser := postgres.CreateUserParams{ @@ -133,24 +129,24 @@ func (h *Handler) registerPost(c *gin.Context) { Password: hash, Email: register.Email, } - user, err := h.Service.CreateUser(c.Request.Context(), createUser) + user, err := h.Service.CreateUser(c.Request().Context(), createUser) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return err } token, err := h.TokenVerifier.CreateToken(&user) if err != nil { - c.AbortWithError(http.StatusUnauthorized, err) + return err } go h.UpdateLastLogin(user.ID) - budgets, err := h.Service.GetBudgetsForUser(c.Request.Context(), user.ID) + budgets, err := h.Service.GetBudgetsForUser(c.Request().Context(), user.ID) if err != nil { - return + return err } - c.JSON(http.StatusOK, LoginResponse{token, user, budgets}) + return c.JSON(http.StatusOK, LoginResponse{token, user, budgets}) } func (h *Handler) UpdateLastLogin(userID uuid.UUID) { -- 2.47.2 From 1a11555075f271ac4e329327a49d797806a1c6a6 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sat, 20 Aug 2022 22:23:42 +0000 Subject: [PATCH 02/11] Continue migration to echo --- server/account.go | 47 ++++++++++++---------------- server/admin.go | 49 ++++++++++++++++-------------- server/autocomplete.go | 69 +++++++++++++++++++----------------------- server/budget.go | 10 +++--- server/budgeting.go | 33 +++++++++----------- server/category.go | 14 ++++----- server/http.go | 8 ----- server/reconcile.go | 44 +++++++++++---------------- server/transaction.go | 43 +++++++++++++------------- server/ynab-import.go | 50 +++++++++++++++--------------- 10 files changed, 168 insertions(+), 199 deletions(-) diff --git a/server/account.go b/server/account.go index 6de2af0..1bae15f 100644 --- a/server/account.go +++ b/server/account.go @@ -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) } diff --git a/server/admin.go b/server/admin.go index b3a5b81..53a2826 100644 --- a/server/admin.go +++ b/server/admin.go @@ -4,63 +4,66 @@ import ( "fmt" "net/http" - "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" "github.com/pressly/goose/v3" ) -func (h *Handler) clearDatabase(c *gin.Context) { +func (h *Handler) clearDatabase(c echo.Context) error { if err := goose.Reset(h.Service.DB, "schema"); err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) } if err := goose.Up(h.Service.DB, "schema"); err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) } + + return nil } -func (h *Handler) deleteBudget(c *gin.Context) { +func (h *Handler) deleteBudget(c echo.Context) error { budgetID := c.Param("budgetid") budgetUUID, err := uuid.Parse(budgetID) if err != nil { - c.AbortWithStatus(http.StatusBadRequest) - return + return echo.NewHTTPError(http.StatusBadRequest, err) } - h.clearBudgetData(c, budgetUUID) - - err = h.Service.DeleteBudget(c.Request.Context(), budgetUUID) + err = h.clearBudgetData(c, budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) - return + return err } + + err = h.Service.DeleteBudget(c.Request().Context(), budgetUUID) + if err != nil { + return err + } + + return nil } -func (h *Handler) clearBudgetData(c *gin.Context, budgetUUID uuid.UUID) { - rows, err := h.Service.DeleteAllAssignments(c.Request.Context(), budgetUUID) +func (h *Handler) clearBudgetData(c echo.Context, budgetUUID uuid.UUID) error { + rows, err := h.Service.DeleteAllAssignments(c.Request().Context(), budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) - return + return err } fmt.Printf("Deleted %d assignments\n", rows) - rows, err = h.Service.DeleteAllTransactions(c.Request.Context(), budgetUUID) + rows, err = h.Service.DeleteAllTransactions(c.Request().Context(), budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) - return + return err } fmt.Printf("Deleted %d transactions\n", rows) + return nil } -func (h *Handler) clearBudget(c *gin.Context) { +func (h *Handler) clearBudget(c echo.Context) error { budgetID := c.Param("budgetid") budgetUUID, err := uuid.Parse(budgetID) if err != nil { - c.AbortWithStatus(http.StatusBadRequest) - return + return echo.NewHTTPError(http.StatusBadRequest, err) } - h.clearBudgetData(c, budgetUUID) + return h.clearBudgetData(c, budgetUUID) } diff --git a/server/autocomplete.go b/server/autocomplete.go index 9d88c70..1360513 100644 --- a/server/autocomplete.go +++ b/server/autocomplete.go @@ -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) } diff --git a/server/budget.go b/server/budget.go index 682ac75..b64919a 100644 --- a/server/budget.go +++ b/server/budget.go @@ -3,17 +3,17 @@ package server import ( "net/http" - "github.com/gin-gonic/gin" + "github.com/labstack/echo/v4" ) type newBudgetInformation struct { Name string `json:"name"` } -func (h *Handler) newBudget(c *gin.Context) { +func (h *Handler) newBudget(c echo.Context) error { var newBudget newBudgetInformation if err := c.BindJSON(&newBudget); err != nil { - c.AbortWithError(http.StatusNotAcceptable, err) + return echo.NewHTTPError(http.StatusNotAcceptable, err) return } @@ -23,9 +23,9 @@ func (h *Handler) newBudget(c *gin.Context) { } userID := MustGetToken(c).GetID() - budget, err := h.Service.NewBudget(c.Request.Context(), newBudget.Name, userID) + budget, err := h.Service.NewBudget(c.Request().Context(), newBudget.Name, userID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } diff --git a/server/budgeting.go b/server/budgeting.go index 0527ce0..d99b744 100644 --- a/server/budgeting.go +++ b/server/budgeting.go @@ -7,8 +7,8 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "git.javil.eu/jacob1123/budgeteer/postgres/numeric" - "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) type CategoryWithBalance struct { @@ -27,7 +27,7 @@ func NewCategoryWithBalance(category *postgres.GetCategoriesRow) CategoryWithBal } } -func (h *Handler) budgetingForMonth(c *gin.Context) { +func (h *Handler) budgetingForMonth(c echo.Context) error { budgetID := c.Param("budgetid") budgetUUID, err := uuid.Parse(budgetID) if err != nil { @@ -35,9 +35,9 @@ func (h *Handler) budgetingForMonth(c *gin.Context) { return } - budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID) + budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID) if err != nil { - c.AbortWithError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err) return } @@ -47,9 +47,9 @@ func (h *Handler) budgetingForMonth(c *gin.Context) { return } - data, err := h.getBudgetingViewForMonth(c.Request.Context(), budget, month) + data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } c.JSON(http.StatusOK, data) @@ -105,33 +105,30 @@ type BudgetingResponse struct { Budget postgres.Budget } -func (h *Handler) budget(c *gin.Context) { +func (h *Handler) budget(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") } - h.getBudget(c, budgetUUID) + return h.getBudget(c, budgetUUID) } -func (h *Handler) getBudget(c *gin.Context, budgetUUID uuid.UUID) { - budget, err := h.Service.GetBudget(c.Request.Context(), budgetUUID) +func (h *Handler) getBudget(c echo.Context, budgetUUID uuid.UUID) error { + budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID) if err != nil { - c.AbortWithError(http.StatusNotFound, err) - return + return echo.NewHTTPError(http.StatusNotFound, err) } - accounts, err := h.Service.GetAccountsWithBalance(c.Request.Context(), budgetUUID) + accounts, err := h.Service.GetAccountsWithBalance(c.Request().Context(), budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) - return + return err } data := BudgetingResponse{accounts, budget} - c.JSON(http.StatusOK, data) + return c.JSON(http.StatusOK, data) } func (h *Handler) calculateBalances(budget postgres.Budget, month Month, diff --git a/server/category.go b/server/category.go index 7507cb7..fb43095 100644 --- a/server/category.go +++ b/server/category.go @@ -6,15 +6,15 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "git.javil.eu/jacob1123/budgeteer/postgres/numeric" - "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) type SetCategoryAssignmentRequest struct { Assigned float64 } -func (h *Handler) setCategoryAssignment(c *gin.Context) { +func (h *Handler) setCategoryAssignment(c echo.Context) error { categoryID := c.Param("categoryid") categoryUUID, err := uuid.Parse(categoryID) if err != nil { @@ -25,20 +25,20 @@ func (h *Handler) setCategoryAssignment(c *gin.Context) { var request SetCategoryAssignmentRequest err = c.BindJSON(&request) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("invalid payload: %w", err)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("invalid payload: %w", err)) return } date, err := getDate(c) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("date invalid: %w", err)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("date invalid: %w", err)) return } var amount numeric.Numeric err = amount.Set(request.Assigned) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse amount: %w", err)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse amount: %w", err)) return } @@ -47,9 +47,9 @@ func (h *Handler) setCategoryAssignment(c *gin.Context) { Date: date.FirstOfMonth(), Amount: amount, } - err = h.Service.UpdateAssignment(c.Request.Context(), updateArgs) + err = h.Service.UpdateAssignment(c.Request().Context(), updateArgs) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update assignment: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("update assignment: %w", err)) return } } diff --git a/server/http.go b/server/http.go index fdade1f..e6ddabe 100644 --- a/server/http.go +++ b/server/http.go @@ -33,14 +33,6 @@ func (h *Handler) Serve() { } } -type ErrorResponse struct { - Message string -} - -type SuccessResponse struct { - Message string -} - // LoadRoutes initializes all the routes. func (h *Handler) LoadRoutes(router *echo.Echo) { router.Use(enableCachingForStaticFiles()) diff --git a/server/reconcile.go b/server/reconcile.go index 2ac619b..80cb1ab 100644 --- a/server/reconcile.go +++ b/server/reconcile.go @@ -8,8 +8,8 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "git.javil.eu/jacob1123/budgeteer/postgres/numeric" - "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) type ReconcileTransactionsRequest struct { @@ -22,68 +22,60 @@ type ReconcileTransactionsResponse struct { ReconciliationTransaction *postgres.DisplayTransaction } -func (h *Handler) reconcileTransactions(c *gin.Context) { +func (h *Handler) reconcileTransactions(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 ReconcileTransactionsRequest - err = c.BindJSON(&request) + err = c.Bind(&request) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err)) - return + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err)) } var amount numeric.Numeric err = amount.Set(request.ReconcilationTransactionAmount) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err)) - return + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse request: %w", err)) } - tx, err := h.Service.BeginTx(c.Request.Context(), &sql.TxOptions{}) + tx, err := h.Service.BeginTx(c.Request().Context(), &sql.TxOptions{}) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("begin tx: %w", err)) - return + return fmt.Errorf("begin tx: %w", err) } db := h.Service.WithTx(tx) for _, transactionID := range request.TransactionIDs { - err := db.SetTransactionReconciled(c.Request.Context(), transactionID) + err := db.SetTransactionReconciled(c.Request().Context(), transactionID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("update transaction: %w", err)) - return + return fmt.Errorf("update transaction: %w", err) } } reconciliationTransaction, err := h.CreateReconcilationTransaction(amount, accountUUID, db, c) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("insert new transaction: %w", err)) - return + return fmt.Errorf("insert new transaction: %w", err) } - err = h.Service.SetLastReconciled(c.Request.Context(), accountUUID) + err = h.Service.SetLastReconciled(c.Request().Context(), accountUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("set last reconciled: %w", err)) - return + return fmt.Errorf("set last reconciled: %w", err) } err = tx.Commit() if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("commit: %w", err)) - return + return fmt.Errorf("commit: %w", err) } - c.JSON(http.StatusOK, ReconcileTransactionsResponse{ + return c.JSON(http.StatusOK, ReconcileTransactionsResponse{ Message: fmt.Sprintf("Set status for %d transactions", len(request.TransactionIDs)), ReconciliationTransaction: reconciliationTransaction, }) } -func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUUID uuid.UUID, db *postgres.Queries, c *gin.Context) (*postgres.DisplayTransaction, error) { +func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUUID uuid.UUID, db *postgres.Queries, c echo.Context) (*postgres.DisplayTransaction, error) { if amount.IsZero() { return nil, nil //nolint: nilnil } @@ -95,12 +87,12 @@ func (*Handler) CreateReconcilationTransaction(amount numeric.Numeric, accountUU AccountID: accountUUID, Status: "Reconciled", } - transactionUUID, err := db.CreateTransaction(c.Request.Context(), createTransaction) + transactionUUID, err := db.CreateTransaction(c.Request().Context(), createTransaction) if err != nil { return nil, fmt.Errorf("insert new transaction: %w", err) } - transaction, err := db.GetTransaction(c.Request.Context(), transactionUUID) + transaction, err := db.GetTransaction(c.Request().Context(), transactionUUID) if err != nil { return nil, fmt.Errorf("get created transaction: %w", err) } diff --git a/server/transaction.go b/server/transaction.go index 0a959ba..a98c2d6 100644 --- a/server/transaction.go +++ b/server/transaction.go @@ -10,6 +10,7 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres/numeric" "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) type NewTransactionPayload struct { @@ -27,17 +28,17 @@ type NewTransactionPayload struct { State string `json:"state"` } -func (h *Handler) updateTransaction(c *gin.Context) { +func (h *Handler) updateTransaction(c echo.Context) error { var payload NewTransactionPayload err := c.BindJSON(&payload) if err != nil { - c.AbortWithError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err) return } amount, err := numeric.Parse(payload.Amount) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("amount: %w", err)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("amount: %w", err)) return } @@ -51,17 +52,17 @@ func (h *Handler) updateTransaction(c *gin.Context) { h.UpdateTransaction(payload, amount, transactionUUID, c) } -func (h *Handler) newTransaction(c *gin.Context) { +func (h *Handler) newTransaction(c echo.Context) error { var payload NewTransactionPayload err := c.BindJSON(&payload) if err != nil { - c.AbortWithError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err) return } amount, err := numeric.Parse(payload.Amount) if err != nil { - c.AbortWithError(http.StatusBadRequest, fmt.Errorf("amount: %w", err)) + return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("amount: %w", err)) return } @@ -77,39 +78,39 @@ func (h *Handler) newTransaction(c *gin.Context) { if payload.Payee.Type == "account" { groupID, err := h.CreateTransferForOtherAccount(newTransaction, amount, payload, c) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } newTransaction.GroupID = groupID } else { - payeeID, err := GetPayeeID(c.Request.Context(), payload, h) + payeeID, err := GetPayeeID(c.Request().Context(), payload, h) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create payee: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("create payee: %w", err)) } newTransaction.PayeeID = payeeID } - transactionUUID, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction) + transactionUUID, err := h.Service.CreateTransaction(c.Request().Context(), newTransaction) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err)) return } - transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID) + transaction, err := h.Service.GetTransaction(c.Request().Context(), transactionUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err)) return } c.JSON(http.StatusOK, transaction) } -func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionUUID uuid.UUID, c *gin.Context) { +func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionUUID uuid.UUID, c echo.Context) error { if amount.IsZero() { - err := h.Service.DeleteTransaction(c.Request.Context(), transactionUUID) + err := h.Service.DeleteTransaction(c.Request().Context(), transactionUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err)) } return } @@ -123,15 +124,15 @@ func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeri ID: transactionUUID, } - err := h.Service.UpdateTransaction(c.Request.Context(), editTransaction) + err := h.Service.UpdateTransaction(c.Request().Context(), editTransaction) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("edit transaction: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("edit transaction: %w", err)) return } - transaction, err := h.Service.GetTransaction(c.Request.Context(), transactionUUID) + transaction, err := h.Service.GetTransaction(c.Request().Context(), transactionUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err)) + return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err)) return } @@ -146,7 +147,7 @@ func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTr // transfer does not need category. Either it's account is off-budget or no category was supplied. newTransaction.CategoryID = uuid.NullUUID{} - _, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction) + _, err := h.Service.CreateTransaction(c.Request().Context(), newTransaction) if err != nil { return uuid.NullUUID{}, fmt.Errorf("create transfer transaction: %w", err) } diff --git a/server/ynab-import.go b/server/ynab-import.go index ac0da74..3fdacf7 100644 --- a/server/ynab-import.go +++ b/server/ynab-import.go @@ -4,11 +4,11 @@ import ( "net/http" "git.javil.eu/jacob1123/budgeteer/postgres" - "github.com/gin-gonic/gin" "github.com/google/uuid" + "github.com/labstack/echo/v4" ) -func (h *Handler) importYNAB(c *gin.Context) { +func (h *Handler) importYNAB(c echo.Context) error { budgetID, succ := c.Params.Get("budgetid") if !succ { c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"}) @@ -17,54 +17,54 @@ func (h *Handler) importYNAB(c *gin.Context) { budgetUUID, err := uuid.Parse(budgetID) if !succ { - c.AbortWithError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err) return } - ynab, err := postgres.NewYNABImport(c.Request.Context(), h.Service.Queries, budgetUUID) + ynab, err := postgres.NewYNABImport(c.Request().Context(), h.Service.Queries, budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } transactionsFile, err := c.FormFile("transactions") if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } transactions, err := transactionsFile.Open() if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } - err = ynab.ImportTransactions(c.Request.Context(), transactions) + err = ynab.ImportTransactions(c.Request().Context(), transactions) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } assignmentsFile, err := c.FormFile("assignments") if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } assignments, err := assignmentsFile.Open() if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } - err = ynab.ImportAssignments(c.Request.Context(), assignments) + err = ynab.ImportAssignments(c.Request().Context(), assignments) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } } -func (h *Handler) exportYNABTransactions(c *gin.Context) { +func (h *Handler) exportYNABTransactions(c echo.Context) error { budgetID, succ := c.Params.Get("budgetid") if !succ { c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"}) @@ -73,24 +73,24 @@ func (h *Handler) exportYNABTransactions(c *gin.Context) { budgetUUID, err := uuid.Parse(budgetID) if !succ { - c.AbortWithError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err) return } - ynab, err := postgres.NewYNABExport(c.Request.Context(), h.Service.Queries, budgetUUID) + ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } - err = ynab.ExportTransactions(c.Request.Context(), c.Writer) + err = ynab.ExportTransactions(c.Request().Context(), c.Writer) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } } -func (h *Handler) exportYNABAssignments(c *gin.Context) { +func (h *Handler) exportYNABAssignments(c echo.Context) error { budgetID, succ := c.Params.Get("budgetid") if !succ { c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"}) @@ -99,19 +99,19 @@ func (h *Handler) exportYNABAssignments(c *gin.Context) { budgetUUID, err := uuid.Parse(budgetID) if !succ { - c.AbortWithError(http.StatusBadRequest, err) + return echo.NewHTTPError(http.StatusBadRequest, err) return } - ynab, err := postgres.NewYNABExport(c.Request.Context(), h.Service.Queries, budgetUUID) + ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } - err = ynab.ExportAssignments(c.Request.Context(), c.Writer) + err = ynab.ExportAssignments(c.Request().Context(), c.Writer) if err != nil { - c.AbortWithError(http.StatusInternalServerError, err) + return echo.NewHTTPError(http.StatusInternalServerError, err) return } } -- 2.47.2 From 9da4a6f03ec90720d96d337ba76117ba0f1412e2 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sat, 20 Aug 2022 22:44:59 +0000 Subject: [PATCH 03/11] Continue migration to echo --- go.mod | 8 +++-- go.sum | 9 +++--- server/budget.go | 11 +++---- server/budgeting.go | 11 +++---- server/category.go | 13 ++++---- server/http.go | 6 +++- server/session.go | 17 +++++------ server/transaction.go | 27 +++++------------ server/util.go | 4 +-- server/ynab-import.go | 69 ++++++++++++++++++------------------------- 10 files changed, 76 insertions(+), 99 deletions(-) diff --git a/go.mod b/go.mod index 756a310..090cddb 100644 --- a/go.mod +++ b/go.mod @@ -11,15 +11,19 @@ require ( golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa ) -require github.com/DATA-DOG/go-txdb v0.1.5 +require ( + github.com/DATA-DOG/go-txdb v0.1.5 + github.com/labstack/echo/v4 v4.8.0 +) require ( - github.com/labstack/echo/v4 v4.8.0 // indirect + github.com/golang-jwt/jwt v3.2.2+incompatible // indirect github.com/labstack/gommon v0.3.1 // indirect github.com/mattn/go-colorable v0.1.11 // indirect github.com/valyala/bytebufferpool v1.0.0 // indirect github.com/valyala/fasttemplate v1.2.1 // indirect golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect + golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 // indirect ) require ( diff --git a/go.sum b/go.sum index 2603286..6471cc1 100644 --- a/go.sum +++ b/go.sum @@ -83,6 +83,8 @@ github.com/gofrs/uuid v4.0.0+incompatible/go.mod h1:b2aQJv3Z4Fp6yNu3cdSllBxTCLRx github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= +github.com/golang-jwt/jwt v3.2.2+incompatible h1:IfV12K8xAKAnZqdXVzCZ+TOjboZ2keLg81eXfW3O+oY= +github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I= github.com/golang-sql/civil v0.0.0-20190719163853-cb61b32ac6fe/go.mod h1:8vg3r2VgvsThLBIFL93Qb5yWzgyZWhEmBwUJWevAkK0= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc= @@ -206,7 +208,6 @@ github.com/mattn/go-colorable v0.1.11 h1:nQ+aFkoE2TMGc0b68U2OKSexC+eq46+XwZzWXHR github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-isatty v0.0.5/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= -github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= @@ -334,6 +335,7 @@ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPh golang.org/x/crypto v0.0.0-20201203163018-be400aefbc4c/go.mod h1:jdWPYTVW3xRLrWPugEBEK3UY2ZEsg3UU495nc5E+M+I= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= +golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa h1:idItI2DDfCokpg0N51B2VtiLdJ4vAuXC9fnCb2gACo4= golang.org/x/crypto v0.0.0-20211108221036-ceb1ce70b4fa/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= @@ -389,7 +391,6 @@ golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210426230700-d19ff857e887/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 h1:RqytpXGR1iVNX7psjB3ff8y7sNFinVFvkx1c8SjBkio= golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -401,11 +402,12 @@ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= -golang.org/x/text v0.3.6 h1:aRYxNxv6iGQlyVaZmk6ZgYEDa+Jg18DxebPSrd6bg1M= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324 h1:Hir2P/De0WpUhtrKGGjvSb2YxUgyZ7EFOSLIcSSpiwE= +golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= @@ -453,7 +455,6 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= diff --git a/server/budget.go b/server/budget.go index b64919a..57ea7c5 100644 --- a/server/budget.go +++ b/server/budget.go @@ -12,22 +12,19 @@ type newBudgetInformation struct { func (h *Handler) newBudget(c echo.Context) error { var newBudget newBudgetInformation - if err := c.BindJSON(&newBudget); err != nil { + if err := c.Bind(&newBudget); err != nil { return echo.NewHTTPError(http.StatusNotAcceptable, err) - return } if newBudget.Name == "" { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"budget name is required"}) - return + return echo.NewHTTPError(http.StatusBadRequest, "budget name is required") } userID := MustGetToken(c).GetID() budget, err := h.Service.NewBudget(c.Request().Context(), newBudget.Name, userID) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } - c.JSON(http.StatusOK, budget) + return c.JSON(http.StatusOK, budget) } diff --git a/server/budgeting.go b/server/budgeting.go index d99b744..f3cb07e 100644 --- a/server/budgeting.go +++ b/server/budgeting.go @@ -31,28 +31,25 @@ func (h *Handler) budgetingForMonth(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") } budget, err := h.Service.GetBudget(c.Request().Context(), budgetUUID) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, err) - return } month, err := getDate(c) if err != nil { c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String()) - return } data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } - c.JSON(http.StatusOK, data) + + return c.JSON(http.StatusOK, data) } func (h *Handler) getBudgetingViewForMonth(ctx context.Context, budget postgres.Budget, month Month) (BudgetingForMonthResponse, error) { diff --git a/server/category.go b/server/category.go index fb43095..4e9a355 100644 --- a/server/category.go +++ b/server/category.go @@ -18,28 +18,24 @@ func (h *Handler) setCategoryAssignment(c echo.Context) error { categoryID := c.Param("categoryid") categoryUUID, err := uuid.Parse(categoryID) if err != nil { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"categoryid missing from URL"}) - return + return echo.NewHTTPError(http.StatusBadRequest, "categoryid missing from URL") } var request SetCategoryAssignmentRequest - err = c.BindJSON(&request) + err = c.Bind(&request) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("invalid payload: %w", err)) - return } date, err := getDate(c) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("date invalid: %w", err)) - return } var amount numeric.Numeric err = amount.Set(request.Assigned) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("parse amount: %w", err)) - return } updateArgs := postgres.UpdateAssignmentParams{ @@ -49,7 +45,8 @@ func (h *Handler) setCategoryAssignment(c echo.Context) error { } err = h.Service.UpdateAssignment(c.Request().Context(), updateArgs) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("update assignment: %w", err)) - return + return fmt.Errorf("update assignment: %w", err) } + + return nil } diff --git a/server/http.go b/server/http.go index e6ddabe..17f4930 100644 --- a/server/http.go +++ b/server/http.go @@ -13,6 +13,7 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "github.com/labstack/echo/v4" + "github.com/labstack/echo/v4/middleware" ) // Handler handles incoming requests. @@ -36,7 +37,10 @@ func (h *Handler) Serve() { // LoadRoutes initializes all the routes. func (h *Handler) LoadRoutes(router *echo.Echo) { router.Use(enableCachingForStaticFiles()) - router.Use(h.ServeStatic) + router.Use(middleware.StaticWithConfig(middleware.StaticConfig{ + Filesystem: h.StaticFS, + HTML5: true, + })) api := router.Group("/api/v1") diff --git a/server/session.go b/server/session.go index 86bd910..66c535a 100644 --- a/server/session.go +++ b/server/session.go @@ -7,7 +7,6 @@ import ( "git.javil.eu/jacob1123/budgeteer" "git.javil.eu/jacob1123/budgeteer/postgres" - "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/labstack/echo/v4" ) @@ -18,8 +17,8 @@ const ( ParamName = "token" ) -func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn - token := c.MustGet(ParamName) +func MustGetToken(c echo.Context) budgeteer.Token { //nolint:ireturn + token := c.Get(ParamName) if token, ok := token.(budgeteer.Token); ok { return token } @@ -27,16 +26,16 @@ func MustGetToken(c *gin.Context) budgeteer.Token { //nolint:ireturn panic("Token is not a valid Token") } -func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, *ErrorResponse) { //nolint:ireturn +func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolint:ireturn tokenString := c.Request().Header.Get(HeaderName) if len(tokenString) <= len(Bearer) { - return nil, &ErrorResponse{"no authorization header supplied"} + return nil, echo.NewHTTPError(http.StatusUnauthorized, "no authorization header supplied") } tokenString = tokenString[7:] token, err := h.TokenVerifier.VerifyToken(tokenString) if err != nil { - return nil, &ErrorResponse{fmt.Sprintf("verify token '%s': %s", tokenString, err)} + return nil, fmt.Errorf("verify token '%s': %s", tokenString, err) } return token, nil @@ -107,16 +106,16 @@ func (h *Handler) registerPost(c echo.Context) error { var register registerInformation err := c.Bind(®ister) if err != nil { - return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"error parsing body"}) + return echo.NewHTTPError(http.StatusBadRequest, "error parsing body") } if register.Email == "" || register.Password == "" || register.Name == "" { - return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"e-mail, password and name are required"}) + return echo.NewHTTPError(http.StatusBadRequest, "e-mail, password and name are required") } _, err = h.Service.GetUserByUsername(c.Request().Context(), register.Email) if err == nil { - return echo.NewHTTPError(http.StatusBadRequest, ErrorResponse{"email is already taken"}) + return echo.NewHTTPError(http.StatusBadRequest, "email is already taken") } hash, err := h.CredentialsVerifier.Hash(register.Password) diff --git a/server/transaction.go b/server/transaction.go index a98c2d6..feb708c 100644 --- a/server/transaction.go +++ b/server/transaction.go @@ -8,7 +8,6 @@ import ( "git.javil.eu/jacob1123/budgeteer/postgres" "git.javil.eu/jacob1123/budgeteer/postgres/numeric" - "github.com/gin-gonic/gin" "github.com/google/uuid" "github.com/labstack/echo/v4" ) @@ -30,40 +29,35 @@ type NewTransactionPayload struct { func (h *Handler) updateTransaction(c echo.Context) error { var payload NewTransactionPayload - err := c.BindJSON(&payload) + err := c.Bind(&payload) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, err) - return } amount, err := numeric.Parse(payload.Amount) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("amount: %w", err)) - return } transactionID := c.Param("transactionid") transactionUUID, err := uuid.Parse(transactionID) if err != nil { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"transactionid missing from URL"}) - return + return echo.NewHTTPError(http.StatusBadRequest, "transactionid missing from URL") } - h.UpdateTransaction(payload, amount, transactionUUID, c) + return h.UpdateTransaction(payload, amount, transactionUUID, c) } func (h *Handler) newTransaction(c echo.Context) error { var payload NewTransactionPayload - err := c.BindJSON(&payload) + err := c.Bind(&payload) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, err) - return } amount, err := numeric.Parse(payload.Amount) if err != nil { return echo.NewHTTPError(http.StatusBadRequest, fmt.Errorf("amount: %w", err)) - return } newTransaction := postgres.CreateTransactionParams{ @@ -79,7 +73,6 @@ func (h *Handler) newTransaction(c echo.Context) error { groupID, err := h.CreateTransferForOtherAccount(newTransaction, amount, payload, c) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, err) - return } newTransaction.GroupID = groupID @@ -94,16 +87,14 @@ func (h *Handler) newTransaction(c echo.Context) error { transactionUUID, err := h.Service.CreateTransaction(c.Request().Context(), newTransaction) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("create transaction: %w", err)) - return } transaction, err := h.Service.GetTransaction(c.Request().Context(), transactionUUID) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err)) - return } - c.JSON(http.StatusOK, transaction) + return c.JSON(http.StatusOK, transaction) } func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeric.Numeric, transactionUUID uuid.UUID, c echo.Context) error { @@ -112,7 +103,7 @@ func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeri if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("delete transaction: %w", err)) } - return + return nil } editTransaction := postgres.UpdateTransactionParams{ @@ -127,19 +118,17 @@ func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeri err := h.Service.UpdateTransaction(c.Request().Context(), editTransaction) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("edit transaction: %w", err)) - return } transaction, err := h.Service.GetTransaction(c.Request().Context(), transactionUUID) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, fmt.Errorf("get transaction: %w", err)) - return } - c.JSON(http.StatusOK, transaction) + return c.JSON(http.StatusOK, transaction) } -func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c *gin.Context) (uuid.NullUUID, error) { +func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c echo.Context) (uuid.NullUUID, error) { newTransaction.GroupID = uuid.NullUUID{UUID: uuid.New(), Valid: true} newTransaction.Amount = amount.Neg() newTransaction.AccountID = payload.Payee.ID.UUID diff --git a/server/util.go b/server/util.go index 34955b8..285e0e8 100644 --- a/server/util.go +++ b/server/util.go @@ -5,10 +5,10 @@ import ( "strconv" "time" - "github.com/gin-gonic/gin" + "github.com/labstack/echo/v4" ) -func getDate(c *gin.Context) (Month, error) { +func getDate(c echo.Context) (Month, error) { var year, month int yearString := c.Param("year") monthString := c.Param("month") diff --git a/server/ynab-import.go b/server/ynab-import.go index 3fdacf7..3bb1a7b 100644 --- a/server/ynab-import.go +++ b/server/ynab-import.go @@ -9,109 +9,98 @@ import ( ) func (h *Handler) importYNAB(c echo.Context) error { - budgetID, succ := c.Params.Get("budgetid") - if !succ { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"}) - return + budgetID := c.Param("budgetid") + if budgetID == "" { + return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified") } budgetUUID, err := uuid.Parse(budgetID) - if !succ { + if err != nil { return echo.NewHTTPError(http.StatusBadRequest, err) - return } ynab, err := postgres.NewYNABImport(c.Request().Context(), h.Service.Queries, budgetUUID) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } transactionsFile, err := c.FormFile("transactions") if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } transactions, err := transactionsFile.Open() if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } err = ynab.ImportTransactions(c.Request().Context(), transactions) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } assignmentsFile, err := c.FormFile("assignments") if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } assignments, err := assignmentsFile.Open() if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } err = ynab.ImportAssignments(c.Request().Context(), assignments) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } + + return nil } func (h *Handler) exportYNABTransactions(c echo.Context) error { - budgetID, succ := c.Params.Get("budgetid") - if !succ { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"}) - return + budgetID := c.Param("budgetid") + if budgetID == "" { + return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified") } budgetUUID, err := uuid.Parse(budgetID) - if !succ { + if err != nil { return echo.NewHTTPError(http.StatusBadRequest, err) - return } ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } - err = ynab.ExportTransactions(c.Request().Context(), c.Writer) + err = ynab.ExportTransactions(c.Request().Context(), c.Response().Writer) if err != nil { - return echo.NewHTTPError(http.StatusInternalServerError, err) - return + return err } + + return nil } func (h *Handler) exportYNABAssignments(c echo.Context) error { - budgetID, succ := c.Params.Get("budgetid") - if !succ { - c.AbortWithStatusJSON(http.StatusBadRequest, ErrorResponse{"no budget_id specified"}) - return + budgetID := c.Param("budgetid") + if budgetID == "" { + return echo.NewHTTPError(http.StatusBadRequest, "no budget_id specified") } budgetUUID, err := uuid.Parse(budgetID) - if !succ { + if err != nil { return echo.NewHTTPError(http.StatusBadRequest, err) - return } ynab, err := postgres.NewYNABExport(c.Request().Context(), h.Service.Queries, budgetUUID) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, err) - return } - err = ynab.ExportAssignments(c.Request().Context(), c.Writer) + err = ynab.ExportAssignments(c.Request().Context(), c.Response().Writer) if err != nil { return echo.NewHTTPError(http.StatusInternalServerError, err) - return } + + return nil } -- 2.47.2 From d258ab63e457d69bc29f5f530aa87f55b80c62a8 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sat, 20 Aug 2022 22:45:07 +0000 Subject: [PATCH 04/11] Finish migration --- go.mod | 13 ------------- go.sum | 35 ----------------------------------- server/account_test.go | 8 +++++--- 3 files changed, 5 insertions(+), 51 deletions(-) diff --git a/go.mod b/go.mod index 090cddb..6071583 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.17 require ( github.com/dgrijalva/jwt-go v3.2.0+incompatible - github.com/gin-gonic/gin v1.7.4 github.com/google/uuid v1.3.0 github.com/jackc/pgx/v4 v4.13.0 github.com/pressly/goose/v3 v3.3.1 @@ -27,11 +26,6 @@ require ( ) require ( - github.com/gin-contrib/sse v0.1.0 // indirect - github.com/go-playground/locales v0.13.0 // indirect - github.com/go-playground/universal-translator v0.17.0 // indirect - github.com/go-playground/validator/v10 v10.4.1 // indirect - github.com/golang/protobuf v1.5.0 // indirect github.com/jackc/chunkreader/v2 v2.0.1 // indirect github.com/jackc/pgconn v1.10.0 // indirect github.com/jackc/pgio v1.0.0 // indirect @@ -39,16 +33,9 @@ require ( github.com/jackc/pgproto3/v2 v2.1.1 // indirect github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect github.com/jackc/pgtype v1.8.1 // direct - github.com/json-iterator/go v1.1.9 // indirect - github.com/leodido/go-urn v1.2.0 // indirect github.com/mattn/go-isatty v0.0.14 // indirect - github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect - github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 // indirect github.com/pkg/errors v0.9.1 // indirect github.com/shopspring/decimal v1.3.1 // indirect - github.com/ugorji/go/codec v1.1.7 // indirect golang.org/x/sys v0.0.0-20211103235746-7861aae1554b // indirect golang.org/x/text v0.3.7 // indirect - google.golang.org/protobuf v1.26.0 // indirect - gopkg.in/yaml.v2 v2.3.0 // indirect ) diff --git a/go.sum b/go.sum index 6471cc1..e1c303d 100644 --- a/go.sum +++ b/go.sum @@ -56,23 +56,11 @@ github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25Kn github.com/frankban/quicktest v1.11.3/go.mod h1:wRf/ReqHper53s+kmmSZizM8NamnL3IM0I9ntUbOk+k= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= -github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= -github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= -github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM= -github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A= -github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4= -github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q= -github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8= -github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no= -github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= -github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE= -github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4= github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.6.0 h1:BCTh4TKNUYmOmMUcQ3IipzF5prigylS7XXjEkfCHuOE= github.com/go-sql-driver/mysql v1.6.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= @@ -91,7 +79,6 @@ github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4er github.com/golang/mock v1.1.1/go.mod h1:oTYuIxOrZwtPieC+H1uAHpcLFnEyAGVDL/k47Jfbm0A= github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= -github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8= github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA= @@ -99,7 +86,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= @@ -107,9 +93,7 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI= github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ= github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= @@ -170,8 +154,6 @@ github.com/jackc/puddle v0.0.0-20190608224051-11cab39313c9/go.mod h1:m4B5Dj62Y0f github.com/jackc/puddle v1.1.3/go.mod h1:m4B5Dj62Y0fbyuIc15OsIqK0+JU8nkqQjsgx7dvjSWk= github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo= -github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns= -github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= @@ -180,18 +162,14 @@ github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxv github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= -github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI= github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/pty v1.1.8/go.mod h1:O1sed60cT9XZ5uDucP5qwvh+TE3NnUj51EiZO/lmSfw= -github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/labstack/echo/v4 v4.8.0 h1:wdc6yKVaHxkNOEdz4cRZs1pQkwSXPiRjq69yWP4QQS8= github.com/labstack/echo/v4 v4.8.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks= github.com/labstack/gommon v0.3.1 h1:OomWaJXm7xR6L1HmEtGyQf26TEn7V6X88mktX9kee9o= github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM= -github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y= -github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII= github.com/lib/pq v0.0.0-20180327071824-d34b9ff171c2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= @@ -220,10 +198,6 @@ github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc= -github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg= -github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0= github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U= @@ -292,10 +266,6 @@ github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635/go.mod h1:hkRG github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tv42/httpunix v0.0.0-20191220191345-2ba4b9c3382c/go.mod h1:hzIxponao9Kjc7aWznkXaL4U4TWaDSs8zcsY4Ka08nM= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo= -github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw= -github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs= -github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY= github.com/urfave/cli v1.22.1/go.mod h1:Gos4lmkARVdJ6EkW0WaNv/tZAAMe9V7XWyB60NtXRu0= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= @@ -427,7 +397,6 @@ golang.org/x/xerrors v0.0.0-20190513163551-3ee3066db522/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= @@ -440,11 +409,9 @@ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miE google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= -google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/inconshreveable/log15.v2 v2.0.0-20180818164646-67afb5ed74ec/go.mod h1:aPpfJ7XW+gOuirDoZ8gHhLh3kZ1B08FtV2bbmy7Jv3s= @@ -452,8 +419,6 @@ gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo= gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74= gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU= gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo= diff --git a/server/account_test.go b/server/account_test.go index e233b41..1540ff3 100644 --- a/server/account_test.go +++ b/server/account_test.go @@ -10,7 +10,8 @@ import ( "git.javil.eu/jacob1123/budgeteer/bcrypt" "git.javil.eu/jacob1123/budgeteer/jwt" "git.javil.eu/jacob1123/budgeteer/postgres" - "github.com/gin-gonic/gin" + + "github.com/labstack/echo/v4" ) func TestRegisterUser(t *testing.T) { @@ -29,15 +30,16 @@ func TestRegisterUser(t *testing.T) { } recorder := httptest.NewRecorder() - context, engine := gin.CreateTestContext(recorder) + engine := echo.New() h.LoadRoutes(engine) t.Run("RegisterUser", func(t *testing.T) { t.Parallel() - context.Request, err = http.NewRequest( + request, err := http.NewRequest( http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`)) + context := engine.NewContext(request, recorder) if err != nil { t.Errorf("error creating request: %s", err) return -- 2.47.2 From 71be1ac49f0067e4448a7944f691fdb19a2ad581 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 19:32:20 +0000 Subject: [PATCH 05/11] Send Content-Type on POST --- web/src/api.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web/src/api.ts b/web/src/api.ts index 5c5a4cb..db77552 100644 --- a/web/src/api.ts +++ b/web/src/api.ts @@ -13,7 +13,10 @@ export function POST(path: string, body: FormData | string | null) { const sessionStore = useSessionStore(); return fetch(BASE_URL + path, { method: "POST", - headers: sessionStore.AuthHeaders, + headers: { + ...sessionStore.AuthHeaders, + "Content-Type": "application/json" + }, body: body, }); } -- 2.47.2 From 1c003486ca9c60b322aa6cb3dce16dc584c978c3 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 19:35:51 +0000 Subject: [PATCH 06/11] Fix linter issues --- server/account.go | 12 ++++++------ web/src/stores/transactions.ts | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/server/account.go b/server/account.go index 1bae15f..9e04631 100644 --- a/server/account.go +++ b/server/account.go @@ -10,11 +10,11 @@ import ( ) type FilterTransactionsRequest struct { - CategoryID string `json:"category_id"` - PayeeID string `json:"payee_id"` - AccountID string `json:"account_id"` - FromDate time.Time `json:"from_date"` - ToDate time.Time `json:"to_date"` + CategoryID string `json:"categoryId"` + PayeeID string `json:"payeeId"` + AccountID string `json:"accountId"` + FromDate time.Time `json:"fromDate"` + ToDate time.Time `json:"toDate"` } func (h *Handler) filteredTransactions(c echo.Context) error { @@ -58,7 +58,7 @@ func parseEmptyUUID(value string) (uuid.NullUUID, bool) { return uuid.NullUUID{}, false } - return uuid.NullUUID{val, true}, true + return uuid.NullUUID{UUID: val, Valid: true}, true } func (h *Handler) problematicTransactions(c echo.Context) error { diff --git a/web/src/stores/transactions.ts b/web/src/stores/transactions.ts index 1e4d6d0..cb90112 100644 --- a/web/src/stores/transactions.ts +++ b/web/src/stores/transactions.ts @@ -93,11 +93,11 @@ export const useTransactionsStore = defineStore("budget/transactions", { async GetFilteredTransactions(accountID : string | null, categoryID : string | null, payeeID : string | null, fromDate : string, toDate : string) { const budgetStore = useBudgetsStore(); const payload = JSON.stringify({ - category_id: categoryID, - payee_id: payeeID, - account_id: accountID, - from_date: fromDate, - to_date: toDate, + categoryId: categoryID, + payeeId: payeeID, + accountId: accountID, + fromDate: fromDate, + toDate: toDate, }); const result = await POST("/budget/" + budgetStore.CurrentBudgetID + "/filtered-transactions", payload); const response = await result.json(); -- 2.47.2 From 08fbacc7e651c59192e7701c3d3b7d2eeffbf35c Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 19:41:04 +0000 Subject: [PATCH 07/11] Set Content-Type in test and handle error earlier --- server/account_test.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/server/account_test.go b/server/account_test.go index 1540ff3..f0f9795 100644 --- a/server/account_test.go +++ b/server/account_test.go @@ -39,13 +39,19 @@ func TestRegisterUser(t *testing.T) { http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`)) + request.Header.Set("Content-Type", "application/json") context := engine.NewContext(request, recorder) if err != nil { t.Errorf("error creating request: %s", err) return } - h.registerPost(context) + err = h.registerPost(context) + if err != nil { + t.Error(err.Error()) + t.Error("Error registering") + return + } if recorder.Code != http.StatusOK { t.Errorf("handler returned wrong status code: got %v want %v", recorder.Code, http.StatusOK) -- 2.47.2 From 4ef0b759efc9be038e6dd40755c489db7048e773 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 19:49:16 +0000 Subject: [PATCH 08/11] Fix linter errors --- .golangci.yml | 14 ++++++++++++++ server/account_test.go | 3 ++- server/budgeting.go | 2 +- server/session.go | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index 81fc978..a8c1953 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -14,6 +14,7 @@ linters: - gci # not working, shows errors on freshly formatted file - varnamelen - lll + linters-settings: errcheck: exclude-functions: @@ -25,3 +26,16 @@ linters-settings: varnamelen: ignore-decls: - c *gin.Context + wrapcheck: + ignoreSigs: + - .JSON( + - .Errorf( + - errors.New( + - errors.Unwrap( + - .Wrap( + - .Wrapf( + - .WithMessage( + - .WithMessagef( + - .WithStack( + ignorePackageGlobs: + - git.javil.eu/jacob1123/budgeteer/postgres \ No newline at end of file diff --git a/server/account_test.go b/server/account_test.go index f0f9795..a25c6b3 100644 --- a/server/account_test.go +++ b/server/account_test.go @@ -1,6 +1,7 @@ package server import ( + "context" "encoding/json" "net/http" "net/http/httptest" @@ -35,7 +36,7 @@ func TestRegisterUser(t *testing.T) { t.Run("RegisterUser", func(t *testing.T) { t.Parallel() - request, err := http.NewRequest( + request, err := http.NewRequestWithContext(context.Background(), http.MethodPost, "/api/v1/user/register", strings.NewReader(`{"password":"pass","email":"info@example.com","name":"Test"}`)) diff --git a/server/budgeting.go b/server/budgeting.go index f3cb07e..ae4cb39 100644 --- a/server/budgeting.go +++ b/server/budgeting.go @@ -41,7 +41,7 @@ func (h *Handler) budgetingForMonth(c echo.Context) error { month, err := getDate(c) if err != nil { - c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String()) + return c.Redirect(http.StatusTemporaryRedirect, "/budget/"+budget.ID.String()) } data, err := h.getBudgetingViewForMonth(c.Request().Context(), budget, month) diff --git a/server/session.go b/server/session.go index 66c535a..172f5ec 100644 --- a/server/session.go +++ b/server/session.go @@ -35,7 +35,7 @@ func (h *Handler) verifyLogin(c echo.Context) (budgeteer.Token, error) { //nolin tokenString = tokenString[7:] token, err := h.TokenVerifier.VerifyToken(tokenString) if err != nil { - return nil, fmt.Errorf("verify token '%s': %s", tokenString, err) + return nil, fmt.Errorf("verify token '%s': %w", tokenString, err) } return token, nil -- 2.47.2 From 2f636b5f9ced63e6c8b099e11bf1cb1fae3c46ac Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 19:56:55 +0000 Subject: [PATCH 09/11] Wrap some errors --- .golangci.yml | 2 ++ server/session.go | 10 +++++----- server/ynab-import.go | 9 +++++---- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index a8c1953..8fa2359 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -29,6 +29,8 @@ linters-settings: wrapcheck: ignoreSigs: - .JSON( + - .Redirect( + - .String( - .Errorf( - errors.New( - errors.Unwrap( diff --git a/server/session.go b/server/session.go index 172f5ec..01ba5bf 100644 --- a/server/session.go +++ b/server/session.go @@ -63,7 +63,7 @@ func (h *Handler) loginPost(c echo.Context) error { var login loginInformation err := c.Bind(&login) if err != nil { - return err + return fmt.Errorf("parse payload: %w", err) } user, err := h.Service.GetUserByUsername(c.Request().Context(), login.User) @@ -72,12 +72,12 @@ func (h *Handler) loginPost(c echo.Context) error { } if err = h.CredentialsVerifier.Verify(login.Password, user.Password); err != nil { - return err + return fmt.Errorf("verify password: %w", err) } token, err := h.TokenVerifier.CreateToken(&user) if err != nil { - return err + return fmt.Errorf("create token: %w", err) } go h.UpdateLastLogin(user.ID) @@ -120,7 +120,7 @@ func (h *Handler) registerPost(c echo.Context) error { hash, err := h.CredentialsVerifier.Hash(register.Password) if err != nil { - return err + return fmt.Errorf("hash password: %w", err) } createUser := postgres.CreateUserParams{ @@ -135,7 +135,7 @@ func (h *Handler) registerPost(c echo.Context) error { token, err := h.TokenVerifier.CreateToken(&user) if err != nil { - return err + return fmt.Errorf("create token: %w", err) } go h.UpdateLastLogin(user.ID) diff --git a/server/ynab-import.go b/server/ynab-import.go index 3bb1a7b..445479c 100644 --- a/server/ynab-import.go +++ b/server/ynab-import.go @@ -1,6 +1,7 @@ package server import ( + "fmt" "net/http" "git.javil.eu/jacob1123/budgeteer/postgres" @@ -26,12 +27,12 @@ func (h *Handler) importYNAB(c echo.Context) error { transactionsFile, err := c.FormFile("transactions") if err != nil { - return err + return fmt.Errorf("get transactions: %w", err) } transactions, err := transactionsFile.Open() if err != nil { - return err + return fmt.Errorf("open transactions: %w", err) } err = ynab.ImportTransactions(c.Request().Context(), transactions) @@ -41,12 +42,12 @@ func (h *Handler) importYNAB(c echo.Context) error { assignmentsFile, err := c.FormFile("assignments") if err != nil { - return err + return fmt.Errorf("get assignments: %w", err) } assignments, err := assignmentsFile.Open() if err != nil { - return err + return fmt.Errorf("open assignments: %w", err) } err = ynab.ImportAssignments(c.Request().Context(), assignments) -- 2.47.2 From 0c2438373d94c13b5a1ea05505e1e9331b58a522 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 20:00:13 +0000 Subject: [PATCH 10/11] js lint --- web/src/components/Autocomplete.vue | 6 +++--- web/src/pages/AllAccounts.vue | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/components/Autocomplete.vue b/web/src/components/Autocomplete.vue index de06c09..22f6111 100644 --- a/web/src/components/Autocomplete.vue +++ b/web/src/components/Autocomplete.vue @@ -11,10 +11,10 @@ export interface Suggestion { } const props = defineProps<{ - text: string, - id: string | undefined, + text: string | null, + id: string | null, model: string, - type?: string | undefined, + type?: string | null, }>(); const SearchQuery = ref(props.text || ""); diff --git a/web/src/pages/AllAccounts.vue b/web/src/pages/AllAccounts.vue index f1c9396..bf5a96d 100644 --- a/web/src/pages/AllAccounts.vue +++ b/web/src/pages/AllAccounts.vue @@ -42,7 +42,7 @@ const filters = ref({ ToDate: new Date(2999,11,32), }); -watch(() => filters.value.AccountID +watch(() => (filters.value.AccountID ?? "") + filters.value.PayeeID + filters.value.CategoryID + filters.value.FromDate?.toISOString() -- 2.47.2 From 0b36048f47ff4daa5a63535e363fa5ad7c94b0c0 Mon Sep 17 00:00:00 2001 From: Jan Bader Date: Sun, 21 Aug 2022 20:01:41 +0000 Subject: [PATCH 11/11] use null instead of undefined --- web/src/components/TransactionInputRow.vue | 4 ++-- web/src/stores/transactions.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/web/src/components/TransactionInputRow.vue b/web/src/components/TransactionInputRow.vue index 40db10a..da8fa19 100644 --- a/web/src/components/TransactionInputRow.vue +++ b/web/src/components/TransactionInputRow.vue @@ -16,9 +16,9 @@ const TX = ref({ Memo: "", Amount: 0, Payee: "", - PayeeID: undefined, + PayeeID: null, Category: "", - CategoryID: undefined, + CategoryID: null, CategoryGroup: "", GroupID: "", ID: "", diff --git a/web/src/stores/transactions.ts b/web/src/stores/transactions.ts index cb90112..f2ceb7e 100644 --- a/web/src/stores/transactions.ts +++ b/web/src/stores/transactions.ts @@ -17,12 +17,12 @@ export interface Transaction { TransferAccount: string; CategoryGroup: string; Category: string; - CategoryID: string | undefined; + CategoryID: string | null; Memo: string; Status: string; GroupID: string; Payee: string; - PayeeID: string | undefined; + PayeeID: string | null; Amount: number; Reconciled: boolean; Account: string; -- 2.47.2