feat: persist data in PostgreSQL and add Basic/Bearer sessions in Redis

This commit is contained in:
2026-10-30 01:34:50 +03:00
parent 196e118ede
commit f68710818d
27 changed files with 1229 additions and 214 deletions
+39
View File
@@ -0,0 +1,39 @@
package postgres
import (
"embed"
"errors"
"strings"
"github.com/golang-migrate/migrate/v4"
_ "github.com/golang-migrate/migrate/v4/database/pgx/v5"
"github.com/golang-migrate/migrate/v4/source/iofs"
)
//go:embed migrations/*.sql
var migrationsFS embed.FS
func Migrate(databaseURL string) error {
src, err := iofs.New(migrationsFS, "migrations")
if err != nil {
return err
}
m, err := migrate.NewWithSourceInstance("iofs", src, migrateURL(databaseURL))
if err != nil {
return err
}
defer m.Close()
if err := m.Up(); err != nil && !errors.Is(err, migrate.ErrNoChange) {
return err
}
return nil
}
func migrateURL(databaseURL string) string {
for _, prefix := range []string{"postgresql://", "postgres://"} {
if rest, ok := strings.CutPrefix(databaseURL, prefix); ok {
return "pgx5://" + rest
}
}
return databaseURL
}
@@ -0,0 +1,4 @@
DROP TABLE IF EXISTS messages;
DROP TABLE IF EXISTS chat_members;
DROP TABLE IF EXISTS chats;
DROP TABLE IF EXISTS users;
@@ -0,0 +1,32 @@
CREATE TABLE users (
id uuid PRIMARY KEY,
username text NOT NULL UNIQUE,
display_name text NOT NULL,
password_hash text NOT NULL,
created_at timestamptz NOT NULL
);
CREATE TABLE chats (
id uuid PRIMARY KEY,
title text NOT NULL,
created_at timestamptz NOT NULL
);
CREATE TABLE chat_members (
chat_id uuid NOT NULL REFERENCES chats (id) ON DELETE CASCADE,
user_id uuid NOT NULL REFERENCES users (id),
position int NOT NULL,
PRIMARY KEY (chat_id, user_id)
);
CREATE INDEX chat_members_user_id_idx ON chat_members (user_id);
CREATE TABLE messages (
id uuid PRIMARY KEY,
chat_id uuid NOT NULL REFERENCES chats (id) ON DELETE CASCADE,
sender_id uuid NOT NULL REFERENCES users (id),
text text NOT NULL,
created_at timestamptz NOT NULL
);
CREATE INDEX messages_chat_created_id_idx ON messages (chat_id, created_at, id);
@@ -0,0 +1,106 @@
package postgres_test
import (
"context"
"errors"
"os"
"sync"
"testing"
"time"
"uuid"
"github.com/jackc/pgx/v5/pgxpool"
"messenger/internal/domain"
"messenger/internal/repository/postgres"
)
func newStore(t *testing.T) (*postgres.Store, *pgxpool.Pool) {
t.Helper()
dbURL := os.Getenv("TEST_DATABASE_URL")
if dbURL == "" {
t.Skip("TEST_DATABASE_URL is required")
}
if err := postgres.Migrate(dbURL); err != nil {
t.Fatal(err)
}
pool, err := postgres.NewPool(context.Background(), dbURL)
if err != nil {
t.Fatal(err)
}
t.Cleanup(pool.Close)
return postgres.New(pool), pool
}
func newUser(username string) domain.User {
return domain.User{ID: uuid.New(), Username: username, DisplayName: "Test", CreatedAt: time.Now().UTC()}
}
func TestRegisterUsernameRace(t *testing.T) {
store, pool := newStore(t)
ctx := context.Background()
username := "race_" + uuid.New().String()[:8]
const workers = 20
var wg sync.WaitGroup
errs := make([]error, workers)
start := make(chan struct{})
for i := range workers {
wg.Go(func() {
<-start
errs[i] = store.CreateUser(ctx, newUser(username), "hash")
})
}
close(start)
wg.Wait()
created := 0
for _, err := range errs {
switch {
case err == nil:
created++
case !errors.Is(err, domain.ErrConflict):
t.Errorf("unexpected error: %v", err)
}
}
if created != 1 {
t.Errorf("created %d users, want exactly 1", created)
}
var rows int
if err := pool.QueryRow(ctx, `SELECT count(*) FROM users WHERE username = $1`, username).Scan(&rows); err != nil {
t.Fatal(err)
}
if rows != 1 {
t.Errorf("users rows = %d, want 1", rows)
}
}
func TestCreateChatRollback(t *testing.T) {
store, pool := newStore(t)
ctx := context.Background()
alice := newUser("rb_" + uuid.New().String()[:8])
if err := store.CreateUser(ctx, alice, "hash"); err != nil {
t.Fatal(err)
}
chat := domain.Chat{
ID: uuid.New(),
Title: "rollback",
MemberIDs: []uuid.UUID{alice.ID, uuid.New()},
CreatedAt: time.Now().UTC(),
}
if err := store.CreateChat(ctx, chat); !errors.Is(err, domain.ErrNotFound) {
t.Fatalf("CreateChat with unknown member: got %v, want ErrNotFound", err)
}
var chats, members int
if err := pool.QueryRow(ctx, `SELECT count(*) FROM chats WHERE id = $1`, chat.ID).Scan(&chats); err != nil {
t.Fatal(err)
}
if err := pool.QueryRow(ctx, `SELECT count(*) FROM chat_members WHERE chat_id = $1`, chat.ID).Scan(&members); err != nil {
t.Fatal(err)
}
if chats != 0 || members != 0 {
t.Errorf("after rollback: chats=%d chat_members=%d, want 0 and 0", chats, members)
}
}
+237
View File
@@ -0,0 +1,237 @@
package postgres
import (
"context"
"errors"
"fmt"
"time"
"uuid"
"github.com/jackc/pgx/v5"
"github.com/jackc/pgx/v5/pgconn"
"github.com/jackc/pgx/v5/pgxpool"
"messenger/internal/domain"
)
const (
maxConns = 10
connectTimeout = 3 * time.Second
statementTimeout = "5000"
)
type Store struct {
pool *pgxpool.Pool
}
func NewPool(ctx context.Context, databaseURL string) (*pgxpool.Pool, error) {
cfg, err := pgxpool.ParseConfig(databaseURL)
if err != nil {
return nil, err
}
cfg.MaxConns = maxConns
cfg.ConnConfig.ConnectTimeout = connectTimeout
cfg.ConnConfig.RuntimeParams["statement_timeout"] = statementTimeout
return pgxpool.NewWithConfig(ctx, cfg)
}
func New(pool *pgxpool.Pool) *Store {
return &Store{pool: pool}
}
func (s *Store) Ping(ctx context.Context) error {
return dbErr(s.pool.Ping(ctx))
}
func (s *Store) CreateUser(ctx context.Context, u domain.User, passwordHash string) error {
_, err := s.pool.Exec(ctx,
`INSERT INTO users (id, username, display_name, password_hash, created_at) VALUES ($1, $2, $3, $4, $5)`,
u.ID, u.Username, u.DisplayName, passwordHash, u.CreatedAt)
return dbErr(err)
}
func (s *Store) GetUser(ctx context.Context, id uuid.UUID) (domain.User, error) {
var u domain.User
err := s.pool.QueryRow(ctx,
`SELECT id, username, display_name, created_at FROM users WHERE id = $1`, id,
).Scan(&u.ID, &u.Username, &u.DisplayName, &u.CreatedAt)
return u, dbErr(err)
}
func (s *Store) GetUserByUsername(ctx context.Context, username string) (domain.User, string, error) {
var u domain.User
var hash string
err := s.pool.QueryRow(ctx,
`SELECT id, username, display_name, created_at, password_hash FROM users WHERE username = $1`, username,
).Scan(&u.ID, &u.Username, &u.DisplayName, &u.CreatedAt, &hash)
return u, hash, dbErr(err)
}
func (s *Store) CreateChat(ctx context.Context, c domain.Chat) error {
tx, err := s.pool.Begin(ctx)
if err != nil {
return dbErr(err)
}
defer tx.Rollback(ctx)
if _, err := tx.Exec(ctx, `INSERT INTO chats (id, title, created_at) VALUES ($1, $2, $3)`,
c.ID, c.Title, c.CreatedAt); err != nil {
return dbErr(err)
}
for i, userID := range c.MemberIDs {
if _, err := tx.Exec(ctx, `INSERT INTO chat_members (chat_id, user_id, position) VALUES ($1, $2, $3)`,
c.ID, userID, i); err != nil {
return dbErr(err)
}
}
return dbErr(tx.Commit(ctx))
}
func (s *Store) GetChat(ctx context.Context, id uuid.UUID) (domain.Chat, error) {
var c domain.Chat
err := s.pool.QueryRow(ctx, `SELECT id, title, created_at FROM chats WHERE id = $1`, id).
Scan(&c.ID, &c.Title, &c.CreatedAt)
if err != nil {
return domain.Chat{}, dbErr(err)
}
chats := []domain.Chat{c}
if err := s.loadMembers(ctx, chats); err != nil {
return domain.Chat{}, err
}
return chats[0], nil
}
func (s *Store) ListUserChats(ctx context.Context, userID uuid.UUID, after *domain.Cursor, limit int) ([]domain.Chat, bool, error) {
var rows pgx.Rows
var err error
if after == nil {
rows, err = s.pool.Query(ctx, `
SELECT c.id, c.title, c.created_at
FROM chats c
JOIN chat_members m ON m.chat_id = c.id
WHERE m.user_id = $1
ORDER BY c.created_at, c.id
LIMIT $2`, userID, limit+1)
} else {
rows, err = s.pool.Query(ctx, `
SELECT c.id, c.title, c.created_at
FROM chats c
JOIN chat_members m ON m.chat_id = c.id
WHERE m.user_id = $1 AND (c.created_at, c.id) > ($2, $3)
ORDER BY c.created_at, c.id
LIMIT $4`, userID, after.CreatedAt, after.ID, limit+1)
}
if err != nil {
return nil, false, dbErr(err)
}
chats, err := pgx.CollectRows(rows, func(row pgx.CollectableRow) (domain.Chat, error) {
var c domain.Chat
err := row.Scan(&c.ID, &c.Title, &c.CreatedAt)
return c, err
})
if err != nil {
return nil, false, dbErr(err)
}
more := len(chats) > limit
if more {
chats = chats[:limit]
}
if err := s.loadMembers(ctx, chats); err != nil {
return nil, false, err
}
return chats, more, nil
}
func (s *Store) loadMembers(ctx context.Context, chats []domain.Chat) error {
if len(chats) == 0 {
return nil
}
ids := make([]uuid.UUID, len(chats))
index := make(map[uuid.UUID]int, len(chats))
for i, c := range chats {
ids[i] = c.ID
index[c.ID] = i
}
rows, err := s.pool.Query(ctx,
`SELECT chat_id, user_id FROM chat_members WHERE chat_id = ANY($1) ORDER BY chat_id, position`, ids)
if err != nil {
return dbErr(err)
}
defer rows.Close()
for rows.Next() {
var chatID, userID uuid.UUID
if err := rows.Scan(&chatID, &userID); err != nil {
return dbErr(err)
}
i := index[chatID]
chats[i].MemberIDs = append(chats[i].MemberIDs, userID)
}
return dbErr(rows.Err())
}
func (s *Store) CreateMessage(ctx context.Context, m domain.Message) error {
_, err := s.pool.Exec(ctx,
`INSERT INTO messages (id, chat_id, sender_id, text, created_at) VALUES ($1, $2, $3, $4, $5)`,
m.ID, m.ChatID, m.SenderID, m.Text, m.CreatedAt)
return dbErr(err)
}
func (s *Store) ListMessages(ctx context.Context, chatID uuid.UUID, after *domain.Cursor, limit int) ([]domain.Message, bool, error) {
var rows pgx.Rows
var err error
if after == nil {
rows, err = s.pool.Query(ctx, `
SELECT id, chat_id, sender_id, text, created_at
FROM messages
WHERE chat_id = $1
ORDER BY created_at, id
LIMIT $2`, chatID, limit+1)
} else {
rows, err = s.pool.Query(ctx, `
SELECT id, chat_id, sender_id, text, created_at
FROM messages
WHERE chat_id = $1 AND (created_at, id) > ($2, $3)
ORDER BY created_at, id
LIMIT $4`, chatID, after.CreatedAt, after.ID, limit+1)
}
if err != nil {
return nil, false, dbErr(err)
}
msgs, err := pgx.CollectRows(rows, func(row pgx.CollectableRow) (domain.Message, error) {
var m domain.Message
err := row.Scan(&m.ID, &m.ChatID, &m.SenderID, &m.Text, &m.CreatedAt)
return m, err
})
if err != nil {
return nil, false, dbErr(err)
}
more := len(msgs) > limit
if more {
msgs = msgs[:limit]
}
return msgs, more, nil
}
func dbErr(err error) error {
if err == nil {
return nil
}
if errors.Is(err, pgx.ErrNoRows) {
return domain.ErrNotFound
}
var pgErr *pgconn.PgError
if errors.As(err, &pgErr) {
switch pgErr.Code {
case "23505":
return domain.ErrConflict
case "23503":
return domain.ErrNotFound
}
switch pgErr.Code[:2] {
case "08", "53", "57":
return fmt.Errorf("%w: %v", domain.ErrUnavailable, err)
}
return err
}
return fmt.Errorf("%w: %v", domain.ErrUnavailable, err)
}