From 6395b9fa3a2ba060986e0858bdcd27abff2d536d Mon Sep 17 00:00:00 2001 From: Pavel Date: Sat, 8 Jun 2024 16:20:31 +0300 Subject: [PATCH] add new type tagsToAdd to rules repo methods --- model/amo.go | 1 + repository/amo/amo.go | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/model/amo.go b/model/amo.go index 75e74ec..4a90abd 100644 --- a/model/amo.go +++ b/model/amo.go @@ -279,6 +279,7 @@ type AmoUsersTrueResults struct { AmoAccountID int32 UTMs UTMSavingMap FieldsRule Fieldsrule + TagsToAdd TagsToAdd PerformerID int32 StepID int32 PipelineID int32 diff --git a/repository/amo/amo.go b/repository/amo/amo.go index b78bc05..f63b78e 100644 --- a/repository/amo/amo.go +++ b/repository/amo/amo.go @@ -817,6 +817,7 @@ func (r *AmoRepository) ChangeQuizSettings(ctx context.Context, request *model.R Stepid: request.StepID, //Utms: request.Utms, Fieldsrule: jsonFieldRule, + Tagstoadd: jsonTagsToAdd, Accountid: accountID, Quizid: int32(quizID), }) @@ -833,12 +834,17 @@ func (r *AmoRepository) SetQuizSettings(ctx context.Context, request *model.Rule if err != nil { return err } + jsonTagsToAdd, err := json.Marshal(request.TagsToAdd) + if err != nil { + return err + } _, err = r.queries.SetQuizSettings(ctx, sqlcgen.SetQuizSettingsParams{ Performerid: request.PerformerID, Pipelineid: request.PipelineID, Stepid: request.StepID, //Utms: request.Utms, Fieldsrule: jsonFieldRule, + Tagstoadd: jsonTagsToAdd, Accountid: accountID, Quizid: int32(quizID), }) @@ -862,6 +868,12 @@ func (r *AmoRepository) GettingQuizRules(ctx context.Context, quizID int) (*mode return nil, err } + var tagsToAdd model.TagsToAdd + err = json.Unmarshal(row.Tagstoadd, &tagsToAdd) + if err != nil { + return nil, err + } + return &model.Rule{ ID: row.ID, Accountid: row.Accountid, @@ -871,6 +883,7 @@ func (r *AmoRepository) GettingQuizRules(ctx context.Context, quizID int) (*mode Stepid: row.Stepid, //Utms: row.Utms, Fieldsrule: fieldsRule, + TagsToAdd: tagsToAdd, }, nil } @@ -1028,6 +1041,12 @@ func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) ([]model return nil, err } + var tagsToAdd model.TagsToAdd + err = json.Unmarshal(row.Tagstoadd, &tagsToAdd) + if err != nil { + return nil, err + } + result := model.AmoUsersTrueResults{ QuizID: row.QuizID, AnswerID: row.ID, @@ -1039,6 +1058,7 @@ func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) ([]model AmoAccountID: row.Accountid, UTMs: utm, FieldsRule: fieldsRule, + TagsToAdd: tagsToAdd, PerformerID: row.Performerid, StepID: row.Stepid, PipelineID: row.Pipelineid,