feat: turn generate api

internal/controller/controller.go

@@ -70,19 +70,31 @@ type Ctrl interface {
 	PlanetRouteRemove(actor, loadType string, origin uint) error
 }
 
-func GenerateGame(configure func(*Param), races []string) (ID uuid.UUID, err error) {
+func GenerateGame(configure func(*Param), races []string) (s game.State, err error) {
 	ec, err := NewRepoController(configure)
 	if err != nil {
-		return uuid.Nil, err
+		return game.State{}, err
 	}
 	if err = ec.Repo.Lock(); err != nil {
 		return
 	}
 	defer func() {
 		err = errors.Join(err, ec.Repo.Release())
+		if err == nil {
+			s, err = GameState(configure)
+		}
 	}()
 
-	ID, err = NewGame(ec.Repo, races)
+	_, err = NewGame(ec.Repo, races)
+	return
+}
+
+func GenerateTurn(configure func(*Param)) (err error) {
+	ec, err := NewRepoController(configure)
+	if err != nil {
+		return err
+	}
+	err = ec.ExecuteLocked(func(c *Controller) error { return c.MakeTurn() })
 	return
 }
 
@@ -96,6 +108,9 @@ func ExecuteCommand(configure func(*Param), consumer func(c Ctrl) error) (err er
 
 func GameState(configure func(*Param)) (s game.State, err error) {
 	ec, err := NewRepoController(configure)
+	if err != nil {
+		return game.State{}, err
+	}
 
 	g, err := ec.Repo.LoadStateSafe()
 	if err != nil {
@@ -123,7 +138,7 @@ type RepoController struct {
 	Repo Repo
 }
 
-func (ec *RepoController) ExecuteCommand(consumer func(c *Controller) error) (err error) {
+func (ec *RepoController) ExecuteLocked(consumer func(*Controller) error) (err error) {
 	if err := ec.Repo.Lock(); err != nil {
 		return err
 	}
@@ -136,15 +151,21 @@ func (ec *RepoController) ExecuteCommand(consumer func(c *Controller) error) (er
 		return err
 	}
 
-	err = consumer(NewGameController(g))
-
-	if err == nil {
-		g.Stage += 1
-		ec.Repo.SaveLastState(g)
-	}
+	err = consumer(ec.NewGameController(g))
 	return
 }
 
+func (ec *RepoController) ExecuteCommand(consumer func(*Controller) error) (err error) {
+	return ec.ExecuteLocked(func(c *Controller) error {
+		err = consumer(c)
+		if err == nil {
+			c.Cache.StageCommand()
+			err = c.saveState()
+		}
+		return err
+	})
+}
+
 func NewRepoController(config Configurer) (*RepoController, error) {
 	c := &Param{
 		StoragePath: ".",
@@ -161,14 +182,19 @@ func NewRepoController(config Configurer) (*RepoController, error) {
 	}, nil
 }
 
-func NewGameController(g *game.Game) *Controller {
+func (ec *RepoController) NewGameController(g *game.Game) *Controller {
 	return &Controller{
-		Cache: NewCache(g),
+		RepoController: ec,
+		Cache:          NewCache(g),
 	}
 }
 
+func (c *Controller) saveState() error {
+	return c.Repo.SaveLastState(c.Cache.g)
+}
+
 type Controller struct {
-	Repo  Repo
+	*RepoController
 	Cache *Cache
 }