From 78903fc1de09b4079ed687f06f39dbce0d7a1b2b Mon Sep 17 00:00:00 2001 From: le-xuan-quynh Date: Sun, 1 May 2022 17:15:18 +0700 Subject: [PATCH] refactor code --- internal/database/postgres-repository.go | 9 ++++++++- pkg/authorization/middleware/middleware.go | 4 +--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/internal/database/postgres-repository.go b/internal/database/postgres-repository.go index 44b17ac..7d3302e 100644 --- a/internal/database/postgres-repository.go +++ b/internal/database/postgres-repository.go @@ -2,9 +2,11 @@ package database import ( "context" + "database/sql" "github.com/hashicorp/go-hclog" "github.com/jmoiron/sqlx" uuid "github.com/satori/go.uuid" + "log" "time" ) @@ -179,7 +181,12 @@ func (repo *postgresRepository) GetListOfPasswords(ctx context.Context, userID s if err != nil { return nil, err } - defer rows.Close() + defer func(rows *sql.Rows) { + err := rows.Close() + if err != nil { + log.Println(err) + } + }(rows) var passwords []string for rows.Next() { var password string diff --git a/pkg/authorization/middleware/middleware.go b/pkg/authorization/middleware/middleware.go index 90ae9d1..576123d 100644 --- a/pkg/authorization/middleware/middleware.go +++ b/pkg/authorization/middleware/middleware.go @@ -112,8 +112,7 @@ func ValidateParamRequest(validator *database.Validation, logger hclog.Logger) e logger.Error("validation of verification data json failed", "error", errs) return nil, errors.New("please check your param request") } - resp, err = next(ctx, request) - return + return next(ctx, request) } } } @@ -127,7 +126,6 @@ func RateLimitRequest(tb *ratelimit.Bucket, logger hclog.Logger) endpoint.Middle return nil, errors.New("you request too fast, please slow down") } return next(ctx, request) - return } } }