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

commented utms methods

Browse Source
This commit is contained in:
Pavel 2024-05-17 21:54:53 +03:00
parent 83b2c9e22a
commit 168a6d8fec
3 changed files with 112 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dal/db_query/queries.sql
View File

@ -1037,3 +1037,8 @@ WHERE AmoUserID = $1 AND Deleted = false;
-- name: GetFieldByAmoID :one -- name: GetFieldByAmoID :one
SELECT * FROM fields WHERE AmoID = $1 AND Deleted = false; 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
dal/db_query/utm.sql
View File

@ -4,10 +4,6 @@
-- WHERE -- WHERE
-- ID = ANY($1::int[]) AND Deleted = FALSE; -- 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 -- name: UpdateUtms :exec
-- UPDATE utms AS u -- UPDATE utms AS u

211
repository/amo/amo.go
View File

@ -811,10 +811,10 @@ func (r *AmoRepository) ChangeQuizSettings(ctx context.Context, request *model.R
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,
Accountid: accountID, Accountid: accountID,
Quizid: int32(quizID), Quizid: int32(quizID),
}) })
if err != nil { if err != nil {
@ -833,10 +833,10 @@ func (r *AmoRepository) SetQuizSettings(ctx context.Context, request *model.Rule
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,
Accountid: accountID, Accountid: accountID,
Quizid: int32(quizID), Quizid: int32(quizID),
}) })
if err != nil { if err != nil {
@ -865,8 +865,8 @@ func (r *AmoRepository) GettingQuizRules(ctx context.Context, quizID int) (*mode
Performerid: row.Performerid, Performerid: row.Performerid,
Pipelineid: row.Pipelineid, Pipelineid: row.Pipelineid,
Stepid: row.Stepid, Stepid: row.Stepid,
Utms: row.Utms, //Utms: row.Utms,
Fieldsrule: fieldsRule, Fieldsrule: fieldsRule,
}, nil }, nil
} }
@ -891,112 +891,115 @@ func (r *AmoRepository) UpdateFieldRules(ctx context.Context, fieldRules model.F
// методы UTMs // методы UTMs
func (r *AmoRepository) DeletingUserUtm(ctx context.Context, request *model.ListDeleteUTMIDsReq) error { func (r *AmoRepository) DeletingUserUtm(ctx context.Context, request *model.ListDeleteUTMIDsReq) error {
err := r.queries.DeletingUTM(ctx, request.Utms) //err := r.queries.DeletingUTM(ctx, request.Utms)
if err != nil { //if err != nil {
return err // return err
} //}
return nil return nil
} }
// todo нужно ли тут ограничивать индексом что то // todo нужно ли тут ограничивать индексом что то
func (r *AmoRepository) SavingUserUtm(ctx context.Context, utms []model.UTM, accountID string) (*model.ListSavedIDUTMResp, error) { func (r *AmoRepository) SavingUserUtm(ctx context.Context, utms []model.UTM, accountID string) (*model.ListSavedIDUTMResp, error) {
column2, err := json.Marshal(utms) //column2, err := json.Marshal(utms)
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
rows, err := r.queries.SaveUTMs(ctx, sqlcgen.SaveUTMsParams{ //rows, err := r.queries.SaveUTMs(ctx, sqlcgen.SaveUTMsParams{
Accountid: accountID, // Accountid: accountID,
Column2: column2, // Column2: column2,
}) //})
//
//var ids []int64
//
//for _, row := range rows {
// ids = append(ids, row.ID)
//}
//
//return &model.ListSavedIDUTMResp{
// Ids: ids,
//}, nil
var ids []int64 return nil, nil
for _, row := range rows {
ids = append(ids, row.ID)
}
return &model.ListSavedIDUTMResp{
Ids: ids,
}, nil
} }
func (r *AmoRepository) GettingUserUtm(ctx context.Context, request *model.PaginationReq, accountID string, quizID int) (*model.GetListUserUTMResp, error) { 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{ //rows, err := r.queries.GetUTMsWithPagination(ctx, sqlcgen.GetUTMsWithPaginationParams{
Accountid: accountID, // Accountid: accountID,
Column2: request.Page, // Column2: request.Page,
Limit: request.Size, // Limit: request.Size,
Quizid: int32(quizID), // Quizid: int32(quizID),
}) //})
//
if err != nil { //if err != nil {
return nil, err // return nil, err
} //}
//
var count int64 //var count int64
var utmS []model.UTM //var utmS []model.UTM
//
for _, row := range rows { //for _, row := range rows {
count = row.TotalCount // count = row.TotalCount
utm := model.UTM{ // utm := model.UTM{
ID: row.ID, // ID: row.ID,
Amofieldid: row.Amofieldid, // Amofieldid: row.Amofieldid,
Quizid: row.Quizid, // Quizid: row.Quizid,
Accountid: row.Accountid, // Accountid: row.Accountid,
Name: row.Name, // Name: row.Name,
Deleted: row.Deleted, // Deleted: row.Deleted,
Createdat: row.Createdat.Time.Unix(), // Createdat: row.Createdat.Time.Unix(),
} // }
//
utmS = append(utmS, utm) // utmS = append(utmS, utm)
} //}
//
return &model.GetListUserUTMResp{ //return &model.GetListUserUTMResp{
Count: count, // Count: count,
Items: utmS, // Items: utmS,
}, nil //}, nil
return nil, nil
} }
func (r *AmoRepository) GetUtmsByID(ctx context.Context, ids []int32) ([]model.UTM, error) { func (r *AmoRepository) GetUtmsByID(ctx context.Context, ids []int32) ([]model.UTM, error) {
rows, err := r.queries.GetUtmsByID(ctx, ids) //rows, err := r.queries.GetUtmsByID(ctx, ids)
if err != nil { //if err != nil {
return nil, err // 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 return nil, nil
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
} }
func (r *AmoRepository) UpdateUTMs(ctx context.Context, utms []model.UTM) error { func (r *AmoRepository) UpdateUTMs(ctx context.Context, utms []model.UTM) error {
dollar1, err := json.Marshal(utms) //dollar1, err := json.Marshal(utms)
if err != nil { //if err != nil {
return err // return err
} //}
err = r.queries.UpdateUtms(ctx, dollar1) //err = r.queries.UpdateUtms(ctx, dollar1)
//
if err != nil { //if err != nil {
return err // return err
} //}
return nil return nil
} }
func (r *AmoRepository) UpdateUtmsFields(ctx context.Context, ids []int32) error { func (r *AmoRepository) UpdateUtmsFields(ctx context.Context, ids []int32) error {
err := r.queries.UpdateUtmsFields(ctx, ids) //err := r.queries.UpdateUtmsFields(ctx, ids)
if err != nil { //if err != nil {
return err // return err
} //}
return nil return nil
} }
@ -1016,15 +1019,15 @@ func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) ([]model
return nil, err return nil, err
} }
result := model.AmoUsersTrueResults{ result := model.AmoUsersTrueResults{
QuizID: row.QuizID, QuizID: row.QuizID,
AnswerID: row.ID, AnswerID: row.ID,
Result: row.Result.Bool, Result: row.Result.Bool,
QuestionID: row.QuestionID, QuestionID: row.QuestionID,
Content: row.Content.String, Content: row.Content.String,
Session: row.Session.String, Session: row.Session.String,
AccessToken: row.Accesstoken, AccessToken: row.Accesstoken,
AmoAccountID: row.Accountid, AmoAccountID: row.Accountid,
UTMs: row.Utms, //UTMs: row.Utms,
FieldsRule: fieldsRule, FieldsRule: fieldsRule,
PerformerID: row.Performerid, PerformerID: row.Performerid,
StepID: row.Stepid, StepID: row.Stepid,