diff --git a/repos/rooms.go b/repos/rooms.go index f1fa7c0..9a26647 100644 --- a/repos/rooms.go +++ b/repos/rooms.go @@ -47,7 +47,7 @@ func (p *RepoProvider) RoomCreate(ctx context.Context, r *models.Room) error { if err != nil { return err } - _, err = db.ExecContext(ctx, `INSERT INTO settings (room_id, language, room_pass, turn_time) VALUES (?, ?, ?, ?)`, r.ID, r.Settings.Language, r.Settings.RoomPass, r.Settings.RoundTime) + _, err = db.ExecContext(ctx, `INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left) VALUES (?, ?, ?, ?, ?)`, r.ID, r.Settings.Language, r.Settings.RoomPass, r.Settings.RoundTime, r.Settings.TurnSecondsLeft) return err } @@ -60,6 +60,10 @@ func (p *RepoProvider) RoomDeleteByID(ctx context.Context, id string) error { func (p *RepoProvider) RoomUpdate(ctx context.Context, r *models.Room) error { db := getDB(ctx, p.DB) _, err := db.ExecContext(ctx, `UPDATE rooms SET team_turn = ?, this_turn_limit = ?, opened_this_turn = ?, blue_counter = ?, red_counter = ?, red_turn = ?, mime_done = ?, is_running = ?, is_over = ?, team_won = ?, room_link = ? WHERE id = ?`, r.TeamTurn, r.ThisTurnLimit, r.OpenedThisTurn, r.BlueCounter, r.RedCounter, r.RedTurn, r.MimeDone, r.IsRunning, r.IsOver, r.TeamWon, r.RoomLink, r.ID) + if err != nil { + return err + } + _, err = db.ExecContext(ctx, `UPDATE settings SET language = ?, room_pass = ?, turn_time = ?, turn_seconds_left = ? WHERE room_id = ?`, r.Settings.Language, r.Settings.RoomPass, r.Settings.RoundTime, r.Settings.TurnSecondsLeft, r.ID) return err } diff --git a/repos/rooms_test.go b/repos/rooms_test.go index b5316de..096bd1f 100644 --- a/repos/rooms_test.go +++ b/repos/rooms_test.go @@ -84,6 +84,7 @@ func setupTestDB(t *testing.T) (*sqlx.DB, func()) { language TEXT NOT NULL DEFAULT 'en', room_pass TEXT NOT NULL DEFAULT '', turn_time INTEGER NOT NULL DEFAULT 60, + turn_seconds_left INTEGER NOT NULL DEFAULT 0, created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, FOREIGN KEY (room_id) REFERENCES rooms(id) ON DELETE CASCADE ); @@ -144,11 +145,12 @@ func TestRoomsRepo_CreateRoom(t *testing.T) { assert.Equal(t, room.CreatorName, retrievedRoom.CreatorName) var retrievedSettings models.GameSettings - err = db.Get(&retrievedSettings, "SELECT id, language, room_pass, turn_time FROM settings WHERE room_id = ?", room.ID) + err = db.Get(&retrievedSettings, "SELECT id, language, room_pass, turn_time, turn_seconds_left FROM settings WHERE room_id = ?", room.ID) assert.NoError(t, err) assert.Equal(t, room.Settings.Language, retrievedSettings.Language) assert.Equal(t, room.Settings.RoundTime, retrievedSettings.RoundTime) assert.Equal(t, room.Settings.RoomPass, retrievedSettings.RoomPass) + assert.Equal(t, room.Settings.TurnSecondsLeft, retrievedSettings.TurnSecondsLeft) } func TestRoomsRepo_GetRoomByID(t *testing.T) { @@ -182,7 +184,7 @@ func TestRoomsRepo_GetRoomByID(t *testing.T) { // Insert a room directly into the database for testing GetRoomByID _, err := db.Exec(`INSERT INTO rooms (id, created_at, creator_name, team_turn, this_turn_limit, opened_this_turn, blue_counter, red_counter, red_turn, mime_done, is_running, is_over, team_won, room_link) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, room.ID, room.CreatedAt, room.CreatorName, room.TeamTurn, room.ThisTurnLimit, room.OpenedThisTurn, room.BlueCounter, room.RedCounter, room.RedTurn, room.MimeDone, room.IsRunning, room.IsOver, room.TeamWon, room.RoomLink) assert.NoError(t, err) - _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time) VALUES (?, ?, ?, ?)`, room.ID, room.Settings.Language, room.Settings.RoomPass, room.Settings.RoundTime) + _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left) VALUES (?, ?, ?, ?, ?)`, room.ID, room.Settings.Language, room.Settings.RoomPass, room.Settings.RoundTime, room.Settings.TurnSecondsLeft) assert.NoError(t, err) retrievedRoom, err := repo.RoomGetByID(context.Background(), room.ID) @@ -244,12 +246,12 @@ func TestRoomsRepo_ListRooms(t *testing.T) { _, err := db.Exec(`INSERT INTO rooms (id, created_at, creator_name, team_turn, this_turn_limit, opened_this_turn, blue_counter, red_counter, red_turn, mime_done, is_running, is_over, team_won, room_link) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, room1.ID, room1.CreatedAt, room1.CreatorName, room1.TeamTurn, room1.ThisTurnLimit, room1.OpenedThisTurn, room1.BlueCounter, room1.RedCounter, room1.RedTurn, room1.MimeDone, room1.IsRunning, room1.IsOver, room1.TeamWon, room1.RoomLink) assert.NoError(t, err) - _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time) VALUES (?, ?, ?, ?)`, room1.ID, room1.Settings.Language, room1.Settings.RoomPass, room1.Settings.RoundTime) + _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left) VALUES (?, ?, ?, ?, ?)`, room1.ID, room1.Settings.Language, room1.Settings.RoomPass, room1.Settings.RoundTime, room1.Settings.TurnSecondsLeft) assert.NoError(t, err) _, err = db.Exec(`INSERT INTO rooms (id, created_at, creator_name, team_turn, this_turn_limit, opened_this_turn, blue_counter, red_counter, red_turn, mime_done, is_running, is_over, team_won, room_link) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, room2.ID, room2.CreatedAt, room2.CreatorName, room2.TeamTurn, room2.ThisTurnLimit, room2.OpenedThisTurn, room2.BlueCounter, room2.RedCounter, room2.RedTurn, room2.MimeDone, room2.IsRunning, room2.IsOver, room2.TeamWon, room2.RoomLink) assert.NoError(t, err) - _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time) VALUES (?, ?, ?, ?)`, room2.ID, room2.Settings.Language, room2.Settings.RoomPass, room2.Settings.RoundTime) + _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left) VALUES (?, ?, ?, ?, ?)`, room2.ID, room2.Settings.Language, room2.Settings.RoomPass, room2.Settings.RoundTime, room2.Settings.TurnSecondsLeft) assert.NoError(t, err) rooms, err := repo.RoomList(context.Background()) @@ -287,7 +289,7 @@ func TestRoomsRepo_DeleteRoomByID(t *testing.T) { _, err := db.Exec(`INSERT INTO rooms (id, created_at, creator_name, team_turn, this_turn_limit, opened_this_turn, blue_counter, red_counter, red_turn, mime_done, is_running, is_over, team_won, room_link) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, room.ID, room.CreatedAt, room.CreatorName, room.TeamTurn, room.ThisTurnLimit, room.OpenedThisTurn, room.BlueCounter, room.RedCounter, room.RedTurn, room.MimeDone, room.IsRunning, room.IsOver, room.TeamWon, room.RoomLink) assert.NoError(t, err) - _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time) VALUES (?, ?, ?, ?)`, room.ID, room.Settings.Language, room.Settings.RoomPass, room.Settings.RoundTime) + _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left) VALUES (?, ?, ?, ?, ?)`, room.ID, room.Settings.Language, room.Settings.RoomPass, room.Settings.RoundTime, room.Settings.TurnSecondsLeft) assert.NoError(t, err) // Insert a word card for the room @@ -348,16 +350,19 @@ func TestRoomsRepo_UpdateRoom(t *testing.T) { _, err := db.Exec(`INSERT INTO rooms (id, created_at, creator_name, team_turn, this_turn_limit, opened_this_turn, blue_counter, red_counter, red_turn, mime_done, is_running, is_over, team_won, room_link) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)`, room.ID, room.CreatedAt, room.CreatorName, room.TeamTurn, room.ThisTurnLimit, room.OpenedThisTurn, room.BlueCounter, room.RedCounter, room.RedTurn, room.MimeDone, room.IsRunning, room.IsOver, room.TeamWon, room.RoomLink) assert.NoError(t, err) - _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time) VALUES (?, ?, ?, ?)`, room.ID, room.Settings.Language, room.Settings.RoomPass, room.Settings.RoundTime) + _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left) VALUES (?, ?, ?, ?, ?)`, room.ID, room.Settings.Language, room.Settings.RoomPass, room.Settings.RoundTime, room.Settings.TurnSecondsLeft) assert.NoError(t, err) room.TeamTurn = "red" room.BlueCounter = 10 room.Settings.RoundTime = 120 + room.Settings.TurnSecondsLeft = 30 // Set a value for turn_seconds_left err = repo.RoomUpdate(context.Background(), room) assert.NoError(t, err) + + var updatedRoom models.Room err = db.Get(&updatedRoom, "SELECT * FROM rooms WHERE id = ?", room.ID) assert.NoError(t, err) @@ -368,4 +373,5 @@ func TestRoomsRepo_UpdateRoom(t *testing.T) { err = db.Get(&updatedSettings, "SELECT * FROM settings WHERE room_id = ?", room.ID) assert.NoError(t, err) assert.Equal(t, uint32(120), updatedSettings.RoundTime) -} \ No newline at end of file + assert.Equal(t, uint32(30), updatedSettings.TurnSecondsLeft) +} diff --git a/repos/settings_test.go b/repos/settings_test.go new file mode 100644 index 0000000..4818ff5 --- /dev/null +++ b/repos/settings_test.go @@ -0,0 +1,57 @@ +package repos + +import ( + "context" + "gralias/models" + "testing" + "time" + + "github.com/stretchr/testify/assert" + _ "github.com/mattn/go-sqlite3" +) + +func TestSettingsRepo_SettingsUpdate(t *testing.T) { + db, teardown := setupTestDB(t) + defer teardown() + + repo := &RepoProvider{DB: db} + + // Create a dummy room first + room := &models.Room{ + ID: "test_room_settings", + CreatedAt: time.Now(), + CreatorName: "test_creator", + } + _, err := db.Exec(`INSERT INTO rooms (id, created_at, creator_name) VALUES (?, ?, ?)`, room.ID, room.CreatedAt, room.CreatorName) + assert.NoError(t, err) + + settings := &models.GameSettings{ + RoomID: "test_room_settings", + Language: "en", + RoomPass: "pass123", + RoundTime: 60, + TurnSecondsLeft: 60, + CreatedAt: time.Now(), + } + + // Insert initial settings + _, err = db.Exec(`INSERT INTO settings (room_id, language, room_pass, turn_time, turn_seconds_left, created_at) VALUES (?, ?, ?, ?, ?, ?)`, settings.RoomID, settings.Language, settings.RoomPass, settings.RoundTime, settings.TurnSecondsLeft, settings.CreatedAt) + assert.NoError(t, err) + + // Update settings + settings.RoundTime = 120 + settings.TurnSecondsLeft = 30 + settings.Language = "ru" + + err = repo.SettingsUpdate(context.Background(), settings) + assert.NoError(t, err) + + // Verify updated settings + var updatedSettings models.GameSettings + err = db.Get(&updatedSettings, "SELECT * FROM settings WHERE room_id = ?", settings.RoomID) + assert.NoError(t, err) + + assert.Equal(t, uint32(120), updatedSettings.RoundTime) + assert.Equal(t, uint32(30), updatedSettings.TurnSecondsLeft) + assert.Equal(t, "ru", updatedSettings.Language) +}