refactor: add save()/savePlayer() methods on game instances
Wrap free persistence functions in instance methods for cleaner call sites (gi.save() instead of saveGame(gi.queries, gi.game)). Methods log errors via zerolog before returning them.
This commit is contained in:
@@ -62,7 +62,7 @@ func (si *SnakeGameInstance) countdownPhase() {
|
||||
si.game.Status = StatusInProgress
|
||||
|
||||
if si.queries != nil {
|
||||
saveSnakeGame(si.queries, si.game) //nolint:errcheck
|
||||
si.save() //nolint:errcheck
|
||||
}
|
||||
si.gameMu.Unlock()
|
||||
si.notify()
|
||||
@@ -123,7 +123,7 @@ func (si *SnakeGameInstance) gamePhase() {
|
||||
if time.Since(lastInput) > inactivityLimit {
|
||||
si.game.Status = StatusFinished
|
||||
if si.queries != nil {
|
||||
saveSnakeGame(si.queries, si.game) //nolint:errcheck
|
||||
si.save() //nolint:errcheck
|
||||
}
|
||||
si.gameMu.Unlock()
|
||||
si.notify()
|
||||
@@ -193,7 +193,7 @@ func (si *SnakeGameInstance) gamePhase() {
|
||||
|
||||
// Throttle DB saves: persist on game over or every 2 seconds
|
||||
if si.queries != nil && (gameOver || time.Since(lastSave) >= 2*time.Second) {
|
||||
saveSnakeGame(si.queries, si.game) //nolint:errcheck
|
||||
si.save() //nolint:errcheck
|
||||
lastSave = time.Now()
|
||||
}
|
||||
|
||||
|
||||
@@ -4,8 +4,26 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/ryanhamamura/c4/db/repository"
|
||||
|
||||
"github.com/rs/zerolog/log"
|
||||
)
|
||||
|
||||
func (si *SnakeGameInstance) save() error {
|
||||
err := saveSnakeGame(si.queries, si.game)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Str("game_id", si.game.ID).Msg("failed to save snake game")
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
func (si *SnakeGameInstance) savePlayer(player *Player) error {
|
||||
err := saveSnakePlayer(si.queries, si.game.ID, player)
|
||||
if err != nil {
|
||||
log.Error().Err(err).Str("game_id", si.game.ID).Msg("failed to save snake player")
|
||||
}
|
||||
return err
|
||||
}
|
||||
|
||||
// saveSnakeGame persists the snake game state via upsert.
|
||||
func saveSnakeGame(queries *repository.Queries, sg *SnakeGame) error {
|
||||
boardJSON := "{}"
|
||||
|
||||
@@ -62,7 +62,7 @@ func (ss *SnakeStore) Create(width, height int, mode GameMode, speed int) *Snake
|
||||
ss.gamesMu.Unlock()
|
||||
|
||||
if ss.queries != nil {
|
||||
saveSnakeGame(ss.queries, sg) //nolint:errcheck
|
||||
si.save() //nolint:errcheck
|
||||
}
|
||||
|
||||
return si
|
||||
@@ -206,8 +206,8 @@ func (si *SnakeGameInstance) Join(player *Player) bool {
|
||||
si.game.Players[slot] = player
|
||||
|
||||
if si.queries != nil {
|
||||
saveSnakePlayer(si.queries, si.game.ID, player) //nolint:errcheck
|
||||
saveSnakeGame(si.queries, si.game) //nolint:errcheck
|
||||
si.savePlayer(player) //nolint:errcheck
|
||||
si.save() //nolint:errcheck
|
||||
}
|
||||
|
||||
si.notify()
|
||||
@@ -293,7 +293,7 @@ func (si *SnakeGameInstance) CreateRematch() *SnakeGameInstance {
|
||||
si.game.RematchGameID = &newID
|
||||
|
||||
if si.queries != nil {
|
||||
saveSnakeGame(si.queries, si.game) //nolint:errcheck
|
||||
si.save() //nolint:errcheck
|
||||
}
|
||||
si.gameMu.Unlock()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user