Ilia Denisov
601970b028
Three-stage refactor of the game-engine plumbing (game logic untouched): Stage 1 — lock-free persistence + admin serialisation. Remove the file lock from repo/fs (the .lock file, the Read/Write-vs-*Safe duality and the dead ReadSafe polling) and replace the two-step rename with a single atomic rename so concurrent reads are torn-free without a lock. Serialise the state-mutating admin writers (init/turn/banish) with one shared router LimitMiddleware, rewritten to block on the request context instead of a racy shared 100ms timer. Stage 2 — remove the obsolete immediate-command path end to end. Players submit through PUT /api/v1/order; the legacy PUT /api/v1/command path is deleted across game (route, handler, 24 command factories, Ctrl), backend (Commands handler/route, engineclient.ExecuteCommands), gateway (dispatch + executeUserGamesCommand + routing entry), the FlatBuffers/model contract (UserGamesCommand[Response]) and transcoder, plus every affected OpenAPI/README/FUNCTIONAL/ARCHITECTURE doc. The integration proxy test is converted to the order path. Stage 3 — flatten the REST->engine wrapper. Replace the executor adapter, the controller package functions and RepoController with one concrete controller.Service; drop the single-implementation Repo and Storage interfaces (repo.Repo / fs.FS are now concrete). Handlers depend on a thin handler.Engine seam and own the domain->REST projection; storage is resolved once at startup instead of per request. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
90 lines
2.8 KiB
Go
90 lines
2.8 KiB
Go
package router_test
|
|
|
|
import (
|
|
"encoding/json"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"testing"
|
|
|
|
"galaxy/model/rest"
|
|
|
|
"galaxy/util"
|
|
|
|
"galaxy/game/internal/router"
|
|
|
|
"github.com/google/uuid"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestGetTurn(t *testing.T) {
|
|
root, cleanup := util.CreateWorkDir(t)
|
|
defer cleanup()
|
|
|
|
r := router.SetupRouter(newService(t, root))
|
|
|
|
// create game
|
|
|
|
payload := generateInitRequest(10)
|
|
|
|
w := httptest.NewRecorder()
|
|
req, _ := http.NewRequest("POST", "/api/v1/admin/init", asBody(payload))
|
|
r.ServeHTTP(w, req)
|
|
|
|
assert.Equal(t, http.StatusCreated, w.Code, w.Body)
|
|
var initResponse rest.StateResponse
|
|
assert.NoError(t, json.Unmarshal(w.Body.Bytes(), &initResponse))
|
|
assert.NoError(t, uuid.Validate(initResponse.ID.String()))
|
|
assert.NotEqual(t, uuid.Nil, uuid.MustParse(initResponse.ID.String()))
|
|
assert.Equal(t, uint(0), initResponse.Turn)
|
|
assert.Equal(t, uint(0), initResponse.Stage)
|
|
for i := range initResponse.Players {
|
|
assert.NoError(t, uuid.Validate(initResponse.Players[i].ID.String()))
|
|
assert.Equal(t, raceName(i), initResponse.Players[i].RaceName)
|
|
assert.Equal(t, uint(3), initResponse.Players[i].Planets)
|
|
assert.Equal(t, 2000., initResponse.Players[i].Population)
|
|
assert.False(t, initResponse.Players[i].Extinct)
|
|
}
|
|
|
|
// generate next turn
|
|
|
|
w = httptest.NewRecorder()
|
|
req, _ = http.NewRequest("PUT", "/api/v1/admin/turn", nil)
|
|
r.ServeHTTP(w, req)
|
|
|
|
assert.Equal(t, http.StatusOK, w.Code, w.Body)
|
|
|
|
var turnResponse rest.StateResponse
|
|
assert.NoError(t, json.Unmarshal(w.Body.Bytes(), &turnResponse))
|
|
assert.NoError(t, uuid.Validate(turnResponse.ID.String()))
|
|
assert.Equal(t, initResponse.ID, turnResponse.ID)
|
|
assert.Equal(t, uint(1), turnResponse.Turn)
|
|
assert.Equal(t, uint(0), turnResponse.Stage)
|
|
for i := range turnResponse.Players {
|
|
assert.NoError(t, uuid.Validate(turnResponse.Players[i].ID.String()))
|
|
assert.Equal(t, raceName(i), turnResponse.Players[i].RaceName)
|
|
assert.Equal(t, uint(3), turnResponse.Players[i].Planets)
|
|
assert.Equal(t, 2000., turnResponse.Players[i].Population)
|
|
assert.False(t, turnResponse.Players[i].Extinct)
|
|
}
|
|
|
|
// validate status
|
|
|
|
w = httptest.NewRecorder()
|
|
req, _ = http.NewRequest("GET", "/api/v1/admin/status", nil)
|
|
r.ServeHTTP(w, req)
|
|
|
|
assert.Equal(t, http.StatusOK, w.Code, w.Body)
|
|
var stateResponse rest.StateResponse
|
|
assert.NoError(t, json.Unmarshal(w.Body.Bytes(), &stateResponse))
|
|
assert.Equal(t, initResponse.ID, stateResponse.ID)
|
|
assert.Equal(t, uint(1), stateResponse.Turn)
|
|
assert.Equal(t, uint(0), stateResponse.Stage)
|
|
for i := range stateResponse.Players {
|
|
assert.NoError(t, uuid.Validate(stateResponse.Players[i].ID.String()))
|
|
assert.Equal(t, raceName(i), stateResponse.Players[i].RaceName)
|
|
assert.Equal(t, uint(3), stateResponse.Players[i].Planets)
|
|
assert.Equal(t, 2000., stateResponse.Players[i].Population)
|
|
assert.False(t, stateResponse.Players[i].Extinct)
|
|
}
|
|
}
|