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

add new type tagsToAdd to rules repo methods

Browse Source
This commit is contained in:
Pavel 2024-06-08 16:20:31 +03:00
parent cb1e8abc79
commit 6395b9fa3a
2 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
model/amo.go
View File

@ -279,6 +279,7 @@ type AmoUsersTrueResults struct {
AmoAccountID int32 AmoAccountID int32
UTMs UTMSavingMap UTMs UTMSavingMap
FieldsRule Fieldsrule FieldsRule Fieldsrule
TagsToAdd TagsToAdd
PerformerID int32 PerformerID int32
StepID int32 StepID int32
PipelineID int32 PipelineID int32

20
repository/amo/amo.go
View File

@ -817,6 +817,7 @@ func (r *AmoRepository) ChangeQuizSettings(ctx context.Context, request *model.R
Stepid: request.StepID, Stepid: request.StepID,
//Utms: request.Utms, //Utms: request.Utms,
Fieldsrule: jsonFieldRule, Fieldsrule: jsonFieldRule,
Tagstoadd: jsonTagsToAdd,
Accountid: accountID, Accountid: accountID,
Quizid: int32(quizID), Quizid: int32(quizID),
}) })
@ -833,12 +834,17 @@ func (r *AmoRepository) SetQuizSettings(ctx context.Context, request *model.Rule
if err != nil { if err != nil {
return err return err
} }
jsonTagsToAdd, err := json.Marshal(request.TagsToAdd)
if err != nil {
return err
}
_, err = r.queries.SetQuizSettings(ctx, sqlcgen.SetQuizSettingsParams{ _, err = r.queries.SetQuizSettings(ctx, sqlcgen.SetQuizSettingsParams{
Performerid: request.PerformerID, Performerid: request.PerformerID,
Pipelineid: request.PipelineID, Pipelineid: request.PipelineID,
Stepid: request.StepID, Stepid: request.StepID,
//Utms: request.Utms, //Utms: request.Utms,
Fieldsrule: jsonFieldRule, Fieldsrule: jsonFieldRule,
Tagstoadd: jsonTagsToAdd,
Accountid: accountID, Accountid: accountID,
Quizid: int32(quizID), Quizid: int32(quizID),
}) })
@ -862,6 +868,12 @@ func (r *AmoRepository) GettingQuizRules(ctx context.Context, quizID int) (*mode
return nil, err return nil, err
} }
var tagsToAdd model.TagsToAdd
err = json.Unmarshal(row.Tagstoadd, &tagsToAdd)
if err != nil {
return nil, err
}
return &model.Rule{ return &model.Rule{
ID: row.ID, ID: row.ID,
Accountid: row.Accountid, Accountid: row.Accountid,
@ -871,6 +883,7 @@ func (r *AmoRepository) GettingQuizRules(ctx context.Context, quizID int) (*mode
Stepid: row.Stepid, Stepid: row.Stepid,
//Utms: row.Utms, //Utms: row.Utms,
Fieldsrule: fieldsRule, Fieldsrule: fieldsRule,
TagsToAdd: tagsToAdd,
}, nil }, nil
} }
@ -1028,6 +1041,12 @@ func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) ([]model
return nil, err return nil, err
} }
var tagsToAdd model.TagsToAdd
err = json.Unmarshal(row.Tagstoadd, &tagsToAdd)
if err != nil {
return nil, err
}
result := model.AmoUsersTrueResults{ result := model.AmoUsersTrueResults{
QuizID: row.QuizID, QuizID: row.QuizID,
AnswerID: row.ID, AnswerID: row.ID,
@ -1039,6 +1058,7 @@ func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) ([]model
AmoAccountID: row.Accountid, AmoAccountID: row.Accountid,
UTMs: utm, UTMs: utm,
FieldsRule: fieldsRule, FieldsRule: fieldsRule,
TagsToAdd: tagsToAdd,
PerformerID: row.Performerid, PerformerID: row.Performerid,
StepID: row.Stepid, StepID: row.Stepid,
PipelineID: row.Pipelineid, PipelineID: row.Pipelineid,