From 2d76b4bafd0e7c7259f0734022956a000fc83d8e Mon Sep 17 00:00:00 2001 From: Pavel Date: Fri, 27 Sep 2024 16:47:08 +0300 Subject: [PATCH] - --- go.mod | 2 +- go.sum | 12 ++---------- internal/controllers/steps.go | 13 +------------ internal/service/pipelines.go | 3 ++- internal/service/steps.go | 5 +++-- 5 files changed, 9 insertions(+), 26 deletions(-) diff --git a/go.mod b/go.mod index 1109d9e..156d8f9 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/lib/pq v1.10.9 github.com/twmb/franz-go v1.17.1 go.uber.org/zap v1.27.0 - penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927102828-c7ddbc2ab0f0 + penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927134525-05cc400827a5 penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 ) diff --git a/go.sum b/go.sum index 28dc5de..49101fe 100644 --- a/go.sum +++ b/go.sum @@ -141,15 +141,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d h1:gbaDt35HMDqOK84WYmDIlXMI7rstUcRqNttaT6Kx1do= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240202120244-c4ef330cfe5d/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926081605-f7dda8704dbf h1:Tnhg4SypUiQP/s5hd9AE6LQ38mABe070czaa5xjuIu8= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926081605-f7dda8704dbf/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926124254-355001566829 h1:GZ6cDgC799ds9hVEQXDa4A+ENVyfJDOmPBPydetdZXU= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926124254-355001566829/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926135458-58615f64a3dd h1:VMU3RF1HyxQ+1xRVhj9zY4YHRkKe/m3p/zJBjExemQc= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926135458-58615f64a3dd/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926142728-9491e7daffc7 h1:pBzs1DsBD9r0RNKOdcgwaqjT1xteVXe1hap+avomqBY= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926142728-9491e7daffc7/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927102828-c7ddbc2ab0f0 h1:PRimpAbejtMw9piGw2UVW4MZpg9RWYiQqe276Spnb60= -penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927102828-c7ddbc2ab0f0/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927134525-05cc400827a5 h1:YnVeXy4zDlfkiwaFRZCMLDcxrIqKtQBJKZWp4lIn6tA= +penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927134525-05cc400827a5/go.mod h1:uOuosXduBzd2WbLH6TDZO7ME7ZextulA662oZ6OsoB0= penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3 h1:sf6e2mp582L3i/FMDd2q6QuWm1njRXzYpIX0SipsvM4= penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3/go.mod h1:i7M72RIpkSjcQtHID6KKj9RT/EYZ1rxS6tIPKWa/BSY= diff --git a/internal/controllers/steps.go b/internal/controllers/steps.go index 0437645..8df6875 100644 --- a/internal/controllers/steps.go +++ b/internal/controllers/steps.go @@ -5,7 +5,6 @@ import ( "github.com/gofiber/fiber/v2" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/middleware" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/pj_errors" - "strconv" ) func (c *Controller) GetStepsWithPagination(ctx *fiber.Ctx) error { @@ -14,22 +13,12 @@ func (c *Controller) GetStepsWithPagination(ctx *fiber.Ctx) error { return ctx.Status(fiber.StatusUnauthorized).SendString("account id is required") } - pipelineIDStr := ctx.Query("pipelineID") - if pipelineIDStr == "" { - return ctx.Status(fiber.StatusBadRequest).SendString("pipeline id is required") - } - - pipelineID, err := strconv.Atoi(pipelineIDStr) - if err != nil { - return ctx.Status(fiber.StatusBadRequest).SendString("invalid pipeline id parameter") - } - req, err := extractParams(ctx) if err != nil { return err } - response, err := c.service.GetStepsWithPagination(ctx.Context(), req, accountID, pipelineID) + response, err := c.service.GetStepsWithPagination(ctx.Context(), req, accountID) if err != nil { switch { case errors.Is(err, pj_errors.ErrNotFound): diff --git a/internal/service/pipelines.go b/internal/service/pipelines.go index 48674a3..74e1207 100644 --- a/internal/service/pipelines.go +++ b/internal/service/pipelines.go @@ -4,6 +4,7 @@ import ( "context" "database/sql" "go.uber.org/zap" + "penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/models" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/pj_errors" ) @@ -23,7 +24,7 @@ func (s *Service) UpdateListPipelines(ctx context.Context, accountID string) err return nil } -func (s *Service) GetPipelinesWithPagination(ctx context.Context, req *model.PaginationReq, accountID string) (*model.UserListPipelinesResp, error) { +func (s *Service) GetPipelinesWithPagination(ctx context.Context, req *model.PaginationReq, accountID string) (*model.UserBitrixListPipelinesResp, error) { response, err := s.repository.BitrixRepo.GetPipelinesWithPagination(ctx, req, accountID) if err != nil { if err == sql.ErrNoRows { diff --git a/internal/service/steps.go b/internal/service/steps.go index 281b292..02e7efd 100644 --- a/internal/service/steps.go +++ b/internal/service/steps.go @@ -4,12 +4,13 @@ import ( "context" "database/sql" "go.uber.org/zap" + "penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/models" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/pj_errors" ) -func (s *Service) GetStepsWithPagination(ctx context.Context, req *model.PaginationReq, accountID string, pipelineID int) (*model.UserListStepsResp, error) { - response, err := s.repository.BitrixRepo.GetStepsWithPagination(ctx, req, accountID, int32(pipelineID)) +func (s *Service) GetStepsWithPagination(ctx context.Context, req *model.PaginationReq, accountID string) (*model.UserListBitrixStepsResp, error) { + response, err := s.repository.BitrixRepo.GetStepsWithPagination(ctx, req, accountID) if err != nil { if err == sql.ErrNoRows { return nil, pj_errors.ErrNotFound