diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index 5d2e81f..a1b082b 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -1101,7 +1101,7 @@ ORDER BY (q.session != '') ASC, --без сессии первые потом с LIMIT $4 OFFSET $5; -- name: GetQuestionsAICount :one -SELECT COUNT(*) AS count FROM question WHERE quiz_id = $1 AND (session = $2 OR session = '') AND deleted = FALSE; +SELECT COUNT(*) AS count FROM question WHERE quiz_id = $1 AND auditory = $2 AND (session = $3 OR session = '') AND deleted = FALSE; -- name: CreateQuizAudience :one INSERT INTO gigachatAudience (QuizID, Sex, Age) VALUES ($1, $2, $3) RETURNING ID; diff --git a/dal/sqlcgen/queries.sql.go b/dal/sqlcgen/queries.sql.go index a7c2eb1..544eeb2 100644 --- a/dal/sqlcgen/queries.sql.go +++ b/dal/sqlcgen/queries.sql.go @@ -3219,16 +3219,17 @@ func (q *Queries) GetQuestionsAI(ctx context.Context, arg GetQuestionsAIParams) } const getQuestionsAICount = `-- name: GetQuestionsAICount :one -SELECT COUNT(*) AS count FROM question WHERE quiz_id = $1 AND (session = $2 OR session = '') AND deleted = FALSE +SELECT COUNT(*) AS count FROM question WHERE quiz_id = $1 AND auditory = $2 AND (session = $3 OR session = '') AND deleted = FALSE ` type GetQuestionsAICountParams struct { - QuizID int64 `db:"quiz_id" json:"quiz_id"` - Session string `db:"session" json:"session"` + QuizID int64 `db:"quiz_id" json:"quiz_id"` + Auditory int64 `db:"auditory" json:"auditory"` + Session string `db:"session" json:"session"` } func (q *Queries) GetQuestionsAICount(ctx context.Context, arg GetQuestionsAICountParams) (int64, error) { - row := q.db.QueryRowContext(ctx, getQuestionsAICount, arg.QuizID, arg.Session) + row := q.db.QueryRowContext(ctx, getQuestionsAICount, arg.QuizID, arg.Auditory, arg.Session) var count int64 err := row.Scan(&count) return count, err diff --git a/repository/question/question.go b/repository/question/question.go index c1d6991..1e7c66e 100644 --- a/repository/question/question.go +++ b/repository/question/question.go @@ -538,8 +538,9 @@ func (r *QuestionRepository) GetQuestionsAI(ctx context.Context, quizID int64, s } count, err = r.queries.GetQuestionsAICount(ctx, sqlcgen.GetQuestionsAICountParams{ - QuizID: quizID, - Session: session, + QuizID: quizID, + Session: session, + Auditory: auditory, }) return questions, uint64(count), nil