minecraft-platform/backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(backend): fixed user registration

Browse Source
This commit is contained in:
Vladimir Zagainov
2025-06-19 08:49:50 +03:00
parent 96fb472497
commit ac9db69585
2 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
internal/database/user_repository.go
View File

@@ -4,6 +4,7 @@ import (
"context"
"database/sql"
"errors"
"log"
"gitea.mrixs.me/minecraft-platform/backend/internal/models"
"github.com/google/uuid"
@@ -21,33 +22,47 @@ type UserRepository struct {
// CreateUserTx создает нового пользователя и его профиль в рамках одной транзакции
func (r *UserRepository) CreateUserTx(ctx context.Context, user *models.User) error {
log.Println("[DB] Beginning CreateUserTx transaction")
tx, err := r.DB.Begin(ctx)
if err != nil {
log.Printf("[DB] ERROR: Failed to begin transaction: %v", err)
return err
}
defer tx.Rollback(ctx)
log.Println("[DB] Checking if user exists...")
var exists bool
err = tx.QueryRow(ctx,
"SELECT EXISTS(SELECT 1 FROM users WHERE username = $1 OR email = $2)").Scan(&exists)
"SELECT EXISTS(SELECT 1 FROM users WHERE username = $1 OR email = $2)", user.Username, user.Email).Scan(&exists)
if err != nil {
log.Printf("[DB] ERROR: User existence check failed: %v", err)
return err
}
if exists {
log.Printf("[DB] User with username '%s' or email '%s' already exists.", user.Username, user.Email)
return ErrUserExists
}
log.Println("[DB] User does not exist, proceeding.")
log.Println("[DB] Inserting into 'users' table...")
var newUserID int
err = tx.QueryRow(ctx, "INSERT INTO users (uuid, username, email, password_hash, role) VALUES ($1, $2, $3, $4, $5) RETURNING id").Scan(&newUserID)
err = tx.QueryRow(ctx, "INSERT INTO users (uuid, username, email, password_hash, role) VALUES ($1, $2, $3, $4, $5) RETURNING id",
user.UUID, user.Username, user.Email, user.PasswordHash, user.Role).Scan(&newUserID)
if err != nil {
log.Printf("[DB] ERROR: Insert into 'users' failed: %v", err)
return err
}
log.Printf("[DB] Inserted into 'users' table successfully. New user ID: %d", newUserID)
_, err = tx.Exec(ctx, "INSERT INTO profiles (user_id) VALUES ($1)")
log.Println("[DB] Inserting into 'profiles' table...")
_, err = tx.Exec(ctx, "INSERT INTO profiles (user_id) VALUES ($1)", newUserID)
if err != nil {
log.Printf("[DB] ERROR: Insert into 'profiles' failed: %v", err)
return err
}
log.Println("[DB] Inserted into 'profiles' table successfully.")
log.Println("[DB] Committing transaction...")
return tx.Commit(ctx)
}
@@ -122,8 +137,6 @@ var (
)
// ValidateAccessToken проверяет, действителен ли токен для данного пользователя.
// В нашей реализации мы просто проверяем его существование.
// В более сложных системах здесь можно было бы проверять срок действия токена.
func (r *UserRepository) ValidateAccessToken(ctx context.Context, token string, userUUID uuid.UUID) error {
var exists bool
query := `