diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index 2b754b1..d577b56 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -1013,7 +1013,7 @@ WHERE NOT EXISTS ( ); -- name: GettingAmoUsersTrueResults :many -SELECT a.*,t.accesstoken,r.* +SELECT a.quiz_id,a.id,a.result,a.question_id,a.content,a.session,t.accesstoken,r.accountid,r.utms,r.fieldsrule,r.performerid,r.stepid,r.pipelineid FROM answer a INNER JOIN quiz q ON a.quiz_id = q.id LEFT JOIN amoCRMStatuses s ON a.id = s.AnswerID @@ -1022,5 +1022,6 @@ FROM answer a INNER JOIN users u ON q.accountid = u.accountid AND u.amoid = r.accountid WHERE a.result = true AND s.id IS NULL + AND a.deleted = false AND r.deleted = false AND q.deleted = false; diff --git a/repository/amo/amo.go b/repository/amo/amo.go index 8ae7f7c..bcf6ad7 100644 --- a/repository/amo/amo.go +++ b/repository/amo/amo.go @@ -835,3 +835,10 @@ func (r *AmoRepository) UpdateUtmsFields(ctx context.Context, ids []int32) error return nil } + +func (r *AmoRepository) GettingAmoUsersTrueResults(ctx context.Context) error { + rows, err := r.queries.GettingAmoUsersTrueResults(ctx) + if err != nil { + return err + } +}