Merge pull request #65 from lungria/feature/fix-last-import-time

fix last import time + some linter issues

Author: flerka

.github/workflows/pr.yml

@@ -24,13 +24,13 @@ jobs:
           - 5432:5432
     steps:
     - name: Set up Go 1.x
-      uses: actions/setup-go@v2
+      uses: actions/setup-go@v3
       with:
-        go-version: ^1.17
+        go-version: ^1.18
       id: go
 
     - name: Check out code into the Go module directory
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Build
       run: go build -v .
@@ -46,8 +46,8 @@ jobs:
     name: Lint
     runs-on: ubuntu-20.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - name: golangci-lint
-        uses: golangci/golangci-lint-action@v2
+        uses: golangci/golangci-lint-action@v3
         with:
-          version: v1.42.1
+          version: v1.46

.github/workflows/tag.yml

@@ -13,16 +13,16 @@ jobs:
       DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}  
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Docker Buildx
         id: buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
         with:
           version: latest
 
       - name: Login to DockerHub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_TOKEN }}
@@ -31,7 +31,7 @@ jobs:
         run: echo "TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v3
         with:
           platforms: linux/arm64,linux/amd64
           push: true

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.17.1-alpine3.14 as builder
+FROM golang:1.18.1-alpine3.14 as builder
 
 ARG TARGETOS
 ARG TARGETARCH

budget/budget_test.go

@@ -19,10 +19,10 @@ func TestBudgetsStorageGetLast_WhenNoLimitsExist_NoErrorReturned(t *testing.T) {
 	budgetID := prepareTestBudget(t, pool)
 	db := budget.NewRepository(pool)
 
-	budget, err := db.GetLast(context.Background())
+	result, err := db.GetLast(context.Background())
 
 	assert.NoError(t, err)
-	assert.Equal(t, budget.ID, budgetID)
+	assert.Equal(t, result.ID, budgetID)
 }
 
 func TestBudgetsStorageGetLast_WhenLimitsExist_NoErrorReturned(t *testing.T) {
@@ -51,12 +51,12 @@ func TestBudgetsStorageGetLast_WhenLimitsExist_NoErrorReturned(t *testing.T) {
 
 	db := budget.NewRepository(pool)
 
-	budget, err := db.GetLast(context.Background())
+	result, err := db.GetLast(context.Background())
 
 	assert.NoError(t, err)
-	assert.Equal(t, budget.ID, budgetID)
-	assert.Len(t, budget.Limits, 2)
-	assert.Equal(t, int64(200), budget.Limits[0].Amount)
+	assert.Equal(t, result.ID, budgetID)
+	assert.Len(t, result.Limits, 2)
+	assert.Equal(t, int64(200), result.Limits[0].Amount)
 }
 
 func prepareTestBudget(t *testing.T, db *pgxpool.Pool) int {
@@ -81,10 +81,10 @@ func prepareTestLimit(t *testing.T, db *pgxpool.Pool, budgetID int, limit budget
 	require.NoError(t, err)
 }
 
-func prepareTestCategory(t *testing.T, db *pgxpool.Pool, category category.Category) {
+func prepareTestCategory(t *testing.T, db *pgxpool.Pool, ctg category.Category) {
 	_, err := db.Exec(context.Background(), `
 				insert into category ("ID", "name", "logo", "createdAt")
-				values ($1, $2, $3, current_timestamp(0))`, category.ID, category.Name, category.Logo)
+				values ($1, $2, $3, current_timestamp(0))`, ctg.ID, ctg.Name, ctg.Logo)
 
 	require.NoError(t, err)
 }

go.mod

@@ -1,13 +1,13 @@
 module github.com/lungria/spendshelf-backend
 
-go 1.17
+go 1.18
 
 require (
-	github.com/caarlos0/env/v6 v6.7.1
-	github.com/gin-gonic/gin v1.7.4
-	github.com/jackc/pgx/v4 v4.13.0
-	github.com/rs/cors v1.8.0
-	github.com/rs/zerolog v1.25.0
+	github.com/caarlos0/env/v6 v6.9.1
+	github.com/gin-gonic/gin v1.7.7
+	github.com/jackc/pgx/v4 v4.16.1
+	github.com/rs/cors/wrapper/gin v0.0.0-20220223021805-a4a5ce87d5a2
+	github.com/rs/zerolog v1.26.1
 	github.com/stretchr/testify v1.7.0
 )
 
@@ -16,26 +16,28 @@ require (
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-playground/validator/v10 v10.4.1 // indirect
-	github.com/golang/protobuf v1.3.3 // indirect
+	github.com/go-playground/validator/v10 v10.11.0 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/jackc/chunkreader/v2 v2.0.1 // indirect
-	github.com/jackc/pgconn v1.10.0 // indirect
+	github.com/jackc/pgconn v1.12.1 // indirect
 	github.com/jackc/pgio v1.0.0 // indirect
 	github.com/jackc/pgpassfile v1.0.0 // indirect
-	github.com/jackc/pgproto3/v2 v2.1.1 // indirect
+	github.com/jackc/pgproto3/v2 v2.3.0 // indirect
 	github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect
-	github.com/jackc/pgtype v1.8.1 // indirect
-	github.com/jackc/puddle v1.1.3 // indirect
-	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/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/jackc/pgtype v1.11.0 // indirect
+	github.com/jackc/puddle v1.2.1 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/leodido/go-urn v1.2.1 // indirect
+	github.com/mattn/go-isatty v0.0.14 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/ugorji/go/codec v1.1.7 // indirect
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/text v0.3.6 // indirect
-	gopkg.in/yaml.v2 v2.2.8 // indirect
+	github.com/rs/cors v1.8.2 // indirect
+	github.com/ugorji/go/codec v1.2.7 // indirect
+	golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122 // indirect
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
+	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
 )