From f9c4d49ce1f11295153d875dc85e5c9ee66405da Mon Sep 17 00:00:00 2001 From: iChemy Date: Mon, 16 Sep 2024 20:20:38 +0900 Subject: [PATCH 1/2] :art: add setup-go in lint --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1aa3d95..c72fda8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -50,6 +50,9 @@ jobs: needs: build steps: - uses: actions/checkout@v4 + - uses: actions/setup-go@v5 + with: + go-version-file: ./go.mod - uses: golangci/golangci-lint-action@v6 with: version: latest From 5ac48d9804b9c83ff082014d230e33d9b201fb81 Mon Sep 17 00:00:00 2001 From: iChemy Date: Mon, 16 Sep 2024 20:31:06 +0900 Subject: [PATCH 2/2] :art: change arg order of errors.Is --- router/users.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/router/users.go b/router/users.go index 295dc39..b7c7e72 100644 --- a/router/users.go +++ b/router/users.go @@ -16,7 +16,7 @@ import ( func (h *Handlers) HandleGetUserMe(c echo.Context) error { user, err := h.Repo.GetUserMe(getConinfo(c)) if err != nil { - if errors.Is(domain.ErrInvalidToken, err) { + if errors.Is(err, domain.ErrInvalidToken) { return forbidden(err, message("token is invalid."), needAuthorization(true)) } return judgeErrorResponse(err) @@ -30,7 +30,7 @@ func (h *Handlers) HandleGetUsers(c echo.Context) error { users, err := h.Repo.GetAllUsers(includeSuspend, true, getConinfo(c)) if err != nil { - if errors.Is(domain.ErrInvalidToken, err) { + if errors.Is(err, domain.ErrInvalidToken) { return forbidden(err, message("token is invalid."), needAuthorization(true)) } return judgeErrorResponse(err)