PenaSide/notifier
3
0
Fork 0
Code Issues 4 Pull Requests Actions Packages Projects Releases Wiki Activity

fix lint

Browse Source
This commit is contained in:
Pasha 2024-12-16 15:07:19 +03:00
parent d312604e97
commit 20dcb01f55
5 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/clients/customer.go
View File

@ -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]
}

7
internal/clients/errors.go Normal file
View File

@ -0,0 +1,7 @@
package clients
import "errors"
var (
errSendingRequest = errors.New("error sending request")
)

4
internal/clients/mail.go
View File

@ -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
}

13
internal/clients/quiz_rpc.go
View File

@ -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
}

21
internal/repository/repository.go
View File

@ -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