SQuiz/bitrix
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-

Browse Source
This commit is contained in:
Pavel 2024-09-27 14:24:30 +03:00
parent 64d8340035
commit 4c7c02bf15
5 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/main.go
View File

@ -6,6 +6,7 @@ import (
"os"
"os/signal"
"penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/app"
"penahub.gitlab.yandexcloud.net/backend/quiz/bitrix/internal/initialize"
"syscall"
"go.uber.org/zap"

2
go.mod
View File

@ -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-20240926142728-9491e7daffc7
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240927102828-c7ddbc2ab0f0
penahub.gitlab.yandexcloud.net/devops/linters/golang.git v0.0.0-20240829220549-d35409b619a3
)

2
go.sum
View File

@ -149,5 +149,7 @@ penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240926135458-586
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/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=

5
internal/controllers/user.go
View File

@ -50,9 +50,8 @@ func (c *Controller) SoftDeleteAccount(ctx *fiber.Ctx) error {
err := c.service.SoftDeleteAccount(ctx.Context(), accountID)
if err != nil {
if err != nil {
return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
}
return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
}
return ctx.SendStatus(fiber.StatusOK)
}

4
internal/service/user.go
View File

@ -25,7 +25,7 @@ func (s *Service) UpdateListUsers(ctx context.Context, accountID string) error {
return nil
}
func (s *Service) GettingUserWithPagination(ctx context.Context, req *model.PaginationReq, accountID string) (*model.UserListResp, error) {
func (s *Service) GettingUserWithPagination(ctx context.Context, req *model.PaginationReq, accountID string) (*model.UserListBitrixResp, error) {
response, err := s.repository.BitrixRepo.GettingUserWithPagination(ctx, req, accountID)
if err != nil {
s.logger.Error("error getting users with pagination", zap.Error(err))
@ -43,7 +43,7 @@ func (s *Service) SoftDeleteAccount(ctx context.Context, accountID string) error
return nil
}
func (s *Service) GetCurrentAccount(ctx context.Context, accountID string) (*model.AmoAccount, error) {
func (s *Service) GetCurrentAccount(ctx context.Context, accountID string) (*model.BitrixAccount, error) {
user, err := s.repository.BitrixRepo.GetCurrentAccount(ctx, accountID)
if err != nil {
if err == sql.ErrNoRows {