feat(tester): add UpdateProblem endpoint
This commit is contained in:
parent
50a4f87f53
commit
2bc625363d
10 changed files with 237 additions and 34 deletions
|
@ -3,28 +3,40 @@ package repository
|
|||
import (
|
||||
"context"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/models"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/tester"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type ProblemRepository struct {
|
||||
db *sqlx.DB
|
||||
//logger *zap.Logger
|
||||
_db *sqlx.DB
|
||||
}
|
||||
|
||||
func NewProblemRepository(db *sqlx.DB) *ProblemRepository {
|
||||
return &ProblemRepository{
|
||||
db: db,
|
||||
//logger: logger,
|
||||
_db: db,
|
||||
}
|
||||
}
|
||||
|
||||
func (r *ProblemRepository) BeginTx(ctx context.Context) (tester.Tx, error) {
|
||||
tx, err := r._db.BeginTxx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return tx, nil
|
||||
}
|
||||
|
||||
func (r *ProblemRepository) DB() tester.Querier {
|
||||
return r._db
|
||||
}
|
||||
|
||||
const createProblemQuery = "INSERT INTO problems (title) VALUES (?) RETURNING id"
|
||||
|
||||
func (r *ProblemRepository) CreateProblem(ctx context.Context, title string) (int32, error) {
|
||||
func (r *ProblemRepository) CreateProblem(ctx context.Context, q tester.Querier, title string) (int32, error) {
|
||||
const op = "ProblemRepository.CreateProblem"
|
||||
|
||||
query := r.db.Rebind(createProblemQuery)
|
||||
rows, err := r.db.QueryxContext(ctx, query, title)
|
||||
query := q.Rebind(createProblemQuery)
|
||||
rows, err := q.QueryxContext(ctx, query, title)
|
||||
if err != nil {
|
||||
return 0, handlePgErr(err, op)
|
||||
}
|
||||
|
@ -42,12 +54,12 @@ func (r *ProblemRepository) CreateProblem(ctx context.Context, title string) (in
|
|||
|
||||
const readProblemQuery = "SELECT * from problems WHERE id=? LIMIT 1"
|
||||
|
||||
func (r *ProblemRepository) ReadProblemById(ctx context.Context, id int32) (*models.Problem, error) {
|
||||
func (r *ProblemRepository) ReadProblemById(ctx context.Context, q tester.Querier, id int32) (*models.Problem, error) {
|
||||
const op = "ProblemRepository.ReadProblemById"
|
||||
|
||||
var problem models.Problem
|
||||
query := r.db.Rebind(readProblemQuery)
|
||||
err := r.db.GetContext(ctx, &problem, query, id)
|
||||
query := q.Rebind(readProblemQuery)
|
||||
err := q.GetContext(ctx, &problem, query, id)
|
||||
if err != nil {
|
||||
return nil, handlePgErr(err, op)
|
||||
}
|
||||
|
@ -56,11 +68,11 @@ func (r *ProblemRepository) ReadProblemById(ctx context.Context, id int32) (*mod
|
|||
|
||||
const deleteProblemQuery = "DELETE FROM problems WHERE id=?"
|
||||
|
||||
func (r *ProblemRepository) DeleteProblem(ctx context.Context, id int32) error {
|
||||
func (r *ProblemRepository) DeleteProblem(ctx context.Context, q tester.Querier, id int32) error {
|
||||
const op = "ProblemRepository.DeleteProblem"
|
||||
|
||||
query := r.db.Rebind(deleteProblemQuery)
|
||||
_, err := r.db.ExecContext(ctx, query, id)
|
||||
query := q.Rebind(deleteProblemQuery)
|
||||
_, err := q.ExecContext(ctx, query, id)
|
||||
if err != nil {
|
||||
return handlePgErr(err, op)
|
||||
}
|
||||
|
@ -75,7 +87,7 @@ LIMIT ? OFFSET ?`
|
|||
CountProblemsQuery = "SELECT COUNT(*) FROM problems"
|
||||
)
|
||||
|
||||
func (r *ProblemRepository) ListProblems(ctx context.Context, page int32, pageSize int32) ([]*models.ProblemListItem, int32, error) {
|
||||
func (r *ProblemRepository) ListProblems(ctx context.Context, q tester.Querier, page int32, pageSize int32) ([]*models.ProblemListItem, int32, error) {
|
||||
const op = "ContestRepository.ListProblems"
|
||||
|
||||
if pageSize > 20 || pageSize < 1 {
|
||||
|
@ -83,19 +95,56 @@ func (r *ProblemRepository) ListProblems(ctx context.Context, page int32, pageSi
|
|||
}
|
||||
|
||||
var problems []*models.ProblemListItem
|
||||
query := r.db.Rebind(ListProblemsQuery)
|
||||
err := r.db.SelectContext(ctx, &problems, query, pageSize, (page-1)*pageSize)
|
||||
query := q.Rebind(ListProblemsQuery)
|
||||
err := q.SelectContext(ctx, &problems, query, pageSize, (page-1)*pageSize)
|
||||
if err != nil {
|
||||
return nil, 0, handlePgErr(err, op)
|
||||
}
|
||||
|
||||
query = r.db.Rebind(CountProblemsQuery)
|
||||
query = q.Rebind(CountProblemsQuery)
|
||||
|
||||
var count int32
|
||||
err = r.db.GetContext(ctx, &count, query)
|
||||
err = q.GetContext(ctx, &count, query)
|
||||
if err != nil {
|
||||
return nil, 0, handlePgErr(err, op)
|
||||
}
|
||||
|
||||
return problems, count, nil
|
||||
}
|
||||
|
||||
const (
|
||||
UpdateProblemQuery = `UPDATE problems
|
||||
SET title = COALESCE(?, title),
|
||||
legend = COALESCE(?, legend),
|
||||
input_format = COALESCE(?, input_format),
|
||||
output_format = COALESCE(?, output_format),
|
||||
notes = COALESCE(?, notes),
|
||||
tutorial = COALESCE(?, tutorial),
|
||||
latex_summary = COALESCE(?, latex_summary),
|
||||
time_limit = COALESCE(?, time_limit),
|
||||
memory_limit = COALESCE(?, memory_limit)
|
||||
WHERE id=?`
|
||||
)
|
||||
|
||||
func (r *ProblemRepository) UpdateProblem(ctx context.Context, q tester.Querier, id int32, problem models.ProblemUpdate) error {
|
||||
const op = "ProblemRepository.UpdateProblem"
|
||||
|
||||
query := q.Rebind(UpdateProblemQuery)
|
||||
_, err := q.ExecContext(ctx, query,
|
||||
problem.Title,
|
||||
problem.Legend,
|
||||
problem.InputFormat,
|
||||
problem.OutputFormat,
|
||||
problem.Notes,
|
||||
problem.Tutorial,
|
||||
problem.LatexSummary,
|
||||
problem.TimeLimit,
|
||||
problem.MemoryLimit,
|
||||
id,
|
||||
)
|
||||
if err != nil {
|
||||
return handlePgErr(err, op)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue