developer/galaxy-game
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

wip: refactor controller

Browse Source
This commit is contained in:
Ilia Denisov
2026-01-14 22:17:24 +02:00
parent 1bfc9242af
commit fe8a8d4150
43 changed files with 4710 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/game/cmd_group.go
+3 -3
View File
@@ -8,14 +8,14 @@ import (
func JoinEqualGroups(configure func(*controller.Param), race string) (err error) {
control(configure, func(c *controller.Controller) {
c.ExecuteGame(func(r controller.Repo, g *game.Game) {
err = joinEqualGroups(r, g, race)
err = joinEqualGroups(c, r, g, race)
})
})
return
}
func joinEqualGroups(r controller.Repo, g *game.Game, race string) error {
if err := g.JoinEqualGroups(race); err != nil {
func joinEqualGroups(c *controller.Controller, r controller.Repo, g *game.Game, race string) error {
if err := c.JoinEqualGroups(race); err != nil {
return err
}
return r.SaveState(g)
internal/game/cmd_group_test.go
+1 -2
View File
@@ -5,12 +5,11 @@ import (
"github.com/iliadenisov/galaxy/internal/controller"
"github.com/iliadenisov/galaxy/internal/game"
mg "github.com/iliadenisov/galaxy/internal/model/game"
"github.com/stretchr/testify/assert"
)
func TestJoinEqualGroups(t *testing.T) {
g(t, func(p func(*controller.Param), g func() *mg.Game) {
c(t, func(p func(*controller.Param), g func() *controller.Controller) {
err := game.JoinEqualGroups(p, "race_01")
assert.NoError(t, err)
})
internal/game/cmd_ship_type.go
+10 -10
View File
@@ -5,17 +5,17 @@ import (
"github.com/iliadenisov/galaxy/internal/model/game"
)
func CreateShipType(configure func(*controller.Param), race, typeName string, drive, weapons, shields, cargo float64, armament int) (err error) {
func CreateShipType(configure func(*controller.Param), race, typeName string, drive float64, ammo int, weapons, shields, cargo float64) (err error) {
control(configure, func(c *controller.Controller) {
c.ExecuteGame(func(r controller.Repo, g *game.Game) {
err = createShipType(r, g, race, typeName, drive, weapons, shields, cargo, armament)
err = createShipType(c, r, g, race, typeName, drive, ammo, weapons, shields, cargo)
})
})
return
}
func createShipType(r controller.Repo, g *game.Game, race, typeName string, d, w, s, c float64, a int) error {
if err := g.CreateShipType(race, typeName, d, w, s, c, a); err != nil {
func createShipType(c *controller.Controller, r controller.Repo, g *game.Game, race, typeName string, drive float64, ammo int, weapons, shields, cargo float64) error {
if err := c.CreateShipType(race, typeName, drive, ammo, weapons, shields, cargo); err != nil {
return err
}
return r.SaveState(g)
@@ -24,14 +24,14 @@ func createShipType(r controller.Repo, g *game.Game, race, typeName string, d, w
func MergeShipType(configure func(*controller.Param), race, source, target string) (err error) {
control(configure, func(c *controller.Controller) {
c.ExecuteGame(func(r controller.Repo, g *game.Game) {
err = mergeShipType(r, g, race, source, target)
err = mergeShipType(c, r, g, race, source, target)
})
})
return
}
func mergeShipType(r controller.Repo, g *game.Game, race, source, target string) error {
if err := g.MergeShipType(race, source, target); err != nil {
func mergeShipType(c *controller.Controller, r controller.Repo, g *game.Game, race, source, target string) error {
if err := c.MergeShipType(race, source, target); err != nil {
return err
}
return r.SaveState(g)
@@ -40,14 +40,14 @@ func mergeShipType(r controller.Repo, g *game.Game, race, source, target string)
func DeleteShipType(configure func(*controller.Param), race, typeName string) (err error) {
control(configure, func(c *controller.Controller) {
c.ExecuteGame(func(r controller.Repo, g *game.Game) {
err = deleteShipType(r, g, race, typeName)
err = deleteShipType(c, r, g, race, typeName)
})
})
return
}
func deleteShipType(r controller.Repo, g *game.Game, race, typeName string) error {
if err := g.DeleteShipType(race, typeName); err != nil {
func deleteShipType(c *controller.Controller, r controller.Repo, g *game.Game, race, typeName string) error {
if err := c.DeleteShipType(race, typeName); err != nil {
return err
}
return r.SaveState(g)
internal/game/cmd_ship_type_test.go
+8 -8
View File
@@ -15,14 +15,14 @@ import (
func TestCreateShipType(t *testing.T) {
race := "race_01"
typeName := "Drone"
g(t, func(p func(*controller.Param), g func() *mg.Game) {
c(t, func(p func(*controller.Param), ctrl func() *controller.Controller) {
err := game.DeleteShipType(p, race, typeName)
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
err = game.CreateShipType(p, unknownRaceName, " "+typeName+" ", 1, 0, 0, 0, 0) // TODO: test on dead race
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownRace))
err = game.CreateShipType(p, race, " "+typeName+" ", 1, 0, 0, 0, 0)
assert.NoError(t, err)
st, err := g().ShipTypes(race)
st, err := ctrl().ShipTypes(race)
assert.NoError(t, err)
assert.Len(t, st, 1)
assert.Equal(t, st[0].Name, typeName)
@@ -36,7 +36,7 @@ func TestCreateShipType(t *testing.T) {
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownRace))
err = game.DeleteShipType(p, race, typeName)
assert.NoError(t, err)
st, err = g().ShipTypes(race)
st, err = ctrl().ShipTypes(race)
assert.NoError(t, err)
assert.Len(t, st, 0)
})
@@ -82,12 +82,12 @@ func TestCreateShipTypeValidation(t *testing.T) {
g(t, func(p func(*controller.Param), g func() *mg.Game) {
for i, tc := range table {
if tc.err == "" {
err := game.CreateShipType(p, race, tc.name+strconv.Itoa(i), tc.d, tc.w, tc.s, tc.c, tc.a)
err := game.CreateShipType(p, race, tc.name+strconv.Itoa(i), tc.d, tc.a, tc.w, tc.s, tc.c)
assert.NoError(t, err)
err = game.CreateShipType(p, race, tc.name+strconv.Itoa(i), tc.d, tc.w, tc.s, tc.c, tc.a)
err = game.CreateShipType(p, race, tc.name+strconv.Itoa(i), tc.d, tc.a, tc.w, tc.s, tc.c)
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityTypeNameDuplicate))
} else {
err := game.CreateShipType(p, race, tc.name, tc.d, tc.w, tc.s, tc.c, tc.a)
err := game.CreateShipType(p, race, tc.name, tc.d, tc.a, tc.w, tc.s, tc.c)
assert.ErrorContains(t, err, tc.err)
}
}
@@ -96,7 +96,7 @@ func TestCreateShipTypeValidation(t *testing.T) {
func TestMergeShipType(t *testing.T) {
race := "race_01"
g(t, func(p func(*controller.Param), g func() *mg.Game) {
c(t, func(p func(*controller.Param), ctrl func() *controller.Controller) {
err := game.CreateShipType(p, race, "Drone", 1, 0, 0, 0, 0)
assert.NoError(t, err)
err = game.CreateShipType(p, race, "Spy", 1, 0, 0, 0, 0)
@@ -109,7 +109,7 @@ func TestMergeShipType(t *testing.T) {
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputEntityNotExists))
err = game.MergeShipType(p, race, "Spy", "Drone")
assert.NoError(t, err)
st, err := g().ShipTypes(race)
st, err := ctrl().ShipTypes(race)
assert.NoError(t, err)
assert.Len(t, st, 2)
err = game.MergeShipType(p, race, "Drone", "Cruiser")
internal/game/cmd_war_peace.go
+4 -4
View File
@@ -7,20 +7,20 @@ import (
func DeclareWar(configure func(*controller.Param), from, to string) (err error) {
control(configure, func(c *controller.Controller) {
c.ExecuteGame(func(r controller.Repo, g *game.Game) { err = updateRelation(r, g, from, to, game.RelationWar) })
c.ExecuteGame(func(r controller.Repo, g *game.Game) { err = updateRelation(c, r, g, from, to, game.RelationWar) })
})
return
}
func DeclarePeace(configure func(*controller.Param), from, to string) (err error) {
control(configure, func(c *controller.Controller) {
c.ExecuteGame(func(r controller.Repo, g *game.Game) { err = updateRelation(r, g, from, to, game.RelationPeace) })
c.ExecuteGame(func(r controller.Repo, g *game.Game) { err = updateRelation(c, r, g, from, to, game.RelationPeace) })
})
return
}
func updateRelation(r controller.Repo, g *game.Game, hostRace, opponentRace string, rel game.Relation) error {
if err := g.UpdateRelation(hostRace, opponentRace, rel); err != nil {
func updateRelation(c *controller.Controller, r controller.Repo, g *game.Game, hostRace, opponentRace string, rel game.Relation) error {
if err := c.UpdateRelation(hostRace, opponentRace, rel); err != nil {
return err
}
return r.SaveState(g)
internal/game/cmd_war_peace_test.go
+16 -16
View File
@@ -12,33 +12,33 @@ import (
)
func TestDeclarePeaceAndWarSingle(t *testing.T) {
g(t, func(f func(*controller.Param), g func() *mg.Game) {
c(t, func(f func(*controller.Param), ctrl func() *controller.Controller) {
hostRace := "race_05"
opponentRace := "race_01"
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
r, err = g().Relation(unknownRaceName, opponentRace) // TODO: test on dead race
r, err = ctrl().Relation(unknownRaceName, opponentRace) // TODO: test on dead race
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownRace))
r, err = g().Relation(hostRace, unknownRaceName) // TODO: test on dead race
r, err = ctrl().Relation(hostRace, unknownRaceName) // TODO: test on dead race
assert.ErrorContains(t, err, e.GenericErrorText(e.ErrInputUnknownRace))
assert.NoError(t, game.DeclarePeace(f, hostRace, opponentRace))
r, err = g().Relation(hostRace, opponentRace)
r, err = ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationPeace, r.Relation)
assert.Equal(t, mg.RelationPeace, r)
assert.NoError(t, game.DeclareWar(f, hostRace, opponentRace))
r, err = g().Relation(hostRace, opponentRace)
r, err = ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
})
}
func TestDeclarePeaceAndWarAll(t *testing.T) {
g(t, func(f func(*controller.Param), g func() *mg.Game) {
c(t, func(f func(*controller.Param), ctrl func() *controller.Controller) {
hostRace := "race_07"
for i := range testRaceCount {
@@ -46,9 +46,9 @@ func TestDeclarePeaceAndWarAll(t *testing.T) {
if opponentRace == hostRace {
continue
}
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
}
assert.NoError(t, game.DeclarePeace(f, hostRace, hostRace))
@@ -58,9 +58,9 @@ func TestDeclarePeaceAndWarAll(t *testing.T) {
if opponentRace == hostRace {
continue
}
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationPeace, r.Relation)
assert.Equal(t, mg.RelationPeace, r)
}
assert.NoError(t, game.DeclareWar(f, hostRace, hostRace))
@@ -70,9 +70,9 @@ func TestDeclarePeaceAndWarAll(t *testing.T) {
if opponentRace == hostRace {
continue
}
r, err := g().Relation(hostRace, opponentRace)
r, err := ctrl().Relation(hostRace, opponentRace)
assert.NoError(t, err)
assert.Equal(t, mg.RelationWar, r.Relation)
assert.Equal(t, mg.RelationWar, r)
}
})
}
internal/game/controller_test.go
+30
View File
@@ -52,3 +52,33 @@ func g(t *testing.T, f func(p func(*controller.Param), g func() *mg.Game)) {
}
f(p, g)
}
func c(t *testing.T, f func(p func(*controller.Param), g func() *controller.Controller)) {
root, cleanup := util.CreateWorkDir(t)
defer cleanup()
races := make([]string, testRaceCount)
for i := range testRaceCount {
races[i] = raceNum(i)
}
p := func(p *controller.Param) { p.StoragePath = root }
_, err := game.GenerateGame(p, races)
if err != nil {
assert.FailNow(t, "c: GenerateGame", err)
return
}
g := func() *controller.Controller {
c, err := controller.NewController(p)
if err != nil {
assert.FailNow(t, "c: NewController", err)
return nil
}
g, err := game.LoadState(p)
if err != nil {
assert.FailNow(t, "c: LoadState", err)
return nil
}
c.Cache = controller.NewCache(g)
return c
}
f(p, g)
}