From 20dcb01f550634b888ecca4be1d75b149a231482 Mon Sep 17 00:00:00 2001 From: Pasha Date: Mon, 16 Dec 2024 15:07:19 +0300 Subject: [PATCH] fix lint --- internal/clients/customer.go | 4 ++-- internal/clients/errors.go | 7 +++++++ internal/clients/mail.go | 4 ++-- internal/clients/quiz_rpc.go | 13 ++++++++----- internal/repository/repository.go | 21 +++++++++++---------- 5 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 internal/clients/errors.go diff --git a/internal/clients/customer.go b/internal/clients/customer.go index d4fd35a..6c19c47 100644 --- a/internal/clients/customer.go +++ b/internal/clients/customer.go @@ -3,9 +3,9 @@ package clients import ( "encoding/json" "fmt" + "gitea.pena/PenaSide/notifier/internal/models" "github.com/gofiber/fiber/v2" "go.uber.org/zap" - "gitea.pena/PenaSide/notifier/internal/models" ) type Customer struct { @@ -41,7 +41,7 @@ func (c *Customer) GetAccount(userID string) (models.Account, error) { statusCode, body, errs := resp.Bytes() if errs != nil { - c.logger.Error("Error sending request:", zap.Error(errs[0])) + c.logger.Error(errSendingRequest.Error(), zap.Error(errs[0])) return account, errs[0] } diff --git a/internal/clients/errors.go b/internal/clients/errors.go new file mode 100644 index 0000000..2e98cf7 --- /dev/null +++ b/internal/clients/errors.go @@ -0,0 +1,7 @@ +package clients + +import "errors" + +var ( + errSendingRequest = errors.New("error sending request") +) diff --git a/internal/clients/mail.go b/internal/clients/mail.go index eea63d1..824f884 100644 --- a/internal/clients/mail.go +++ b/internal/clients/mail.go @@ -82,12 +82,12 @@ func (m *MailClient) MailSender(data SenderDeps) error { statusCode, body, errs := req.Bytes() if errs != nil { - m.deps.Logger.Error("Error sending request:", zap.Error(errs[0])) + m.deps.Logger.Error(errSendingRequest.Error(), zap.Error(errs[0])) return errs[0] } if statusCode != fiber.StatusOK { - err = fmt.Errorf("the SMTP service returned an error: %s Response body: %s", statusCode, body) + err = fmt.Errorf("the SMTP service returned an error: %d Response body: %s", statusCode, body) m.deps.Logger.Error("Error sending email:", zap.Error(err)) return err } diff --git a/internal/clients/quiz_rpc.go b/internal/clients/quiz_rpc.go index aacbb8d..5d6ef46 100644 --- a/internal/clients/quiz_rpc.go +++ b/internal/clients/quiz_rpc.go @@ -2,10 +2,10 @@ package clients import ( "context" + "gitea.pena/PenaSide/notifier/internal/proto/notifyer" "go.uber.org/zap" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" - "gitea.pena/PenaSide/notifier/internal/proto/notifyer" ) type QuizClient struct { @@ -20,10 +20,13 @@ func NewQuizClient(address string, logger *zap.Logger) *QuizClient { } } +var coreRpcHost = "core rpc host" +var request = "request" + func (q *QuizClient) GetQuizzes(ctx context.Context, req *notifyer.GetQuizzesRequest) (*notifyer.GetQuizzesResponse, error) { connection, err := grpc.Dial(q.address, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - q.logger.Error("failed to connect on GetQuizzes of core rpc", zap.Error(err), zap.String("core rpc host", q.address)) + q.logger.Error("failed to connect on GetQuizzes of core rpc", zap.Error(err), zap.String(coreRpcHost, q.address)) return nil, err } defer func() { @@ -36,7 +39,7 @@ func (q *QuizClient) GetQuizzes(ctx context.Context, req *notifyer.GetQuizzesReq response, err := client.GetQuizzes(ctx, req) if err != nil { - q.logger.Error("failed to GetQuizzes core rpc", zap.Error(err), zap.Any("request", req)) + q.logger.Error("failed to GetQuizzes core rpc", zap.Error(err), zap.Any(request, req)) return nil, err } @@ -46,7 +49,7 @@ func (q *QuizClient) GetQuizzes(ctx context.Context, req *notifyer.GetQuizzesReq func (q *QuizClient) GetStartedQuizzes(ctx context.Context, req *notifyer.GetStartedQuizzesRequest) (*notifyer.GetStartedQuizzesResponse, error) { connection, err := grpc.Dial(q.address, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { - q.logger.Error("failed to connect on GetStartedQuizzes of core rpc", zap.Error(err), zap.String("core rpc host", q.address)) + q.logger.Error("failed to connect on GetStartedQuizzes of core rpc", zap.Error(err), zap.String(coreRpcHost, q.address)) return nil, err } defer func() { @@ -59,7 +62,7 @@ func (q *QuizClient) GetStartedQuizzes(ctx context.Context, req *notifyer.GetSta response, err := client.GetStartedQuizzes(ctx, req) if err != nil { - q.logger.Error("failed to GetStartedQuizzes core rpc", zap.Error(err), zap.Any("request", req)) + q.logger.Error("failed to GetStartedQuizzes core rpc", zap.Error(err), zap.Any(request, req)) return nil, err } diff --git a/internal/repository/repository.go b/internal/repository/repository.go index 6c45da1..0bd4aed 100644 --- a/internal/repository/repository.go +++ b/internal/repository/repository.go @@ -2,10 +2,11 @@ package repository import ( "context" + "errors" + "gitea.pena/PenaSide/notifier/internal/models" "go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" - "gitea.pena/PenaSide/notifier/internal/models" "time" ) @@ -39,18 +40,18 @@ func (r *Repository) GetMany(ctx context.Context) ([]models.Message, error) { from := time.Now().AddDate(0, 0, -7) filter := bson.D{ - {"$and", bson.A{ + {Key: "$and", Value: bson.A{ bson.D{ - {"$or", bson.A{ - bson.D{{"sendRegistration", false}}, - bson.D{{"sendNoneCreated", false}}, - bson.D{{"sendUnpublished", false}}, + {Key: "$or", Value: bson.A{ + bson.D{{Key: "sendRegistration", Value: false}}, + bson.D{{Key: "sendNoneCreated", Value: false}}, + bson.D{{Key: "sendUnpublished", Value: false}}, }}, }, bson.D{ - {"sendAt", bson.D{ - {"$gte", to}, - {"$lte", from}, + {Key: "sendAt", Value: bson.D{ + {Key: "$gte", Value: to}, + {Key: "$lte", Value: from}, }}, }, }}, @@ -58,7 +59,7 @@ func (r *Repository) GetMany(ctx context.Context) ([]models.Message, error) { cursor, err := r.mdb.Find(ctx, filter) if err != nil { - if err == mongo.ErrNoDocuments { + if errors.Is(err, mongo.ErrNoDocuments) { return []models.Message{}, nil } return nil, err