diff --git a/dal/db_query/queries.sql b/dal/db_query/queries.sql index 78114f7..fc2463c 100644 --- a/dal/db_query/queries.sql +++ b/dal/db_query/queries.sql @@ -33,9 +33,10 @@ INSERT INTO question ( content, parent_ids, updated_at, - session + session, + auditory ) -VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10) +VALUES ($1,$2,$3,$4,$5,$6,$7,$8,$9,$10,$11) RETURNING id, created_at, updated_at; -- name: DeleteQuestion :one diff --git a/dal/schema/000022_init.down.sql b/dal/schema/000022_init.down.sql new file mode 100644 index 0000000..a9de7cd --- /dev/null +++ b/dal/schema/000022_init.down.sql @@ -0,0 +1 @@ +ALTER TABLE question DROP CONSTRAINT IF EXISTS fk_auditory, DROP COLUMN IF EXISTS auditory; diff --git a/dal/schema/000022_init.up.sql b/dal/schema/000022_init.up.sql new file mode 100644 index 0000000..2791201 --- /dev/null +++ b/dal/schema/000022_init.up.sql @@ -0,0 +1,2 @@ +ALTER TABLE question ADD COLUMN auditory BIGINT, +ADD CONSTRAINT fk_auditory FOREIGN KEY (auditory) REFERENCES gigachatAudience(ID); diff --git a/model/model.go b/model/model.go index 3fbea45..fcbc96d 100644 --- a/model/model.go +++ b/model/model.go @@ -106,7 +106,8 @@ type Question struct { CreatedAt time.Time `json:"created_at"` UpdatedAt time.Time `json:"updated_at"` - Session string `json:"session"` + Session string `json:"session"` + Auditory int64 `json:"auditory"` } // Answer record of question answer diff --git a/repository/bitrix/bitrix.go b/repository/bitrix/bitrix.go index 923eab4..50af251 100644 --- a/repository/bitrix/bitrix.go +++ b/repository/bitrix/bitrix.go @@ -4,9 +4,10 @@ import ( "context" "database/sql" "encoding/json" - "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/dal/sqlcgen" - "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/model" - "penahub.gitlab.yandexcloud.net/backend/quiz/common.git/pj_errors" + "gitea.pena/SQuiz/common/dal/sqlcgen" + "gitea.pena/SQuiz/common/model" + "gitea.pena/SQuiz/common/pj_errors" + "time" ) diff --git a/repository/question/question.go b/repository/question/question.go index 6c07758..496dd87 100644 --- a/repository/question/question.go +++ b/repository/question/question.go @@ -110,6 +110,8 @@ func (r *QuestionRepository) GetQuestionList( whereClause = append(whereClause, fmt.Sprintf("to_tsvector('russian', que.title) @@ to_tsquery('russian', $%d)", len(data))) } + whereClause = append(whereClause, "que.auditory IS NULL") + data = append(data, limit, offset) if len(whereClause) != 0 { query = fmt.Sprintf(query, diff --git a/repository/statistics/statistics.go b/repository/statistics/statistics.go index b4ef5f3..ddf5dca 100644 --- a/repository/statistics/statistics.go +++ b/repository/statistics/statistics.go @@ -3,6 +3,7 @@ package statistics import ( "context" "database/sql" + "fmt" "gitea.pena/SQuiz/common/dal/sqlcgen" ) diff --git a/sqlc.yaml b/sqlc.yaml index d2c89c7..faf4c77 100644 --- a/sqlc.yaml +++ b/sqlc.yaml @@ -44,6 +44,8 @@ packages: - "./dal/schema/000020_init.down.sql" - "./dal/schema/000021_init.up.sql" - "./dal/schema/000021_init.down.sql" + - "./dal/schema/000022_init.up.sql" + - "./dal/schema/000022_init.down.sql" engine: "postgresql" emit_json_tags: true emit_db_tags: true