From 1a0da95d1d2947126a93ec8664aa9b750b82b0b0 Mon Sep 17 00:00:00 2001 From: skeris Date: Fri, 29 Nov 2024 01:31:35 +0300 Subject: [PATCH] add account id to quiz rules getting --- go.mod | 2 +- go.sum | 4 ++++ internal/controllers/rules.go | 7 ++++++- internal/service/rules.go | 4 ++-- 4 files changed, 13 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index d81805f..4bc9a46 100644 --- a/go.mod +++ b/go.mod @@ -14,7 +14,7 @@ require ( github.com/twmb/franz-go v1.16.1 go.uber.org/zap v1.27.0 google.golang.org/protobuf v1.33.0 - penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128215257-f982b5feed3f + penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128224506-7c545dd5f525 ) require ( diff --git a/go.sum b/go.sum index 7897497..4df67da 100644 --- a/go.sum +++ b/go.sum @@ -156,5 +156,9 @@ penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241127183946-e42 penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241127183946-e4272e6ac822/go.mod h1:nfZkoj8MCYaoP+xiPeUn5D0lIzinUr1qDkNfX0ng9rk= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128215257-f982b5feed3f h1:tg13lAhb9QG5Guex891o09eF045YE64c8n9ZnG6qkmc= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128215257-f982b5feed3f/go.mod h1:nfZkoj8MCYaoP+xiPeUn5D0lIzinUr1qDkNfX0ng9rk= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128222225-9ff7f440978c h1:d2eIhKKUmSKQmvbdX7OabibQ8izo9MVP74wTuY1xwzk= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128222225-9ff7f440978c/go.mod h1:nfZkoj8MCYaoP+xiPeUn5D0lIzinUr1qDkNfX0ng9rk= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128224506-7c545dd5f525 h1:4FL+sSXvPUcuLQPVIoVJyziWPuJ6YlMcMi83fa/4BEY= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20241128224506-7c545dd5f525/go.mod h1:nfZkoj8MCYaoP+xiPeUn5D0lIzinUr1qDkNfX0ng9rk= penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240803124813-79e62d2acf3c h1:imtXaIVscs8it6SfAmDxjNxqQSF44GgCTl1N6JT6unA= penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240803124813-79e62d2acf3c/go.mod h1:i7M72RIpkSjcQtHID6KKj9RT/EYZ1rxS6tIPKWa/BSY= diff --git a/internal/controllers/rules.go b/internal/controllers/rules.go index 7754e14..a4d3887 100644 --- a/internal/controllers/rules.go +++ b/internal/controllers/rules.go @@ -95,8 +95,13 @@ func (c *Controller) GettingQuizRules(ctx *fiber.Ctx) error { if err != nil { return ctx.Status(fiber.StatusBadRequest).SendString("failed convert quizID to int") } + accountID, ok := middleware.GetAccountId(ctx) + if !ok { + return ctx.Status(fiber.StatusUnauthorized).SendString("account id is required") + } - response, err := c.service.GettingQuizRules(ctx.Context(), quizIDInt) + + response, err := c.service.GettingQuizRules(ctx.Context(),accountID, quizIDInt) if err != nil { switch { diff --git a/internal/service/rules.go b/internal/service/rules.go index d2c2e57..c85b7da 100644 --- a/internal/service/rules.go +++ b/internal/service/rules.go @@ -75,8 +75,8 @@ func (s *Service) SetQuizSettings(ctx context.Context, request *model.RulesReq, return nil } -func (s *Service) GettingQuizRules(ctx context.Context, quizID int) (*model.Rule, error) { - rule, err := s.repository.AmoRepo.GettingQuizRules(ctx, quizID) +func (s *Service) GettingQuizRules(ctx context.Context,accountID string, quizID int) (*model.Rule, error) { + rule, err := s.repository.AmoRepo.GettingQuizRules(ctx,accountID , quizID) if err != nil { if err == sql.ErrNoRows { return nil, pj_errors.ErrNotFound