feat: turn stage increment after player's command

internal/controller/cache.go

@@ -28,6 +28,10 @@ func NewCache(g *game.Game) *Cache {
 	return c
 }
 
+func (c Cache) Stage() uint {
+	return c.g.Stage
+}
+
 func (c *Cache) ShipGroupShipClass(groupIndex int) *game.ShipType {
 	if len(c.cacheShipClassByShipGroupIndex) == 0 {
 		c.cacheShipsAndGroups()

internal/controller/controller.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"errors"
 	"fmt"
 
 	"github.com/iliadenisov/galaxy/internal/model/game"
@@ -70,15 +71,18 @@ func NewRepoController(r Repo) *Controller {
 	}
 }
 
-func (c *Controller) ExecuteState(consumer func(Repo)) error {
+func (c *Controller) ExecuteState(consumer func(Repo) error) (err error) {
 	if err := c.Repo.Lock(); err != nil {
 		return fmt.Errorf("execute: lock failed: %s", err)
 	}
-	consumer(c.Repo)
-	return c.Repo.Release()
+	defer func() {
+		err = errors.Join(err, c.Repo.Release())
+	}()
+	err = consumer(c.Repo)
+	return
 }
 
-func (c *Controller) ExecuteGame(consumer func(Repo, *game.Game)) error {
+func (c *Controller) ExecuteCommand(consumer func(Repo, *game.Game) error) (err error) {
 	if err := c.Repo.Lock(); err != nil {
 		return fmt.Errorf("execute: lock failed: %s", err)
 	}
@@ -86,7 +90,14 @@ func (c *Controller) ExecuteGame(consumer func(Repo, *game.Game)) error {
 	if err != nil {
 		return err
 	}
+	defer func() {
+		err = errors.Join(err, c.Repo.Release())
+	}()
 	c.Cache = NewCache(g)
-	consumer(c.Repo, g)
-	return c.Repo.Release()
+	err = consumer(c.Repo, g)
+	if err == nil {
+		g.Stage += 1
+		c.Repo.SaveLastState(g)
+	}
+	return
 }

internal/controller/generate_turn.go

@@ -12,6 +12,7 @@ import (
 func MakeTurn(c *Controller, r Repo) error {
 	// Next turn
 	c.Cache.g.Turn += 1
+	c.Cache.g.Stage = 0
 
 	// 00. Вышедшие расы удаляются из списка участвующих рас перед началом просчета очередного хода
 	c.Cache.TurnWipeExtinctRaces()