feat: merge auth&tester
This commit is contained in:
Vyacheslav1557
parent
0a2dea6c23
commit
441af4c6a2
72 changed files with 4910 additions and 2378 deletions
156
internal/users/repository/pg_repository.go
Normal file
156
internal/users/repository/pg_repository.go
Normal file
|
|
@ -0,0 +1,156 @@
|
|||
package repository
|
||||
|
||||
import (
|
||||
"context"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/models"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/users"
|
||||
"git.sch9.ru/new_gate/ms-tester/pkg"
|
||||
"github.com/jmoiron/sqlx"
|
||||
)
|
||||
|
||||
type Repository struct {
|
||||
_db *sqlx.DB
|
||||
}
|
||||
|
||||
func NewRepository(db *sqlx.DB) *Repository {
|
||||
return &Repository{
|
||||
_db: db,
|
||||
}
|
||||
}
|
||||
|
||||
func (r *Repository) BeginTx(ctx context.Context) (users.Tx, error) {
|
||||
tx, err := r._db.BeginTxx(ctx, nil)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return tx, nil
|
||||
}
|
||||
|
||||
func (r *Repository) DB() users.Querier {
|
||||
return r._db
|
||||
}
|
||||
|
||||
const CreateUserQuery = `
|
||||
INSERT INTO users
|
||||
(username, hashed_pwd, role)
|
||||
VALUES ($1, $2, $3)
|
||||
RETURNING id
|
||||
`
|
||||
|
||||
func (r *Repository) CreateUser(ctx context.Context, q users.Querier, user *models.UserCreation) (int32, error) {
|
||||
const op = "Caller.CreateUser"
|
||||
|
||||
rows, err := q.QueryxContext(
|
||||
ctx,
|
||||
CreateUserQuery,
|
||||
user.Username,
|
||||
user.Password,
|
||||
user.Role,
|
||||
)
|
||||
if err != nil {
|
||||
return 0, pkg.HandlePgErr(err, op)
|
||||
}
|
||||
|
||||
defer rows.Close()
|
||||
var id int32
|
||||
rows.Next()
|
||||
err = rows.Scan(&id)
|
||||
if err != nil {
|
||||
return 0, pkg.HandlePgErr(err, op)
|
||||
}
|
||||
|
||||
return id, nil
|
||||
}
|
||||
|
||||
const ReadUserByUsernameQuery = "SELECT * from users WHERE username=$1 LIMIT 1"
|
||||
|
||||
func (r *Repository) ReadUserByUsername(ctx context.Context, q users.Querier, username string) (*models.User, error) {
|
||||
const op = "Caller.ReadUserByUsername"
|
||||
|
||||
var user models.User
|
||||
err := q.GetContext(ctx, &user, ReadUserByUsernameQuery, username)
|
||||
if err != nil {
|
||||
return nil, pkg.HandlePgErr(err, op)
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
const ReadUserByIdQuery = "SELECT * from users WHERE id=$1 LIMIT 1"
|
||||
|
||||
func (r *Repository) ReadUserById(ctx context.Context, q users.Querier, id int32) (*models.User, error) {
|
||||
const op = "Caller.ReadUserById"
|
||||
|
||||
var user models.User
|
||||
err := q.GetContext(ctx, &user, ReadUserByIdQuery, id)
|
||||
if err != nil {
|
||||
return nil, pkg.HandlePgErr(err, op)
|
||||
}
|
||||
return &user, nil
|
||||
}
|
||||
|
||||
const UpdateUserQuery = `
|
||||
UPDATE users
|
||||
SET username = COALESCE($1, username),
|
||||
role = COALESCE($2, role)
|
||||
WHERE id = $3
|
||||
`
|
||||
|
||||
func (r *Repository) UpdateUser(ctx context.Context, q users.Querier, id int32, update *models.UserUpdate) error {
|
||||
const op = "Caller.UpdateUser"
|
||||
|
||||
_, err := q.ExecContext(
|
||||
ctx,
|
||||
UpdateUserQuery,
|
||||
update.Username,
|
||||
update.Role,
|
||||
id,
|
||||
)
|
||||
|
||||
if err != nil {
|
||||
return pkg.HandlePgErr(err, op)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
const DeleteUserQuery = "DELETE FROM users WHERE id = $1"
|
||||
|
||||
func (r *Repository) DeleteUser(ctx context.Context, q users.Querier, id int32) error {
|
||||
const op = "Caller.DeleteUser"
|
||||
|
||||
_, err := q.ExecContext(ctx, DeleteUserQuery, id)
|
||||
if err != nil {
|
||||
return pkg.HandlePgErr(err, op)
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
const (
|
||||
ListUsersQuery = "SELECT * FROM users LIMIT $1 OFFSET $2"
|
||||
CountUsersQuery = "SELECT COUNT(*) FROM users"
|
||||
)
|
||||
|
||||
func (r *Repository) ListUsers(ctx context.Context, q users.Querier, filters models.UsersListFilters) (*models.UsersList, error) {
|
||||
const op = "Caller.ListUsers"
|
||||
|
||||
list := make([]*models.User, 0)
|
||||
err := q.SelectContext(ctx, &list, ListUsersQuery, filters.PageSize, filters.Offset())
|
||||
if err != nil {
|
||||
return nil, pkg.HandlePgErr(err, op)
|
||||
}
|
||||
|
||||
var count int32
|
||||
err = q.GetContext(ctx, &count, CountUsersQuery)
|
||||
if err != nil {
|
||||
return nil, pkg.HandlePgErr(err, op)
|
||||
}
|
||||
|
||||
return &models.UsersList{
|
||||
Users: list,
|
||||
Pagination: models.Pagination{
|
||||
Total: models.Total(count, filters.PageSize),
|
||||
Page: filters.Page,
|
||||
},
|
||||
}, nil
|
||||
}
|
||||
222
internal/users/repository/pg_repository_test.go
Normal file
222
internal/users/repository/pg_repository_test.go
Normal file
|
|
@ -0,0 +1,222 @@
|
|||
package repository_test
|
||||
|
||||
import (
|
||||
"context"
|
||||
"database/sql"
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/models"
|
||||
"git.sch9.ru/new_gate/ms-tester/internal/users/repository"
|
||||
"github.com/DATA-DOG/go-sqlmock"
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
// setupTestDB creates a mocked sqlx.DB and sqlmock instance for testing.
|
||||
func setupTestDB(t *testing.T) (*sqlx.DB, sqlmock.Sqlmock) {
|
||||
db, mock, err := sqlmock.New(sqlmock.QueryMatcherOption(sqlmock.QueryMatcherEqual))
|
||||
assert.NoError(t, err)
|
||||
sqlxDB := sqlx.NewDb(db, "sqlmock")
|
||||
return sqlxDB, mock
|
||||
}
|
||||
|
||||
func TestRepository_CreateUser(t *testing.T) {
|
||||
db, mock := setupTestDB(t)
|
||||
defer db.Close()
|
||||
|
||||
repo := repository.NewRepository(db)
|
||||
|
||||
t.Run("success", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
var expectedId int32 = 1
|
||||
user := &models.UserCreation{
|
||||
Username: "testuser",
|
||||
Password: "hashed-password",
|
||||
Role: models.RoleAdmin,
|
||||
}
|
||||
|
||||
mock.ExpectQuery(repository.CreateUserQuery).
|
||||
WithArgs(user.Username, sqlmock.AnyArg(), user.Role).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id"}).AddRow(expectedId))
|
||||
|
||||
id, err := repo.CreateUser(ctx, db, user)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, expectedId, id)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRepository_ReadUserByUsername(t *testing.T) {
|
||||
db, mock := setupTestDB(t)
|
||||
defer db.Close()
|
||||
|
||||
repo := repository.NewRepository(db)
|
||||
|
||||
t.Run("success", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
expected := &models.User{
|
||||
Id: 1,
|
||||
Username: "testuser",
|
||||
HashedPassword: "hashed-password",
|
||||
CreatedAt: time.Now(),
|
||||
UpdatedAt: time.Now(),
|
||||
Role: models.RoleAdmin,
|
||||
}
|
||||
|
||||
columns := []string{
|
||||
"id",
|
||||
"username",
|
||||
"hashed_pwd",
|
||||
"created_at",
|
||||
"updated_at",
|
||||
"role",
|
||||
}
|
||||
|
||||
rows := sqlmock.NewRows(columns).AddRow(
|
||||
expected.Id,
|
||||
expected.Username,
|
||||
expected.HashedPassword,
|
||||
expected.CreatedAt,
|
||||
expected.UpdatedAt,
|
||||
expected.Role,
|
||||
)
|
||||
|
||||
mock.ExpectQuery(repository.ReadUserByUsernameQuery).WithArgs(expected.Username).WillReturnRows(rows)
|
||||
|
||||
user, err := repo.ReadUserByUsername(ctx, db, expected.Username)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, expected, user)
|
||||
})
|
||||
|
||||
t.Run("not found", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
username := "testuser"
|
||||
|
||||
mock.ExpectQuery(repository.ReadUserByUsernameQuery).WithArgs(username).WillReturnError(sql.ErrNoRows)
|
||||
|
||||
user, err := repo.ReadUserByUsername(ctx, db, username)
|
||||
assert.Error(t, err)
|
||||
assert.Nil(t, user)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRepository_ReadUserById(t *testing.T) {
|
||||
db, mock := setupTestDB(t)
|
||||
defer db.Close()
|
||||
|
||||
repo := repository.NewRepository(db)
|
||||
|
||||
t.Run("success", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
expected := &models.User{
|
||||
Id: 1,
|
||||
Username: "testuser",
|
||||
Role: models.RoleAdmin,
|
||||
}
|
||||
|
||||
mock.ExpectQuery(repository.ReadUserByIdQuery).
|
||||
WithArgs(expected.Id).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id", "username", "role"}).
|
||||
AddRow(expected.Id, expected.Username, expected.Role))
|
||||
|
||||
user, err := repo.ReadUserById(ctx, db, expected.Id)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, expected, user)
|
||||
})
|
||||
|
||||
t.Run("not found", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
userID := int32(1)
|
||||
|
||||
mock.ExpectQuery(repository.ReadUserByIdQuery).WithArgs(userID).WillReturnError(sql.ErrNoRows)
|
||||
|
||||
user, err := repo.ReadUserById(ctx, db, userID)
|
||||
assert.Error(t, err)
|
||||
assert.Nil(t, user)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRepository_UpdateUser(t *testing.T) {
|
||||
db, mock := setupTestDB(t)
|
||||
defer db.Close()
|
||||
|
||||
repo := repository.NewRepository(db)
|
||||
|
||||
t.Run("success", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
userID := int32(1)
|
||||
username := "testuser"
|
||||
role := models.RoleStudent
|
||||
update := &models.UserUpdate{
|
||||
Username: &username,
|
||||
Role: &role,
|
||||
}
|
||||
|
||||
mock.ExpectExec(repository.UpdateUserQuery).
|
||||
WithArgs(update.Username, update.Role, userID).
|
||||
WillReturnResult(sqlmock.NewResult(0, 1))
|
||||
|
||||
err := repo.UpdateUser(ctx, db, userID, update)
|
||||
assert.NoError(t, err)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRepository_DeleteUser(t *testing.T) {
|
||||
db, mock := setupTestDB(t)
|
||||
defer db.Close()
|
||||
|
||||
repo := repository.NewRepository(db)
|
||||
|
||||
t.Run("success", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
userID := int32(1)
|
||||
|
||||
mock.ExpectExec(repository.DeleteUserQuery).
|
||||
WithArgs(userID).
|
||||
WillReturnResult(sqlmock.NewResult(0, 1))
|
||||
|
||||
err := repo.DeleteUser(ctx, db, userID)
|
||||
assert.NoError(t, err)
|
||||
})
|
||||
}
|
||||
|
||||
func TestRepository_ListUsers(t *testing.T) {
|
||||
db, mock := setupTestDB(t)
|
||||
defer db.Close()
|
||||
|
||||
repo := repository.NewRepository(db)
|
||||
|
||||
t.Run("success", func(t *testing.T) {
|
||||
ctx := context.Background()
|
||||
|
||||
filters := models.UsersListFilters{
|
||||
Page: 1,
|
||||
PageSize: 10,
|
||||
}
|
||||
expectedUsers := []*models.User{
|
||||
{Id: 1, Username: "user1", Role: models.RoleAdmin},
|
||||
{Id: 2, Username: "user2", Role: models.RoleStudent},
|
||||
}
|
||||
totalCount := int32(2)
|
||||
|
||||
mock.ExpectQuery(repository.ListUsersQuery).
|
||||
WithArgs(filters.PageSize, filters.Offset()).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"id", "username", "role"}).
|
||||
AddRow(expectedUsers[0].Id, expectedUsers[0].Username, expectedUsers[0].Role).
|
||||
AddRow(expectedUsers[1].Id, expectedUsers[1].Username, expectedUsers[1].Role))
|
||||
|
||||
mock.ExpectQuery(repository.CountUsersQuery).
|
||||
WillReturnRows(sqlmock.NewRows([]string{"count"}).AddRow(totalCount))
|
||||
|
||||
result, err := repo.ListUsers(ctx, db, filters)
|
||||
assert.NoError(t, err)
|
||||
assert.Equal(t, expectedUsers, result.Users)
|
||||
assert.Equal(t, models.Pagination{Total: 1, Page: 1}, result.Pagination)
|
||||
})
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue