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

some update with common quiz amo repo

Browse Source
This commit is contained in:
Pavel 2024-04-18 14:13:03 +03:00
parent f1bf31a302
commit febeb74b35
16 changed files with 134 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
go.mod
View File

@ -9,7 +9,7 @@ require (
github.com/stretchr/testify v1.8.4 github.com/stretchr/testify v1.8.4
go.mongodb.org/mongo-driver v1.14.0 go.mongodb.org/mongo-driver v1.14.0
go.uber.org/zap v1.27.0 go.uber.org/zap v1.27.0
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240417181958-44291564e21f penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240418110002-105a18f646f0
penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af
) )

4
go.sum
View File

@ -187,7 +187,7 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240223054633-6cb3d5ce45b6 h1:oV+/HNX+JPoQ3/GUx08hio7d45WpY0AMGrFs7j70QlA= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240223054633-6cb3d5ce45b6 h1:oV+/HNX+JPoQ3/GUx08hio7d45WpY0AMGrFs7j70QlA=
penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240223054633-6cb3d5ce45b6/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM= penahub.gitlab.yandexcloud.net/backend/penahub_common v0.0.0-20240223054633-6cb3d5ce45b6/go.mod h1:lTmpjry+8evVkXWbEC+WMOELcFkRD1lFMc7J09mOndM=
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240417181958-44291564e21f h1:DE/eXlvfVcdlhdk0AP9Mg7saLSKn5dPHDRAwp4swGOA= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240418110002-105a18f646f0 h1:DwTvHNGmE6ddntxSBb6OJXaJXy1Sbz2ifYUG77zsjyY=
penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240417181958-44291564e21f/go.mod h1:oRyhT55ctjqp/7ZxIzkR7OsQ7T/NLibsfrbb7Ytns64= penahub.gitlab.yandexcloud.net/backend/quiz/common.git v0.0.0-20240418110002-105a18f646f0/go.mod h1:oRyhT55ctjqp/7ZxIzkR7OsQ7T/NLibsfrbb7Ytns64=
penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af h1:jQ7HaXSutDX5iepU7VRImxhikK7lV/lBKkiloOZ4Emo= penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af h1:jQ7HaXSutDX5iepU7VRImxhikK7lV/lBKkiloOZ4Emo=
penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af/go.mod h1:5S5YwjSXWmnEKjBjG6MtyGtFmljjukDRS8CwHk/CF/I= penahub.gitlab.yandexcloud.net/backend/quiz/core.git v0.0.0-20240219174804-d78fd38511af/go.mod h1:5S5YwjSXWmnEKjBjG6MtyGtFmljjukDRS8CwHk/CF/I=

2
internal/controllers/fields.go
View File

@ -8,7 +8,7 @@ func (c *Controller) GettingFieldsFromCash(ctx *fiber.Ctx) error {
return err return err
} }
response, err := c.service.GettingFieldsFromCash(ctx.Context(), req) response, err := c.service.GetFieldsWithPagination(ctx.Context(), req)
if err != nil { if err != nil {
return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error") return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
} }

2
internal/controllers/middleware.go
View File

@ -22,7 +22,7 @@ func extractParams(ctx *fiber.Ctx) (*model.PaginationReq, error) {
req := model.PaginationReq{ req := model.PaginationReq{
Page: page, Page: page,
Size: size, Size: int32(size),
} }
return &req, nil return &req, nil

2
internal/controllers/pipelines.go
View File

@ -17,7 +17,7 @@ func (c *Controller) GettingPipelinesFromCash(ctx *fiber.Ctx) error {
return err return err
} }
response, err := c.service.GettingPipelinesFromCash(ctx.Context(), req) response, err := c.service.GetPipelinesWithPagination(ctx.Context(), req)
if err != nil { if err != nil {
return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error") return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
} }

2
internal/controllers/steps.go
View File

@ -8,7 +8,7 @@ func (c *Controller) GettingStepsFromCash(ctx *fiber.Ctx) error {
return err return err
} }
response, err := c.service.GettingStepsFromCash(ctx.Context(), req) response, err := c.service.GetStepsWithPagination(ctx.Context(), req)
if err != nil { if err != nil {
return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error") return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")

2
internal/controllers/tags.go
View File

@ -8,7 +8,7 @@ func (c *Controller) GettingTagsFromCash(ctx *fiber.Ctx) error {
return err return err
} }
response, err := c.service.GettingTagsFromCash(ctx.Context(), req) response, err := c.service.GetTagsWithPagination(ctx.Context(), req)
if err != nil { if err != nil {
return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error") return ctx.Status(fiber.StatusInternalServerError).SendString("Internal Server Error")
} }

3
internal/repository/tags.go
View File

@ -7,11 +7,12 @@ import (
"go.mongodb.org/mongo-driver/bson" "go.mongodb.org/mongo-driver/bson"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
"time" "time"
) )
// test + // test +
func (r *Repository) GettingTagsFromCash(ctx context.Context, req *models.PaginationReq) (*models.UserListTagsResp, error) { func (r *Repository) GettingTagsFromCash(ctx context.Context, req *model.PaginationReq) (*models.UserListTagsResp, error) {
offset := (req.Page - 1) * req.Size offset := (req.Page - 1) * req.Size
totalTags, err := r.tags.CountDocuments(ctx, bson.M{"deleted": false}) totalTags, err := r.tags.CountDocuments(ctx, bson.M{"deleted": false})

3
internal/repository/utm.go
View File

@ -8,10 +8,11 @@ import (
"go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/bson/primitive"
"go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/mongo"
"go.mongodb.org/mongo-driver/mongo/options" "go.mongodb.org/mongo-driver/mongo/options"
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
) )
// test + // test +
func (r *Repository) DeletingUserUtm(ctx context.Context, request *models.ListDeleteUTMIDsReq) error { func (r *Repository) DeletingUserUtm(ctx context.Context, request *model.ListDeleteUTMIDsReq) error {
var objIDs []primitive.ObjectID var objIDs []primitive.ObjectID
for _, id := range request.Utms { for _, id := range request.Utms {

4
internal/service/fields.go
View File

@ -6,8 +6,8 @@ import (
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
) )
func (s *Service) GettingFieldsFromCash(ctx context.Context, req *model.PaginationReq) (*model.UserListFieldsResp, error) { func (s *Service) GetFieldsWithPagination(ctx context.Context, req *model.PaginationReq) (*model.UserListFieldsResp, error) {
response, err := s.repository.AmoRepo.GettingFieldsFromCash(ctx, req) response, err := s.repository.AmoRepo.GetFieldsWithPagination(ctx, req)
if err != nil { if err != nil {
s.logger.Error("error getting fields with pagination", zap.Error(err)) s.logger.Error("error getting fields with pagination", zap.Error(err))
return nil, err return nil, err

4
internal/service/pipelines.go
View File

@ -15,8 +15,8 @@ func (s *Service) UpdateListPipelines(ctx context.Context) error {
return nil return nil
} }
func (s *Service) GettingPipelinesFromCash(ctx context.Context, req *model.PaginationReq) (*model.UserListPipelinesResp, error) { func (s *Service) GetPipelinesWithPagination(ctx context.Context, req *model.PaginationReq) (*model.UserListPipelinesResp, error) {
response, err := s.repository.AmoRepo.GettingPipelinesFromCash(ctx, req) response, err := s.repository.AmoRepo.GetPipelinesWithPagination(ctx, req)
if err != nil { if err != nil {
s.logger.Error("error getting pipelines with pagination", zap.Error(err)) s.logger.Error("error getting pipelines with pagination", zap.Error(err))
return nil, err return nil, err

4
internal/service/steps.go
View File

@ -6,8 +6,8 @@ import (
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
) )
func (s *Service) GettingStepsFromCash(ctx context.Context, req *model.PaginationReq) (*model.UserListStepsResp, error) { func (s *Service) GetStepsWithPagination(ctx context.Context, req *model.PaginationReq) (*model.UserListStepsResp, error) {
response, err := s.repository.AmoRepo.GettingStepsFromCash(ctx, req) response, err := s.repository.AmoRepo.GetStepsWithPagination(ctx, req)
if err != nil { if err != nil {
s.logger.Error("error getting steps with pagination", zap.Error(err)) s.logger.Error("error getting steps with pagination", zap.Error(err))
return nil, err return nil, err

4
internal/service/tags.go
View File

@ -6,8 +6,8 @@ import (
"penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model"
) )
func (s *Service) GettingTagsFromCash(ctx context.Context, req *model.PaginationReq) (*model.UserListTagsResp, error) { func (s *Service) GetTagsWithPagination(ctx context.Context, req *model.PaginationReq) (*model.UserListTagsResp, error) {
response, err := s.repository.AmoRepo.GettingTagsFromCash(ctx, req) response, err := s.repository.AmoRepo.GetTagsWithPagination(ctx, req)
if err != nil { if err != nil {
s.logger.Error("error getting tags with pagination", zap.Error(err)) s.logger.Error("error getting tags with pagination", zap.Error(err))
return nil, err return nil, err

20
internal/tools/construct.go
View File

@ -9,10 +9,10 @@ func ToPipeline(amoPipelines []models.Pipeline) []model.Pipeline {
var pipelines []model.Pipeline var pipelines []model.Pipeline
for _, p := range amoPipelines { for _, p := range amoPipelines {
pipeline := model.Pipeline{ pipeline := model.Pipeline{
Amoid: p.ID, Amoid: int32(p.ID),
Name: p.Name, Name: p.Name,
Isarchive: p.IsArchive, Isarchive: p.IsArchive,
AccountID: p.AccountID, AccountID: int32(p.AccountID),
} }
pipelines = append(pipelines, pipeline) pipelines = append(pipelines, pipeline)
} }
@ -23,23 +23,22 @@ func ToStep(amoStatuses []models.Statuses) []model.Step {
var steps []model.Step var steps []model.Step
for _, s := range amoStatuses { for _, s := range amoStatuses {
step := model.Step{ step := model.Step{
Amoid: s.ID, Amoid: int32(s.ID),
Name: s.Name, Name: s.Name,
Pipelineid: s.PipelineID, Pipelineid: int32(s.PipelineID),
Color: s.Color, Color: s.Color,
Accountid: s.AccountID, Accountid: int32(s.AccountID),
} }
steps = append(steps, step) steps = append(steps, step)
} }
return steps return steps
} }
func ToTag(amoTag []models.Tag, entity model.EntityType, accountID int) []model.Tag { func ToTag(amoTag []models.Tag, entity model.EntityType) []model.Tag {
var tags []model.Tag var tags []model.Tag
for _, t := range amoTag { for _, t := range amoTag {
tag := model.Tag{ tag := model.Tag{
Amoid: t.ID, Amoid: int32(t.ID),
Accountid: accountID,
Entity: entity, Entity: entity,
Name: t.Name, Name: t.Name,
Color: t.Color, Color: t.Color,
@ -49,13 +48,12 @@ func ToTag(amoTag []models.Tag, entity model.EntityType, accountID int) []model.
return tags return tags
} }
func ToField(amoField []models.CustomField, entity model.EntityType, accountID int) []model.Field { func ToField(amoField []models.CustomField, entity model.EntityType) []model.Field {
var fields []model.Field var fields []model.Field
for _, f := range amoField { for _, f := range amoField {
field := model.Field{ field := model.Field{
Amoid: f.ID, Amoid: int32(f.ID),
Code: f.Code, Code: f.Code,
Accountid: accountID,
Name: f.Name, Name: f.Name,
Entity: entity, Entity: entity,
Type: f.Type, Type: f.Type,

18
internal/workers/data_updater/data_updater.go
View File

@ -61,7 +61,6 @@ func (wc *DataUpdater) processTasks(ctx context.Context) {
return return
} }
for _, token := range allTokens { for _, token := range allTokens {
accountID := 0 // id аккаунта в амо для тегов и кастомных полей так как там не приходит
// pipelines // pipelines
pipelines, err := wc.amoClient.GetListPipelines(token.AccessToken) pipelines, err := wc.amoClient.GetListPipelines(token.AccessToken)
if err != nil { if err != nil {
@ -74,7 +73,6 @@ func (wc *DataUpdater) processTasks(ctx context.Context) {
// steps // steps
for _, pipeline := range pipelines.Embedded.Pipelines { for _, pipeline := range pipelines.Embedded.Pipelines {
accountID = pipeline.AccountID
steps, err := wc.amoClient.GetListSteps(pipeline.ID, token.AccessToken) steps, err := wc.amoClient.GetListSteps(pipeline.ID, token.AccessToken)
if err != nil { if err != nil {
wc.logger.Error("error getting list steps pipeline:", zap.Error(err)) wc.logger.Error("error getting list steps pipeline:", zap.Error(err))
@ -132,25 +130,25 @@ func (wc *DataUpdater) processTasks(ctx context.Context) {
for _, entityType := range entityTypes { for _, entityType := range entityTypes {
switch entityType { switch entityType {
case model.LeadsTags: case model.LeadsTags:
err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(leadsTags, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(leadsTags, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update leads tags") wc.logger.Error("error update leads tags")
continue continue
} }
case model.ContactsTags: case model.ContactsTags:
err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(contactsTags, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(contactsTags, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update contacts tags") wc.logger.Error("error update contacts tags")
continue continue
} }
case model.CompaniesTags: case model.CompaniesTags:
err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(companiesTags, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(companiesTags, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update companies tags") wc.logger.Error("error update companies tags")
continue continue
} }
case model.CustomersTags: case model.CustomersTags:
err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(customersTags, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckTags(ctx, tools.ToTag(customersTags, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update customer tags") wc.logger.Error("error update customer tags")
continue continue
@ -201,25 +199,25 @@ func (wc *DataUpdater) processTasks(ctx context.Context) {
for _, entityType := range entityTypes { for _, entityType := range entityTypes {
switch entityType { switch entityType {
case model.LeadsTags: case model.LeadsTags:
err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(leadsFields, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(leadsFields, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update leads fields") wc.logger.Error("error update leads fields")
continue continue
} }
case model.ContactsTags: case model.ContactsTags:
err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(contactsFields, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(contactsFields, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update contacts fields") wc.logger.Error("error update contacts fields")
continue continue
} }
case model.CompaniesTags: case model.CompaniesTags:
err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(companiesFields, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(companiesFields, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update companies fields") wc.logger.Error("error update companies fields")
continue continue
} }
case model.CustomersTags: case model.CustomersTags:
err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(companiesFields, entityType, accountID), token.AccountID) err := wc.repo.AmoRepo.CheckFields(ctx, tools.ToField(companiesFields, entityType), token.AccountID)
if err != nil { if err != nil {
wc.logger.Error("error update customer fields") wc.logger.Error("error update customer fields")
continue continue

175
tests/repository/repository_test.go
View File

@ -24,69 +24,76 @@ func Test_Repository(t *testing.T) {
panic(err) panic(err)
} }
err = webhookCreate(ctx, repo) //err = webhookCreate(ctx, repo)
assert.NoError(t, err) //assert.NoError(t, err)
err = webhookUpdate(ctx, repo) //err = webhookUpdate(ctx, repo)
assert.NoError(t, err) //assert.NoError(t, err)
count := 0 //count := 0
for { //for {
if count == 8 { // if count == 8 {
break // break
} // }
time.Sleep(time.Second) // time.Sleep(time.Second)
tokens, err := checkExpired(ctx, repo) // tokens, err := checkExpired(ctx, repo)
assert.NoError(t, err) // assert.NoError(t, err)
if len(tokens) > 0 { // if len(tokens) > 0 {
fmt.Println(tokens) // fmt.Println(tokens)
count++ // count++
} // }
} //}
err = getAllTokens(ctx, t, repo) err = getAllTokens(ctx, t, repo)
assert.NoError(t, err) assert.NoError(t, err)
//err = createUser(ctx, repo) err = createUser(ctx, repo)
assert.NoError(t, err)
//err = updateUser(ctx, repo)
//assert.NoError(t, err)
//err = checkUsers(ctx, repo)
//assert.NoError(t, err)
//err = gettingUserFromCash(ctx, t, repo)
//assert.NoError(t, err)
//err = checkPipelines(ctx, repo)
//assert.NoError(t, err)
//err = gettingPipelinesFromCash(ctx, t, repo)
//assert.NoError(t, err)
//err = checkSteps(ctx, repo)
//assert.NoError(t, err)
//err = gettingStepsFromCash(ctx, t, repo)
//assert.NoError(t, err)
//err = checkTags(ctx, repo)
//assert.NoError(t, err)
//err = gettingTagsFromCash(ctx, t, repo)
//assert.NoError(t, err)
//err = checkFields(ctx, repo)
//assert.NoError(t, err)
//err = gettingFieldsFromCash(ctx, t, repo)
//assert.NoError(t, err)
//err = saveUtms(ctx, repo)
//assert.NoError(t, err)
//err = gettingUserUtm(ctx, t, repo)
//assert.NoError(t, err)
//err = deleteUserUTM(ctx, t, repo)
//assert.NoError(t, err) //assert.NoError(t, err)
err = updateUser(ctx, repo)
assert.NoError(t, err)
err = checkUsers(ctx, repo)
assert.NoError(t, err)
err = gettingUserFromCash(ctx, t, repo)
assert.NoError(t, err)
err = checkPipelines(ctx, repo)
assert.NoError(t, err)
err = gettingPipelinesFromCash(ctx, t, repo)
assert.NoError(t, err)
err = checkSteps(ctx, repo)
assert.NoError(t, err)
err = gettingStepsFromCash(ctx, t, repo)
assert.NoError(t, err)
err = checkTags(ctx, repo)
assert.NoError(t, err)
err = gettingTagsFromCash(ctx, t, repo)
assert.NoError(t, err)
err = checkFields(ctx, repo)
assert.NoError(t, err)
err = gettingFieldsFromCash(ctx, t, repo)
assert.NoError(t, err)
err = saveUtms(ctx, repo)
assert.NoError(t, err)
err = gettingUserUtm(ctx, t, repo)
assert.NoError(t, err)
err = deleteUserUTM(ctx, t, repo)
assert.NoError(t, err)
} }
//func createUser(ctx context.Context, repo *dal.AmoDal) error { func createUser(ctx context.Context, repo *dal.AmoDal) error {
// for i := 1; i < 10; i++ { for i := 1; i < 10; i++ {
// accID := strconv.Itoa(i) accID := strconv.Itoa(i)
// err := repo.AmoRepo.CreateAccount(ctx, accID) err := repo.AmoRepo.CreateAccount(ctx, accID, model.User{
// if err != nil { AmoID: int32(i),
// return err Name: "Test" + strconv.Itoa(i),
// } Email: "Test" + strconv.Itoa(i) + "@mail.test",
// } Amouserid: int32(i),
// return nil Subdomain: "Test",
//} Country: "RUSSIA",
})
if err != nil {
return err
}
}
return nil
}
func updateUser(ctx context.Context, repo *dal.AmoDal) error { func updateUser(ctx context.Context, repo *dal.AmoDal) error {
var testUserInfo models.AmocrmUserInformation var testUserInfo models.AmocrmUserInformation
@ -152,7 +159,7 @@ func gettingUserFromCash(ctx context.Context, t *testing.T, repo *dal.AmoDal) er
for i := 1; i < 10; i++ { for i := 1; i < 10; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingUserWithPagination(ctx, &req) resp, err := repo.AmoRepo.GettingUserWithPagination(ctx, &req)
@ -202,10 +209,10 @@ func gettingPipelinesFromCash(ctx context.Context, t *testing.T, repo *dal.AmoDa
for i := 1; i < 28; i++ { for i := 1; i < 28; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingPipelinesFromCash(ctx, &req) resp, err := repo.AmoRepo.GetPipelinesWithPagination(ctx, &req)
if err != nil { if err != nil {
return err return err
} }
@ -253,10 +260,10 @@ func gettingStepsFromCash(ctx context.Context, t *testing.T, repo *dal.AmoDal) e
for i := 1; i < 46; i++ { for i := 1; i < 46; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingStepsFromCash(ctx, &req) resp, err := repo.AmoRepo.GetStepsWithPagination(ctx, &req)
if err != nil { if err != nil {
return err return err
} }
@ -316,22 +323,21 @@ func checkTags(ctx context.Context, repo *dal.AmoDal) error {
if err != nil { if err != nil {
return err return err
} }
id := 666666
for i := 0; i < 9; i++ { for i := 0; i < 9; i++ {
accID := strconv.Itoa(i) accID := strconv.Itoa(i)
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testLeadsTags.Embedded.Tags, model.LeadsTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testLeadsTags.Embedded.Tags, model.LeadsTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCompaniesTags.Embedded.Tags, model.CompaniesTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCompaniesTags.Embedded.Tags, model.CompaniesTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCustomersTags.Embedded.Tags, model.CustomersTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCustomersTags.Embedded.Tags, model.CustomersTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testContactsTags.Embedded.Tags, model.ContactsTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testContactsTags.Embedded.Tags, model.ContactsTags), accID)
if err != nil { if err != nil {
return err return err
} }
@ -339,19 +345,19 @@ func checkTags(ctx context.Context, repo *dal.AmoDal) error {
for i := 0; i < 9; i++ { for i := 0; i < 9; i++ {
accID := strconv.Itoa(i) accID := strconv.Itoa(i)
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testLeadsTags2.Embedded.Tags, model.LeadsTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testLeadsTags2.Embedded.Tags, model.LeadsTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCompaniesTags2.Embedded.Tags, model.CompaniesTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCompaniesTags2.Embedded.Tags, model.CompaniesTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCustomersTags2.Embedded.Tags, model.CustomersTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testCustomersTags2.Embedded.Tags, model.CustomersTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testContactsTags2.Embedded.Tags, model.ContactsTags, id), accID) err = repo.AmoRepo.CheckTags(ctx, tools.ToTag(testContactsTags2.Embedded.Tags, model.ContactsTags), accID)
if err != nil { if err != nil {
return err return err
} }
@ -367,10 +373,10 @@ func gettingTagsFromCash(ctx context.Context, t *testing.T, repo *dal.AmoDal) er
for i := 1; i < 73; i++ { for i := 1; i < 73; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingTagsFromCash(ctx, &req) resp, err := repo.AmoRepo.GetTagsWithPagination(ctx, &req)
if err != nil { if err != nil {
return err return err
} }
@ -431,22 +437,21 @@ func checkFields(ctx context.Context, repo *dal.AmoDal) error {
return err return err
} }
id := 666666
for i := 0; i < 9; i++ { for i := 0; i < 9; i++ {
accID := strconv.Itoa(i) accID := strconv.Itoa(i)
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testLeadsFields.Embedded.CustomFields, model.LeadsTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testLeadsFields.Embedded.CustomFields, model.LeadsTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCompaniesFields.Embedded.CustomFields, model.CompaniesTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCompaniesFields.Embedded.CustomFields, model.CompaniesTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCustomersFields.Embedded.CustomFields, model.CustomersTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCustomersFields.Embedded.CustomFields, model.CustomersTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testContactsFields.Embedded.CustomFields, model.ContactsTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testContactsFields.Embedded.CustomFields, model.ContactsTags), accID)
if err != nil { if err != nil {
return err return err
} }
@ -454,19 +459,19 @@ func checkFields(ctx context.Context, repo *dal.AmoDal) error {
for i := 0; i < 9; i++ { for i := 0; i < 9; i++ {
accID := strconv.Itoa(i) accID := strconv.Itoa(i)
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testLeadsFields2.Embedded.CustomFields, model.LeadsTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testLeadsFields2.Embedded.CustomFields, model.LeadsTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCompaniesFields2.Embedded.CustomFields, model.CompaniesTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCompaniesFields2.Embedded.CustomFields, model.CompaniesTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCustomersFields2.Embedded.CustomFields, model.CustomersTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testCustomersFields2.Embedded.CustomFields, model.CustomersTags), accID)
if err != nil { if err != nil {
return err return err
} }
err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testContactsFields2.Embedded.CustomFields, model.ContactsTags, id), accID) err = repo.AmoRepo.CheckFields(ctx, tools.ToField(testContactsFields2.Embedded.CustomFields, model.ContactsTags), accID)
if err != nil { if err != nil {
return err return err
} }
@ -482,10 +487,10 @@ func gettingFieldsFromCash(ctx context.Context, t *testing.T, repo *dal.AmoDal)
for i := 1; i < 73; i++ { for i := 1; i < 73; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingFieldsFromCash(ctx, &req) resp, err := repo.AmoRepo.GetFieldsWithPagination(ctx, &req)
if err != nil { if err != nil {
return err return err
} }
@ -582,7 +587,7 @@ func gettingUserUtm(ctx context.Context, t *testing.T, repo *dal.AmoDal) error {
for i := 1; i < 50; i++ { for i := 1; i < 50; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingUserUtm(ctx, &req, "1", 1) resp, err := repo.AmoRepo.GettingUserUtm(ctx, &req, "1", 1)
@ -622,7 +627,7 @@ func deleteUserUTM(ctx context.Context, t *testing.T, repo *dal.AmoDal) error {
for i := 1; i < 50; i++ { for i := 1; i < 50; i++ {
req := model.PaginationReq{ req := model.PaginationReq{
Page: 1, Page: 1,
Size: i, Size: int32(i),
} }
resp, err := repo.AmoRepo.GettingUserUtm(ctx, &req, "5", 5) resp, err := repo.AmoRepo.GettingUserUtm(ctx, &req, "5", 5)