commented utms methods
This commit is contained in:
parent
83b2c9e22a
commit
168a6d8fec
@ -1037,3 +1037,8 @@ WHERE AmoUserID = $1 AND Deleted = false;
|
||||
|
||||
-- name: GetFieldByAmoID :one
|
||||
SELECT * FROM fields WHERE AmoID = $1 AND Deleted = false;
|
||||
|
||||
-- name: GetUserFieldsByID :many
|
||||
SELECT ID,AmoID,Code,AccountID,Name,Entity,Type
|
||||
FROM fields
|
||||
WHERE AccountID = $1 AND Deleted = false;
|
||||
|
||||
@ -4,10 +4,6 @@
|
||||
-- WHERE
|
||||
-- ID = ANY($1::int[]) AND Deleted = FALSE;
|
||||
--
|
||||
-- -- name: GetUserFieldsByID :many
|
||||
-- SELECT ID,AmoID,Code,AccountID,Name,Entity,Type
|
||||
-- FROM fields
|
||||
-- WHERE AccountID = $1 AND Deleted = false;
|
||||
|
||||
-- name: UpdateUtms :exec
|
||||
-- UPDATE utms AS u
|
||||
|
||||
@ -811,10 +811,10 @@ func (r *AmoRepository) ChangeQuizSettings(ctx context.Context, request *model.R
|
||||
Performerid: request.PerformerID,
|
||||
Pipelineid: request.PipelineID,
|
||||
Stepid: request.StepID,
|
||||
Utms: request.Utms,
|
||||
Fieldsrule: jsonFieldRule,
|
||||
Accountid: accountID,
|
||||
Quizid: int32(quizID),
|
||||
//Utms: request.Utms,
|
||||
Fieldsrule: jsonFieldRule,
|
||||
Accountid: accountID,
|
||||
Quizid: int32(quizID),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
@ -833,10 +833,10 @@ func (r *AmoRepository) SetQuizSettings(ctx context.Context, request *model.Rule
|
||||
Performerid: request.PerformerID,
|
||||
Pipelineid: request.PipelineID,
|
||||
Stepid: request.StepID,
|
||||
Utms: request.Utms,
|
||||
Fieldsrule: jsonFieldRule,
|
||||
Accountid: accountID,
|
||||
Quizid: int32(quizID),
|
||||
//Utms: request.Utms,
|
||||
Fieldsrule: jsonFieldRule,
|
||||
Accountid: accountID,
|
||||
Quizid: int32(quizID),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
@ -865,8 +865,8 @@ func (r *AmoRepository) GettingQuizRules(ctx context.Context, quizID int) (*mode
|
||||
Performerid: row.Performerid,
|
||||
Pipelineid: row.Pipelineid,
|
||||
Stepid: row.Stepid,
|
||||
Utms: row.Utms,
|
||||
Fieldsrule: fieldsRule,
|
||||
//Utms: row.Utms,
|
||||
Fieldsrule: fieldsRule,
|
||||
}, nil
|
||||
}
|
||||
|
||||
@ -891,112 +891,115 @@ func (r *AmoRepository) UpdateFieldRules(ctx context.Context, fieldRules model.F
|
||||
// методы UTMs
|
||||
|
||||
func (r *AmoRepository) DeletingUserUtm(ctx context.Context, request *model.ListDeleteUTMIDsReq) error {
|
||||
err := r.queries.DeletingUTM(ctx, request.Utms)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//err := r.queries.DeletingUTM(ctx, request.Utms)
|
||||
//if err != nil {
|
||||
// return err
|
||||
//}
|
||||
return nil
|
||||
}
|
||||
|
||||
// todo нужно ли тут ограничивать индексом что то
|
||||
func (r *AmoRepository) SavingUserUtm(ctx context.Context, utms []model.UTM, accountID string) (*model.ListSavedIDUTMResp, error) {
|
||||
column2, err := json.Marshal(utms)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
rows, err := r.queries.SaveUTMs(ctx, sqlcgen.SaveUTMsParams{
|
||||
Accountid: accountID,
|
||||
Column2: column2,
|
||||
})
|
||||
//column2, err := json.Marshal(utms)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//rows, err := r.queries.SaveUTMs(ctx, sqlcgen.SaveUTMsParams{
|
||||
// Accountid: accountID,
|
||||
// Column2: column2,
|
||||
//})
|
||||
//
|
||||
//var ids []int64
|
||||
//
|
||||
//for _, row := range rows {
|
||||
// ids = append(ids, row.ID)
|
||||
//}
|
||||
//
|
||||
//return &model.ListSavedIDUTMResp{
|
||||
// Ids: ids,
|
||||
//}, nil
|
||||
|
||||
var ids []int64
|
||||
|
||||
for _, row := range rows {
|
||||
ids = append(ids, row.ID)
|
||||
}
|
||||
|
||||
return &model.ListSavedIDUTMResp{
|
||||
Ids: ids,
|
||||
}, nil
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *AmoRepository) GettingUserUtm(ctx context.Context, request *model.PaginationReq, accountID string, quizID int) (*model.GetListUserUTMResp, error) {
|
||||
rows, err := r.queries.GetUTMsWithPagination(ctx, sqlcgen.GetUTMsWithPaginationParams{
|
||||
Accountid: accountID,
|
||||
Column2: request.Page,
|
||||
Limit: request.Size,
|
||||
Quizid: int32(quizID),
|
||||
})
|
||||
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
var count int64
|
||||
var utmS []model.UTM
|
||||
|
||||
for _, row := range rows {
|
||||
count = row.TotalCount
|
||||
utm := model.UTM{
|
||||
ID: row.ID,
|
||||
Amofieldid: row.Amofieldid,
|
||||
Quizid: row.Quizid,
|
||||
Accountid: row.Accountid,
|
||||
Name: row.Name,
|
||||
Deleted: row.Deleted,
|
||||
Createdat: row.Createdat.Time.Unix(),
|
||||
}
|
||||
|
||||
utmS = append(utmS, utm)
|
||||
}
|
||||
|
||||
return &model.GetListUserUTMResp{
|
||||
Count: count,
|
||||
Items: utmS,
|
||||
}, nil
|
||||
//rows, err := r.queries.GetUTMsWithPagination(ctx, sqlcgen.GetUTMsWithPaginationParams{
|
||||
// Accountid: accountID,
|
||||
// Column2: request.Page,
|
||||
// Limit: request.Size,
|
||||
// Quizid: int32(quizID),
|
||||
//})
|
||||
//
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//
|
||||
//var count int64
|
||||
//var utmS []model.UTM
|
||||
//
|
||||
//for _, row := range rows {
|
||||
// count = row.TotalCount
|
||||
// utm := model.UTM{
|
||||
// ID: row.ID,
|
||||
// Amofieldid: row.Amofieldid,
|
||||
// Quizid: row.Quizid,
|
||||
// Accountid: row.Accountid,
|
||||
// Name: row.Name,
|
||||
// Deleted: row.Deleted,
|
||||
// Createdat: row.Createdat.Time.Unix(),
|
||||
// }
|
||||
//
|
||||
// utmS = append(utmS, utm)
|
||||
//}
|
||||
//
|
||||
//return &model.GetListUserUTMResp{
|
||||
// Count: count,
|
||||
// Items: utmS,
|
||||
//}, nil
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *AmoRepository) GetUtmsByID(ctx context.Context, ids []int32) ([]model.UTM, error) {
|
||||
rows, err := r.queries.GetUtmsByID(ctx, ids)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
//rows, err := r.queries.GetUtmsByID(ctx, ids)
|
||||
//if err != nil {
|
||||
// return nil, err
|
||||
//}
|
||||
//
|
||||
//var utmS []model.UTM
|
||||
//for _, row := range rows {
|
||||
// utm := model.UTM{
|
||||
// ID: row.ID,
|
||||
// Amofieldid: row.Amofieldid,
|
||||
// Quizid: row.Quizid,
|
||||
// Accountid: row.Accountid,
|
||||
// Name: row.Name,
|
||||
// }
|
||||
//
|
||||
// utmS = append(utmS, utm)
|
||||
//}
|
||||
|
||||
var utmS []model.UTM
|
||||
for _, row := range rows {
|
||||
utm := model.UTM{
|
||||
ID: row.ID,
|
||||
Amofieldid: row.Amofieldid,
|
||||
Quizid: row.Quizid,
|
||||
Accountid: row.Accountid,
|
||||
Name: row.Name,
|
||||
}
|
||||
|
||||
utmS = append(utmS, utm)
|
||||
}
|
||||
|
||||
return utmS, nil
|
||||
return nil, nil
|
||||
}
|
||||
|
||||
func (r *AmoRepository) UpdateUTMs(ctx context.Context, utms []model.UTM) error {
|
||||
dollar1, err := json.Marshal(utms)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
err = r.queries.UpdateUtms(ctx, dollar1)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//dollar1, err := json.Marshal(utms)
|
||||
//if err != nil {
|
||||
// return err
|
||||
//}
|
||||
//err = r.queries.UpdateUtms(ctx, dollar1)
|
||||
//
|
||||
//if err != nil {
|
||||
// return err
|
||||
//}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (r *AmoRepository) UpdateUtmsFields(ctx context.Context, ids []int32) error {
|
||||
err := r.queries.UpdateUtmsFields(ctx, ids)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
//err := r.queries.UpdateUtmsFields(ctx, ids)
|
||||
//if err != nil {
|
||||
// return err
|
||||
//}
|
||||
|
||||
return nil
|
||||
}
|
||||
@ -1016,15 +1019,15 @@ func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) ([]model
|
||||
return nil, err
|
||||
}
|
||||
result := model.AmoUsersTrueResults{
|
||||
QuizID: row.QuizID,
|
||||
AnswerID: row.ID,
|
||||
Result: row.Result.Bool,
|
||||
QuestionID: row.QuestionID,
|
||||
Content: row.Content.String,
|
||||
Session: row.Session.String,
|
||||
AccessToken: row.Accesstoken,
|
||||
AmoAccountID: row.Accountid,
|
||||
UTMs: row.Utms,
|
||||
QuizID: row.QuizID,
|
||||
AnswerID: row.ID,
|
||||
Result: row.Result.Bool,
|
||||
QuestionID: row.QuestionID,
|
||||
Content: row.Content.String,
|
||||
Session: row.Session.String,
|
||||
AccessToken: row.Accesstoken,
|
||||
AmoAccountID: row.Accountid,
|
||||
//UTMs: row.Utms,
|
||||
FieldsRule: fieldsRule,
|
||||
PerformerID: row.Performerid,
|
||||
StepID: row.Stepid,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user