From 1f6a5c6ee684cc6443147113ba3dc268d5f7881b Mon Sep 17 00:00:00 2001 From: Pavel Date: Mon, 22 Apr 2024 13:43:09 +0300 Subject: [PATCH] update sqlc gen --- dal/sqlcgen/models.go | 24 +++++++++++++++++++++++- dal/sqlcgen/queries.sql.go | 14 +++++--------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/dal/sqlcgen/models.go b/dal/sqlcgen/models.go index 6af78b9..9b817a1 100644 --- a/dal/sqlcgen/models.go +++ b/dal/sqlcgen/models.go @@ -117,10 +117,22 @@ type Quiz struct { AnswersCount sql.NullInt32 `db:"answers_count" json:"answers_count"` AverageTimePassing sql.NullInt32 `db:"average_time_passing" json:"average_time_passing"` SessionsCount sql.NullInt32 `db:"sessions_count" json:"sessions_count"` - Utm json.RawMessage `db:"utm" json:"utm"` Rules json.RawMessage `db:"rules" json:"rules"` } +type Rule struct { + ID int64 `db:"id" json:"id"` + Accountid int32 `db:"accountid" json:"accountid"` + Quizid int32 `db:"quizid" json:"quizid"` + Performerid int32 `db:"performerid" json:"performerid"` + Pipelineid int32 `db:"pipelineid" json:"pipelineid"` + Stepid int32 `db:"stepid" json:"stepid"` + Utms []int32 `db:"utms" json:"utms"` + Fieldsrule json.RawMessage `db:"fieldsrule" json:"fieldsrule"` + Deleted bool `db:"deleted" json:"deleted"` + Createdat sql.NullTime `db:"createdat" json:"createdat"` +} + type Step struct { ID int64 `db:"id" json:"id"` Amoid int32 `db:"amoid" json:"amoid"` @@ -166,3 +178,13 @@ type User struct { Amouserid int32 `db:"amouserid" json:"amouserid"` Country string `db:"country" json:"country"` } + +type Utm struct { + ID int64 `db:"id" json:"id"` + Amofieldid int32 `db:"amofieldid" json:"amofieldid"` + Quizid int32 `db:"quizid" json:"quizid"` + Accountid int32 `db:"accountid" json:"accountid"` + Name string `db:"name" json:"name"` + Deleted bool `db:"deleted" json:"deleted"` + Createdat sql.NullTime `db:"createdat" json:"createdat"` +} diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go index 7a0369b..b61b288 100644 --- a/dal/sqlcgen/queries.sql.go +++ b/dal/sqlcgen/queries.sql.go @@ -799,7 +799,7 @@ func (q *Queries) DeleteQuestion(ctx context.Context, id int64) (Question, error } const deleteQuizByID = `-- name: DeleteQuizByID :one -UPDATE quiz SET deleted=true WHERE quiz.id=$1 AND accountid=$2 RETURNING quiz.id, quiz.qid, quiz.accountid, quiz.deleted, quiz.archived, quiz.fingerprinting, quiz.repeatable, quiz.note_prevented, quiz.mail_notifications, quiz.unique_answers, quiz.super, quiz.group_id, quiz.name, quiz.description, quiz.config, quiz.status, quiz.limit_answers, quiz.due_to, quiz.time_of_passing, quiz.pausable, quiz.version, quiz.version_comment, quiz.parent_ids, quiz.created_at, quiz.updated_at, quiz.questions_count, quiz.answers_count, quiz.average_time_passing, quiz.sessions_count, quiz.utm, quiz.rules +UPDATE quiz SET deleted=true WHERE quiz.id=$1 AND accountid=$2 RETURNING quiz.id, quiz.qid, quiz.accountid, quiz.deleted, quiz.archived, quiz.fingerprinting, quiz.repeatable, quiz.note_prevented, quiz.mail_notifications, quiz.unique_answers, quiz.super, quiz.group_id, quiz.name, quiz.description, quiz.config, quiz.status, quiz.limit_answers, quiz.due_to, quiz.time_of_passing, quiz.pausable, quiz.version, quiz.version_comment, quiz.parent_ids, quiz.created_at, quiz.updated_at, quiz.questions_count, quiz.answers_count, quiz.average_time_passing, quiz.sessions_count, quiz.rules ` type DeleteQuizByIDParams struct { @@ -840,7 +840,6 @@ func (q *Queries) DeleteQuizByID(ctx context.Context, arg DeleteQuizByIDParams) &i.AnswersCount, &i.AverageTimePassing, &i.SessionsCount, - &i.Utm, &i.Rules, ) return i, err @@ -1770,7 +1769,7 @@ func (q *Queries) GetQuestions(ctx context.Context, quizID int64) ([]Question, e } const getQuizById = `-- name: GetQuizById :one -SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, utm, rules FROM quiz WHERE id=$1 AND accountId=$2 +SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, rules FROM quiz WHERE id=$1 AND accountId=$2 ` type GetQuizByIdParams struct { @@ -1811,14 +1810,13 @@ func (q *Queries) GetQuizById(ctx context.Context, arg GetQuizByIdParams) (Quiz, &i.AnswersCount, &i.AverageTimePassing, &i.SessionsCount, - &i.Utm, &i.Rules, ) return i, err } const getQuizByQid = `-- name: GetQuizByQid :one -SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, utm, rules FROM quiz +SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, rules FROM quiz WHERE deleted = false AND archived = false AND @@ -1859,7 +1857,6 @@ func (q *Queries) GetQuizByQid(ctx context.Context, qid uuid.NullUUID) (Quiz, er &i.AnswersCount, &i.AverageTimePassing, &i.SessionsCount, - &i.Utm, &i.Rules, ) return i, err @@ -1882,7 +1879,7 @@ func (q *Queries) GetQuizConfig(ctx context.Context, id int64) (GetQuizConfigRow } const getQuizHistory = `-- name: GetQuizHistory :many -SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, utm, rules FROM quiz WHERE quiz.id = $1 AND quiz.accountId = $4 OR quiz.id = ANY( +SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, rules FROM quiz WHERE quiz.id = $1 AND quiz.accountId = $4 OR quiz.id = ANY( SELECT unnest(parent_ids) FROM quiz WHERE id = $1 ) ORDER BY quiz.id DESC LIMIT $2 OFFSET $3 ` @@ -1938,7 +1935,6 @@ func (q *Queries) GetQuizHistory(ctx context.Context, arg GetQuizHistoryParams) &i.AnswersCount, &i.AverageTimePassing, &i.SessionsCount, - &i.Utm, &i.Rules, ); err != nil { return nil, err @@ -2889,7 +2885,7 @@ SET average_time_passing = COALESCE(sta.average_session_time, 0), sessions_count = COALESCE(sta.sess,0) FROM - (SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, utm, rules FROM quiz WHERE deleted = FALSE AND archived = FALSE) q_sub + (SELECT id, qid, accountid, deleted, archived, fingerprinting, repeatable, note_prevented, mail_notifications, unique_answers, super, group_id, name, description, config, status, limit_answers, due_to, time_of_passing, pausable, version, version_comment, parent_ids, created_at, updated_at, questions_count, answers_count, average_time_passing, sessions_count, rules FROM quiz WHERE deleted = FALSE AND archived = FALSE) q_sub LEFT JOIN answer_aggregates aa ON q_sub.id = aa.quiz_id LEFT JOIN question_aggregates qa ON q_sub.id = qa.quiz_id LEFT JOIN session_times_aggregates sta ON q_sub.id = sta.quiz_id